@alas-ide/codex-acp 2.5.0-alas.3 → 2.5.0-alas.4

package/dist/index.js

@@ -33488,6 +33488,18 @@ function parsePatch(uniDiff) {
 
 // src/GitPatch.ts
 var DIFF_PATCH_MAX_BYTES = 1024 * 1024;
+var NEUTRAL_DIFF_PATCH_META_KEY = "diffPatch";
+var DIFF_PATCH_VERSION = 1;
+var DIFF_PATCH_FORMAT = "git_patch";
+function neutralDiffPatchCapability() {
+  return { version: DIFF_PATCH_VERSION, format: DIFF_PATCH_FORMAT };
+}
+function clientRequestsNeutralDiffPatch(capabilities) {
+  const declared = capabilities?._meta?.[NEUTRAL_DIFF_PATCH_META_KEY];
+  if (declared === null || typeof declared !== "object" || Array.isArray(declared)) return false;
+  const version2 = declared["version"];
+  return typeof version2 === "number" && Number.isInteger(version2) && version2 >= 1;
+}
 var BINARY_PROBE_LENGTH = 8e3;
 var NO_NEWLINE_MARKER = "\";
 var HUNK_HEADER = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
@@ -33707,29 +33719,31 @@ var FileChangeReporter = class {
   }
 };
 function createPatchContent(change, diffPatch) {
-  const supportsDiffPatch = diffPatch === "air";
+  const wrapper = diffPatch === "air" || diffPatch === "neutral" ? diffPatch : null;
   try {
     if (diffPatch === "acpV2") return createAcpV2Content(change);
     switch (change.kind.type) {
       case "add":
-        return createWholeFileContent(change, "add", supportsDiffPatch);
+        return createWholeFileContent(change, "add", wrapper);
       case "delete":
-        return createWholeFileContent(change, "delete", supportsDiffPatch);
+        return createWholeFileContent(change, "delete", wrapper);
       case "update":
-        return createUpdateFileContent(change, change.kind.move_path, supportsDiffPatch);
+        return createUpdateFileContent(change, change.kind.move_path, wrapper);
     }
   } catch (error62) {
     logger.log(`Error processing file update change: ${error62}`);
     return [];
   }
 }
-function createWholeFileContent(change, kind, supportsDiffPatch) {
+function createWholeFileContent(change, kind, wrapper) {
   if (!fitsDiffLimit(change.diff)) {
     logger.log("Skipped the diff of a file that is too large", { path: change.path });
     return [];
   }
-  const patch = !supportsDiffPatch ? null : kind === "add" ? createAddedFileGitPatch(change.path, change.diff) : createDeletedFileGitPatch(change.path, change.diff);
-  if (patch !== null) return [createPatchOnlyContent(change.path, kind, patch)];
+  if (wrapper !== null) {
+    const patch = kind === "add" ? createAddedFileGitPatch(change.path, change.diff) : createDeletedFileGitPatch(change.path, change.diff);
+    if (patch !== null) return [createPatchOnlyContent(change.path, kind, patch, wrapper)];
+  }
   return [{
     type: "diff",
     oldText: kind === "add" ? null : change.diff,
@@ -33738,16 +33752,16 @@ function createWholeFileContent(change, kind, supportsDiffPatch) {
     _meta: { kind }
   }];
 }
-function createUpdateFileContent(change, movePath, supportsDiffPatch) {
+function createUpdateFileContent(change, movePath, wrapper) {
   const unifiedDiff = recoverCorruptedDiff(change.diff);
   const targetPath = movePath ?? change.path;
   if (!fitsDiffLimit(unifiedDiff)) {
     logger.log("Skipped the diff of a file change that is too large", { path: targetPath });
     return [];
   }
-  const gitPatch = supportsDiffPatch ? createUpdateGitPatch(change.path, targetPath, unifiedDiff) : null;
-  if (gitPatch !== null) {
-    return [createPatchOnlyContent(targetPath, "update", gitPatch)];
+  if (wrapper !== null) {
+    const gitPatch = createUpdateGitPatch(change.path, targetPath, unifiedDiff);
+    if (gitPatch !== null) return [createPatchOnlyContent(targetPath, "update", gitPatch, wrapper)];
   }
   if (movePath !== null && unifiedDiff.trim().length === 0) {
     return [{ type: "diff", oldText: "", newText: "", path: targetPath, _meta: { kind: "update" } }];
@@ -33829,17 +33843,14 @@ function parseSinglePatch(diff) {
     return null;
   }
 }
-function createPatchOnlyContent(path16, kind, patch) {
+function createPatchOnlyContent(path16, kind, patch, wrapper) {
+  const diffPatch = { version: DIFF_PATCH_VERSION, format: DIFF_PATCH_FORMAT, text: patch };
   return {
     type: "diff",
     oldText: null,
     newText: "",
     path: path16,
-    _meta: withAirMeta({ kind }, AIR_DIFF_PATCH_KEY, {
-      version: 1,
-      format: "git_patch",
-      text: patch
-    })
+    _meta: wrapper === "air" ? withAirMeta({ kind }, AIR_DIFF_PATCH_KEY, diffPatch) : { kind, [NEUTRAL_DIFF_PATCH_META_KEY]: diffPatch }
   };
 }
 function recoverCorruptedDiff(diff) {
@@ -34746,7 +34757,8 @@ var ClientCapabilities = class _ClientCapabilities {
         planContentDelta: clientSupportsAirCapability(capabilities, AIR_PLAN_CONTENT_DELTA_KEY),
         diffPatch
       },
-      diffPatchFormat: diffPatch ? "air" : "none",
+      // A client that declares both forms gets only the client-neutral one.
+      diffPatchFormat: clientRequestsNeutralDiffPatch(capabilities) ? "neutral" : diffPatch ? "air" : "none",
       permissionPromptFields: false
     });
   }
@@ -40611,7 +40623,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.0-alas.3",
+  version: "2.5.0-alas.4",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -40689,7 +40701,7 @@ var package_default = {
   alasDownstream: {
     upstreamVersion: "2.5.0",
     upstreamCommit: "34e08970aa324a2be985f5080674d5aa91d7666f",
-    sourceCommit: "de8d4c961871fc0584ca1bd89f31a8de95066c65"
+    sourceCommit: "8af13bd4134b9a24acfd06b85418642f3c2742b6"
   }
 };
 
@@ -52553,6 +52565,11 @@ var CodexAcpServer = class {
       ...this.neutralForkPointSupported ? {
         [NEUTRAL_FORK_POINT_META_KEY]: neutralForkPointCapability()
       } : {},
+      // The client-neutral diff patch, see `docs/air-extensions.md`. ACP v2 has its own diff patch,
+      // so `ClientCapabilities.fromV2` never selects it.
+      ...protocolVersion === 1 && this.capabilities.diffPatchFormat === "neutral" ? {
+        [NEUTRAL_DIFF_PATCH_META_KEY]: neutralDiffPatchCapability()
+      } : {},
       // The session index for a client that opted in without AIR, see `docs/air-extensions.md`.
       ...neutralSessionIndex ? {
         [NEUTRAL_SESSION_INDEX_META_KEY]: neutralSessionIndex

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.5.0-alas.3",
+  "version": "2.5.0-alas.4",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -81,6 +81,6 @@
   "alasDownstream": {
     "upstreamVersion": "2.5.0",
     "upstreamCommit": "34e08970aa324a2be985f5080674d5aa91d7666f",
-    "sourceCommit": "de8d4c961871fc0584ca1bd89f31a8de95066c65"
+    "sourceCommit": "8af13bd4134b9a24acfd06b85418642f3c2742b6"
   }
 }