@agentclientprotocol/codex-acp 1.10.1-preview.1 → 1.10.1-preview.3

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.

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) {
@@ -27339,7 +27360,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "1.10.1-preview.1",
+  version: "1.10.1-preview.3",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -27402,7 +27423,7 @@ var package_default = {
   },
   dependencies: {
     "@agentclientprotocol/sdk": "^1.4.0",
-    "@openai/codex": "^0.153.3",
+    "@openai/codex": "^0.153.4",
     diff: "^9.0.0",
     open: "^11.0.1",
     "vscode-jsonrpc": "^9.0.1",
@@ -27535,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;
   }
@@ -27604,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");
   }
@@ -27781,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) {
@@ -30007,6 +30028,10 @@ function extractTurnRouting(notification) {
 // src/ModelConfigOption.ts
 var MODEL_CONFIG_ID = "model";
 var REASONING_EFFORT_CONFIG_ID = "reasoning_effort";
+function formatModelDisplayName(displayName) {
+  if (!/^gpt-/i.test(displayName)) return displayName;
+  return displayName.replace(/^gpt-/i, "").split(/[-/]+/).filter(Boolean).map(capitalize).join(" ");
+}
 function capitalize(value) {
   return value.charAt(0).toUpperCase() + value.slice(1);
 }
@@ -30014,19 +30039,20 @@ 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,
+    name: formatModelDisplayName(model.displayName),
     description: model.description
   }));
   if (!availableModels.some((model) => model.id === currentBaseModelId)) {
     options.unshift({
       value: currentBaseModelId,
-      name: currentBaseModelId,
+      name: formatModelDisplayName(currentBaseModelId),
       description: null
     });
   }
+  const recommendation = recommendedModelId && options.some((option) => option.value === recommendedModelId) ? recommendedModelId : void 0;
   return {
     id: MODEL_CONFIG_ID,
     name: "Model",
@@ -30034,10 +30060,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",
@@ -30049,7 +30077,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) } : {}
   };
 }
 
@@ -30749,14 +30778,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)) {
@@ -30790,7 +30819,7 @@ function createEventMsgUpdates(record2) {
   if (record2["type"] !== "event_msg") {
     return null;
   }
-  const payload = asRecord2(record2["payload"]);
+  const payload = asRecord3(record2["payload"]);
   if (!payload) {
     return [];
   }
@@ -30834,7 +30863,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})` }] : [];
   });
@@ -30844,7 +30873,7 @@ function contentBlocksFromResponseContent(content) {
     return [];
   }
   return content.flatMap((entry) => {
-    const record2 = asRecord2(entry);
+    const record2 = asRecord3(entry);
     if (!record2) {
       return [];
     }
@@ -30877,7 +30906,7 @@ function textParts(value) {
     if (typeof entry === "string") {
       return entry.length > 0 ? [entry] : [];
     }
-    const record2 = asRecord2(entry);
+    const record2 = asRecord3(entry);
     if (!record2) {
       return [];
     }
@@ -30969,7 +30998,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"]),
@@ -31016,14 +31045,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 "";
   }
@@ -31495,7 +31524,7 @@ function outputText(output) {
     return "";
   }
   return output.flatMap((entry) => {
-    const record2 = asRecord2(entry);
+    const record2 = asRecord3(entry);
     if (!record2) {
       return [];
     }
@@ -31511,7 +31540,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) {
@@ -31542,7 +31571,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;
   }
@@ -32192,12 +32221,7 @@ function clientSupportsTypedSessionFailures(capabilities) {
 function clientSupportsAgentFileChangeReports(capabilities) {
   return clientSupportsAirCapability(capabilities, AIR_AGENT_FILE_CHANGE_REPORT_KEY);
 }
-var CodexAcpServer = class _CodexAcpServer {
-  static MODEL_NAME_TOKEN_OVERRIDES = {
-    gpt: "GPT",
-    mini: "Mini",
-    codex: "Codex"
-  };
+var CodexAcpServer = class {
   codexAcpClient;
   connection;
   defaultAuthRequest;
@@ -32324,7 +32348,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
             ]
           }
         }
@@ -33485,14 +33510,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) {
@@ -33569,14 +33604,11 @@ Check ${configPath} and project .codex directories, especially their config.toml
     const modelId = ModelId.fromString(currentModelId);
     return models.find((m) => m.id === modelId.model);
   }
-  normalizeModelDisplayName(displayName) {
-    return displayName.split("-").map((token) => _CodexAcpServer.MODEL_NAME_TOKEN_OVERRIDES[token.toLowerCase()] ?? token).join("-");
-  }
   createModelState(availableModels, selectedModelId) {
     const allowedModels = availableModels.flatMap(
       (model) => model.supportedReasoningEfforts.map((effort) => ({
         modelId: ModelId.fromComponents(model, effort.reasoningEffort).toString(),
-        name: `${this.normalizeModelDisplayName(model.displayName)} (${effort.reasoningEffort})`,
+        name: `${formatModelDisplayName(model.displayName)} (${effort.reasoningEffort})`,
         description: `${model.description} ${effort.description}`
       }))
     );

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.10.1-preview.1",
+  "version": "1.10.1-preview.3",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -66,7 +66,7 @@
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^1.4.0",
-    "@openai/codex": "^0.153.3",
+    "@openai/codex": "^0.153.4",
     "diff": "^9.0.0",
     "open": "^11.0.1",
     "vscode-jsonrpc": "^9.0.1",