@agentclientprotocol/codex-acp 1.10.0 → 1.10.1-preview.2

package/README.md

@@ -10,6 +10,7 @@ Use [OpenAI Codex](https://github.com/openai/codex) from [Agent Client Protocol]
 
 - ChatGPT, API key, and client-provided custom gateway authentication.
 - Model, reasoning effort, fast mode, approval, and sandbox mode configuration.
+- Concrete recommended model and reasoning-effort values through the opt-in [AIR recommended config values](docs/recommended-config-values-extension.md) capability.
 - Text prompts, embedded context, images, resource links, and additional workspace directories.
 - Shell command, file change, [permission request](docs/permission-extension.md), MCP tool call, terminal output, reasoning, plan, web search, image generation, image view, token usage, and review events.
 - [Native ACP subagent sessions](docs/subagent-sessions.md) (after capability negotiation) with separate child histories and root-routed permissions; a legacy tool-call fallback otherwise.
@@ -40,6 +41,16 @@ The npm package includes a compatible `@openai/codex` dependency. Set `CODEX_PAT
 CODEX_PATH=/path/to/codex npx -y @agentclientprotocol/codex-acp
 ```
 
+To try changes that have landed on `main` but are not released yet, install from the
+`preview` channel. Pushes to `main` trigger preview publishing without waiting
+for CI or release-please; release commits are excluded, and newer pushes can
+replace queued previews. See
+[docs/RELEASES.md](docs/RELEASES.md#preview-releases).
+
+```bash
+npx -y @agentclientprotocol/codex-acp@preview
+```
+
 ## Authentication
 
 The adapter advertises ACP auth methods during initialization. Clients can authenticate with:

package/dist/index.js

@@ -23660,16 +23660,37 @@ var AIR_SESSION_FAILURE_KEY = "sessionFailure";
 var AIR_AGENT_FILE_CHANGE_REPORT_KEY = "agentFileChangeReport";
 var AIR_NATIVE_SUBAGENT_SESSIONS_KEY = "nativeSubagentSessions";
 var AIR_ASYNC_TASKS_KEY = "asyncTasks";
+var AIR_RECOMMENDED_CONFIG_VALUE_KEY = "recommendedValue";
 var AIR_ASYNC_TASKS_BACKGROUNDED_KEY = "backgrounded";
 var AIR_AGENT_FILE_CHANGE_REPORT_REQUEST_KEY = "agentFileChangeReportRequest";
 var AIR_EXTENSION_VERSION = 1;
+function withAirMeta(meta3, key, value) {
+  const root = asRecord(meta3);
+  const jetbrains = asRecord(root[JETBRAINS_META_KEY]);
+  const air = asRecord(jetbrains[AIR_META_KEY]);
+  return {
+    ...root,
+    [JETBRAINS_META_KEY]: {
+      ...jetbrains,
+      [AIR_META_KEY]: {
+        ...air,
+        [AIR_EXTENSION_VERSION_KEY]: AIR_EXTENSION_VERSION,
+        [key]: value
+      }
+    }
+  };
+}
 function clientSupportsAirCapability(capabilities, capability) {
-  const jetbrains = capabilities?._meta?.[JETBRAINS_META_KEY];
-  const air = jetbrains?.[AIR_META_KEY];
-  const version2 = air?.[AIR_EXTENSION_VERSION_KEY];
-  const supported = air?.[AIR_EXTENSION_CAPABILITIES_KEY];
+  const meta3 = asRecord(capabilities?._meta);
+  const jetbrains = asRecord(meta3[JETBRAINS_META_KEY]);
+  const air = asRecord(jetbrains[AIR_META_KEY]);
+  const version2 = air[AIR_EXTENSION_VERSION_KEY];
+  const supported = air[AIR_EXTENSION_CAPABILITIES_KEY];
   return typeof version2 === "number" && Number.isInteger(version2) && version2 >= AIR_EXTENSION_VERSION && Array.isArray(supported) && supported.includes(capability);
 }
+function asRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
+}
 
 // src/subagents/CodexAgentPath.ts
 function normalizeAgentPath(path9) {
@@ -25956,8 +25977,9 @@ function buildMcpPermissionRequest(sessionId, params, context, nextStandaloneToo
           toolCallId: nextStandaloneToolCallId(),
           kind: context.isToolApproval ? "execute" : "other",
           status: "pending",
+          title: context.isToolApproval ? "MCP tool call approval" : "Question from MCP server",
           content: [messageContent],
-          rawInput: { serverName: params.serverName, schema: params.requestedSchema }
+          rawInput: { serverName: params.serverName, description: params.message, schema: params.requestedSchema }
         },
         ...context.isToolApproval ? { _meta: { is_mcp_tool_approval: true } } : {},
         options
@@ -25975,8 +25997,9 @@ function buildMcpPermissionRequest(sessionId, params, context, nextStandaloneToo
         toolCallId: `elicitation-${params.elicitationId}`,
         kind: "fetch",
         status: "pending",
+        title: "MCP server requests to open a URL",
         content: [messageContent],
-        rawInput: { serverName: params.serverName, url: params.url }
+        rawInput: { serverName: params.serverName, description: params.message, url: params.url }
       },
       options
     },
@@ -26158,11 +26181,29 @@ var CodexElicitationHandler = class {
         context.isToolApproval,
         context.persistOptions
       );
-      if (correlatedCallId !== void 0 && result.action === "accept") {
-        await this.connection.notify(methods.client.session.update, {
-          sessionId: params.threadId,
-          update: { sessionUpdate: "tool_call_update", toolCallId: correlatedCallId, status: "in_progress" }
-        });
+      if (correlatedCallId !== void 0) {
+        if (result.action === "accept") {
+          await this.connection.notify(methods.client.session.update, {
+            sessionId: params.threadId,
+            update: { sessionUpdate: "tool_call_update", toolCallId: correlatedCallId, status: "in_progress" }
+          });
+        }
+      } else {
+        try {
+          await this.connection.notify(methods.client.session.update, {
+            sessionId: params.threadId,
+            update: {
+              sessionUpdate: "tool_call_update",
+              toolCallId: request.toolCall.toolCallId,
+              status: "completed",
+              title: request.toolCall.title,
+              content: request.toolCall.content,
+              rawOutput: { action: result.action }
+            }
+          });
+        } catch (error51) {
+          logger.error("Failed to finalize standalone MCP elicitation tool call", error51);
+        }
       }
       return result;
     } catch (error51) {
@@ -27319,7 +27360,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "1.10.0",
+  version: "1.10.1-preview.2",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -27515,9 +27556,9 @@ Working directory: ${JSON.stringify(workspace.cwd)}
 Additional allowed directories: ${JSON.stringify(workspace.additionalDirectories)}`;
 }
 function parseAgentFileChangeReportRequest(meta3) {
-  const jetbrains = asRecord(meta3?.[JETBRAINS_META_KEY]);
-  const air = asRecord(jetbrains?.[AIR_META_KEY]);
-  const request = asRecord(air?.[AIR_AGENT_FILE_CHANGE_REPORT_REQUEST_KEY]);
+  const jetbrains = asRecord2(meta3?.[JETBRAINS_META_KEY]);
+  const air = asRecord2(jetbrains?.[AIR_META_KEY]);
+  const request = asRecord2(air?.[AIR_AGENT_FILE_CHANGE_REPORT_REQUEST_KEY]);
   if (request === null || !hasOnlyKeys(request, ["version", "requestId"]) || request["version"] !== AGENT_FILE_CHANGE_REPORT_VERSION) {
     return null;
   }
@@ -27584,7 +27625,7 @@ function parseModelFileChangeReport(turn) {
   } catch {
     throw new AgentFileChangeReportError("invalidOutput", "The audit turn returned invalid JSON");
   }
-  const report = asRecord(value);
+  const report = asRecord2(value);
   if (report === null || !hasOnlyKeys(report, ["paths", "complete", "uncertainty"])) {
     throw new AgentFileChangeReportError("invalidOutput", "The audit turn returned an invalid object");
   }
@@ -27761,7 +27802,7 @@ function isWindowsAbsolutePath2(value) {
 function isValidPathText(value) {
   return value.length > 0 && !/[\u0000-\u001F\u007F-\u009F]/.test(value);
 }
-function asRecord(value) {
+function asRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
 }
 function hasOnlyKeys(value, allowed) {
@@ -27889,6 +27930,7 @@ async function forkSession(request, additionalDirectories, dependencies) {
   await dependencies.refreshSkills(request.cwd, additionalDirectories);
   const lastTurnId = await resolveForkTurnId(request, dependencies.codexClient);
   const response = await dependencies.codexClient.threadFork({
+    excludeTurns: true,
     config: await dependencies.createSessionConfig(
       request.cwd,
       additionalDirectories,
@@ -27914,10 +27956,7 @@ async function forkSession(request, additionalDirectories, dependencies) {
 async function resolveForkTurnId(request, codexClient) {
   const forkPoint = readAirForkPoint(request._meta);
   if (!forkPoint) return void 0;
-  const history = await codexClient.threadRead({
-    threadId: request.sessionId,
-    includeTurns: true
-  });
+  const history = await codexClient.threadReadWithHistory(request.sessionId);
   const candidateIds = airForkMessageIdCandidates(forkPoint.messageId);
   const itemTurnId = candidateIds.map((candidateId) => history.thread.turns.find((turn) => turn.items.some((item) => item.id === candidateId))?.id).find((turnId) => turnId !== void 0);
   if (itemTurnId) return itemTurnId;
@@ -28340,6 +28379,7 @@ var CodexAcpClient = class {
     const additionalDirectories = readAdditionalDirectories(request.cwd, request.additionalDirectories, request._meta);
     await this.refreshSkills(request.cwd, additionalDirectories);
     const response = await this.codexClient.threadResume({
+      excludeTurns: true,
       config: await this.createSessionConfig(request.cwd, additionalDirectories, request.mcpServers ?? []),
       cwd: request.cwd,
       modelProvider: await this.getResumeModelProvider(),
@@ -28374,16 +28414,17 @@ var CodexAcpClient = class {
     const additionalDirectories = readAdditionalDirectories(request.cwd, request.additionalDirectories, request._meta);
     await this.refreshSkills(request.cwd, additionalDirectories);
     const response = await this.codexClient.threadResume({
+      excludeTurns: true,
       config: await this.createSessionConfig(request.cwd, additionalDirectories, request.mcpServers ?? []),
       cwd: request.cwd,
       modelProvider: await this.getResumeModelProvider(),
       threadId: request.sessionId
     });
     onSubscribed?.();
-    const historyResponse = await this.codexClient.threadRead({
-      threadId: response.thread.id,
-      includeTurns: true
-    });
+    const thread = response.thread.historyMode === "paginated" ? {
+      ...response.thread,
+      turns: response.turnsBackwardsCursor === null ? [] : await this.codexClient.threadReadHistory(response.thread.id, response.turnsBackwardsCursor)
+    } : (await this.codexClient.threadReadWithHistory(response.thread.id)).thread;
     const codexModels = await this.fetchAvailableModels();
     const currentModelId = this.createModelId(codexModels, response.model, response.reasoningEffort).toString();
     return {
@@ -28393,15 +28434,12 @@ var CodexAcpClient = class {
       collaborationMode: this.getCollaborationMode(response.thread.id),
       modelProvider: response.modelProvider,
       currentServiceTier: response.serviceTier ?? null,
-      thread: historyResponse.thread,
+      thread,
       additionalDirectories
     };
   }
   async readSessionThread(sessionId) {
-    return (await this.codexClient.threadRead({
-      threadId: sessionId,
-      includeTurns: true
-    })).thread;
+    return (await this.codexClient.threadReadWithHistory(sessionId)).thread;
   }
   async newSession(request) {
     const additionalDirectories = readAdditionalDirectories(request.cwd, request.additionalDirectories, request._meta);
@@ -28682,6 +28720,7 @@ var CodexAcpClient = class {
     let lateStopReason = null;
     try {
       const forkPromise = this.codexClient.threadFork({
+        excludeTurns: true,
         threadId: params.sessionId,
         lastTurnId: params.turnId,
         cwd: params.workspace.cwd,
@@ -29516,6 +29555,41 @@ var CodexAppServerClient = class {
   async threadRead(params) {
     return await this.sendRequest({ method: "thread/read", params });
   }
+  async threadTurnsList(params) {
+    return await this.sendRequest({ method: "thread/turns/list", params });
+  }
+  async threadReadWithHistory(threadId) {
+    const response = await this.threadRead({ threadId });
+    if (response.thread.historyMode === "legacy") {
+      return await this.threadRead({ threadId, includeTurns: true });
+    }
+    const turns = await this.threadReadHistory(threadId);
+    return { ...response, thread: { ...response.thread, turns } };
+  }
+  async threadReadHistory(threadId, initialCursor = null) {
+    const turns = [];
+    const seenCursors = /* @__PURE__ */ new Set();
+    if (initialCursor !== null) seenCursors.add(initialCursor);
+    let cursor = initialCursor;
+    do {
+      const page = await this.threadTurnsList({
+        threadId,
+        cursor,
+        limit: 50,
+        sortDirection: "desc",
+        itemsView: "full"
+      });
+      turns.push(...page.data);
+      cursor = page.nextCursor;
+      if (cursor !== null) {
+        if (seenCursors.has(cursor)) {
+          throw new Error("Codex returned a repeated thread history cursor");
+        }
+        seenCursors.add(cursor);
+      }
+    } while (cursor !== null);
+    return turns.reverse();
+  }
   async threadArchive(params) {
     return await this.sendRequest({ method: "thread/archive", params });
   }
@@ -29961,7 +30035,7 @@ function findSupportedEffort(options, effort) {
   if (!effort) return void 0;
   return options.find((o) => o.reasoningEffort === effort)?.reasoningEffort;
 }
-function createModelConfigOption(availableModels, currentBaseModelId) {
+function createModelConfigOption(availableModels, currentBaseModelId, recommendedModelId) {
   const options = availableModels.map((model) => ({
     value: model.id,
     name: model.displayName,
@@ -29974,6 +30048,7 @@ function createModelConfigOption(availableModels, currentBaseModelId) {
       description: null
     });
   }
+  const recommendation = recommendedModelId && options.some((option) => option.value === recommendedModelId) ? recommendedModelId : void 0;
   return {
     id: MODEL_CONFIG_ID,
     name: "Model",
@@ -29981,10 +30056,12 @@ function createModelConfigOption(availableModels, currentBaseModelId) {
     category: "model",
     type: "select",
     currentValue: currentBaseModelId,
-    options
+    options,
+    ...recommendation ? { _meta: withAirMeta(void 0, AIR_RECOMMENDED_CONFIG_VALUE_KEY, recommendation) } : {}
   };
 }
-function createReasoningEffortConfigOption(supportedReasoningEfforts, currentEffort) {
+function createReasoningEffortConfigOption(supportedReasoningEfforts, currentEffort, recommendedEffort) {
+  const recommendation = findSupportedEffort(supportedReasoningEfforts, recommendedEffort);
   return {
     id: REASONING_EFFORT_CONFIG_ID,
     name: "Reasoning effort",
@@ -29996,7 +30073,8 @@ function createReasoningEffortConfigOption(supportedReasoningEfforts, currentEff
       value: option.reasoningEffort,
       name: capitalize(option.reasoningEffort),
       description: option.description
-    }))
+    })),
+    ...recommendation ? { _meta: withAirMeta(void 0, AIR_RECOMMENDED_CONFIG_VALUE_KEY, recommendation) } : {}
   };
 }
 
@@ -30696,14 +30774,14 @@ function parseJsonRecord(line) {
   }
   try {
     const value = JSON.parse(line);
-    return asRecord2(value);
+    return asRecord3(value);
   } catch {
     return null;
   }
 }
 function extractResponseItem(record2) {
   if (record2["type"] === "response_item") {
-    return asRecord2(record2["payload"]);
+    return asRecord3(record2["payload"]);
   }
   const itemType = record2["type"];
   if (typeof itemType === "string" && isLegacyResponseItemType(itemType)) {
@@ -30737,7 +30815,7 @@ function createEventMsgUpdates(record2) {
   if (record2["type"] !== "event_msg") {
     return null;
   }
-  const payload = asRecord2(record2["payload"]);
+  const payload = asRecord3(record2["payload"]);
   if (!payload) {
     return [];
   }
@@ -30781,7 +30859,7 @@ function imageBlocks(images) {
     if (typeof image === "string") {
       return [{ type: "text", text: `[@image](${image})` }];
     }
-    const record2 = asRecord2(image);
+    const record2 = asRecord3(image);
     const path9 = record2 ? stringValue(record2["path"]) ?? stringValue(record2["url"]) : null;
     return path9 ? [{ type: "text", text: `[@image](${path9})` }] : [];
   });
@@ -30791,7 +30869,7 @@ function contentBlocksFromResponseContent(content) {
     return [];
   }
   return content.flatMap((entry) => {
-    const record2 = asRecord2(entry);
+    const record2 = asRecord3(entry);
     if (!record2) {
       return [];
     }
@@ -30824,7 +30902,7 @@ function textParts(value) {
     if (typeof entry === "string") {
       return entry.length > 0 ? [entry] : [];
     }
-    const record2 = asRecord2(entry);
+    const record2 = asRecord3(entry);
     if (!record2) {
       return [];
     }
@@ -30916,7 +30994,7 @@ function parseFunctionArguments(value) {
 }
 function rawInputForFunctionCall(name, args) {
   if (name === "exec_command") {
-    const record2 = asRecord2(args);
+    const record2 = asRecord3(args);
     if (record2) {
       return {
         command: stringValue(record2["cmd"]) ?? stringValue(record2["command"]),
@@ -30963,14 +31041,14 @@ function functionCallUsesTerminal(item) {
   return item["name"] === "exec_command";
 }
 function commandFromFunctionArguments(args) {
-  const record2 = asRecord2(args);
+  const record2 = asRecord3(args);
   if (!record2) {
     return null;
   }
   return stringValue(record2["cmd"]) ?? stringValue(record2["command"]);
 }
 function cwdFromFunctionArguments(args) {
-  const record2 = asRecord2(args);
+  const record2 = asRecord3(args);
   if (!record2) {
     return "";
   }
@@ -31442,7 +31520,7 @@ function outputText(output) {
     return "";
   }
   return output.flatMap((entry) => {
-    const record2 = asRecord2(entry);
+    const record2 = asRecord3(entry);
     if (!record2) {
       return [];
     }
@@ -31458,7 +31536,7 @@ function outputText(output) {
   }).join("\n");
 }
 function parseExitCode(rawOutput, output) {
-  const record2 = asRecord2(rawOutput);
+  const record2 = asRecord3(rawOutput);
   if (record2) {
     const exitCode2 = numberValue(record2["exit_code"]) ?? numberValue(record2["exitCode"]);
     if (exitCode2 !== null) {
@@ -31489,7 +31567,7 @@ function looksLikeCommandFailure(output) {
   }
   return /(^|\n)(Error|Failed|Command failed|Sandbox error|No such file or directory|Permission denied|Operation not permitted|ENOENT|EACCES)(:|\b)/i.test(trimmed);
 }
-function asRecord2(value) {
+function asRecord3(value) {
   if (value === null || typeof value !== "object" || Array.isArray(value)) {
     return null;
   }
@@ -32271,7 +32349,8 @@ var CodexAcpServer = class _CodexAcpServer {
               AIR_SESSION_FAILURE_KEY,
               AIR_AGENT_FILE_CHANGE_REPORT_KEY,
               AIR_NATIVE_SUBAGENT_SESSIONS_KEY,
-              AIR_ASYNC_TASKS_KEY
+              AIR_ASYNC_TASKS_KEY,
+              AIR_RECOMMENDED_CONFIG_VALUE_KEY
             ]
           }
         }
@@ -33432,14 +33511,24 @@ Check ${configPath} and project .codex directories, especially their config.toml
   }
   createSessionConfigOptions(sessionState) {
     const currentModelId = ModelId.fromString(sessionState.currentModelId);
+    const useRecommendedValue = clientSupportsAirCapability(
+      this.clientCapabilities,
+      AIR_RECOMMENDED_CONFIG_VALUE_KEY
+    );
+    const currentModel = this.findCurrentModel(sessionState.availableModels, sessionState.currentModelId);
+    const recommendedModelId = useRecommendedValue ? sessionState.availableModels.find((model) => model.isDefault)?.id : void 0;
     const configOptions = [
       sessionState.agentMode.toConfigOption(),
       createCollaborationModeConfigOption(sessionState.collaborationMode),
-      createModelConfigOption(sessionState.availableModels, currentModelId.model)
+      createModelConfigOption(sessionState.availableModels, currentModelId.model, recommendedModelId)
     ];
     if (sessionState.supportedReasoningEfforts.length > 0) {
       configOptions.push(
-        createReasoningEffortConfigOption(sessionState.supportedReasoningEfforts, currentModelId.effort)
+        createReasoningEffortConfigOption(
+          sessionState.supportedReasoningEfforts,
+          currentModelId.effort,
+          useRecommendedValue ? currentModel?.defaultReasoningEffort : void 0
+        )
       );
     }
     if (sessionState.currentModelSupportsFast) {

package/package.json

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