diff --git a/packages/paperclip-runner/src/drivers/acpx/acpx-runtime-adapter.test.ts b/packages/paperclip-runner/src/drivers/acpx/acpx-runtime-adapter.test.ts index bf94a35f5b9..abf969e42d7 100644 --- a/packages/paperclip-runner/src/drivers/acpx/acpx-runtime-adapter.test.ts +++ b/packages/paperclip-runner/src/drivers/acpx/acpx-runtime-adapter.test.ts @@ -1118,10 +1118,49 @@ describe("Codex ACPX runtime adapter", () => { expect(spawnedAgentEnvironment(runtimeOptions, options.command)).toEqual({ PAPERCLIP_ACPX_ISOLATED_CONTEXT: "1", PAPERCLIP_ACPX_TASK_TOOL_BRIDGE_URL: binding === "runner-owned" ? "http://127.0.0.1:3210/mcp" : "", + ...(binding === "absent" ? {} : { PAPERCLIP_ACPX_MCP_BEARER_0: "bridge-secret" }), }); }, ); + it("keeps Claude MCP bearer tokens out of the CLI argv and in the launch environment", async () => { + const options = openOptions(fakeCommand()); + options.profile = resolveQualifiedAcpxProfile("claude", "claude-sonnet-5"); + options.mcpServers = [ + { name: "desktop", command: "/bin/desktop-mcp", args: ["mcp"], env: { HOME: "/runtime/home" }, runnerOwned: false }, + { name: "paperclip", url: "http://127.0.0.1:3210/mcp", bearerToken: "bridge-secret", runnerOwned: true }, + { name: "connector", url: "https://connector.invalid/mcp", bearerToken: "connector-secret", runnerOwned: false }, + ]; + let runtimeOptions: AcpRuntimeOptions | undefined; + await openQualifiedAcpxRuntime(options, { + createRegistry: () => registry(), + createStore: () => store(), + createRuntime: (created) => { + runtimeOptions = created; + return fakeRuntime(); + }, + }); + const projected = JSON.stringify(runtimeOptions?.mcpServers); + expect(projected).not.toContain("bridge-secret"); + expect(projected).not.toContain("connector-secret"); + expect(runtimeOptions?.mcpServers).toEqual([ + { name: "desktop", command: "/bin/desktop-mcp", args: ["mcp"], env: [{ name: "HOME", value: "/runtime/home" }] }, + { + type: "http", name: "paperclip", url: "http://127.0.0.1:3210/mcp", + headers: [{ name: "Authorization", value: "Bearer ${PAPERCLIP_ACPX_MCP_BEARER_1}" }], + }, + { + type: "http", name: "connector", url: "https://connector.invalid/mcp", + headers: [{ name: "Authorization", value: "Bearer ${PAPERCLIP_ACPX_MCP_BEARER_2}" }], + }, + ]); + expect(spawnedAgentEnvironment(runtimeOptions, options.command)).toMatchObject({ + PAPERCLIP_ACPX_MCP_BEARER_1: "bridge-secret", + PAPERCLIP_ACPX_MCP_BEARER_2: "connector-secret", + }); + expect(spawnedAgentEnvironment(runtimeOptions, options.command)).not.toHaveProperty("PAPERCLIP_ACPX_MCP_BEARER_0"); + }); + it("launches only through the verified command lease", async () => { const runtime = fakeRuntime(); const command = fakeCommand(); diff --git a/packages/paperclip-runner/src/drivers/acpx/acpx-runtime-adapter.ts b/packages/paperclip-runner/src/drivers/acpx/acpx-runtime-adapter.ts index dbe75691181..a561ac6a7f4 100644 --- a/packages/paperclip-runner/src/drivers/acpx/acpx-runtime-adapter.ts +++ b/packages/paperclip-runner/src/drivers/acpx/acpx-runtime-adapter.ts @@ -428,6 +428,16 @@ export async function openQualifiedAcpxRuntime( ? createAntigravityAdmission(options.systemInstructions, options.profile.reportedModelId) : null; const contextAdmission = instructionAdmission ?? antigravityAdmission; + const mcpBearerVariable = (index: number): string | undefined => + options.profile.agent === "claude" ? `PAPERCLIP_ACPX_MCP_BEARER_${index}` : undefined; + const mcpBearerEnvironment = Object.fromEntries(options.mcpServers.flatMap((server, index) => { + const name = mcpBearerVariable(index); + return name && "url" in server ? [[name, server.bearerToken]] : []; + })); + const mcpBearerCredential = (index: number, bearerToken: string): string => { + const name = mcpBearerVariable(index); + return name ? `\${${name}}` : bearerToken; + }; // The agent's complete launch environment. ACPX's own environment handling // (credential checks, ACP terminals) keeps reading this process's environment. const agentEnvironment = (): Record => ({ @@ -444,6 +454,7 @@ export async function openQualifiedAcpxRuntime( PAPERCLIP_ACPX_TASK_TOOL_BRIDGE_URL: options.mcpServers.find( (server): server is Extract => "url" in server && server.runnerOwned && server.name === "paperclip", )?.url ?? "", + ...mcpBearerEnvironment, } : {}), }); @@ -515,7 +526,7 @@ export async function openQualifiedAcpxRuntime( ? [...options.permissionPolicy.escalate] : undefined, }, - mcpServers: options.mcpServers.map((server) => "command" in server ? { + mcpServers: options.mcpServers.map((server, index) => "command" in server ? { name: server.name, command: server.command, args: server.args, env: Object.entries(server.env).map(([name, value]) => ({ name, value })), } : ({ @@ -523,7 +534,7 @@ export async function openQualifiedAcpxRuntime( name: server.name, url: server.url, headers: [ - { name: "Authorization", value: `Bearer ${server.bearerToken}` }, + { name: "Authorization", value: `Bearer ${mcpBearerCredential(index, server.bearerToken)}` }, ], })), onPermissionRequest: async (request, context) => {