Merge pull request #1 from agentclientprotocol/main

Update from upstream main

Author: gabrielbergamini

package-lock.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.43",
+  "version": "0.0.44",
   "description": "",
   "main": "dist/index.js",
   "bin": {

package.json

@@ -207,7 +207,7 @@ export class CodexAcpClient {
             approvalPolicy: null,
             sandbox: null,
             baseInstructions: null,
-            config: this.createSessionConfig(request.cwd, request.mcpServers ?? []),
+            config: await this.createSessionConfig(request.cwd, request.mcpServers ?? []),
             cwd: request.cwd,
             developerInstructions: null,
             model: null,
@@ -229,7 +229,7 @@ export class CodexAcpClient {
             approvalPolicy: null,
             sandbox: null,
             baseInstructions: null,
-            config: this.createSessionConfig(request.cwd, request.mcpServers ?? []),
+            config: await this.createSessionConfig(request.cwd, request.mcpServers ?? []),
             cwd: request.cwd,
             developerInstructions: null,
             model: null,
@@ -251,7 +251,7 @@ export class CodexAcpClient {
         await this.refreshSkills(request.cwd, request._meta);
 
         const response = await this.codexClient.threadStart({
-            config: this.createSessionConfig(request.cwd, request.mcpServers),
+            config: await this.createSessionConfig(request.cwd, request.mcpServers),
             modelProvider: this.getModelProvider(),
             model: null,
             cwd: request.cwd,
@@ -283,7 +283,7 @@ export class CodexAcpClient {
         return this.codexClient.getMcpServerStartupVersion();
     }
 
-    private createSessionConfig(projectPath: string, mcpServers: Array<McpServer>): JsonObject {
+    private async createSessionConfig(projectPath: string, mcpServers: Array<McpServer>): Promise<JsonObject> {
         const mergedConfig = {
             ...mergeGatewayConfig(this.config, this.gatewayConfig),
             projects: {
@@ -295,10 +295,28 @@ export class CodexAcpClient {
         if (mcpServers.length === 0) {
             return mergedConfig;
         }
+
+        // Deduplicates new servers against existing config to prevent Codex from deep-merging
+        // incompatible field types (e.g., mixing url and stdio schemas).
+        const existingNames = await this.getConfigMcpServerNames(projectPath);
+        const uniqueServers = mcpServers.filter(mcp => !existingNames.has(mcp.name));
+        if (uniqueServers.length === 0) {
+            return mergedConfig;
+        }
+
         return {
             ...mergedConfig,
-            "mcp_servers": Object.fromEntries(mcpServers.map(mcp => [mcp.name, this.createMcpSeverConfig(mcp)]))
+            "mcp_servers": Object.fromEntries(uniqueServers.map(mcp => [mcp.name, this.createMcpSeverConfig(mcp)])),
+        };
+    }
+
+    private async getConfigMcpServerNames(projectPath: string): Promise<Set<string>> {
+        const response = await this.codexClient.configRead({ includeLayers: true, cwd: projectPath });
+        const mcpServers = response?.config?.["mcp_servers"];
+        if (!mcpServers || typeof mcpServers !== "object" || Array.isArray(mcpServers)) {
+            return new Set();
         }
+        return new Set(Object.keys(mcpServers));
     }
 
     getModelProvider(): string | null {

src/CodexAcpClient.ts

@@ -0,0 +1,69 @@
+// noinspection ES6RedundantAwait
+
+import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
+import path from "node:path";
+import fs from "node:fs";
+import os from "node:os";
+import type {McpServerStdio} from "@agentclientprotocol/sdk";
+import {startCodexConnection} from "../../CodexJsonRpcConnection";
+import {createBaseTestFixture, removeDirectoryWithRetry, type TestFixture} from "../acp-test-utils";
+
+describe('MCP config merge across global config and ACP request', { timeout: 40_000 }, () => {
+
+    let codexHome: string;
+    let fixture: TestFixture;
+
+    beforeEach(() => {
+        vi.clearAllMocks();
+
+        const configToml = `
+[mcp_servers.shared-mcp]
+url = "https://example.com/mcp"
+`;
+        codexHome = fs.mkdtempSync(path.join(os.tmpdir(), "codex-acp-mcp-merge-"));
+        fs.writeFileSync(path.join(codexHome, "config.toml"), configToml, "utf8");
+
+        const codexConnection = startCodexConnection(undefined, {
+            ...process.env,
+            CODEX_HOME: codexHome,
+        });
+
+        fixture = createBaseTestFixture({
+            connection: codexConnection.connection,
+            getExitCode: () => codexConnection.process.exitCode,
+        });
+    });
+
+    afterEach(() => {
+        removeDirectoryWithRetry(codexHome);
+    });
+
+    it('should preserve the global url-based MCP when ACP passes a command-type MCP with the same name', async () => {
+        const codexAcpAgent = fixture.getCodexAcpAgent();
+        await codexAcpAgent.initialize({protocolVersion: 1});
+
+        fixture.getCodexAcpClient().authRequired = vi.fn().mockResolvedValue(false);
+
+        const conflictingMcp: McpServerStdio = {
+            name: "shared-mcp",
+            command: "./node_modules/.bin/mcp-hello-world",
+            args: ["example"],
+            env: [{name: "example", value: "example"}],
+        };
+
+        const newSessionResponse = await codexAcpAgent.newSession({
+            cwd: "",
+            mcpServers: [conflictingMcp],
+        });
+        fixture.clearAcpConnectionDump();
+
+        await codexAcpAgent.prompt({
+            sessionId: newSessionResponse.sessionId,
+            prompt: [{type: "text", text: "/mcp"}],
+        });
+
+        const transportDump = fixture.getAcpConnectionDump([]);
+        expect(transportDump).contain("Configured MCP servers:");
+        expect(transportDump).contain("- shared-mcp");
+    });
+});