@alas-ide/codex-acp 2.5.0-alas.7 → 2.5.0-alas.9

package/dist/index.js

@@ -32123,6 +32123,8 @@ var CODEX_ADDITIONAL_PERMISSIONS_TITLE = "Grant permissions?";
 var PERMISSION_PROMPT_META_KEY = "permission_prompt";
 var NEUTRAL_PERMISSION_PRESENTATION_META_KEY = "permissionPresentation";
 var NEUTRAL_QUESTION_CUSTOM_ANSWER_META_KEY = "questionCustomAnswer";
+var NEUTRAL_RECOMMENDED_CONFIG_VALUE_META_KEY = "recommendedConfigValue";
+var NEUTRAL_COMMAND_PRESENTATION_META_KEY = "commandPresentation";
 function neutralPresentationCapability() {
   return { version: 1 };
 }
@@ -35092,7 +35094,9 @@ var ClientCapabilities = class _ClientCapabilities {
     agentFileChangeReportFormat: "none",
     permissionPromptFields: false,
     neutralPermissionPresentation: false,
-    neutralQuestionCustomAnswer: false
+    neutralQuestionCustomAnswer: false,
+    neutralRecommendedConfigValue: false,
+    neutralCommandPresentation: false
   });
   /** The client declares `_meta.jetbrains.air`. */
   airClient;
@@ -35118,6 +35122,10 @@ var ClientCapabilities = class _ClientCapabilities {
   neutralPermissionPresentation;
   /** A question's note field carries `_meta.questionCustomAnswer`. Only ACP v1 reads the opt-in. */
   neutralQuestionCustomAnswer;
+  /** Model and effort selectors carry `_meta.recommendedConfigValue`. Only ACP v1 reads the opt-in. */
+  neutralRecommendedConfigValue;
+  /** Available commands carry `_meta.commandPresentation`. Only ACP v1 reads the opt-in. */
+  neutralCommandPresentation;
   constructor(values) {
     this.airClient = values.airClient;
     this.airToolCallContract = values.airToolCallContract;
@@ -35133,6 +35141,8 @@ var ClientCapabilities = class _ClientCapabilities {
     this.permissionPromptFields = values.permissionPromptFields;
     this.neutralPermissionPresentation = values.neutralPermissionPresentation;
     this.neutralQuestionCustomAnswer = values.neutralQuestionCustomAnswer;
+    this.neutralRecommendedConfigValue = values.neutralRecommendedConfigValue;
+    this.neutralCommandPresentation = values.neutralCommandPresentation;
   }
   static from(capabilities) {
     const airClient = isAirClient(capabilities);
@@ -35159,7 +35169,9 @@ var ClientCapabilities = class _ClientCapabilities {
       agentFileChangeReportFormat: clientRequestsNeutralAgentFileChangeReport(capabilities) ? "neutral" : clientSupportsAirCapability(capabilities, AIR_AGENT_FILE_CHANGE_REPORT_KEY) ? "air" : "none",
       permissionPromptFields: false,
       neutralPermissionPresentation: clientRequestsNeutralPresentation(capabilities, NEUTRAL_PERMISSION_PRESENTATION_META_KEY),
-      neutralQuestionCustomAnswer: clientRequestsNeutralPresentation(capabilities, NEUTRAL_QUESTION_CUSTOM_ANSWER_META_KEY)
+      neutralQuestionCustomAnswer: clientRequestsNeutralPresentation(capabilities, NEUTRAL_QUESTION_CUSTOM_ANSWER_META_KEY),
+      neutralRecommendedConfigValue: clientRequestsNeutralPresentation(capabilities, NEUTRAL_RECOMMENDED_CONFIG_VALUE_META_KEY),
+      neutralCommandPresentation: clientRequestsNeutralPresentation(capabilities, NEUTRAL_COMMAND_PRESENTATION_META_KEY)
     });
   }
   /**
@@ -35188,7 +35200,9 @@ var ClientCapabilities = class _ClientCapabilities {
       permissionPromptFields: true,
       // A v2 request has its own title and description, so v2 ignores both client-neutral opt-ins.
       neutralPermissionPresentation: false,
-      neutralQuestionCustomAnswer: false
+      neutralQuestionCustomAnswer: false,
+      neutralRecommendedConfigValue: false,
+      neutralCommandPresentation: false
     });
   }
   /**
@@ -35476,7 +35490,13 @@ function modelOptions(availableModels, currentBaseModelId) {
   }
   return options;
 }
-function createModelConfigOption(availableModels, currentBaseModelId, recommendedModelId) {
+function recommendationMeta(value, records) {
+  return {
+    ...records.air ? withAirMeta(void 0, AIR_RECOMMENDED_CONFIG_VALUE_KEY, value) : {},
+    ...records.neutral ? { [NEUTRAL_RECOMMENDED_CONFIG_VALUE_META_KEY]: { version: 1, value } } : {}
+  };
+}
+function createModelConfigOption(availableModels, currentBaseModelId, recommendedModelId, records = { air: true, neutral: false }) {
   const options = modelOptions(availableModels, currentBaseModelId);
   const recommendation = recommendedModelId && options.some((option) => option.value === recommendedModelId) ? recommendedModelId : void 0;
   return {
@@ -35487,10 +35507,10 @@ function createModelConfigOption(availableModels, currentBaseModelId, recommende
     type: "select",
     currentValue: currentBaseModelId,
     options,
-    ...recommendation ? { _meta: withAirMeta(void 0, AIR_RECOMMENDED_CONFIG_VALUE_KEY, recommendation) } : {}
+    ...recommendation ? { _meta: recommendationMeta(recommendation, records) } : {}
   };
 }
-function createReasoningEffortConfigOption(supportedReasoningEfforts, currentEffort, recommendedEffort) {
+function createReasoningEffortConfigOption(supportedReasoningEfforts, currentEffort, recommendedEffort, records = { air: true, neutral: false }) {
   const recommendation = findSupportedEffort(supportedReasoningEfforts, recommendedEffort);
   return {
     id: REASONING_EFFORT_CONFIG_ID,
@@ -35504,7 +35524,7 @@ function createReasoningEffortConfigOption(supportedReasoningEfforts, currentEff
       name: capitalize(option.reasoningEffort),
       description: option.description
     })),
-    ...recommendation ? { _meta: withAirMeta(void 0, AIR_RECOMMENDED_CONFIG_VALUE_KEY, recommendation) } : {}
+    ...recommendation ? { _meta: recommendationMeta(recommendation, records) } : {}
   };
 }
 function createSubagentModelConfigOption(availableModels, parentBaseModelId, model) {
@@ -40753,7 +40773,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.0-alas.7",
+  version: "2.5.0-alas.9",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -40831,7 +40851,7 @@ var package_default = {
   alasDownstream: {
     upstreamVersion: "2.5.0",
     upstreamCommit: "34e08970aa324a2be985f5080674d5aa91d7666f",
-    sourceCommit: "4b88aaf47a9765b7b64a51712cca179fc141fa46"
+    sourceCommit: "d9a647ae9cbbf85c89ed99ba5af59c98cd716c55"
   }
 };
 
@@ -47946,7 +47966,7 @@ var CodexCommands = class {
     const skillsResponse = await this.runWithProcessCheck(() => this.codexAcpClient.listSkills(this.createSkillsListParams(sessionState)));
     const commands = this.buildAvailableCommands(
       skillsResponse?.data ?? [],
-      sessionState.clientCapabilities.airClient
+      sessionState.clientCapabilities
     );
     if ((this.snapshots.get(sessionState)?.revision ?? 0) < revision) {
       this.snapshots.set(sessionState, { revision, commands });
@@ -47987,9 +48007,9 @@ var CodexCommands = class {
       cwds: [sessionState.cwd, ...sessionState.additionalDirectories]
     };
   }
-  buildAvailableCommands(skillsEntries, airClient) {
+  buildAvailableCommands(skillsEntries, capabilities) {
     const commands = /* @__PURE__ */ new Map();
-    for (const builtin of this.getBuiltinCommands(airClient)) {
+    for (const builtin of this.getBuiltinCommands(capabilities)) {
       commands.set(builtin.name, builtin);
     }
     for (const entry of skillsEntries) {
@@ -47997,12 +48017,15 @@ var CodexCommands = class {
         const name = `$${skill.name}`;
         if (commands.has(name)) continue;
         const description = skill.shortDescription ?? skill.description ?? skill.name;
-        const meta3 = airOnlyMeta(airClient, AIR_SKILL_PATH_KEY, skill.path);
+        const meta3 = {
+          ...airOnlyMeta(capabilities.airClient, AIR_SKILL_PATH_KEY, skill.path),
+          ...neutralCommandPresentation(capabilities, { kind: "skill", skillPath: skill.path })
+        };
         commands.set(name, {
           name,
           description,
           input: null,
-          ...meta3 ? { _meta: meta3 } : {}
+          ...Object.keys(meta3).length > 0 ? { _meta: meta3 } : {}
         });
       }
     }
@@ -48010,12 +48033,16 @@ var CodexCommands = class {
   }
   /**
    * See the original cli commands documentation here: https://developers.openai.com/codex/cli/slash-commands/
-   * Only AIR gets a command action, in `_meta.jetbrains.air.commandAction`.
+   * AIR gets a command action in `_meta.jetbrains.air.commandAction`, and a client that opted into the
+   * client-neutral form gets it in `_meta.commandPresentation.action`.
    */
-  getBuiltinCommands(airClient) {
+  getBuiltinCommands(capabilities) {
     const commandAction = (action) => {
-      const meta3 = airOnlyMeta(airClient, AIR_COMMAND_ACTION_KEY, action);
-      return meta3 ? { _meta: meta3 } : {};
+      const meta3 = {
+        ...airOnlyMeta(capabilities.airClient, AIR_COMMAND_ACTION_KEY, action),
+        ...neutralCommandPresentation(capabilities, { action })
+      };
+      return Object.keys(meta3).length > 0 ? { _meta: meta3 } : {};
     };
     return [
       {
@@ -48484,6 +48511,10 @@ var CodexCommands = class {
     return count.toString();
   }
 };
+function neutralCommandPresentation(capabilities, presentation) {
+  if (!capabilities.neutralCommandPresentation) return {};
+  return { [NEUTRAL_COMMAND_PRESENTATION_META_KEY]: { version: 1, ...presentation } };
+}
 
 // src/SteeringQueue.ts
 var SteeringQueue = class {
@@ -52715,6 +52746,12 @@ var CodexAcpServer = class {
       ...this.capabilities.neutralQuestionCustomAnswer ? {
         [NEUTRAL_QUESTION_CUSTOM_ANSWER_META_KEY]: neutralPresentationCapability()
       } : {},
+      ...this.capabilities.neutralRecommendedConfigValue ? {
+        [NEUTRAL_RECOMMENDED_CONFIG_VALUE_META_KEY]: neutralPresentationCapability()
+      } : {},
+      ...this.capabilities.neutralCommandPresentation ? {
+        [NEUTRAL_COMMAND_PRESENTATION_META_KEY]: neutralPresentationCapability()
+      } : {},
       // The session index for a client that opted in without AIR, see `docs/air-extensions.md`.
       ...neutralSessionIndex ? {
         [NEUTRAL_SESSION_INDEX_META_KEY]: neutralSessionIndex
@@ -54763,10 +54800,11 @@ You have been logged out. Please try again.`);
   }
   createSessionConfigOptions(sessionState) {
     const currentModelId = ModelId.fromString(sessionState.currentModelId);
-    const useRecommendedValue = clientSupportsAirCapability(
-      this.clientCapabilities,
-      AIR_RECOMMENDED_CONFIG_VALUE_KEY
-    );
+    const records = {
+      air: clientSupportsAirCapability(this.clientCapabilities, AIR_RECOMMENDED_CONFIG_VALUE_KEY),
+      neutral: this.capabilities.neutralRecommendedConfigValue
+    };
+    const useRecommendedValue = records.air || records.neutral;
     const currentModel = this.findCurrentModel(sessionState.availableModels, sessionState.currentModelId);
     const recommendedModelId = useRecommendedValue ? sessionState.availableModels.find((model) => model.isDefault)?.id : void 0;
     const configOptions = [
@@ -54774,14 +54812,15 @@ You have been logged out. Please try again.`);
       createCollaborationModeConfigOption(sessionState.collaborationMode)
     ];
     if (sessionState.availableModels.length > 0) {
-      configOptions.push(createModelConfigOption(sessionState.availableModels, currentModelId.model, recommendedModelId));
+      configOptions.push(createModelConfigOption(sessionState.availableModels, currentModelId.model, recommendedModelId, records));
     }
     if (sessionState.supportedReasoningEfforts.length > 0) {
       configOptions.push(
         createReasoningEffortConfigOption(
           sessionState.supportedReasoningEfforts,
           currentModelId.effort,
-          useRecommendedValue ? currentModel?.defaultReasoningEffort : void 0
+          useRecommendedValue ? currentModel?.defaultReasoningEffort : void 0,
+          records
         )
       );
     }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.5.0-alas.7",
+  "version": "2.5.0-alas.9",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -81,6 +81,6 @@
   "alasDownstream": {
     "upstreamVersion": "2.5.0",
     "upstreamCommit": "34e08970aa324a2be985f5080674d5aa91d7666f",
-    "sourceCommit": "4b88aaf47a9765b7b64a51712cca179fc141fa46"
+    "sourceCommit": "d9a647ae9cbbf85c89ed99ba5af59c98cd716c55"
   }
 }