@alas-ide/codex-acp 2.5.0-alas.6 → 2.5.0-alas.8

package/dist/index.js

@@ -32121,6 +32121,18 @@ var CODEX_NETWORK_PERMISSION_TITLE = "Allow network access?";
 var CODEX_FILE_CHANGE_PERMISSION_TITLE = "Make edits?";
 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";
+function neutralPresentationCapability() {
+  return { version: 1 };
+}
+function clientRequestsNeutralPresentation(capabilities, key) {
+  const declared = capabilities?._meta?.[key];
+  if (declared === null || typeof declared !== "object" || Array.isArray(declared)) return false;
+  const version2 = declared["version"];
+  return typeof version2 === "number" && Number.isInteger(version2) && version2 >= 1;
+}
 function requestPermissionMeta(capabilities, title, reason) {
   const description = nonBlank(reason);
   const permission = {
@@ -32130,6 +32142,7 @@ function requestPermissionMeta(capabilities, title, reason) {
   };
   const meta3 = {
     ...airOnlyMeta(capabilities.airClient, AIR_PERMISSION_KEY, permission),
+    ...capabilities.neutralPermissionPresentation ? { [NEUTRAL_PERMISSION_PRESENTATION_META_KEY]: permission } : {},
     ...capabilities.permissionPromptFields ? { [PERMISSION_PROMPT_META_KEY]: permission } : {}
   };
   return Object.keys(meta3).length > 0 ? { _meta: meta3 } : {};
@@ -32141,11 +32154,15 @@ function readPermissionMeta(meta3) {
   if (typeof title !== "string") return void 0;
   return { version: 1, title, ...typeof description === "string" ? { description } : {} };
 }
-function optionPermissionMeta(airClient, description) {
+function optionPermissionMeta(capabilities, description) {
   const normalized = nonBlank(description);
   if (!normalized) return void 0;
   const permission = { version: 1, description: normalized };
-  return airOnlyMeta(airClient, AIR_PERMISSION_KEY, permission);
+  const meta3 = {
+    ...airOnlyMeta(capabilities.airClient, AIR_PERMISSION_KEY, permission),
+    ...capabilities.neutralPermissionPresentation ? { [NEUTRAL_PERMISSION_PRESENTATION_META_KEY]: permission } : {}
+  };
+  return Object.keys(meta3).length > 0 ? meta3 : void 0;
 }
 function nonBlank(value) {
   const normalized = value?.trim();
@@ -35074,7 +35091,10 @@ var ClientCapabilities = class _ClientCapabilities {
     diffPatchFormat: "none",
     sessionFailureFormat: "none",
     agentFileChangeReportFormat: "none",
-    permissionPromptFields: false
+    permissionPromptFields: false,
+    neutralPermissionPresentation: false,
+    neutralQuestionCustomAnswer: false,
+    neutralRecommendedConfigValue: false
   });
   /** The client declares `_meta.jetbrains.air`. */
   airClient;
@@ -35096,6 +35116,12 @@ var ClientCapabilities = class _ClientCapabilities {
   agentFileChangeReportFormat;
   /** A permission request has its own `title` and `description` (ACP v2). */
   permissionPromptFields;
+  /** The client gets the permission presentation in `_meta.permissionPresentation`. Only ACP v1 reads the opt-in. */
+  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;
   constructor(values) {
     this.airClient = values.airClient;
     this.airToolCallContract = values.airToolCallContract;
@@ -35109,6 +35135,9 @@ var ClientCapabilities = class _ClientCapabilities {
     this.sessionFailureFormat = values.sessionFailureFormat;
     this.agentFileChangeReportFormat = values.agentFileChangeReportFormat;
     this.permissionPromptFields = values.permissionPromptFields;
+    this.neutralPermissionPresentation = values.neutralPermissionPresentation;
+    this.neutralQuestionCustomAnswer = values.neutralQuestionCustomAnswer;
+    this.neutralRecommendedConfigValue = values.neutralRecommendedConfigValue;
   }
   static from(capabilities) {
     const airClient = isAirClient(capabilities);
@@ -35133,7 +35162,10 @@ var ClientCapabilities = class _ClientCapabilities {
       sessionFailureFormat: clientRequestsNeutralSessionFailure(capabilities) ? "neutral" : clientSupportsAirCapability(capabilities, AIR_SESSION_FAILURE_KEY) ? "air" : "none",
       // Likewise. The request and the report use the selected form.
       agentFileChangeReportFormat: clientRequestsNeutralAgentFileChangeReport(capabilities) ? "neutral" : clientSupportsAirCapability(capabilities, AIR_AGENT_FILE_CHANGE_REPORT_KEY) ? "air" : "none",
-      permissionPromptFields: false
+      permissionPromptFields: false,
+      neutralPermissionPresentation: clientRequestsNeutralPresentation(capabilities, NEUTRAL_PERMISSION_PRESENTATION_META_KEY),
+      neutralQuestionCustomAnswer: clientRequestsNeutralPresentation(capabilities, NEUTRAL_QUESTION_CUSTOM_ANSWER_META_KEY),
+      neutralRecommendedConfigValue: clientRequestsNeutralPresentation(capabilities, NEUTRAL_RECOMMENDED_CONFIG_VALUE_META_KEY)
     });
   }
   /**
@@ -35159,7 +35191,11 @@ var ClientCapabilities = class _ClientCapabilities {
       sessionFailureFormat: clientSupportsAirCapability(capabilities, AIR_SESSION_FAILURE_KEY) ? "air" : "none",
       // The client-neutral report is an ACP v1 extension, so v2 ignores its opt-in.
       agentFileChangeReportFormat: clientSupportsAirCapability(capabilities, AIR_AGENT_FILE_CHANGE_REPORT_KEY) ? "air" : "none",
-      permissionPromptFields: true
+      permissionPromptFields: true,
+      // A v2 request has its own title and description, so v2 ignores both client-neutral opt-ins.
+      neutralPermissionPresentation: false,
+      neutralQuestionCustomAnswer: false,
+      neutralRecommendedConfigValue: false
     });
   }
   /**
@@ -35447,7 +35483,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 {
@@ -35458,10 +35500,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,
@@ -35475,7 +35517,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) {
@@ -38937,9 +38979,9 @@ function parsePersistOptions(meta3) {
 function isMcpToolCallApproval(meta3) {
   return isRecord2(meta3) && meta3["codex_approval_kind"] === "mcp_tool_call";
 }
-function buildMcpPermissionOptions(isToolApproval, persistOptions, airClient) {
+function buildMcpPermissionOptions(isToolApproval, persistOptions, capabilities) {
   const permissionOption2 = (optionId, name, kind, description) => {
-    const meta3 = optionPermissionMeta(airClient, description);
+    const meta3 = optionPermissionMeta(capabilities, description);
     return { optionId, name, kind, ...meta3 ? { _meta: meta3 } : {} };
   };
   const options = [permissionOption2(
@@ -39001,7 +39043,7 @@ function buildMcpPermissionRequest(sessionId, params, context, nextStandaloneToo
       options: buildMcpPermissionOptions(
         context.isToolApproval,
         context.persistOptions,
-        renderer.capabilities.airClient
+        renderer.capabilities
       )
     },
     correlatedCallId
@@ -39114,7 +39156,7 @@ function userInputResponseValue(content, fieldId) {
   }
   return value;
 }
-function buildUserInputSchema(questions, clientCapabilities, answersRequired) {
+function buildUserInputSchema(questions, clientCapabilities, answersRequired, neutralCustomAnswer = false) {
   const properties = {};
   const required2 = [];
   const questionIds = new Set(questions.map((question) => question.id));
@@ -39166,7 +39208,10 @@ function buildUserInputSchema(questions, clientCapabilities, answersRequired) {
       properties[userInputNoteFieldId(question.id, questionIds)] = {
         type: "string",
         title: "Additional answer or note",
-        _meta: airClient ? withAirMeta({ ...noteMeta, [LEGACY_AIR_CUSTOM_ANSWER_KEY]: true }, AIR_CUSTOM_ANSWER_KEY, true) : noteMeta
+        _meta: {
+          ...airClient ? withAirMeta({ ...noteMeta, [LEGACY_AIR_CUSTOM_ANSWER_KEY]: true }, AIR_CUSTOM_ANSWER_KEY, true) : noteMeta,
+          ...neutralCustomAnswer ? { [NEUTRAL_QUESTION_CUSTOM_ANSWER_META_KEY]: { version: 1, questionId: question.id } } : {}
+        }
       };
     }
   }
@@ -39176,13 +39221,13 @@ function buildUserInputSchema(questions, clientCapabilities, answersRequired) {
     ...answersRequired ? { required: required2 } : {}
   };
 }
-function buildUserInputRequest(params, clientCapabilities) {
+function buildUserInputRequest(params, clientCapabilities, neutralCustomAnswer) {
   return {
     sessionId: params.threadId,
     toolCallId: params.itemId,
     mode: "form",
     message: "Codex needs your input to continue.",
-    requestedSchema: buildUserInputSchema(params.questions, clientCapabilities, true),
+    requestedSchema: buildUserInputSchema(params.questions, clientCapabilities, true, neutralCustomAnswer),
     _meta: {
       codex: {
         autoResolutionMs: params.autoResolutionMs
@@ -39345,7 +39390,7 @@ var CodexElicitationHandler = class {
     return cancellationSignal ? { cancellationSignal } : void 0;
   }
   async requestUserInputElicitation(params) {
-    const request = buildUserInputRequest(params, this.clientCapabilities);
+    const request = buildUserInputRequest(params, this.clientCapabilities, this.renderer.capabilities.neutralQuestionCustomAnswer);
     const signal = subagentInteractionSignal(params.threadId, this.cancellationSignal);
     if (params.autoResolutionMs === null) {
       return await withSubagentUserAction(params.threadId, () => this.connection.request(
@@ -40721,7 +40766,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.0-alas.6",
+  version: "2.5.0-alas.8",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -40799,7 +40844,7 @@ var package_default = {
   alasDownstream: {
     upstreamVersion: "2.5.0",
     upstreamCommit: "34e08970aa324a2be985f5080674d5aa91d7666f",
-    sourceCommit: "7c99c083270255f2960fa4cd2da93f72bdf402ad"
+    sourceCommit: "bd5ff04afa9b20774e3a7ff1559172fbf50fe9f4"
   }
 };
 
@@ -49257,14 +49302,16 @@ var AsyncQuestionClient = class {
   }
 };
 var AsyncQuestionElicitations = class {
-  constructor(sessionId, clientCapabilities, client) {
+  constructor(sessionId, clientCapabilities, client, neutralCustomAnswer = false) {
     this.sessionId = sessionId;
     this.clientCapabilities = clientCapabilities;
     this.client = client;
+    this.neutralCustomAnswer = neutralCustomAnswer;
   }
   sessionId;
   clientCapabilities;
   client;
+  neutralCustomAnswer;
   // The running turns that asked a question, each with the signal that cancels its questions.
   turns = /* @__PURE__ */ new Map();
   /** Asks the questions of a completed async message and cancels them when their turn ends; never waits. */
@@ -49309,7 +49356,7 @@ var AsyncQuestionElicitations = class {
       mode: "form",
       message: "Codex keeps working while you answer. An answer sent after it finishes is not delivered.",
       // Questions are answered independently, as in Codex.
-      requestedSchema: buildUserInputSchema(questions, this.clientCapabilities, false),
+      requestedSchema: buildUserInputSchema(questions, this.clientCapabilities, false, this.neutralCustomAnswer),
       _meta: { codex: { delivery: "async" } }
     };
     void this.client.createElicitation(request, turn.signal).then(
@@ -52673,6 +52720,17 @@ var CodexAcpServer = class {
       ...protocolVersion === 1 && this.capabilities.agentFileChangeReportFormat === "neutral" ? {
         [NEUTRAL_AGENT_FILE_CHANGE_REPORT_META_KEY]: neutralAgentFileChangeReportCapability()
       } : {},
+      // The client-neutral presentation contracts, see `docs/air-extensions.md`. `ClientCapabilities.fromV2`
+      // never selects them.
+      ...this.capabilities.neutralPermissionPresentation ? {
+        [NEUTRAL_PERMISSION_PRESENTATION_META_KEY]: neutralPresentationCapability()
+      } : {},
+      ...this.capabilities.neutralQuestionCustomAnswer ? {
+        [NEUTRAL_QUESTION_CUSTOM_ANSWER_META_KEY]: neutralPresentationCapability()
+      } : {},
+      ...this.capabilities.neutralRecommendedConfigValue ? {
+        [NEUTRAL_RECOMMENDED_CONFIG_VALUE_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
@@ -54721,10 +54779,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 = [
@@ -54732,14 +54791,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
         )
       );
     }
@@ -56659,7 +56719,7 @@ You have been logged out. Please try again.`);
         this.connection,
         this.clientCapabilities,
         () => this.codexAcpClient
-      ));
+      ), this.capabilities.neutralQuestionCustomAnswer);
       this.asyncQuestions.set(sessionId, questions);
     }
     return questions;

package/package.json

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