@agentclientprotocol/codex-acp 1.11.1-preview.3 → 1.11.1-preview.4

package/dist/index.js

@@ -26090,7 +26090,9 @@ function cancelledResponse() {
 }
 
 // src/CodexElicitationHandler.ts
-var USER_INPUT_OTHER_FIELD_SUFFIX = "__other";
+var USER_INPUT_NOTE_FIELD_SUFFIX = "_note";
+var USER_INPUT_OTHER_OPTION = "None of the above";
+var USER_INPUT_NOTE_PREFIX = "user_note: ";
 function normalizeElicitationSchema(value) {
   const normalized = normalizeElicitationSchemaValue(value);
   if (!isRecord2(normalized)) {
@@ -26147,16 +26149,14 @@ function elicitationResponseMeta(response, context, persist = void 0) {
   }
   return Object.keys(meta3).length === 0 ? null : meta3;
 }
-function userInputOtherFieldId(questionId, questionIds) {
-  const base = `${questionId}${USER_INPUT_OTHER_FIELD_SUFFIX}`;
-  if (!questionIds.has(base)) {
-    return base;
-  }
+function userInputNoteFieldId(questionId, questionIds) {
+  const base = `${questionId}${USER_INPUT_NOTE_FIELD_SUFFIX}`;
+  let fieldId = base;
   let index = 1;
-  while (questionIds.has(`${base}${index}`)) {
-    index += 1;
+  while (questionIds.has(fieldId)) {
+    fieldId = `${base}${index++}`;
   }
-  return `${base}${index}`;
+  return fieldId;
 }
 function userInputResponseValue(content, fieldId) {
   const value = content[fieldId];
@@ -26395,8 +26395,8 @@ var CodexElicitationHandler = class {
       const hasOptions = options.length > 0;
       const hasOtherAnswer = question.isOther && hasOptions;
       const base = {
-        title: question.header || question.id,
-        description: question.question,
+        title: question.question || question.header || question.id,
+        ...question.header ? { description: question.header } : {},
         _meta: {
           codex: {
             isOther: question.isOther,
@@ -26404,42 +26404,45 @@ var CodexElicitationHandler = class {
           }
         }
       };
-      if (!hasOtherAnswer) {
-        required2.push(question.id);
-      }
+      required2.push(question.id);
       properties[question.id] = hasOptions ? {
         ...base,
         type: "string",
-        oneOf: options.map((option) => ({
-          const: option.label,
-          title: option.label,
-          description: option.description
-        }))
+        oneOf: [
+          ...options.map((option) => ({
+            const: option.label,
+            title: option.label,
+            ...option.description ? { description: option.description } : {}
+          })),
+          ...hasOtherAnswer && !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."
+          }] : []
+        ]
       } : {
         ...base,
         type: "string"
       };
       if (hasOtherAnswer) {
-        properties[userInputOtherFieldId(question.id, questionIds)] = {
+        properties[userInputNoteFieldId(question.id, questionIds)] = {
           type: "string",
-          title: "Other",
-          description: "Type your own answer instead of choosing an option above.",
+          title: "Additional answer or note",
           _meta: {
             codex: {
               questionId: question.id,
-              isOtherAnswer: true,
+              role: "user_note",
               isSecret: question.isSecret
             }
           }
         };
       }
     }
-    const firstQuestion = params.questions[0];
     return {
       sessionId: params.threadId,
       toolCallId: params.itemId,
       mode: "form",
-      message: params.questions.length === 1 && firstQuestion ? firstQuestion.question : "Input requested",
+      message: "Codex needs your input to continue.",
       requestedSchema: {
         type: "object",
         properties,
@@ -26490,12 +26493,23 @@ var CodexElicitationHandler = class {
     const content = contentRecord(response.content);
     const questionIds = new Set(params.questions.map((question) => question.id));
     for (const question of params.questions) {
-      const value = question.isOther && question.options != null && question.options.length > 0 ? userInputResponseValue(content, userInputOtherFieldId(question.id, questionIds)) ?? userInputResponseValue(content, question.id) : userInputResponseValue(content, question.id);
-      if (value === void 0) {
+      const answerValues = [];
+      const value = userInputResponseValue(content, question.id);
+      if (value !== void 0) {
+        answerValues.push(...Array.isArray(value) ? value.map(String) : [String(value)]);
+      }
+      if (question.isOther && question.options != null && question.options.length > 0) {
+        const note = userInputResponseValue(content, userInputNoteFieldId(question.id, questionIds));
+        if (note !== void 0) {
+          const notes = Array.isArray(note) ? note : [note];
+          answerValues.push(...notes.map((item) => `${USER_INPUT_NOTE_PREFIX}${String(item).trim()}`));
+        }
+      }
+      if (answerValues.length === 0) {
         continue;
       }
       answers[question.id] = {
-        answers: Array.isArray(value) ? value.map(String) : [String(value)]
+        answers: answerValues
       };
     }
     return { answers };
@@ -27417,7 +27431,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "1.11.1-preview.3",
+  version: "1.11.1-preview.4",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -27480,7 +27494,7 @@ var package_default = {
   },
   dependencies: {
     "@agentclientprotocol/sdk": "^1.4.0",
-    "@openai/codex": "^0.153.4",
+    "@openai/codex": "^0.154.0",
     diff: "^9.0.0",
     open: "^11.0.1",
     "vscode-jsonrpc": "^9.0.1",

package/package.json

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