From debbe28fe768e10167bc2a240af79f814db07368 Mon Sep 17 00:00:00 2001 From: Danny Avila Date: Mon, 9 Nov 2026 08:46:13 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=8C=20fix:=20Treat=20a=20Locked=20Empt?= =?UTF-8?q?y=20MCP=20List=20as=20Governing=20an=20Added=20Pane's=20Tools?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/api/src/agents/__tests__/load.spec.ts | 14 ++++++++++++++ packages/api/src/agents/added.ts | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/api/src/agents/__tests__/load.spec.ts b/packages/api/src/agents/__tests__/load.spec.ts index 99ede1ef26..99425c36dd 100644 --- a/packages/api/src/agents/__tests__/load.spec.ts +++ b/packages/api/src/agents/__tests__/load.spec.ts @@ -1602,6 +1602,20 @@ describe('loadAgent', () => { }, ); + test("an added spec that locks MCP to none drops the primary pane's servers", async () => { + const { EPHEMERAL_AGENT_ID: EID } = Constants; + const result = await loadAddedAgent( + { + req: addedReq({ mcp: ['crm'] }, { lockTools: true, mcpServers: [] }), + conversation: addedConversation, + primaryAgent: { id: EID as string, tools: ['lookup_mcp_crm'] } as LibreChatAgent, + }, + deps, + ); + + expect(result?.tools).not.toContain('lookup_mcp_crm'); + }); + test('an added spec that locks its tools but configures none still mirrors', async () => { const { EPHEMERAL_AGENT_ID: EID } = Constants; const result = await loadAddedAgent( diff --git a/packages/api/src/agents/added.ts b/packages/api/src/agents/added.ts index 31d4a907c2..9a920a7819 100644 --- a/packages/api/src/agents/added.ts +++ b/packages/api/src/agents/added.ts @@ -168,8 +168,9 @@ export async function loadAddedAgent( /** The primary's resolved tools stand in for this pane's, since one badge row * drives both — unless this pane's own spec differs and governs tools the - * primary's resolution never saw: tool toggles it withholds, MCP servers it - * pins, or `askUserQuestion`, which has no badge to carry it. Withheld + * primary's resolution never saw: tool toggles it withholds (an empty locked + * MCP list included), MCP servers it pins, or `askUserQuestion`, which has no + * badge to carry it. Withheld * non-tool settings (artifacts, skills, background, intent) are resolved by * the mirrored branch itself. Only the full resolution below applies those. */ const primaryIsEphemeral = primaryAgent && isEphemeralAgentId(primaryAgent.id); @@ -177,6 +178,7 @@ export async function loadAddedAgent( const governsOwnTools = (spec || '') !== (req.body?.spec || '') && ((modelSpec?.mcpServers?.length ?? 0) > 0 || + withheldToggles.has('mcp') || modelSpec?.askUserQuestion != null || SPEC_TOOL_TOGGLES.some(([toggleField]) => withheldToggles.has(toggleField))); if (primaryIsEphemeral && !governsOwnTools && Array.isArray(primaryAgent.tools)) {