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
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🛋️ perf: Discover MCP Tools Only When Needed (#16190)
lia-by-librechat[bot]17348558213d
diff --git a/client/src/Providers/AgentPanelContext.tsx b/client/src/Providers/AgentPanelContext.tsxindex 3cb2e7c1a2..e6b6a2a35a 100644--- a/client/src/Providers/AgentPanelContext.tsx+++ b/client/src/Providers/AgentPanelContext.tsx@@ -53,13 +53,14 @@ export function AgentPanelProvider({activateCatalog('mcpTools');}}, [panelVisible]);+ const observeVisibleToolAuthorization = panelVisible && observeToolAuthorization;const [mcp, setMcp] = useState<MCP | undefined>(undefined);const [mcps, setMcps] = useState<MCP[] | undefined>(undefined);const [action, setAction] = useState<Action | undefined>(undefined);const [activePanel, setActivePanel] = useState<Panel>(Panel.builder);const [agent_id, setCurrentAgentId] = useState<string | undefined>(undefined);const { availableMCPServers, isLoading, availableMCPServersMap, connectionStatus } =- useMCPServerManager({ observeToolAuthorization });+ useMCPServerManager({ observeToolAuthorization: observeVisibleToolAuthorization });const { data: startupConfig } = useGetStartupConfig();const { data: actions } = useGetActionsQuery(EModelEndpoint.agents, {enabled: observeToolAuthorization,@@ -72,9 +73,8 @@ export function AgentPanelProvider({const mcpToolsReady = useCatalogReady('mcpTools');useMCPRefresh({enabled:- panelVisible &&mcpToolsReady &&- observeToolAuthorization &&+ observeVisibleToolAuthorization &&!isLoading &&availableMCPServers.length > 0,tools: true,@@ -82,7 +82,7 @@ export function AgentPanelProvider({const { data: mcpData, isFetching: mcpToolsFetching } = useMCPToolsQuery({enabled:mcpToolsReady &&- observeToolAuthorization &&+ observeVisibleToolAuthorization &&!isLoading &&availableMCPServers != null &&availableMCPServers.length > 0,diff --git a/client/src/hooks/Config/__tests__/useAppStartup.spec.tsx b/client/src/hooks/Config/__tests__/useAppStartup.spec.tsxindex a45be858b3..7d2ec08db0 100644--- a/client/src/hooks/Config/__tests__/useAppStartup.spec.tsx+++ b/client/src/hooks/Config/__tests__/useAppStartup.spec.tsx@@ -76,19 +76,15 @@ describe('useAppStartup: MCP permission gating', () => {beforeEach(() => {mockInstallCloudFrontImageRetry.mockClear();mockUseMCPServersQuery.mockReturnValue({ data: undefined, isLoading: false });- mockUseMCPToolsQuery.mockReturnValue({ data: undefined, isLoading: false });mockUseCatalogReady.mockReturnValue(true);});it('checks the MCP_SERVERS.USE permission via useHasAccess', () => {mockUseHasAccess.mockReturnValue(false);- renderHook(- () => useAppStartup({ startupConfig: undefined, user: mockUser, mcpWarmupAllowed: true }),- {- wrapper,- },- );+ renderHook(() => useAppStartup({ startupConfig: undefined, user: mockUser }), {+ wrapper,+ });expect(mockUseHasAccess).toHaveBeenCalledWith({permissionType: PermissionTypes.MCP_SERVERS,@@ -96,122 +92,31 @@ describe('useAppStartup: MCP permission gating', () => {});});- it('suppresses all MCP queries when user lacks MCP_SERVERS.USE', () => {+ it('suppresses the MCP server query when user lacks MCP_SERVERS.USE', () => {mockUseHasAccess.mockReturnValue(false);- renderHook(- () => useAppStartup({ startupConfig: undefined, user: mockUser, mcpWarmupAllowed: true }),- { wrapper },- );+ renderHook(() => useAppStartup({ startupConfig: undefined, user: mockUser }), { wrapper });expect(mockUseMCPServersQuery).toHaveBeenCalledWith({ enabled: false });- expect(mockUseMCPToolsQuery).toHaveBeenCalledWith({ enabled: false });});- it('suppresses MCP queries while background catalog warmup has not released them', () => {+ it('suppresses server metadata warmup until the catalog is released', () => {mockUseHasAccess.mockReturnValue(true);mockUseCatalogReady.mockReturnValue(false);- renderHook(- () => useAppStartup({ startupConfig: undefined, user: mockUser, mcpWarmupAllowed: true }),- { wrapper },- );+ renderHook(() => useAppStartup({ startupConfig: undefined, user: mockUser }), { wrapper });expect(mockUseCatalogReady).toHaveBeenCalledWith('mcpServers');- expect(mockUseCatalogReady).toHaveBeenCalledWith('mcpTools');expect(mockUseMCPServersQuery).toHaveBeenCalledWith({ enabled: false });- expect(mockUseMCPToolsQuery).toHaveBeenCalledWith({ enabled: false });- });-- it('enables servers query and tools query when permission granted, servers loaded, and user present', () => {- mockUseHasAccess.mockReturnValue(true);- mockUseMCPServersQuery.mockReturnValue({- data: { 'test-server': { url: 'http://test' } },- isLoading: false,- });-- renderHook(- () => useAppStartup({ startupConfig: undefined, user: mockUser, mcpWarmupAllowed: true }),- {- wrapper,- },- );-- expect(mockUseMCPServersQuery).toHaveBeenCalledWith({ enabled: true });- expect(mockUseMCPToolsQuery).toHaveBeenCalledWith({ enabled: true });- });-- it('waits for the host to allow MCP warmup', () => {- mockUseHasAccess.mockReturnValue(true);- mockUseMCPServersQuery.mockReturnValue({- data: { 'test-server': { url: 'http://test' } },- isLoading: false,- });-- renderHook(- () => useAppStartup({ startupConfig: undefined, user: mockUser, mcpWarmupAllowed: false }),- { wrapper },- );-- expect(mockUseMCPToolsQuery).toHaveBeenCalledWith({ enabled: false });- });-- it('suppresses background tool discovery for an ephemeral agent conversation', () => {- mockUseHasAccess.mockReturnValue(true);- mockUseMCPServersQuery.mockReturnValue({- data: { 'test-server': { url: 'http://test' } },- isLoading: false,- });- renderHook(- () => useAppStartup({ startupConfig: undefined, user: mockUser, mcpWarmupAllowed: false }),- {- wrapper,- },- );-- expect(mockUseMCPServersQuery).toHaveBeenCalledWith({ enabled: true });- expect(mockUseMCPToolsQuery).toHaveBeenCalledWith({ enabled: false });- });-- it('suppresses tools query when permission granted but user prop is undefined', () => {- mockUseHasAccess.mockReturnValue(true);- mockUseMCPServersQuery.mockReturnValue({- data: { 'test-server': { url: 'http://test' } },- isLoading: false,- });-- renderHook(- () => useAppStartup({ startupConfig: undefined, user: undefined, mcpWarmupAllowed: true }),- { wrapper },- );-- expect(mockUseMCPServersQuery).toHaveBeenCalledWith({ enabled: true });- expect(mockUseMCPToolsQuery).toHaveBeenCalledWith({ enabled: false });});- it('suppresses tools query when permission granted but no servers loaded', () => {+ it('warms server metadata without discovering MCP tools during app startup', () => {mockUseHasAccess.mockReturnValue(true);- mockUseMCPServersQuery.mockReturnValue({ data: {}, isLoading: false });- renderHook(- () => useAppStartup({ startupConfig: undefined, user: mockUser, mcpWarmupAllowed: true }),- { wrapper },- );+ renderHook(() => useAppStartup({ startupConfig: undefined, user: mockUser }), { wrapper });expect(mockUseMCPServersQuery).toHaveBeenCalledWith({ enabled: true });- expect(mockUseMCPToolsQuery).toHaveBeenCalledWith({ enabled: false });- });-- it('suppresses tools query while servers are still loading', () => {- mockUseHasAccess.mockReturnValue(true);- mockUseMCPServersQuery.mockReturnValue({ data: undefined, isLoading: true });-- renderHook(- () => useAppStartup({ startupConfig: undefined, user: mockUser, mcpWarmupAllowed: true }),- { wrapper },- );-- expect(mockUseMCPToolsQuery).toHaveBeenCalledWith({ enabled: false });+ expect(mockUseMCPToolsQuery).not.toHaveBeenCalled();});it('installs CloudFront image retry from startup config', () => {@@ -225,7 +130,7 @@ describe('useAppStartup: MCP permission gating', () => {},} as never;- renderHook(() => useAppStartup({ startupConfig, user: mockUser, mcpWarmupAllowed: true }), {+ renderHook(() => useAppStartup({ startupConfig, user: mockUser }), {wrapper,});diff --git a/client/src/hooks/Config/useAppStartup.ts b/client/src/hooks/Config/useAppStartup.tsindex 4c9cd134e0..15392dce65 100644--- a/client/src/hooks/Config/useAppStartup.ts+++ b/client/src/hooks/Config/useAppStartup.ts@@ -10,20 +10,18 @@ import {resolveModelSpecEndpoint,} from 'librechat-data-provider';import type { TStartupConfig, TUser } from 'librechat-data-provider';-import { useMCPToolsQuery, useMCPServersQuery } from '~/data-provider';import { cleanupTimestampedStorage } from '~/utils/timestamps';import useSpeechSettingsInit from './useSpeechSettingsInit';import { useHasAccess, useCatalogReady } from '~/hooks';+import { useMCPServersQuery } from '~/data-provider';import store from '~/store';export default function useAppStartup({startupConfig,user,- mcpWarmupAllowed,}: {startupConfig?: TStartupConfig;user?: TUser;- mcpWarmupAllowed: boolean;}) {const [defaultPreset, setDefaultPreset] = useRecoilState(store.defaultPreset);const canUseMcp = useHasAccess({@@ -32,24 +30,10 @@ export default function useAppStartup({});useSpeechSettingsInit(!!user);- /** MCP catalogs are background-warmed: the queries stay off the startup- * path until warmup releases them (or an MCP UI activates them). */+ /** Server metadata may warm after first paint because it powers lightweight+ * navigation affordances. Tool discovery stays owned by visible MCP consumers. */const mcpServersReady = useCatalogReady('mcpServers');- const mcpToolsReady = useCatalogReady('mcpTools');- const { data: loadedServers, isLoading: serversLoading } = useMCPServersQuery({- enabled: canUseMcp && mcpServersReady,- });-- useMCPToolsQuery({- enabled:- canUseMcp &&- mcpToolsReady &&- !serversLoading &&- !!loadedServers &&- Object.keys(loadedServers).length > 0 &&- mcpWarmupAllowed &&- !!user,- });+ useMCPServersQuery({ enabled: canUseMcp && mcpServersReady });/** Clean up old localStorage entries on startup */useEffect(() => {diff --git a/client/src/routes/ChatRoute.tsx b/client/src/routes/ChatRoute.tsxindex e4236fe194..c0329ea788 100644--- a/client/src/routes/ChatRoute.tsx+++ b/client/src/routes/ChatRoute.tsx@@ -4,13 +4,7 @@ import { useRecoilCallback, useRecoilValue } from 'recoil';import { useParams, useSearchParams } from 'react-router-dom';import { Button, Spinner, useToastContext } from '@librechat/client';import { useGetModelsQuery } from 'librechat-data-provider/react-query';-import {- Constants,- EModelEndpoint,- PermissionBits,- isAgentsEndpoint,- isEphemeralAgentId,-} from 'librechat-data-provider';+import { Constants, EModelEndpoint, PermissionBits } from 'librechat-data-provider';import type { TPreset, TAgentsMap } from 'librechat-data-provider';import {defaultSpecAwaitsAgents,@@ -80,10 +74,7 @@ export default function ChatRoute() {} else if (routeState.pending && conversation?.conversationId === conversationId) {setRouteState({ conversationId, pending: false });}- const mcpWarmupAllowed =- conversation != null &&- !(isAgentsEndpoint(conversation.endpoint) && isEphemeralAgentId(conversation.agent_id ?? ''));- useAppStartup({ startupConfig, user, mcpWarmupAllowed });+ useAppStartup({ startupConfig, user });const { newConversation } = useNewConvo();const { showToast } = useToastContext();const localize = useLocalize();