@agentconnect.md/codex-acp 2.0.1-agentconnect.1 → 2.1.0-agentconnect.1

package/dist/index.js

@@ -27419,6 +27419,7 @@ var AIR_RAW_INPUT_RENDERING_KEY = "rawInputRendering";
 var AIR_PLAN_CONTENT_DELTA_KEY = "planContentDelta";
 var AIR_CONTENT_DELTA_KEY = "contentDelta";
 var AIR_SUBAGENT_KEY = "subagent";
+var AIR_CUSTOM_ANSWER_KEY = "customAnswer";
 var AIR_EXTENSION_VERSION = 1;
 function withAirMeta(meta3, key, value) {
   const root = asRecord(meta3);
@@ -31799,6 +31800,12 @@ function userInputNoteFieldId(questionId, questionIds) {
   }
   return fieldId;
 }
+function typedChoiceAnswer(value, question) {
+  if (typeof value !== "string" || value === USER_INPUT_OTHER_OPTION) {
+    return void 0;
+  }
+  return question.options?.some((option) => option.label === value) ? void 0 : value;
+}
 function userInputResponseValue(content, fieldId) {
   const value = content[fieldId];
   if (typeof value === "string" && value.trim() === "") {
@@ -32027,6 +32034,7 @@ var CodexElicitationHandler = class {
     const properties = {};
     const required2 = [];
     const questionIds = new Set(params.questions.map((question) => question.id));
+    const airClient = isAirClient(this.clientCapabilities);
     for (const question of params.questions) {
       const options = question.options ?? [];
       const hasOptions = options.length > 0;
@@ -32051,7 +32059,7 @@ var CodexElicitationHandler = class {
             title: option.label,
             ...option.description ? { description: option.description } : {}
           })),
-          ...hasOtherAnswer && !options.some((option) => option.label === USER_INPUT_OTHER_OPTION) ? [{
+          ...hasOtherAnswer && !airClient && !options.some((option) => option.label === USER_INPUT_OTHER_OPTION) ? [{
             const: USER_INPUT_OTHER_OPTION,
             title: USER_INPUT_OTHER_OPTION,
             description: "Provide a different answer in the note field."
@@ -32062,16 +32070,17 @@ var CodexElicitationHandler = class {
         type: "string"
       };
       if (hasOtherAnswer) {
+        const noteMeta = {
+          codex: {
+            questionId: question.id,
+            role: "user_note",
+            isSecret: question.isSecret
+          }
+        };
         properties[userInputNoteFieldId(question.id, questionIds)] = {
           type: "string",
           title: "Additional answer or note",
-          _meta: {
-            codex: {
-              questionId: question.id,
-              role: "user_note",
-              isSecret: question.isSecret
-            }
-          }
+          _meta: airClient ? withAirMeta(noteMeta, AIR_CUSTOM_ANSWER_KEY, true) : noteMeta
         };
       }
     }
@@ -32129,13 +32138,18 @@ var CodexElicitationHandler = class {
     const answers = {};
     const content = contentRecord(response.content);
     const questionIds = new Set(params.questions.map((question) => question.id));
+    const airClient = isAirClient(this.clientCapabilities);
     for (const question of params.questions) {
       const answerValues = [];
+      const hasOtherAnswer = question.isOther && question.options != null && question.options.length > 0;
       const value = userInputResponseValue(content, question.id);
-      if (value !== void 0) {
+      const typedAnswer = airClient && hasOtherAnswer ? typedChoiceAnswer(value, question) : void 0;
+      if (typedAnswer !== void 0) {
+        answerValues.push(USER_INPUT_OTHER_OPTION, `${USER_INPUT_NOTE_PREFIX}${typedAnswer.trim()}`);
+      } else if (value !== void 0) {
         answerValues.push(...Array.isArray(value) ? value.map(String) : [String(value)]);
       }
-      if (question.isOther && question.options != null && question.options.length > 0) {
+      if (hasOtherAnswer) {
         const note = userInputResponseValue(content, userInputNoteFieldId(question.id, questionIds));
         if (note !== void 0) {
           const notes = Array.isArray(note) ? note : [note];
@@ -33089,7 +33103,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.0.1-agentconnect.1",
+  version: "2.1.0-agentconnect.1",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -33463,6 +33477,15 @@ function isNoActiveTurnError(err) {
 function isUnknownThreadError(err) {
   return isMissingRolloutError(err) || isThreadNotLoadedError(err) || isInvalidThreadIdError(err);
 }
+function isThreadActiveWriterError(err) {
+  return /\bthread \S+ already has an active writer\b/.test(errorText(err));
+}
+function threadActiveWriterRequestError(threadId, err) {
+  return RequestError.invalidRequest(
+    { reason: "thread_active_writer", threadId, details: errorText(err) },
+    "This Codex session is in use by another Codex client (the Codex app, the CLI or an IDE extension). Close the session there or quit that client, then try again."
+  );
+}
 
 // src/PermissionProfileConfig.ts
 var PERMISSION_PROFILE_CONFIG_ENV = "CODEX_ACP_PERMISSION_PROFILE_CONFIG";
@@ -33873,6 +33896,9 @@ var CodexAcpClient = class {
    * so `thread/read` answers for it and gives back the same state resume
    * would have. A thread id Codex has genuinely never seen fails both calls,
    * and the original resume error is what the caller sees.
+   *
+   * A thread that another Codex client has loaded fails with a clear ACP
+   * error instead of the raw Codex message.
    */
   async resumeThread(params) {
     try {
@@ -33888,6 +33914,7 @@ var CodexAcpClient = class {
         collaborationMode: response.collaborationMode?.mode ?? null
       };
     } catch (err) {
+      if (isThreadActiveWriterError(err)) throw threadActiveWriterRequestError(params.threadId, err);
       if (!isMissingRolloutError(err)) throw err;
       let response;
       try {

package/package.json

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