@agentconnect.md/codex-acp 1.12.0-agentconnect.1 → 1.12.0-agentconnect.2

package/dist/index.js

@@ -26559,14 +26559,14 @@ function userInputResponseValue(content, fieldId) {
   return value;
 }
 var CodexElicitationHandler = class {
-  constructor(connection, permissionContext, clientCapabilities = null, cancellationSignal, fullAccessHttpServers) {
-    this.fullAccessHttpServers = fullAccessHttpServers;
+  constructor(connection, permissionContext, clientCapabilities = null, cancellationSignal, fullAccessApprovedServers) {
+    this.fullAccessApprovedServers = fullAccessApprovedServers;
     this.connection = connection;
     this.permissionContext = permissionContext;
     this.clientCapabilities = clientCapabilities;
     this.cancellationSignal = cancellationSignal;
   }
-  fullAccessHttpServers;
+  fullAccessApprovedServers;
   connection;
   permissionContext;
   clientCapabilities;
@@ -26585,9 +26585,9 @@ var CodexElicitationHandler = class {
   async handleElicitation(params) {
     try {
       const context = this.createMcpElicitationContext(params);
-      const httpServers = this.fullAccessHttpServers?.(params);
-      if (httpServers !== void 0) {
-        const accepted = !this.cancellationSignal?.aborted && params.mode === "form" && context.isToolApproval && context.persistOptions.has("session") && httpServers.has(params.serverName);
+      const approvedServers = this.fullAccessApprovedServers?.(params);
+      if (approvedServers !== void 0) {
+        const accepted = !this.cancellationSignal?.aborted && params.mode === "form" && context.isToolApproval && context.persistOptions.has("session") && approvedServers.has(params.serverName);
         await this.publishAcceptedMcpToolApproval(params.threadId, context, accepted);
         return { action: accepted ? "accept" : "cancel", content: accepted ? {} : null, _meta: null };
       }
@@ -26654,7 +26654,7 @@ var CodexElicitationHandler = class {
     }
   }
   async handleUserInput(params) {
-    if (this.fullAccessHttpServers?.(params) !== void 0 && params.itemId === `mcp-deps-${params.turnId}` && params.questions.some((question) => question.id === "skill_mcp_dependency_install")) {
+    if (this.fullAccessApprovedServers?.(params) !== void 0 && params.itemId === `mcp-deps-${params.turnId}` && params.questions.some((question) => question.id === "skill_mcp_dependency_install")) {
       return { answers: {} };
     }
     if (!clientSupportsFormElicitation(this.clientCapabilities)) {
@@ -27819,7 +27819,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "1.12.0-agentconnect.1",
+  version: "1.12.0-agentconnect.2",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -28110,7 +28110,7 @@ async function forkSession(request, additionalDirectories, dependencies) {
     modelProvider: response.modelProvider,
     currentServiceTier: response.serviceTier ?? null,
     additionalDirectories,
-    fullAccessHttpMcpServers: prepared.fullAccessHttpMcpServers
+    fullAccessApprovedMcpServers: prepared.fullAccessApprovedMcpServers
   };
 }
 async function resolveForkTurnId(request, codexClient) {
@@ -28569,7 +28569,7 @@ var CodexAcpClient = class {
     const initialAgentMode = AgentMode.getInitialAgentMode();
     await this.refreshSkills(request.cwd, additionalDirectories);
     const prepared = await this.createSessionConfig(request.cwd, additionalDirectories, request.mcpServers ?? []);
-    await this.restrictResumedHttpMcpServers(request.sessionId, prepared);
+    await this.restrictResumedMcpServers(request.sessionId, prepared);
     const response = await this.codexClient.threadResume({
       excludeTurns: true,
       config: prepared.config,
@@ -28589,7 +28589,7 @@ var CodexAcpClient = class {
       modelProvider: response.modelProvider,
       currentServiceTier: response.serviceTier ?? null,
       additionalDirectories,
-      fullAccessHttpMcpServers: prepared.fullAccessHttpMcpServers
+      fullAccessApprovedMcpServers: prepared.fullAccessApprovedMcpServers
     };
   }
   async forkSession(request) {
@@ -28609,7 +28609,7 @@ var CodexAcpClient = class {
     const initialAgentMode = AgentMode.getInitialAgentMode();
     await this.refreshSkills(request.cwd, additionalDirectories);
     const prepared = await this.createSessionConfig(request.cwd, additionalDirectories, request.mcpServers ?? []);
-    await this.restrictResumedHttpMcpServers(request.sessionId, prepared);
+    await this.restrictResumedMcpServers(request.sessionId, prepared);
     const response = await this.codexClient.threadResume({
       excludeTurns: true,
       config: prepared.config,
@@ -28634,7 +28634,7 @@ var CodexAcpClient = class {
       currentServiceTier: response.serviceTier ?? null,
       thread,
       additionalDirectories,
-      fullAccessHttpMcpServers: prepared.fullAccessHttpMcpServers
+      fullAccessApprovedMcpServers: prepared.fullAccessApprovedMcpServers
     };
   }
   async readSessionThread(sessionId) {
@@ -28664,7 +28664,7 @@ var CodexAcpClient = class {
       modelProvider: response.modelProvider,
       currentServiceTier: response.serviceTier ?? null,
       additionalDirectories,
-      fullAccessHttpMcpServers: prepared.fullAccessHttpMcpServers
+      fullAccessApprovedMcpServers: prepared.fullAccessApprovedMcpServers
     };
   }
   async closeSession(sessionId) {
@@ -28691,10 +28691,10 @@ var CodexAcpClient = class {
     if (!this.isProtectedFullAccess(agentMode)) return agentMode.approvalPolicy;
     return { granular: { sandbox_approval: false, rules: false, skill_approval: false, request_permissions: false, mcp_elicitations: false } };
   }
-  async restrictResumedHttpMcpServers(sessionId, prepared) {
-    if (prepared.fullAccessHttpMcpServers.length === 0) return;
+  async restrictResumedMcpServers(sessionId, prepared) {
+    if (prepared.fullAccessApprovedMcpServers.length === 0) return;
     const loaded = await this.codexClient.threadLoadedList({});
-    if (loaded.data.includes(sessionId) || loaded.nextCursor !== null) prepared.fullAccessHttpMcpServers = [];
+    if (loaded.data.includes(sessionId) || loaded.nextCursor !== null) prepared.fullAccessApprovedMcpServers = [];
   }
   async deleteSession(sessionId) {
     await this.codexClient.threadArchive({ threadId: sessionId });
@@ -28780,7 +28780,7 @@ var CodexAcpClient = class {
     };
     const configWithWorkspaceRoots = mergeSandboxWorkspaceWriteRoots(mergedConfig, additionalDirectories);
     if (mcpServers.length === 0) {
-      return { config: configWithWorkspaceRoots, fullAccessHttpMcpServers: [] };
+      return { config: configWithWorkspaceRoots, fullAccessApprovedMcpServers: [] };
     }
     const requestedServers = mcpServers.map((mcp) => ({
       name: sanitizeMcpServerName(mcp.name),
@@ -28792,13 +28792,14 @@ var CodexAcpClient = class {
       serversToConfigure = requestedServers.filter((mcp) => !existingNames.has(mcp.name));
     }
     if (serversToConfigure.length === 0) {
-      return { config: configWithWorkspaceRoots, fullAccessHttpMcpServers: [] };
+      return { config: configWithWorkspaceRoots, fullAccessApprovedMcpServers: [] };
     }
     const configuredServers = Object.fromEntries(serversToConfigure.map((mcp) => [mcp.name, this.createMcpSeverConfig(mcp.server)]));
     const inheritedServers = isJsonObject(this.config["mcp_servers"]) ? this.config["mcp_servers"] : {};
     return {
       config: { ...configWithWorkspaceRoots, mcp_servers: configuredServers },
-      fullAccessHttpMcpServers: this.permissionProfileConfig ? Object.entries(configuredServers).filter(([name, server]) => typeof server["url"] === "string" && !existingNames.has(name) && !Object.hasOwn(inheritedServers, name)).map(([name]) => name) : []
+      // Every server the launcher injected, on any transport; a name any config layer also declares is never approved, so session config cannot borrow a launcher's name.
+      fullAccessApprovedMcpServers: this.permissionProfileConfig ? Object.keys(configuredServers).filter((name) => !existingNames.has(name) && !Object.hasOwn(inheritedServers, name)) : []
     };
   }
   async getConfigMcpServerNames(projectPath) {
@@ -32713,7 +32714,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
       supportedReasoningEfforts: currentModel?.supportedReasoningEfforts ?? [],
       supportedInputModalities: currentModel?.inputModalities ?? ["text", "image"],
       agentMode: AgentMode.getInitialAgentMode(),
-      fullAccessHttpMcpServers: sessionMetadata.fullAccessHttpMcpServers ?? [],
+      fullAccessApprovedMcpServers: sessionMetadata.fullAccessApprovedMcpServers ?? [],
       collaborationMode: sessionMetadata.collaborationMode,
       currentTurnId: null,
       lastTokenUsage: null,
@@ -33053,7 +33054,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
             additionalDirectories: session.additionalDirectories,
             mcpServers: session.mcpServers ?? []
           });
-          session.fullAccessHttpMcpServers = metadata.fullAccessHttpMcpServers ?? [];
+          session.fullAccessApprovedMcpServers = metadata.fullAccessApprovedMcpServers ?? [];
           session.authProvider = replacement.getModelProvider();
           session.asyncTasks.refresh();
           logger.log("Resumed session after provider restart", { sessionId: session.sessionId });
@@ -33785,7 +33786,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
       supportedReasoningEfforts: currentModel?.supportedReasoningEfforts ?? [],
       supportedInputModalities: currentModel?.inputModalities ?? ["text", "image"],
       agentMode: AgentMode.getInitialAgentMode(),
-      fullAccessHttpMcpServers: sessionMetadata.fullAccessHttpMcpServers ?? [],
+      fullAccessApprovedMcpServers: sessionMetadata.fullAccessApprovedMcpServers ?? [],
       collaborationMode: sessionMetadata.collaborationMode,
       currentTurnId: null,
       lastTokenUsage: null,
@@ -34529,8 +34530,8 @@ Check ${configPath} and project .codex directories, especially their config.toml
       const permissionContext = permissionLifecycle.beginPrompt();
       let promptAgentMode;
       let permissionModeRevision;
-      const httpServers = new Set(sessionState.fullAccessHttpMcpServers);
-      const noHttpServers = /* @__PURE__ */ new Set();
+      const approvedServers = new Set(sessionState.fullAccessApprovedMcpServers);
+      const noApprovedServers = /* @__PURE__ */ new Set();
       let mcpApprovalTurnId = null;
       const isProtectedFullAccess = () => this.codexAcpClient.isProtectedFullAccess(promptAgentMode ?? sessionState.agentMode);
       const approvalHandler = new CodexApprovalHandler(
@@ -34546,7 +34547,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
         activePrompt.signal,
         (request) => {
           if (!isProtectedFullAccess()) return void 0;
-          return mcpApprovalTurnId !== null && request.turnId === mcpApprovalTurnId && sessionState.agentMode.kind === "full_access" && sessionState.permissionModeRevision === permissionModeRevision ? httpServers : noHttpServers;
+          return mcpApprovalTurnId !== null && request.turnId === mcpApprovalTurnId && sessionState.agentMode.kind === "full_access" && sessionState.permissionModeRevision === permissionModeRevision ? approvedServers : noApprovedServers;
         }
       );
       const observeInteraction = async (event) => {

package/package.json

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