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

package/dist/index.js

@@ -22772,6 +22772,111 @@ function reversePatch(structuredPatch) {
   return reversed;
 }
 
+// src/DiffStats.ts
+var DiffStatsCalculator = class {
+  addedFile(text) {
+    return { version: 1, added: this.lineCount(text), removed: 0 };
+  }
+  deletedFile(text) {
+    return { version: 1, added: 0, removed: this.lineCount(text) };
+  }
+  update(patch) {
+    if (patch.isBinary || patch.hunks.length === 0) return null;
+    let added = 0;
+    let removed = 0;
+    let previousOldEnd = 1;
+    let previousNewEnd = 1;
+    for (const hunk of patch.hunks) {
+      const { oldStart, oldLines, newStart, newLines } = hunk;
+      if (![oldStart, oldLines, newStart, newLines].every(Number.isSafeInteger) || oldStart < previousOldEnd || newStart < previousNewEnd || oldLines < 0 || newLines < 0 || newStart - oldStart !== added - removed) return null;
+      let oldConsumed = 0;
+      let newConsumed = 0;
+      let previousWasContent = false;
+      for (const line of hunk.lines) {
+        switch (line[0]) {
+          case "+":
+            added++;
+            newConsumed++;
+            previousWasContent = true;
+            break;
+          case "-":
+            removed++;
+            oldConsumed++;
+            previousWasContent = true;
+            break;
+          case " ":
+          case void 0:
+            oldConsumed++;
+            newConsumed++;
+            previousWasContent = true;
+            break;
+          case "\\":
+            if (!previousWasContent || line.replace(/\r$/, "") !== "\") return null;
+            previousWasContent = false;
+            break;
+          default:
+            return null;
+        }
+      }
+      if (oldConsumed !== oldLines || newConsumed !== newLines) return null;
+      previousOldEnd = oldStart + oldLines;
+      previousNewEnd = newStart + newLines;
+    }
+    return { version: 1, added, removed };
+  }
+  lineCount(text) {
+    let count = 0;
+    for (let offset = text.indexOf("\n"); offset >= 0; offset = text.indexOf("\n", offset + 1)) count++;
+    for (let offset = text.indexOf("\r"); offset >= 0; offset = text.indexOf("\r", offset + 1)) {
+      if (text[offset + 1] !== "\n") count++;
+    }
+    if (text.length > 0 && !text.endsWith("\n") && !text.endsWith("\r")) count++;
+    return count;
+  }
+};
+
+// src/AirExtension.ts
+var JETBRAINS_META_KEY = "jetbrains";
+var AIR_META_KEY = "air";
+var AIR_EXTENSION_VERSION_KEY = "version";
+var AIR_EXTENSION_CAPABILITIES_KEY = "capabilities";
+var AIR_DIFF_STATS_KEY = "diffStats";
+var AIR_SESSION_FAILURE_KEY = "sessionFailure";
+var AIR_AGENT_FILE_CHANGE_REPORT_KEY = "agentFileChangeReport";
+var AIR_NATIVE_SUBAGENT_SESSIONS_KEY = "nativeSubagentSessions";
+var AIR_ASYNC_TASKS_KEY = "asyncTasks";
+var AIR_RECOMMENDED_CONFIG_VALUE_KEY = "recommendedValue";
+var AIR_ASYNC_TASKS_BACKGROUNDED_KEY = "backgrounded";
+var AIR_AGENT_FILE_CHANGE_REPORT_REQUEST_KEY = "agentFileChangeReportRequest";
+var AIR_EXTENSION_VERSION = 1;
+function withAirMeta(meta3, key, value) {
+  const root = asRecord(meta3);
+  const jetbrains = asRecord(root[JETBRAINS_META_KEY]);
+  const air = asRecord(jetbrains[AIR_META_KEY]);
+  return {
+    ...root,
+    [JETBRAINS_META_KEY]: {
+      ...jetbrains,
+      [AIR_META_KEY]: {
+        ...air,
+        [AIR_EXTENSION_VERSION_KEY]: AIR_EXTENSION_VERSION,
+        [key]: value
+      }
+    }
+  };
+}
+function clientSupportsAirCapability(capabilities, capability) {
+  const meta3 = asRecord(capabilities?._meta);
+  const jetbrains = asRecord(meta3[JETBRAINS_META_KEY]);
+  const air = asRecord(jetbrains[AIR_META_KEY]);
+  const version2 = air[AIR_EXTENSION_VERSION_KEY];
+  const supported = air[AIR_EXTENSION_CAPABILITIES_KEY];
+  return typeof version2 === "number" && Number.isInteger(version2) && version2 >= AIR_EXTENSION_VERSION && Array.isArray(supported) && supported.includes(capability);
+}
+function asRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
+}
+
 // src/CodexToolCallMapper.ts
 import { readFile } from "node:fs/promises";
 import path2 from "node:path";
@@ -22843,6 +22948,7 @@ function commandToolName(source) {
 
 // src/CodexToolCallMapper.ts
 var CONTEXT_COMPACTION_META = createContextCompactionMeta();
+var DIFF_STATS = new DiffStatsCalculator();
 function toAcpStatus(status) {
   switch (status) {
     case "inProgress":
@@ -23507,53 +23613,43 @@ async function createAddFileContent(change) {
     newText: change.diff,
     // app-server always returns file content instead of diff
     path: change.path,
-    _meta: {
-      kind: "add"
-    }
+    _meta: withAirMeta({ kind: "add" }, AIR_DIFF_STATS_KEY, DIFF_STATS.addedFile(change.diff))
   };
 }
 async function createUpdateFileContent(change) {
   if (change.kind.type !== "update") return null;
   const unifiedDiff = recoverCorruptedDiff(change.diff);
+  const patches = parsePatch(unifiedDiff);
+  if (patches.length !== 1) return null;
+  const patch = patches[0];
   const movePath = change.kind.move_path;
   const oldContent = await readFileContent(change.path);
   if (oldContent !== null) {
-    const patchedContent = applyPatch(oldContent, unifiedDiff);
+    const patchedContent = applyPatch(oldContent, patch);
     if (patchedContent === false) {
-      const revertedPatch2 = revertPatch(unifiedDiff);
-      if (revertedPatch2) {
-        const revertedContent2 = applyPatch(oldContent, revertedPatch2);
-        if (revertedContent2 !== false) {
-          return createUpdateDiffContent(change.path, revertedContent2, oldContent);
-        }
+      const revertedContent2 = applyPatch(oldContent, reversePatch(patch));
+      if (revertedContent2 !== false) {
+        return createUpdateDiffContent(change.path, revertedContent2, oldContent, patch);
       }
       return null;
     }
-    return createUpdateDiffContent(movePath ?? change.path, oldContent, patchedContent);
+    return createUpdateDiffContent(movePath ?? change.path, oldContent, patchedContent, patch);
   }
   if (!movePath) return null;
   const newContent = await readFileContent(movePath);
   if (newContent === null) return null;
-  const revertedPatch = revertPatch(unifiedDiff);
-  if (!revertedPatch) return null;
-  const revertedContent = applyPatch(newContent, revertedPatch);
+  const revertedContent = applyPatch(newContent, reversePatch(patch));
   if (revertedContent === false) return null;
-  return createUpdateDiffContent(movePath, revertedContent, newContent);
+  return createUpdateDiffContent(movePath, revertedContent, newContent, patch);
 }
-function revertPatch(unifiedDiff) {
-  const [patch] = parsePatch(unifiedDiff);
-  if (!patch) return null;
-  return reversePatch(patch);
-}
-function createUpdateDiffContent(path9, oldText, newText) {
+function createUpdateDiffContent(path9, oldText, newText, patch) {
+  const stats = DIFF_STATS.update(patch);
   return {
     type: "diff",
     oldText,
     newText,
     path: path9,
-    _meta: {
-      kind: "update"
-    }
+    _meta: stats ? withAirMeta({ kind: "update" }, AIR_DIFF_STATS_KEY, stats) : { kind: "update" }
   };
 }
 async function createDeleteFileContent(change) {
@@ -23563,9 +23659,7 @@ async function createDeleteFileContent(change) {
     // app-server always returns file content instead of diff
     newText: "",
     path: change.path,
-    _meta: {
-      kind: "delete"
-    }
+    _meta: withAirMeta({ kind: "delete" }, AIR_DIFF_STATS_KEY, DIFF_STATS.deletedFile(change.diff))
   };
 }
 async function readFileContent(filePath) {
@@ -23677,47 +23771,6 @@ function sameThreadGoalSnapshot(left, right) {
 // src/CodexEventHandler.ts
 import { randomUUID } from "node:crypto";
 
-// src/AirExtension.ts
-var JETBRAINS_META_KEY = "jetbrains";
-var AIR_META_KEY = "air";
-var AIR_EXTENSION_VERSION_KEY = "version";
-var AIR_EXTENSION_CAPABILITIES_KEY = "capabilities";
-var AIR_SESSION_FAILURE_KEY = "sessionFailure";
-var AIR_AGENT_FILE_CHANGE_REPORT_KEY = "agentFileChangeReport";
-var AIR_NATIVE_SUBAGENT_SESSIONS_KEY = "nativeSubagentSessions";
-var AIR_ASYNC_TASKS_KEY = "asyncTasks";
-var AIR_RECOMMENDED_CONFIG_VALUE_KEY = "recommendedValue";
-var AIR_ASYNC_TASKS_BACKGROUNDED_KEY = "backgrounded";
-var AIR_AGENT_FILE_CHANGE_REPORT_REQUEST_KEY = "agentFileChangeReportRequest";
-var AIR_EXTENSION_VERSION = 1;
-function withAirMeta(meta3, key, value) {
-  const root = asRecord(meta3);
-  const jetbrains = asRecord(root[JETBRAINS_META_KEY]);
-  const air = asRecord(jetbrains[AIR_META_KEY]);
-  return {
-    ...root,
-    [JETBRAINS_META_KEY]: {
-      ...jetbrains,
-      [AIR_META_KEY]: {
-        ...air,
-        [AIR_EXTENSION_VERSION_KEY]: AIR_EXTENSION_VERSION,
-        [key]: value
-      }
-    }
-  };
-}
-function clientSupportsAirCapability(capabilities, capability) {
-  const meta3 = asRecord(capabilities?._meta);
-  const jetbrains = asRecord(meta3[JETBRAINS_META_KEY]);
-  const air = asRecord(jetbrains[AIR_META_KEY]);
-  const version2 = air[AIR_EXTENSION_VERSION_KEY];
-  const supported = air[AIR_EXTENSION_CAPABILITIES_KEY];
-  return typeof version2 === "number" && Number.isInteger(version2) && version2 >= AIR_EXTENSION_VERSION && Array.isArray(supported) && supported.includes(capability);
-}
-function asRecord(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
-}
-
 // src/subagents/CodexAgentPath.ts
 function normalizeAgentPath(path9) {
   const normalized = path9.trim().replace(/\/+$/, "");
@@ -26090,7 +26143,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 +26202,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 +26448,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 +26457,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 +26546,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 +27484,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "1.11.1-preview.3",
+  version: "1.11.1-preview.5",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -27480,7 +27547,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.5",
   "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",