Merge branch 'agentclientprotocol:main' into chapeta/history-attachments

Author: Orcaryn

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v7
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v7
         with:
           node-version: "24"
       - uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6

.github/workflows/e2e.yml

@@ -14,7 +14,7 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v7
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v7
         with:
           node-version: '24'
       - name: Configure sandboxing

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v7
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v7
         with:
           node-version: '24'
       - name: Configure sandboxing
@@ -43,7 +43,7 @@ jobs:
       id-token: write
     steps:
       - uses: actions/checkout@v7
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v7
         with:
           node-version: '24'
           registry-url: 'https://registry.npmjs.org'
@@ -64,7 +64,7 @@ jobs:
           private-key: ${{ secrets.RELEASE_PLZ_APP_PRIVATE_KEY }}
 
       - name: Create Release
-        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
+        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
         with:
           token: ${{ steps.generate-token.outputs.token }}
           generate_release_notes: true

package-lock.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^1.2.1",
-    "@openai/codex": "^0.144.4",
+    "@openai/codex": "^0.144.6",
     "diff": "^9.0.0",
     "open": "^11.0.0",
     "vscode-jsonrpc": "^9.0.1",

package.json

@@ -72,6 +72,7 @@ export class CodexAcpClient {
     private pendingAccountUpdated: Promise<AccountUpdatedNotification> | null = null;
     private readonly sessionNotificationQueues = new Map<string, Promise<void>>();
     private skillExtraRoots: string[] = [];
+    private configPath: string | null = null;
 
 
     constructor(codexClient: CodexAppServerClient, codexConfig?: JsonObject, modelProvider?: string) {
@@ -86,7 +87,7 @@ export class CodexAcpClient {
     };
 
     async initialize(request: acp.InitializeRequest): Promise<void> {
-        await this.codexClient.initialize({
+        const response = await this.codexClient.initialize({
             capabilities: {
                 experimentalApi: true,
                 requestAttestation: false,
@@ -97,6 +98,11 @@ export class CodexAcpClient {
                 title: request.clientInfo?.title ?? this.defaultClientInfo.title,
             }
         });
+        this.configPath = response?.codexHome ?? null;
+    }
+
+    getHomePath(): string | null {
+        return this.configPath;
     }
 
     async authenticate(authRequest: acp.AuthenticateRequest): Promise<Boolean> {
@@ -518,11 +524,16 @@ export class CodexAcpClient {
 
     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)) {
+        const effectiveMcpServers = response?.config?.["mcp_servers"];
+        const configLayers = response?.layers ?? [];
+        const layerMcpServers = configLayers.map(layer => {
+            return isJsonObject(layer.config) ? layer.config["mcp_servers"] : undefined;
+        });
+        const configuredMcpServers = [effectiveMcpServers, ...layerMcpServers].filter(isJsonObject);
+        if (configuredMcpServers.length === 0) {
             return new Set();
         }
-        return new Set(Object.keys(mcpServers));
+        return new Set(configuredMcpServers.flatMap(server => Object.keys(server)));
     }
 
     getModelProvider(): string | null {

src/CodexAcpClient.ts

@@ -313,6 +313,10 @@ export class CodexAcpServer {
             await this.refreshSessionsAuthState(null);
             throw RequestError.internalError(`${(e.message)}\n\nYou have been logged out. Please try again.`);
         }
+        const configPath = this.codexAcpClient.getHomePath() ?? "global";
+        if (e.message.includes("load config")) {
+            throw RequestError.internalError(`${e.message}\n\nCheck ${configPath} and project .codex directories, especially their config.toml files, or any CODEX_CONFIG override.`);
+        }
     }
 
     private beginSessionOpen(sessionId: string): number {

src/CodexAcpServer.ts

@@ -8,20 +8,30 @@ 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 }, () => {
+describe('MCP config merge across configured MCP servers and ACP request', { timeout: 40_000 }, () => {
 
     let codexHome: string;
+    let projectPath: string;
     let fixture: TestFixture;
 
     beforeEach(() => {
         vi.clearAllMocks();
 
-        const configToml = `
+        const globalConfig = `
 [mcp_servers.shared-mcp]
 url = "https://example.com/mcp"
 `;
+
+        const projectConfig = `
+[mcp_servers.project-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");
+        fs.writeFileSync(path.join(codexHome, "config.toml"), globalConfig, "utf8");
+        projectPath = fs.mkdtempSync(path.join(os.tmpdir(), "codex-acp-mcp-project-"));
+        fs.mkdirSync(path.join(projectPath, ".codex"));
+        fs.writeFileSync(path.join(projectPath, ".codex", "config.toml"), projectConfig, "utf8");
 
         const codexConnection = startCodexConnection(undefined, {
             ...process.env,
@@ -37,6 +47,7 @@ url = "https://example.com/mcp"
     afterEach(() => {
         vi.unstubAllEnvs();
         removeDirectoryWithRetry(codexHome);
+        removeDirectoryWithRetry(projectPath);
     });
 
     it('should preserve the global url-based MCP when ACP passes a command-type MCP with the same name', async () => {
@@ -68,6 +79,24 @@ url = "https://example.com/mcp"
         expect(transportDump).contain("- shared-mcp");
     });
 
+    it('should preserve a project 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 = {
+            name: "project-mcp",
+            command: "./node_modules/.bin/mcp-hello-world",
+            args: ["example"],
+            env: [{name: "example", value: "example"}],
+        };
+
+        await expect(codexAcpAgent.newSession({
+            cwd: projectPath,
+            mcpServers: [conflictingMcp],
+        })).resolves.toBeDefined();
+    });
+
     it('should not filter the conflicting ACP MCP when config filtering is disabled', async () => {
         vi.stubEnv("DISABLE_MCP_CONFIG_FILTERING", "true");
         const codexAcpAgent = fixture.getCodexAcpAgent();
@@ -85,6 +114,8 @@ url = "https://example.com/mcp"
         await expect(codexAcpAgent.newSession({
             cwd: "",
             mcpServers: [conflictingMcp],
-        })).rejects.toThrow("url is not supported for stdio");
+        })).rejects.toMatchObject({
+            data: expect.stringContaining("url is not supported for stdio"),
+        });
     });
 });

src/__tests__/CodexACPAgent/mcp-config-merge.test.ts

@@ -41,6 +41,24 @@ describe("New session logout handling", () => {
         expect(logoutSpy).toHaveBeenCalledOnce();
     });
 
+    it("includes the global config path in reload configuration errors", async () => {
+        const fixture = createCodexMockTestFixture();
+        const codexAcpAgent = fixture.getCodexAcpAgent();
+        const codexAcpClient = fixture.getCodexAcpClient();
+        const codexAppServerClient = fixture.getCodexAppServerClient();
+        vi.spyOn(codexAcpClient, "authRequired").mockResolvedValue(false);
+        const logoutSpy = vi.spyOn(codexAcpClient, "logout").mockResolvedValue();
+
+        const errorMessage = 'Internal error: "failed to reload config: filesystem path `/tmp` must be absolute, use `~/...`, or start with `:`"';
+        vi.spyOn(codexAppServerClient, "threadStart").mockRejectedValue(new Error(errorMessage));
+
+        expect(logoutSpy).toHaveBeenCalledTimes(0);
+        await expect(codexAcpAgent.newSession({cwd: "", mcpServers: []}))
+            .rejects.toMatchObject({
+                data: expect.stringContaining(`Check global and project .codex directories`),
+            });
+    });
+
     it("refreshes OpenAI sessions when newSession error forces logout", async () => {
         const fixture = createCodexMockTestFixture();
         const codexAcpAgent = fixture.getCodexAcpAgent();