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

package/dist/index.js

@@ -22824,6 +22824,23 @@ function createContextCompactionMeta(metadata = {}) {
   };
 }
 
+// src/ToolCallName.ts
+function functionToolName(name, namespace) {
+  return `${namespace ?? ""}${name}`;
+}
+function commandToolName(source) {
+  switch (source) {
+    case "unifiedExecStartup":
+      return "exec_command";
+    case "unifiedExecInteraction":
+      return "write_stdin";
+    // These sources do not identify a unique model tool.
+    case "agent":
+    case "userShell":
+      return void 0;
+  }
+}
+
 // src/CodexToolCallMapper.ts
 var CONTEXT_COMPACTION_META = createContextCompactionMeta();
 function toAcpStatus(status) {
@@ -22854,14 +22871,19 @@ async function createFileChangeUpdate(item) {
   };
 }
 async function createCommandExecutionUpdate(item) {
+  const name = commandToolName(item.source);
   const commandAction = item.commandActions.length === 1 ? item.commandActions[0] : void 0;
   if (commandAction) {
-    return createCommandActionEvent(item.id, item.status, item.cwd, commandAction);
+    return {
+      ...createCommandActionEvent(item.id, item.status, item.cwd, commandAction),
+      ...name === void 0 ? {} : { name }
+    };
   }
   const command = stripShellPrefix(item.command);
   return createTerminalCommandEvent({
     sessionUpdate: "tool_call",
     toolCallId: item.id,
+    ...name === void 0 ? {} : { name },
     kind: "execute",
     title: command,
     status: toAcpStatus(item.status),
@@ -22916,7 +22938,10 @@ async function createMcpToolCallUpdate(item) {
   };
 }
 async function createDynamicToolCallUpdate(item) {
-  return createExecuteToolCallUpdate(item, item.tool, { arguments: item.arguments });
+  return {
+    ...await createExecuteToolCallUpdate(item, item.tool, { arguments: item.arguments }),
+    name: functionToolName(item.tool, item.namespace)
+  };
 }
 function createImageViewUpdate(item) {
   const displayPath = item.path;
@@ -22924,6 +22949,7 @@ function createImageViewUpdate(item) {
     sessionUpdate: "tool_call",
     toolCallId: item.id,
     kind: "read",
+    name: "view_image",
     title: `View Image ${displayPath}`,
     status: "completed",
     content: [createContent({
@@ -24705,10 +24731,16 @@ ${event.details}` : event.summary;
   async completeItemEvent(event) {
     switch (event.item.type) {
       case "fileChange":
+        return {
+          sessionUpdate: "tool_call_update",
+          toolCallId: event.item.id,
+          status: event.item.status === "completed" ? "completed" : "failed"
+        };
       case "dynamicToolCall":
         return {
           sessionUpdate: "tool_call_update",
           toolCallId: event.item.id,
+          name: functionToolName(event.item.tool, event.item.namespace),
           status: event.item.status === "completed" ? "completed" : "failed"
         };
       case "mcpToolCall":
@@ -24920,9 +24952,11 @@ ${event.stdin}
     return `mcp_startup.${encodeURIComponent(serverName)}`;
   }
   completeCommandExecutionEvent(item) {
+    const name = commandToolName(item.source);
     const update = {
       sessionUpdate: "tool_call_update",
       toolCallId: item.id,
+      ...name === void 0 ? {} : { name },
       status: item.status === "completed" ? "completed" : "failed",
       rawOutput: {
         formatted_output: item.aggregatedOutput ?? "",
@@ -25538,7 +25572,8 @@ function nonBlank(value) {
 }
 
 // src/permissions/presentation.ts
-function commandToolCall(params) {
+function commandToolCall(params, permissionContext) {
+  const name = permissionContext.commandName(params.threadId, params.itemId);
   const network = params.networkApprovalContext;
   const rawInput = {
     ...params.command ? { command: stripShellPrefix(params.command) } : {},
@@ -25549,6 +25584,7 @@ function commandToolCall(params) {
   const additionalPermissionContent = params.additionalPermissions ? permissionProfileContent(params.additionalPermissions) : [];
   return {
     toolCallId: params.itemId,
+    ...name !== void 0 ? { name } : {},
     kind: "execute",
     status: "pending",
     title: network ? `${network.protocol} network access to ${network.host}` : commandTitle(params.commandActions),
@@ -25574,6 +25610,7 @@ function additionalPermissionsToolCall(itemId, cwd, environmentId, permissions)
   const content = permissionProfileContent(permissions);
   return {
     toolCallId: itemId,
+    name: "request_permissions",
     kind: "other",
     status: "pending",
     title: "Additional sandbox permissions",
@@ -25670,7 +25707,7 @@ var CodexApprovalHandler = class {
     try {
       const response = await this.requestPermission({
         sessionId: params.threadId,
-        toolCall: commandToolCall(authoritativeParams),
+        toolCall: commandToolCall(authoritativeParams, this.permissionContext),
         options: decisions.map(({ option }) => option),
         _meta: requestPermissionMeta(
           params.networkApprovalContext ? CODEX_NETWORK_PERMISSION_TITLE : CODEX_COMMAND_PERMISSION_TITLE,
@@ -25777,6 +25814,7 @@ var PermissionPromptContext = class {
     this.nextStandaloneId = nextStandaloneId;
   }
   nextStandaloneId;
+  commandNames = /* @__PURE__ */ new Map();
   fileChanges = /* @__PURE__ */ new Map();
   pendingMcpApprovals = /* @__PURE__ */ new Map();
   handleNotification(notification) {
@@ -25800,6 +25838,9 @@ var PermissionPromptContext = class {
   fileChange(threadId, itemId) {
     return this.fileChanges.get(threadId)?.get(itemId);
   }
+  commandName(threadId, itemId) {
+    return this.commandNames.get(threadId)?.get(itemId);
+  }
   popPendingMcpApproval(threadId, serverName) {
     const byServer = this.pendingMcpApprovals.get(threadId);
     if (!byServer) return void 0;
@@ -25814,6 +25855,15 @@ var PermissionPromptContext = class {
     return this.nextStandaloneId(serverName);
   }
   handleItemStarted(threadId, item) {
+    if (item.type === "commandExecution") {
+      const name = commandToolName(item.source);
+      if (name !== void 0) {
+        const byItem = this.commandNames.get(threadId) ?? /* @__PURE__ */ new Map();
+        byItem.set(item.id, name);
+        this.commandNames.set(threadId, byItem);
+      }
+      return;
+    }
     if (item.type === "fileChange") {
       const byItem = this.fileChanges.get(threadId) ?? /* @__PURE__ */ new Map();
       byItem.set(item.id, item);
@@ -25828,6 +25878,12 @@ var PermissionPromptContext = class {
     this.pendingMcpApprovals.set(threadId, byServer);
   }
   handleItemCompleted(threadId, item) {
+    if (item.type === "commandExecution") {
+      const byItem = this.commandNames.get(threadId);
+      byItem?.delete(item.id);
+      if (byItem?.size === 0) this.commandNames.delete(threadId);
+      return;
+    }
     if (item.type === "fileChange") {
       const byItem = this.fileChanges.get(threadId);
       byItem?.delete(item.id);
@@ -25845,6 +25901,7 @@ var PermissionPromptContext = class {
     if (byServer.size === 0) this.pendingMcpApprovals.delete(threadId);
   }
   clearTransientState(threadId) {
+    this.commandNames.delete(threadId);
     this.fileChanges.delete(threadId);
     this.pendingMcpApprovals.delete(threadId);
   }
@@ -26033,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)) {
@@ -26090,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];
@@ -26338,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,
@@ -26347,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,
@@ -26433,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 };
@@ -27360,7 +27431,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "1.11.1-preview.2",
+  version: "1.11.1-preview.4",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -27423,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",
@@ -30920,6 +30991,7 @@ function createFunctionCallUpdate(item) {
   if (!toolCallId || !name) {
     return null;
   }
+  const toolName = functionToolName(name, stringValue(item["namespace"]));
   const isExecCommand = name === "exec_command";
   const args = parseFunctionArguments(item["arguments"]);
   const command = isExecCommand ? commandFromFunctionArguments(args) : null;
@@ -30927,7 +30999,10 @@ function createFunctionCallUpdate(item) {
   const commandAction = command ? inferCommandAction(command, cwd) : null;
   if (commandAction) {
     return {
-      update: createCommandActionEvent(toolCallId, "inProgress", cwd, commandAction),
+      update: {
+        ...createCommandActionEvent(toolCallId, "inProgress", cwd, commandAction),
+        name: toolName
+      },
       usesTerminal: false,
       isExecCommand
     };
@@ -30935,6 +31010,7 @@ function createFunctionCallUpdate(item) {
   const update = {
     sessionUpdate: "tool_call",
     toolCallId,
+    name: toolName,
     kind: toolKindForFunctionCall(name),
     title: titleForFunctionCall(name, args),
     status: "in_progress",

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.11.1-preview.2",
+  "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",