Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🛄 fix: Clear MCP Connection State Before Catalog Refresh (#15741)

Danny Avila2577324343cf
diff --git a/client/src/hooks/MCP/__tests__/useMCPServerManager.spec.tsx b/client/src/hooks/MCP/__tests__/useMCPServerManager.spec.tsx
new file mode 100644
index 0000000000..6704435a0b
--- /dev/null
+++ b/client/src/hooks/MCP/__tests__/useMCPServerManager.spec.tsx
@@ -0,0 +1,123 @@
+import React from 'react';
+import { Provider } from 'jotai';
+import { QueryKeys } from 'librechat-data-provider';
+import { act, renderHook, waitFor } from '@testing-library/react';
+import { QueryClient, QueryClientProvider, QueryObserver } from '@tanstack/react-query';
+import type { MCPReinitializeResponse } from 'librechat-data-provider';
+import { useMCPServerManager } from '../useMCPServerManager';
+
+const mockShowToast = jest.fn();
+const mockSetMCPValues = jest.fn();
+const mockReinitialize = jest.fn();
+
+jest.mock('@librechat/client', () => ({
+ useToastContext: () => ({ showToast: mockShowToast }),
+}));
+
+jest.mock('~/hooks', () => ({
+ useLocalize: () => (key: string) => key,
+ useHasAccess: () => true,
+ useCatalogReady: () => true,
+ useMCPSelect: () => ({ mcpValues: [], setMCPValues: mockSetMCPValues }),
+ useMCPConnectionStatus: () => ({ connectionStatus: {} }),
+}));
+
+jest.mock('~/data-provider', () => ({
+ useGetStartupConfig: () => ({ data: {} }),
+ useMCPServersQuery: () => ({ data: {}, isLoading: false }),
+}));
+
+jest.mock('librechat-data-provider/react-query', () => ({
+ useReinitializeMCPServerMutation: () => ({ mutateAsync: mockReinitialize }),
+ useCancelMCPOAuthMutation: () => ({}),
+ useUpdateUserPluginsMutation: () => ({}),
+ useGetAllEffectivePermissionsQuery: () => ({ data: {} }),
+}));
+
+function deferred<T>() {
+ let resolve!: (value: T) => void;
+ let reject!: (reason: Error) => void;
+ const promise = new Promise<T>((resolvePromise, rejectPromise) => {
+ resolve = resolvePromise;
+ reject = rejectPromise;
+ });
+ return { promise, resolve, reject };
+}
+
+describe('useMCPServerManager initialization', () => {
+ it.each(['success', 'error'])(
+ 'finishes before a slow catalog refetch ends in %s',
+ async (outcome) => {
+ const connection = deferred<MCPReinitializeResponse>();
+ const catalog = deferred<string[]>();
+ mockReinitialize.mockReturnValue(connection.promise);
+ const queryClient = new QueryClient({
+ defaultOptions: { queries: { retry: false, cacheTime: 0 } },
+ logger: { log: console.log, warn: console.warn, error: jest.fn() },
+ });
+ const catalogQuery = new QueryObserver(queryClient, {
+ queryKey: [QueryKeys.mcpTools],
+ queryFn: () => catalog.promise,
+ initialData: [],
+ staleTime: Infinity,
+ });
+ const unsubscribe = catalogQuery.subscribe(() => undefined);
+ const invalidate = jest.spyOn(queryClient, 'invalidateQueries');
+ const wrapper = ({ children }: { children: React.ReactNode }) => (
+ <Provider>
+ <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+ </Provider>
+ );
+ const { result, unmount } = renderHook(() => useMCPServerManager(), { wrapper });
+ const initialized = jest.fn();
+
+ try {
+ act(() => {
+ void result.current.initializeServer('test-server').then(initialized);
+ });
+ expect(result.current.isInitializing('test-server')).toBe(true);
+ expect(mockShowToast).not.toHaveBeenCalled();
+
+ const response = { success: true, message: 'Connected', serverName: 'test-server' };
+ await act(async () => {
+ connection.resolve(response);
+ });
+
+ expect(queryClient.getQueryState([QueryKeys.mcpTools])?.fetchStatus).toBe('fetching');
+ expect(result.current.isInitializing('test-server')).toBe(false);
+ expect(initialized).toHaveBeenCalledWith(response);
+ expect(mockSetMCPValues).toHaveBeenCalledWith(['test-server']);
+ expect(mockShowToast).toHaveBeenCalledWith({
+ message: 'com_ui_mcp_initialized_success',
+ status: 'success',
+ });
+ for (const key of [
+ QueryKeys.mcpServers,
+ QueryKeys.mcpTools,
+ QueryKeys.mcpAuthValues,
+ QueryKeys.mcpConnectionStatus,
+ ]) {
+ expect(invalidate).toHaveBeenCalledWith([key]);
+ }
+
+ await act(async () => {
+ if (outcome === 'error') {
+ catalog.reject(new Error('Catalog unavailable'));
+ } else {
+ catalog.resolve(['test-tool']);
+ }
+ });
+ await waitFor(() => {
+ expect(queryClient.getQueryState([QueryKeys.mcpTools])?.fetchStatus).toBe('idle');
+ });
+ expect(result.current.isInitializing('test-server')).toBe(false);
+ expect(mockShowToast).toHaveBeenCalledTimes(1);
+ } finally {
+ catalog.resolve([]);
+ unmount();
+ unsubscribe();
+ queryClient.clear();
+ }
+ },
+ );
+});
diff --git a/client/src/hooks/MCP/useMCPServerManager.ts b/client/src/hooks/MCP/useMCPServerManager.ts
index 6afa424c30..1a2b82fa95 100644
--- a/client/src/hooks/MCP/useMCPServerManager.ts
+++ b/client/src/hooks/MCP/useMCPServerManager.ts
@@ -506,12 +506,15 @@ export function useMCPServerManager({
startServerPolling(serverName, response.flowId, response.oauthTimeout);
} else {
- await Promise.all([
+ cleanupServerState(serverName);
+ void Promise.all([
queryClient.invalidateQueries([QueryKeys.mcpServers]),
queryClient.invalidateQueries([QueryKeys.mcpTools]),
queryClient.invalidateQueries([QueryKeys.mcpAuthValues]),
queryClient.invalidateQueries([QueryKeys.mcpConnectionStatus]),
- ]);
+ ]).catch((error) => {
+ console.error(`[MCP Manager] Failed to refresh queries for ${serverName}:`, error);
+ });
showToast({
message: localize('com_ui_mcp_initialized_success', { 0: serverName }),
@@ -522,8 +525,6 @@ export function useMCPServerManager({
if (!currentValues.includes(serverName)) {
setMCPValues([...currentValues, serverName]);
}
-
- cleanupServerState(serverName);
}
return response;
} catch (error) {