🎚️ feat: Let Chat Users Switch a Saved Agent's Tools

api/server/controllers/agents/v1.js

@@ -67,6 +67,7 @@ const {
   EModelEndpoint,
   FileSources,
   removeCodeExecutionCaller,
+  pickUserToggleOptions,
   hasActivePiiFields,
   hasActivePiiPatterns,
   openapiToFunction,
@@ -958,6 +959,8 @@ const getAgentHandler = async (req, res, expandProperties = false) => {
         provider: agent.provider,
         model: agent.model,
         model_parameters: getSafeModelParameters(agent.model_parameters),
+        tools: agent.tools,
+        tool_options: pickUserToggleOptions(agent.tool_options),
         isPublic: agent.isPublic,
         version: agent.version,
         // Safe metadata

api/server/controllers/agents/v1.spec.js

@@ -1476,6 +1476,30 @@ describe('Agent Controllers - Mass Assignment Protection', () => {
       const response = mockRes.json.mock.calls[0][0];
       expect(response.conversation_starters).toEqual(starters);
     });
+
+    test('should include the tools and only their user switches in the basic VIEW response', async () => {
+      const agent = await Agent.create({
+        id: `agent_${uuidv4()}`,
+        name: 'Switchable Agent',
+        provider: 'openai',
+        model: 'gpt-4',
+        author: new mongoose.Types.ObjectId(),
+        tools: ['web_search', 'search_mcp_docs'],
+        tool_options: {
+          web_search: { user_toggle: 'off', defer_loading: true },
+          search_mcp_docs: { allowed_callers: ['direct'] },
+        },
+      });
+
+      mockReq.params = { id: agent.id };
+
+      await getAgentHandler(mockReq, mockRes);
+
+      expect(mockRes.status).toHaveBeenCalledWith(200);
+      const response = mockRes.json.mock.calls[0][0];
+      expect(response.tools).toEqual(['web_search', 'search_mcp_docs']);
+      expect(response.tool_options).toEqual({ web_search: { user_toggle: 'off' } });
+    });
   });
 
   describe('getAgentVersionsHandler', () => {

api/server/services/Endpoints/agents/build.js

@@ -20,6 +20,7 @@ const buildOptions = (req, endpoint, parsedBody, endpointType) => {
     agent_id: isAgentsEndpoint(endpoint) ? agent_id : Constants.EPHEMERAL_AGENT_ID,
     endpoint,
     model_parameters,
+    userToolSwitches: req.body?.ephemeralAgent ?? null,
   }).catch((error) => {
     logger.error(`[/agents/:${agent_id}] Error retrieving agent during build options step`, error);
     return undefined;

client/src/Providers/BadgeRowContext.tsx

@@ -1,7 +1,7 @@
 import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
 import { useSetRecoilState } from 'recoil';
 import { Tools, Constants, LocalStorageKeys, AgentCapabilities } from 'librechat-data-provider';
-import type { TAgentsEndpoint, TEphemeralAgent } from 'librechat-data-provider';
+import type { AgentToolSwitches, TAgentsEndpoint, TEphemeralAgent } from 'librechat-data-provider';
 import {
   useMCPServerManager,
   useSearchApiKeyForm,
@@ -16,6 +16,8 @@ interface BadgeRowContextType {
   conversationId?: string | null;
   storageContextKey?: string;
   agentsConfig?: TAgentsEndpoint | null;
+  /** Present only in a saved agent's chat: the tools its creator made switchable. */
+  agentToolSwitches?: AgentToolSwitches;
   skills: ReturnType<typeof useToolToggle>;
   memory: ReturnType<typeof useToolToggle>;
   webSearch: ReturnType<typeof useToolToggle>;
@@ -38,6 +40,7 @@ interface BadgeRowProviderProps {
   conversationId?: string | null;
   specName?: string | null;
   observeToolAuthorization?: boolean;
+  agentToolSwitches?: AgentToolSwitches;
 }
 
 export default function BadgeRowProvider({
@@ -46,6 +49,7 @@ export default function BadgeRowProvider({
   conversationId,
   specName,
   observeToolAuthorization = false,
+  agentToolSwitches,
 }: BadgeRowProviderProps) {
   const lastContextKeyRef = useRef<string>('');
   const hasInitializedRef = useRef(false);
@@ -272,14 +276,35 @@ export default function BadgeRowProvider({
     isAuthenticated: true,
   });
 
+  const agentServers = useMemo(
+    () => (agentToolSwitches ? Object.keys(agentToolSwitches.mcp) : undefined),
+    [agentToolSwitches],
+  );
   const mcpServerManager = useMCPServerManager({
     conversationId,
     storageContextKey,
     specName,
+    agentServers,
     ownsChatSelection: true,
     observeToolAuthorization,
   });
 
+  /** In a saved agent's chat the MCP menu offers exactly the servers its creator made
+   *  switchable, including ones `chatMenu: false` hides from plain chats. */
+  const chatMcpServerManager = useMemo(() => {
+    if (!agentToolSwitches) {
+      return mcpServerManager;
+    }
+    const isSwitchable = ({ serverName }: { serverName: string }) =>
+      serverName in agentToolSwitches.mcp;
+    const agentMCPServers = mcpServerManager.availableMCPServers.filter(isSwitchable);
+    return {
+      ...mcpServerManager,
+      availableMCPServers: agentMCPServers,
+      selectableServers: agentMCPServers,
+    };
+  }, [mcpServerManager, agentToolSwitches]);
+
   /* Memoized because this is an inline child of `ChatForm`, which re-renders on
      every keystroke: a fresh value here invalidated every consumer's memo, and
      the palette rebuilt its whole tool, skill and server catalog per character
@@ -292,11 +317,12 @@ export default function BadgeRowProvider({
       artifacts,
       fileSearch,
       agentsConfig,
+      agentToolSwitches,
       conversationId,
       storageContextKey,
       codeInterpreter,
       searchApiKeyForm,
-      mcpServerManager,
+      mcpServerManager: chatMcpServerManager,
     }),
     [
       skills,
@@ -305,11 +331,12 @@ export default function BadgeRowProvider({
       artifacts,
       fileSearch,
       agentsConfig,
+      agentToolSwitches,
       conversationId,
       storageContextKey,
       codeInterpreter,
       searchApiKeyForm,
-      mcpServerManager,
+      chatMcpServerManager,
     ],
   );
 

client/src/Providers/__tests__/BadgeRowContext.agentSwitches.spec.tsx

@@ -0,0 +1,71 @@
+import React from 'react';
+import { RecoilRoot } from 'recoil';
+import { render } from '@testing-library/react';
+import type { AgentToolSwitches } from 'librechat-data-provider';
+import BadgeRowProvider, { useBadgeRowContext } from '../BadgeRowContext';
+
+const mockUseMCPServerManager = jest.fn();
+
+const server = (serverName: string, chatMenu?: boolean) => ({
+  serverName,
+  config: { type: 'sse', url: 'http://mcp', chatMenu },
+});
+
+jest.mock('~/hooks', () => ({
+  useMCPServerManager: (args: unknown) => mockUseMCPServerManager(args),
+  useSearchApiKeyForm: () => ({}),
+  useGetAgentsConfig: () => ({ agentsConfig: undefined }),
+  useToolToggle: () => ({}),
+}));
+
+jest.mock('~/data-provider', () => ({
+  useGetStartupConfig: () => ({ data: undefined }),
+}));
+
+let context: ReturnType<typeof useBadgeRowContext>;
+const Consumer = () => {
+  context = useBadgeRowContext();
+  return null;
+};
+
+const renderProvider = (agentToolSwitches?: AgentToolSwitches) =>
+  render(
+    <RecoilRoot>
+      <BadgeRowProvider conversationId="convo_1" agentToolSwitches={agentToolSwitches}>
+        <Consumer />
+      </BadgeRowProvider>
+    </RecoilRoot>,
+  );
+
+describe('BadgeRowProvider agent switches', () => {
+  beforeEach(() => {
+    mockUseMCPServerManager.mockReset();
+    const hidden = server('hidden', false);
+    const visible = server('visible');
+    const other = server('other');
+    mockUseMCPServerManager.mockReturnValue({
+      availableMCPServers: [hidden, visible, other],
+      selectableServers: [visible, other],
+    });
+  });
+
+  it("offers the agent's switchable servers, including one hidden from the chat menu", () => {
+    renderProvider({ builtins: {}, mcp: { hidden: true, visible: false } });
+
+    expect(mockUseMCPServerManager).toHaveBeenCalledWith(
+      expect.objectContaining({ agentServers: ['hidden', 'visible'] }),
+    );
+    const names = (list: Array<{ serverName: string }>) => list.map((s) => s.serverName);
+    expect(names(context!.mcpServerManager.selectableServers)).toEqual(['hidden', 'visible']);
+    expect(names(context!.mcpServerManager.availableMCPServers)).toEqual(['hidden', 'visible']);
+  });
+
+  it('leaves the manager untouched outside a saved agent chat', () => {
+    renderProvider();
+
+    expect(mockUseMCPServerManager).toHaveBeenCalledWith(
+      expect.objectContaining({ agentServers: undefined }),
+    );
+    expect(context!.mcpServerManager.selectableServers).toHaveLength(2);
+  });
+});

client/src/components/Chat/Input/ChatForm.tsx

@@ -8,22 +8,12 @@ import {
   PermissionTypes,
   isAgentsEndpoint,
   isAssistantsEndpoint,
+  getAgentToolSwitches,
 } from 'librechat-data-provider';
 import type { TChatProject, TMessage, TConversation } from 'librechat-data-provider';
 import type { SetterOrUpdater } from 'recoil';
 import type { ExtendedFile, FileSetter, ConvoGenerator, TAskFunction } from '~/common';
 import type { QueuedMessageContext } from '~/hooks/Chat/useSteering';
-import {
-  cn,
-  getModelSpec,
-  hasIncompleteFiles,
-  removeFocusRings,
-  getComposerDraftId,
-  getPendingDraftId,
-  clearAllDrafts,
-  getFilesDraftCached,
-  isPastedTextFileMarked,
-} from '~/utils';
 import {
   useTextarea,
   useAutoSave,
@@ -34,7 +24,19 @@ import {
   useSubmitMessage,
   useFocusChatEffect,
   useCodeWorkspace,
+  useApplyAgentToolSwitches,
 } from '~/hooks';
+import {
+  cn,
+  getModelSpec,
+  hasIncompleteFiles,
+  removeFocusRings,
+  getComposerDraftId,
+  getPendingDraftId,
+  clearAllDrafts,
+  getFilesDraftCached,
+  isPastedTextFileMarked,
+} from '~/utils';
 import {
   useChatContext,
   useChatFormContext,
@@ -47,6 +49,7 @@ import {
   PendingToolApprovalButton,
   PendingToolApprovalPanel,
 } from '~/components/Chat/approval/Review';
+import { useGetAgentByIdQuery, useGetStartupConfig } from '~/data-provider';
 import useComposerRestore from '~/hooks/Input/useComposerRestore';
 import { useChatSettings } from '~/Providers/ChatSettingsContext';
 import usePastedTextEdit from '~/hooks/Files/usePastedTextEdit';
@@ -61,7 +64,6 @@ import DuringRunSendButton from './DuringRunSendButton';
 import ProjectLandingChip from '../ProjectLandingChip';
 import useHasAccess from '~/hooks/Roles/useHasAccess';
 import useDictation from '~/hooks/Input/useDictation';
-import { useGetStartupConfig } from '~/data-provider';
 import CodeWorkspaceMenu from './CodeWorkspaceMenu';
 import useSteering from '~/hooks/Chat/useSteering';
 import CodeApprovalMenu from './CodeApprovalMenu';
@@ -240,6 +242,18 @@ const ChatForm = memo(function ChatForm({
     () => conversation?.conversationId ?? Constants.NEW_CONVO,
     [conversation?.conversationId],
   );
+  /** A saved agent's chat offers the tools its creator made switchable, in the
+   *  same palette and bar the ephemeral tools use. */
+  const toolSwitchAgentId =
+    isAgentsEndpoint(endpoint) && modelSpec?.hideBadgeRow !== true
+      ? conversation?.agent_id
+      : undefined;
+  const { data: switchAgent } = useGetAgentByIdQuery(toolSwitchAgentId);
+  useApplyAgentToolSwitches({ agent: switchAgent, conversationId });
+  const agentToolSwitches = useMemo(
+    () => (toolSwitchAgentId && switchAgent ? getAgentToolSwitches(switchAgent) : undefined),
+    [toolSwitchAgentId, switchAgent],
+  );
   const isNewConversation = conversationId === '' || conversationId === Constants.NEW_CONVO;
   /**
    * The quote feature merges excerpts server-side in `BaseClient.sendMessage`,
@@ -963,6 +977,7 @@ const ChatForm = memo(function ChatForm({
                 specName={conversation?.spec}
                 isSubmitting={isSubmitting}
                 observeToolAuthorization={showTools}
+                agentToolSwitches={agentToolSwitches}
               >
                 <Bar
                   index={index}
@@ -985,7 +1000,7 @@ const ChatForm = memo(function ChatForm({
                   setFilesLoading={setFilesLoading}
                   canAttach={attachTarget.canAttach}
                   anchorRef={composerBoxRef}
-                  showTools={showTools}
+                  showTools={showTools || agentToolSwitches != null}
                   isSubmitting={isSubmitting}
                   showSpeech={SpeechToText}
                   speechDisabled={speechDisabled}