@agentclientprotocol/codex-acp 2.1.2-preview.1 → 2.1.2-preview.2

package/dist/index.js

@@ -32448,6 +32448,12 @@ function sanitizeMcpServerName(name) {
 // src/tool-calls/reporters/McpStartupReporter.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
 var McpStartupReporter = class {
+  static skipped(serverNames) {
+    return serverNames.map((server) => failure2(
+      server,
+      `[codex-acp] MCP server \`${server}\` was not started, because the Codex config already defines an MCP server with this name. Codex uses its own entry, or no server if that entry is disabled.`
+    ));
+  }
   static failures(event) {
     return [
       ...event.failed.map((server) => failure2(
@@ -32497,7 +32503,7 @@ var McpSessionStartup = class {
    * The promise rejects when the startup fails before `awaitTimeoutMs`. Then the session has no pending startup.
    */
   begin(sessionId, mcpServers, afterVersion, options) {
-    const pendingStartup = this.createPendingSession(sessionId, mcpServers, afterVersion);
+    const pendingStartup = this.createPendingSession(sessionId, mcpServers, afterVersion, options.skippedServers ?? []);
     if (options.publish) {
       this.pendingSessions.set(sessionId, pendingStartup);
     }
@@ -32536,8 +32542,8 @@ var McpSessionStartup = class {
   publishAsync(sessionId) {
     void this.doPublish(sessionId);
   }
-  createPendingSession(sessionId, mcpServers, afterVersion) {
-    const requestedServers = new Set(getRequestedMcpServerNames(mcpServers));
+  createPendingSession(sessionId, mcpServers, afterVersion, skippedServers) {
+    const requestedServers = new Set(getRequestedMcpServerNames(mcpServers).filter((server) => !skippedServers.includes(server)));
     const abort = new AbortController();
     const startup = this.runWithProcessCheck(() => this.codexAcpClient().awaitMcpServerStartup(
       Array.from(requestedServers),
@@ -32546,7 +32552,7 @@ var McpSessionStartup = class {
     ));
     void startup.catch(() => {
     });
-    return { requestedServers, startup, abort };
+    return { requestedServers, skippedServers, startup, abort };
   }
   async doPublish(sessionId) {
     const pendingStartup = this.pendingSessions.get(sessionId);
@@ -32558,7 +32564,7 @@ var McpSessionStartup = class {
       if (!this.isSessionOpen(sessionId) || this.pendingSessions.get(sessionId) !== pendingStartup) {
         return;
       }
-      await this.publish(sessionId, mcpStartup, pendingStartup.abort.signal, pendingStartup.requestedServers);
+      await this.publish(sessionId, mcpStartup, pendingStartup);
     } catch (err) {
       if (!pendingStartup.abort.signal.aborted) {
         logger.error(`Failed to publish MCP startup status for session ${sessionId}`, err);
@@ -32567,7 +32573,8 @@ var McpSessionStartup = class {
       this.forget(sessionId, pendingStartup);
     }
   }
-  async publish(sessionId, mcpStartup, signal, requestedServers) {
+  async publish(sessionId, mcpStartup, pendingStartup) {
+    const { requestedServers, skippedServers, abort: { signal } } = pendingStartup;
     const filteredStartup = {
       ready: mcpStartup.ready.filter((server) => requestedServers.has(server)),
       failed: mcpStartup.failed.filter((server) => requestedServers.has(server.server)),
@@ -32587,11 +32594,14 @@ var McpSessionStartup = class {
       return;
     }
     const renderer = new AcpToolCallRenderer(this.capabilities());
-    for (const facts4 of McpStartupReporter.failures({
-      ...filteredStartup,
-      ready: readyAfterOauth,
-      failed: failuresAfterOauth
-    })) {
+    for (const facts4 of [
+      ...McpStartupReporter.skipped(skippedServers),
+      ...McpStartupReporter.failures({
+        ...filteredStartup,
+        ready: readyAfterOauth,
+        failed: failuresAfterOauth
+      })
+    ]) {
       await this.connection.notify(methods.client.session.update, {
         sessionId,
         update: renderer.render(facts4)
@@ -33523,7 +33533,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.1.2-preview.1",
+  version: "2.1.2-preview.2",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -33797,13 +33807,14 @@ import { createHash } from "node:crypto";
 async function forkSession(request, additionalDirectories, dependencies) {
   await dependencies.refreshSkills(request.cwd, additionalDirectories);
   const lastTurnId = await resolveForkTurnId(request, dependencies.codexClient);
+  const sessionConfig = await dependencies.createSessionConfig(
+    request.cwd,
+    additionalDirectories,
+    request.mcpServers ?? []
+  );
   const response = await dependencies.codexClient.threadFork({
     excludeTurns: true,
-    config: await dependencies.createSessionConfig(
-      request.cwd,
-      additionalDirectories,
-      request.mcpServers ?? []
-    ),
+    config: sessionConfig.config,
     cwd: request.cwd,
     ...lastTurnId !== void 0 && { lastTurnId },
     modelProvider: await dependencies.getResumeModelProvider(),
@@ -33818,7 +33829,8 @@ async function forkSession(request, additionalDirectories, dependencies) {
     collaborationMode: dependencies.getCollaborationMode(response.thread.id),
     modelProvider: response.modelProvider,
     currentServiceTier: response.serviceTier ?? null,
-    additionalDirectories
+    additionalDirectories,
+    skippedMcpServers: sessionConfig.skippedMcpServers
   };
 }
 async function resolveForkTurnId(request, codexClient) {
@@ -34324,9 +34336,10 @@ var CodexAcpClient = class {
   async resumeSession(request, onSubscribed) {
     const additionalDirectories = readAdditionalDirectories(request.cwd, request.additionalDirectories, request._meta);
     await this.refreshSkills(request.cwd, additionalDirectories);
+    const sessionConfig = await this.createSessionConfig(request.cwd, additionalDirectories, request.mcpServers ?? []);
     const response = await this.resumeThread({
       excludeTurns: true,
-      config: await this.createSessionConfig(request.cwd, additionalDirectories, request.mcpServers ?? []),
+      config: sessionConfig.config,
       cwd: request.cwd,
       modelProvider: await this.getResumeModelProvider(),
       threadId: request.sessionId
@@ -34342,7 +34355,8 @@ var CodexAcpClient = class {
       collaborationMode: response.collaborationMode ?? this.getCollaborationMode(response.thread.id),
       modelProvider: response.modelProvider,
       currentServiceTier: response.serviceTier ?? null,
-      additionalDirectories
+      additionalDirectories,
+      skippedMcpServers: sessionConfig.skippedMcpServers
     };
   }
   async forkSession(request) {
@@ -34360,9 +34374,10 @@ var CodexAcpClient = class {
   async loadSession(request, onSubscribed) {
     const additionalDirectories = readAdditionalDirectories(request.cwd, request.additionalDirectories, request._meta);
     await this.refreshSkills(request.cwd, additionalDirectories);
+    const sessionConfig = await this.createSessionConfig(request.cwd, additionalDirectories, request.mcpServers ?? []);
     const response = await this.resumeThread({
       excludeTurns: true,
-      config: await this.createSessionConfig(request.cwd, additionalDirectories, request.mcpServers ?? []),
+      config: sessionConfig.config,
       cwd: request.cwd,
       modelProvider: await this.getResumeModelProvider(),
       threadId: request.sessionId
@@ -34391,7 +34406,8 @@ var CodexAcpClient = class {
       currentServiceTier: response.serviceTier ?? null,
       thread,
       history,
-      additionalDirectories
+      additionalDirectories,
+      skippedMcpServers: sessionConfig.skippedMcpServers
     };
   }
   /**
@@ -34422,8 +34438,9 @@ var CodexAcpClient = class {
   async newSession(request) {
     const additionalDirectories = readAdditionalDirectories(request.cwd, request.additionalDirectories, request._meta);
     await this.refreshSkills(request.cwd, additionalDirectories);
+    const sessionConfig = await this.createSessionConfig(request.cwd, additionalDirectories, request.mcpServers);
     const response = await this.codexClient.threadStart({
-      config: await this.createSessionConfig(request.cwd, additionalDirectories, request.mcpServers),
+      config: sessionConfig.config,
       modelProvider: this.getModelProvider(),
       cwd: request.cwd
     });
@@ -34439,7 +34456,8 @@ var CodexAcpClient = class {
       collaborationMode: this.getCollaborationMode(response.thread.id),
       modelProvider: response.modelProvider,
       currentServiceTier: response.serviceTier ?? null,
-      additionalDirectories
+      additionalDirectories,
+      skippedMcpServers: sessionConfig.skippedMcpServers
     };
   }
   async closeSession(sessionId) {
@@ -34543,7 +34561,7 @@ var CodexAcpClient = class {
     };
     const configWithWorkspaceRoots = mergeSandboxWorkspaceWriteRoots(mergedConfig, additionalDirectories);
     if (mcpServers.length === 0) {
-      return configWithWorkspaceRoots;
+      return { config: configWithWorkspaceRoots, skippedMcpServers: [] };
     }
     const requestedServers = mcpServers.map((mcp) => ({
       name: sanitizeMcpServerName(mcp.name),
@@ -34554,12 +34572,22 @@ var CodexAcpClient = class {
       const existingNames = await this.getConfigMcpServerNames(projectPath);
       serversToConfigure = requestedServers.filter((mcp) => !existingNames.has(mcp.name));
     }
+    const skippedMcpServers = requestedServers.filter((mcp) => !serversToConfigure.includes(mcp)).map((mcp) => mcp.name);
+    if (skippedMcpServers.length > 0) {
+      logger.log("Skipping requested MCP servers that the Codex config already defines", {
+        projectPath,
+        skippedMcpServers
+      });
+    }
     if (serversToConfigure.length === 0) {
-      return configWithWorkspaceRoots;
+      return { config: configWithWorkspaceRoots, skippedMcpServers };
     }
     return {
-      ...configWithWorkspaceRoots,
-      "mcp_servers": Object.fromEntries(serversToConfigure.map((mcp) => [mcp.name, this.createMcpSeverConfig(mcp.server)]))
+      config: {
+        ...configWithWorkspaceRoots,
+        "mcp_servers": Object.fromEntries(serversToConfigure.map((mcp) => [mcp.name, this.createMcpSeverConfig(mcp.server)]))
+      },
+      skippedMcpServers
     };
   }
   async getConfigMcpServerNames(projectPath) {
@@ -38644,7 +38672,8 @@ Check ${configPath} and project .codex directories, especially their config.toml
     if (requestedMcpServers.length > 0 && mcpServerStartupVersion !== null) {
       const startupWait = this.mcpSessionStartup.begin(sessionId, requestedMcpServers, mcpServerStartupVersion, {
         publish: canPublishSessionUpdates,
-        awaitTimeoutMs: parseMcpStartupAwaitTimeoutMs(request._meta)
+        awaitTimeoutMs: parseMcpStartupAwaitTimeoutMs(request._meta),
+        skippedServers: sessionMetadata.skippedMcpServers
       });
       if (startupWait !== null) {
         try {
@@ -39842,7 +39871,10 @@ Check ${configPath} and project .codex directories, especially their config.toml
     }
     subscribed = false;
     if (requestedMcpServers.length > 0 && mcpServerStartupVersion !== null) {
-      this.mcpSessionStartup.begin(sessionId, requestedMcpServers, mcpServerStartupVersion, { publish: true });
+      this.mcpSessionStartup.begin(sessionId, requestedMcpServers, mcpServerStartupVersion, {
+        publish: true,
+        skippedServers: sessionMetadata.skippedMcpServers
+      });
     }
     await this.publishAvailableCommands(sessionState, requestedSessionGeneration);
     await this.publishCurrentGoalBestEffort(sessionState, requestedSessionGeneration, true);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.1.2-preview.1",
+  "version": "2.1.2-preview.2",
   "description": "",
   "main": "dist/index.js",
   "bin": {