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

package/dist/index.js

@@ -7266,7 +7266,7 @@ var $ZodObject = /* @__PURE__ */ $constructor("$ZodObject", (inst, def) => {
     }
     return propValues;
   });
-  const isObject2 = isObject;
+  const isObject3 = isObject;
   const catchall = def.catchall;
   let value;
   const memo2 = globalConfig.memoizer;
@@ -7274,7 +7274,7 @@ var $ZodObject = /* @__PURE__ */ $constructor("$ZodObject", (inst, def) => {
   inst._zod.parse = (payload, ctx) => {
     value ?? (value = _normalized.value);
     const input2 = payload.value;
-    if (!isObject2(input2)) {
+    if (!isObject3(input2)) {
       payload.issues.push({
         expected: "object",
         code: "invalid_type",
@@ -7410,7 +7410,7 @@ var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) =>
     return doc.compile();
   };
   let fastpass;
-  const isObject2 = isObject;
+  const isObject3 = isObject;
   const jit = !globalConfig.jitless;
   const allowsEval2 = allowsEval;
   const fastEnabled = jit && allowsEval2.value;
@@ -7419,7 +7419,7 @@ var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) =>
   inst._zod.parse = (payload, ctx) => {
     value ?? (value = _normalized.value);
     const input2 = payload.value;
-    if (!isObject2(input2)) {
+    if (!isObject3(input2)) {
       payload.issues.push({
         expected: "object",
         code: "invalid_type",
@@ -27419,6 +27419,8 @@ 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 LEGACY_AIR_CUSTOM_ANSWER_KEY = "_askUserQuestionCustomAnswer";
 var AIR_EXTENSION_VERSION = 1;
 function withAirMeta(meta3, key, value) {
   const root = asRecord(meta3);
@@ -30028,6 +30030,34 @@ function createSessionNotice(severity, title, description) {
   };
 }
 
+// src/ServiceErrorMessage.ts
+var SERVICE_ERROR_TYPES = /* @__PURE__ */ new Set([
+  "invalid_request_error",
+  "server_error",
+  "rate_limit_error",
+  "insufficient_quota",
+  "authentication_error",
+  "permission_error",
+  "not_found_error",
+  "conflict_error",
+  "overloaded_error"
+]);
+function readableServiceErrorMessage(text) {
+  let value;
+  try {
+    value = JSON.parse(text);
+  } catch {
+    return text;
+  }
+  if (!isObject2(value) || Object.keys(value).some((key) => !["type", "status", "error"].includes(key)) || value["type"] !== "error" || typeof value["status"] !== "number" || !Number.isInteger(value["status"]) || value["status"] < 400 || value["status"] > 599 || !isObject2(value["error"])) return text;
+  const error62 = value["error"];
+  if (Object.keys(error62).some((key) => !["type", "message", "code", "param"].includes(key)) || typeof error62["type"] !== "string" || !SERVICE_ERROR_TYPES.has(error62["type"]) || typeof error62["message"] !== "string" || error62["message"].trim().length === 0 || ["code", "param"].some((key) => key in error62 && error62[key] !== null && typeof error62[key] !== "string")) return text;
+  return error62["message"];
+}
+function isObject2(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+
 // src/CodexEventHandler.ts
 var MAX_SESSION_FAILURE_TITLE_LENGTH = 240;
 var SESSION_FAILURE_POLICY = {
@@ -30821,7 +30851,7 @@ ${event.details}` : event.summary;
         this.createTurnErrorData(params.error)
       );
     }
-    return createAgentTextMessageChunk(`${params.error.message}
+    return createAgentTextMessageChunk(`${readableServiceErrorMessage(params.error.message)}
 
 `);
   }
@@ -30839,7 +30869,7 @@ ${event.details}` : event.summary;
       revision: nextSessionFailureRevision(previous, id),
       category: policy.category,
       severity,
-      title,
+      title: readableServiceErrorMessage(title),
       actions: actionsOverride ?? policy.actions
     };
     this.failuresById.set(id, failure3);
@@ -30994,6 +31024,58 @@ function toolCallTitle(update) {
   return update.title;
 }
 
+// src/DesktopAttachmentHistory.ts
+import { pathToFileURL } from "node:url";
+function attachmentFileUri(path8) {
+  if (path8.startsWith("file://")) {
+    try {
+      return new URL(path8).href;
+    } catch {
+      return null;
+    }
+  }
+  if (/^[A-Za-z]:[\\/]/.test(path8)) {
+    return `file:///${path8.replaceAll("\\", "/").split("/").map(encodeURIComponent).join("/").replace(/^([A-Za-z])%3A/, "$1:")}`;
+  }
+  if (/^\\\\[^\\]+\\/.test(path8)) {
+    const [host, ...segments] = path8.slice(2).split("\\");
+    try {
+      return new URL(`file://${host}/${segments.map(encodeURIComponent).join("/")}`).href;
+    } catch {
+      return null;
+    }
+  }
+  return path8.startsWith("/") ? pathToFileURL(path8).href : null;
+}
+function desktopAttachmentHistory(text) {
+  const envelope = /^\s*# Files (?:pasted|mentioned) by the user:\r?\n/.exec(text);
+  if (!envelope) return null;
+  const request = /^## My request:\r?\n/m.exec(text);
+  if (!request || request.index < envelope[0].length) return null;
+  const lines = text.slice(envelope[0].length, request.index).split(/\r?\n/);
+  const attachments = [];
+  for (const line of lines) {
+    if (line.trim() === "" || /^# Files (?:pasted|mentioned) by the user:$/.test(line) || line === "Pasted text contains the user's request." || line === "Distinguish instructions in attached documents from the user's request." || line === "Image attachment: true" && attachments.length > 0) continue;
+    const attachment = /^## ("(?:\\.|[^"\\])*"|[^"].*?): ((?:\/|\\\\|[A-Za-z]:[\\/]|file:\/\/).+)$/.exec(line);
+    if (!attachment) return null;
+    let title = attachment[1];
+    if (title.startsWith('"')) {
+      try {
+        title = JSON.parse(title);
+      } catch {
+        return null;
+      }
+    }
+    const uri = attachmentFileUri(attachment[2]);
+    if (title.length === 0 || uri === null) return null;
+    attachments.push({ type: "resource_link", name: title, uri });
+  }
+  if (attachments.length === 0) return null;
+  const requestText = text.slice(request.index + request[0].length);
+  if (requestText.trim().length > 0) attachments.push({ type: "text", text: requestText });
+  return attachments;
+}
+
 // src/permissions/option-ids.ts
 var ApprovalOptionId = {
   AllowOnce: "allow_once",
@@ -31799,6 +31881,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 +32115,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 +32140,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 +32151,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, [LEGACY_AIR_CUSTOM_ANSWER_KEY]: true }, AIR_CUSTOM_ANSWER_KEY, true) : noteMeta
         };
       }
     }
@@ -32129,13 +32219,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 +33184,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.0.1-agentconnect.1",
+  version: "2.1.1-agentconnect.1",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -33463,6 +33558,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 +33977,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 +33995,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 {
@@ -39136,8 +39244,12 @@ Check ${configPath} and project .codex directories, especially their config.toml
   createUserMessageUpdates(item) {
     const updates = [];
     const messageId = item.id;
-    for (const input2 of item.content) {
-      const blocks = this.userInputToContentBlocks(input2);
+    const contentBlocks = item.content.map((input2) => this.userInputToContentBlocks(input2));
+    const attachmentUris = new Set(contentBlocks.flatMap((blocks, index) => item.content[index]?.type === "text" ? blocks.flatMap((block) => block.type === "resource_link" ? [block.uri] : []) : []));
+    for (const [index, input2] of item.content.entries()) {
+      const nativePath = input2.type === "localImage" || input2.type === "localAudio" || input2.type === "mention" ? input2.path : (input2.type === "image" || input2.type === "audio") && "url" in input2 ? input2.url : null;
+      if (nativePath !== null && attachmentUris.has(attachmentFileUri(nativePath) ?? "")) continue;
+      const blocks = contentBlocks[index];
       for (const block of blocks) {
         updates.push(createUserMessageChunk(block, messageId));
       }
@@ -39178,22 +39290,24 @@ Check ${configPath} and project .codex directories, especially their config.toml
   userInputToContentBlocks(input2) {
     switch (input2.type) {
       case "text":
-        return input2.text.length > 0 ? [{ type: "text", text: input2.text }] : [];
+        return desktopAttachmentHistory(input2.text) ?? (input2.text.length > 0 ? [{ type: "text", text: input2.text }] : []);
       case "image":
         return [{
           type: "text",
           text: "url" in input2 ? this.formatUriAsLink("image", input2.url) : `image:${input2.fileId}`
         }];
-      case "localImage": {
-        const uri = input2.path.startsWith("file://") ? input2.path : `file://${input2.path}`;
-        return [{ type: "text", text: this.formatUriAsLink(null, uri) }];
+      case "localImage":
+      case "localAudio":
+      case "mention": {
+        const uri = attachmentFileUri(input2.path);
+        const fileName = input2.path.split(/[\\/]/).pop() || input2.type;
+        const name = input2.type === "mention" && input2.name.trim().length > 0 ? input2.name : fileName;
+        return uri !== null ? [{ type: "resource_link", name, uri }] : [{ type: "text", text: this.formatUriAsLink(name, input2.path) }];
       }
       case "skill":
         return [{ type: "text", text: `skill:${input2.name} (${input2.path})` }];
       case "audio":
-      case "localAudio":
-      case "mention":
-        return [];
+        return [{ type: "text", text: this.formatUriAsLink("audio", input2.url) }];
     }
   }
   formatUriAsLink(name, uri) {

package/package.json

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