From 8ed7a7d3d77ba863c1724effb3dbc1d904e66ee2 Mon Sep 17 00:00:00 2001 From: "lia-by-librechat[bot]" <328778573+lia-by-librechat[bot]@users.noreply.github.com> Date: Sat, 14 Nov 2026 12:15:33 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=82=20fix:=20Emit=20Persisted=20Agent?= =?UTF-8?q?=20IDs=20in=20Attribution=20Headers=20(#18151)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lia --- packages/api/src/mcp/__tests__/agent.test.ts | 35 ++++++++++++++++++++ packages/api/src/utils/env.spec.ts | 24 ++++++++++++++ packages/api/src/utils/env.ts | 8 +++-- packages/api/src/utils/headers.spec.ts | 17 ++++++++++ 4 files changed, 82 insertions(+), 2 deletions(-) diff --git a/packages/api/src/mcp/__tests__/agent.test.ts b/packages/api/src/mcp/__tests__/agent.test.ts index 07861242f5..bee7ac098d 100644 --- a/packages/api/src/mcp/__tests__/agent.test.ts +++ b/packages/api/src/mcp/__tests__/agent.test.ts @@ -89,6 +89,41 @@ describe('MCP executing agent context', () => { expect(requiresEphemeralUserConnection(config)).toBe(true); }); + it('emits the persisted tool owner while keeping parallel connection identities distinct', async () => { + const runtimeIds = ['agent_root____1', 'agent_root____12']; + const keys = new Set(); + for (const agentId of runtimeIds) { + const callTool = jest.fn().mockImplementation(({ requestBody }) => { + expect(requestBody.agentId).toBe(agentId); + keys.add(getMCPAgentConnectionKey('connection', config, requestBody)); + return Promise.resolve(processMCPEnv({ options: config, body: requestBody })); + }); + const tool = createAgentMCPTool( + { agentId, requestBody: { agentId: 'agent_spoofed' } }, + ({ requestBody, invokeTool }) => { + expect(requestBody.agentId).toBe(agentId); + expect(processMCPEnv({ options: config, body: requestBody })).toMatchObject({ + headers: { 'X-Agent-Id': 'agent_root' }, + }); + return () => + invokeTool( + { callTool }, + { + serverName: 'analytics', + toolName: 'select', + provider: 'openai', + flowManager: {} as Parameters[1]['flowManager'], + requestBody: { agentId: 'agent_override' }, + }, + ); + }, + ); + await expect(tool()).resolves.toMatchObject({ headers: { 'X-Agent-Id': 'agent_root' } }); + expect(callTool).toHaveBeenCalledTimes(1); + } + expect(keys.size).toBe(runtimeIds.length); + }); + it('does not let a custom user variable replace the tool owner', () => { expect( processMCPEnv({ diff --git a/packages/api/src/utils/env.spec.ts b/packages/api/src/utils/env.spec.ts index 47906c1b79..88b1b84f2e 100644 --- a/packages/api/src/utils/env.spec.ts +++ b/packages/api/src/utils/env.spec.ts @@ -2425,6 +2425,30 @@ describe('resolveHeaders agent placeholders', () => { expect(result['X-Agent-Id']).toBe('agent_HTbJ5rDW0kOOK1a5MPBSt'); }); + it.each(['1', '12'])( + 'emits the persisted id for parallel runtime node %s without mutating its identity', + (index) => { + const agent = { id: `${persistedAgent.id}____${index}` }; + expect( + resolveHeaders({ + headers: { 'X-Meta': 'agent={{LIBRECHAT_AGENT_ID}};ref={{LIBRECHAT_AGENT_ID}}' }, + agent, + stripUnresolved: true, + }), + ).toEqual({ 'X-Meta': `agent=${persistedAgent.id};ref=${persistedAgent.id}` }); + expect(agent.id).toBe(`${persistedAgent.id}____${index}`); + }, + ); + + it.each(['agent_with_underscores', 'agent_with____text', 'agent_with___1'])( + 'preserves non-runtime suffixes in persisted id %s', + (id) => { + expect(resolveHeaders({ headers: agentHeaders, agent: { id } })).toEqual({ + 'X-Agent-Id': id, + }); + }, + ); + it('resolves alongside user and body placeholders without interfering', () => { const result = resolveHeaders({ headers: { diff --git a/packages/api/src/utils/env.ts b/packages/api/src/utils/env.ts index b708d9b3a2..84b7a725c7 100644 --- a/packages/api/src/utils/env.ts +++ b/packages/api/src/utils/env.ts @@ -1,5 +1,9 @@ import { logger } from '@librechat/data-schemas'; -import { extractEnvVariable, isEphemeralAgentId } from 'librechat-data-provider'; +import { + extractEnvVariable, + isEphemeralAgentId, + stripAgentIdSuffix, +} from 'librechat-data-provider'; import type { Agent, MCPOptions } from 'librechat-data-provider'; import type { IUser } from '@librechat/data-schemas'; import type { RequestBody } from '~/types'; @@ -342,7 +346,7 @@ export function processAgentPlaceholders(value: string, agent: Partial): } const fieldValue = agent[field]; - const replacementValue = fieldValue == null ? '' : String(fieldValue); + const replacementValue = fieldValue == null ? '' : stripAgentIdSuffix(fieldValue); value = value.replace(new RegExp(placeholder, 'g'), replacementValue); } diff --git a/packages/api/src/utils/headers.spec.ts b/packages/api/src/utils/headers.spec.ts index 8afb6a390b..15dad02ce5 100644 --- a/packages/api/src/utils/headers.spec.ts +++ b/packages/api/src/utils/headers.spec.ts @@ -257,6 +257,23 @@ describe('resolveConfigHeaders', () => { }); }); + it('normalizes parallel identity across provider carriers without rewriting managed Google auth', () => { + const template = { 'X-Agent-Id': '{{LIBRECHAT_AGENT_ID}}' }; + const credential = 'Bearer {{LIBRECHAT_AGENT_ID}}'; + const llmConfig = { + configuration: { defaultHeaders: { ...template } }, + clientOptions: { defaultHeaders: { ...template } }, + customHeaders: mergeGoogleHeaders(template, { Authorization: credential }), + }; + + resolveConfigHeaders({ llmConfig, agent: { id: 'agent_root____12' } }); + + expect(llmConfig.configuration.defaultHeaders['X-Agent-Id']).toBe('agent_root'); + expect(llmConfig.clientOptions.defaultHeaders['X-Agent-Id']).toBe('agent_root'); + expect(llmConfig.customHeaders?.['X-Agent-Id']).toBe('agent_root'); + expect(llmConfig.customHeaders?.Authorization).toBe(credential); + }); + it('leaves configs without header maps untouched', () => { const llmConfig = { model: 'gpt-4o', configuration: {} } as unknown as RunLLMConfig; expect(() => resolveConfigHeaders({ llmConfig, user, body })).not.toThrow();