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
🧼 fix: Sanitize MCP Server Selection Against Config (#10243)
Federico Ruggi13b784a3e68a
diff --git a/client/src/components/Agents/tests/VirtualScrollingPerformance.test.tsx b/client/src/components/Agents/tests/VirtualScrollingPerformance.test.tsxindex 1efb239308..1e1b7d1e4b 100644--- a/client/src/components/Agents/tests/VirtualScrollingPerformance.test.tsx+++ b/client/src/components/Agents/tests/VirtualScrollingPerformance.test.tsx@@ -194,7 +194,7 @@ describe('Virtual Scrolling Performance', () => {// Performance check: rendering should be fastconst renderTime = endTime - startTime;- expect(renderTime).toBeLessThan(720);+ expect(renderTime).toBeLessThan(740);console.log(`Rendered 1000 agents in ${renderTime.toFixed(2)}ms`);console.log(`Only ${renderedCards.length} DOM nodes created for 1000 agents`);diff --git a/client/src/hooks/MCP/__tests__/useMCPSelect.test.tsx b/client/src/hooks/MCP/__tests__/useMCPSelect.test.tsxindex b562b77d86..7145e95e74 100644--- a/client/src/hooks/MCP/__tests__/useMCPSelect.test.tsx+++ b/client/src/hooks/MCP/__tests__/useMCPSelect.test.tsx@@ -6,6 +6,7 @@ import { Constants, LocalStorageKeys } from 'librechat-data-provider';import { ephemeralAgentByConvoId } from '~/store';import { setTimestamp } from '~/utils/timestamps';import { useMCPSelect } from '../useMCPSelect';+import * as dataProvider from '~/data-provider';// Mock dependenciesjest.mock('~/utils/timestamps', () => ({@@ -14,10 +15,21 @@ jest.mock('~/utils/timestamps', () => ({jest.mock('lodash/isEqual', () => jest.fn((a, b) => JSON.stringify(a) === JSON.stringify(b)));-const createWrapper = () => {+jest.mock('~/data-provider', () => ({+ ...jest.requireActual('~/data-provider'),+ useGetStartupConfig: jest.fn(),+}));++const createWrapper = (mcpServers: string[] = []) => {// Create a new Jotai store for each test to ensure clean stateconst store = createStore();+ // Mock the startup config+ (dataProvider.useGetStartupConfig as jest.Mock).mockReturnValue({+ data: { mcpServers: Object.fromEntries(mcpServers.map((v) => [v, {}])) },+ isLoading: false,+ });+const Wrapper: React.FC<{ children: React.ReactNode }> = ({ children }) => (<RecoilRoot><Provider store={store}>{children}</Provider>@@ -65,7 +77,7 @@ describe('useMCPSelect', () => {describe('State Updates', () => {it('should update mcpValues when setMCPValues is called', async () => {const { result } = renderHook(() => useMCPSelect({}), {- wrapper: createWrapper(),+ wrapper: createWrapper(['value1', 'value2']),});const newValues = ['value1', 'value2'];@@ -229,7 +241,7 @@ describe('useMCPSelect', () => {const { result, rerender } = renderHook(({ conversationId }) => useMCPSelect({ conversationId }),{- wrapper: createWrapper(),+ wrapper: createWrapper(['convo1-value', 'convo2-value']),initialProps: { conversationId: 'convo1' },},);@@ -271,7 +283,7 @@ describe('useMCPSelect', () => {describe('Ephemeral Agent Synchronization', () => {it('should sync mcpValues when ephemeralAgent is updated externally', async () => {// Create a shared wrapper for both hooks to share the same Recoil/Jotai context- const wrapper = createWrapper();+ const wrapper = createWrapper(['external-value1', 'external-value2']);// Create a component that uses both hooks to ensure they share stateconst TestComponent = () => {@@ -298,9 +310,75 @@ describe('useMCPSelect', () => {});});+ it('should filter out MCPs not in configured servers', async () => {+ const wrapper = createWrapper(['server1', 'server2']);++ const TestComponent = () => {+ const mcpHook = useMCPSelect({});+ const setEphemeralAgent = useSetRecoilState(ephemeralAgentByConvoId(Constants.NEW_CONVO));+ return { mcpHook, setEphemeralAgent };+ };++ const { result } = renderHook(() => TestComponent(), { wrapper });++ act(() => {+ result.current.setEphemeralAgent({+ mcp: ['server1', 'removed-server', 'server2'],+ });+ });++ await waitFor(() => {+ expect(result.current.mcpHook.mcpValues).toEqual(['server1', 'server2']);+ });+ });++ it('should clear all MCPs when none are in configured servers', async () => {+ const wrapper = createWrapper(['server1', 'server2']);++ const TestComponent = () => {+ const mcpHook = useMCPSelect({});+ const setEphemeralAgent = useSetRecoilState(ephemeralAgentByConvoId(Constants.NEW_CONVO));+ return { mcpHook, setEphemeralAgent };+ };++ const { result } = renderHook(() => TestComponent(), { wrapper });++ act(() => {+ result.current.setEphemeralAgent({+ mcp: ['removed1', 'removed2', 'removed3'],+ });+ });++ await waitFor(() => {+ expect(result.current.mcpHook.mcpValues).toEqual([]);+ });+ });++ it('should keep all MCPs when all are in configured servers', async () => {+ const wrapper = createWrapper(['server1', 'server2', 'server3']);++ const TestComponent = () => {+ const mcpHook = useMCPSelect({});+ const setEphemeralAgent = useSetRecoilState(ephemeralAgentByConvoId(Constants.NEW_CONVO));+ return { mcpHook, setEphemeralAgent };+ };++ const { result } = renderHook(() => TestComponent(), { wrapper });++ act(() => {+ result.current.setEphemeralAgent({+ mcp: ['server1', 'server2'],+ });+ });++ await waitFor(() => {+ expect(result.current.mcpHook.mcpValues).toEqual(['server1', 'server2']);+ });+ });+it('should update ephemeralAgent when mcpValues changes through hook', async () => {// Create a shared wrapper for both hooks- const wrapper = createWrapper();+ const wrapper = createWrapper(['hook-value1', 'hook-value2']);// Create a component that uses both the hook and accesses Recoil stateconst TestComponent = () => {@@ -326,7 +404,7 @@ describe('useMCPSelect', () => {it('should handle empty ephemeralAgent.mcp array correctly', async () => {// Create a shared wrapper- const wrapper = createWrapper();+ const wrapper = createWrapper(['initial-value']);// Create a component that uses both hooksconst TestComponent = () => {@@ -360,7 +438,7 @@ describe('useMCPSelect', () => {it('should properly sync non-empty arrays from ephemeralAgent', async () => {// Additional test to ensure non-empty arrays DO sync- const wrapper = createWrapper();+ const wrapper = createWrapper(['value1', 'value2', 'value3', 'value4', 'value5']);const TestComponent = () => {const mcpHook = useMCPSelect({});@@ -401,7 +479,7 @@ describe('useMCPSelect', () => {describe('Edge Cases', () => {it('should handle undefined conversationId', () => {const { result } = renderHook(() => useMCPSelect({ conversationId: undefined }), {- wrapper: createWrapper(),+ wrapper: createWrapper(['test']),});expect(result.current.mcpValues).toEqual([]);@@ -422,12 +500,11 @@ describe('useMCPSelect', () => {});it('should handle very large arrays without performance issues', async () => {+ const largeArray = Array.from({ length: 1000 }, (_, i) => `value-${i}`);const { result } = renderHook(() => useMCPSelect({}), {- wrapper: createWrapper(),+ wrapper: createWrapper(largeArray),});- const largeArray = Array.from({ length: 1000 }, (_, i) => `value-${i}`);-const startTime = performance.now();act(() => {@@ -457,8 +534,9 @@ describe('useMCPSelect', () => {describe('Memory Leak Prevention', () => {it('should not leak memory on repeated updates', async () => {+ const values = Array.from({ length: 100 }, (_, i) => `value-${i}`);const { result } = renderHook(() => useMCPSelect({}), {- wrapper: createWrapper(),+ wrapper: createWrapper(values),});// Perform many updates to test for memory leaksdiff --git a/client/src/hooks/MCP/useMCPSelect.ts b/client/src/hooks/MCP/useMCPSelect.tsindex dc3ac869c9..3f37bb4d70 100644--- a/client/src/hooks/MCP/useMCPSelect.ts+++ b/client/src/hooks/MCP/useMCPSelect.ts@@ -1,13 +1,18 @@-import { useCallback, useEffect } from 'react';+import { useCallback, useEffect, useMemo } from 'react';import { useAtom } from 'jotai';import isEqual from 'lodash/isEqual';import { useRecoilState } from 'recoil';import { Constants, LocalStorageKeys } from 'librechat-data-provider';import { ephemeralAgentByConvoId, mcpValuesAtomFamily, mcpPinnedAtom } from '~/store';+import { useGetStartupConfig } from '~/data-provider';import { setTimestamp } from '~/utils/timestamps';export function useMCPSelect({ conversationId }: { conversationId?: string | null }) {const key = conversationId ?? Constants.NEW_CONVO;+ const { data: startupConfig } = useGetStartupConfig();+ const configuredServers = useMemo(() => {+ return new Set(Object.keys(startupConfig?.mcpServers ?? {}));+ }, [startupConfig?.mcpServers]);const [isPinned, setIsPinned] = useAtom(mcpPinnedAtom);const [mcpValues, setMCPValuesRaw] = useAtom(mcpValuesAtomFamily(key));@@ -15,10 +20,13 @@ export function useMCPSelect({ conversationId }: { conversationId?: string | nul// Sync Jotai state with ephemeral agent stateuseEffect(() => {- if (ephemeralAgent?.mcp && ephemeralAgent.mcp.length > 0) {- setMCPValuesRaw(ephemeralAgent.mcp);+ const mcps = ephemeralAgent?.mcp ?? [];+ if (mcps.length > 0) {+ // Strip out servers that are not available in the startup config+ const activeMcps = mcps.filter((mcp) => configuredServers.has(mcp));+ setMCPValuesRaw(activeMcps);}- }, [ephemeralAgent?.mcp, setMCPValuesRaw]);+ }, [ephemeralAgent?.mcp, setMCPValuesRaw, configuredServers]);useEffect(() => {setEphemeralAgent((prev) => {