@buildautomaton/cli 0.1.42 → 0.1.43

package/dist/cli.js

@@ -25174,7 +25174,7 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.42".length > 0 ? "0.1.42" : "0.0.0-dev";
+var CLI_VERSION = "0.1.43".length > 0 ? "0.1.43" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
@@ -27903,6 +27903,99 @@ function dedupeSessionFileChangesByPath(items, richness = (item) => defaultRichn
   return Array.from(byPath.entries()).sort(([a], [b]) => a.localeCompare(b)).map(([, v]) => v);
 }
 
+// ../types/src/diff/line-diff.ts
+function normalizeDiffLineText(line) {
+  return line.replace(/\r$/, "").replace(/\s*\\s*$/, "");
+}
+function normalizePatchContent(patch) {
+  return patch.replace(/^\n+/, "").replace(/\n+$/, "");
+}
+function splitTextIntoDiffLines(text) {
+  if (text.length === 0) return [];
+  const lines = text.split("\n").map((line) => normalizeDiffLineText(line));
+  if (text.endsWith("\n") && lines.at(-1) === "") {
+    lines.pop();
+  }
+  return lines;
+}
+function createEofNewlineDiffLine(change) {
+  return {
+    type: change === "added" ? "add" : "remove",
+    line: "",
+    oldLineNo: null,
+    newLineNo: null,
+    eofNewlineChange: change
+  };
+}
+function hasSameLogicalLines(left, right) {
+  return left.length === right.length && left.every((line, index) => line === right[index]);
+}
+function detectEofNewlineChange(oldText, newText, oldLines, newLines) {
+  if (!hasSameLogicalLines(oldLines, newLines) || oldLines.length === 0) return null;
+  if (!oldText.endsWith("\n") && newText.endsWith("\n")) return "added";
+  if (oldText.endsWith("\n") && !newText.endsWith("\n")) return "removed";
+  return null;
+}
+function computeLineDiff(oldText, newText) {
+  const oldLines = splitTextIntoDiffLines(oldText);
+  const newLines = splitTextIntoDiffLines(newText);
+  const m = oldLines.length;
+  const n = newLines.length;
+  const dp = Array(m + 1);
+  for (let i2 = 0; i2 <= m; i2++) dp[i2] = Array(n + 1).fill(0);
+  for (let i2 = 1; i2 <= m; i2++) {
+    for (let j2 = 1; j2 <= n; j2++) {
+      if (oldLines[i2 - 1] === newLines[j2 - 1]) {
+        dp[i2][j2] = dp[i2 - 1][j2 - 1] + 1;
+      } else {
+        dp[i2][j2] = Math.max(dp[i2 - 1][j2], dp[i2][j2 - 1]);
+      }
+    }
+  }
+  const result = [];
+  let i = m;
+  let j = n;
+  while (i > 0 || j > 0) {
+    if (i > 0 && j > 0 && oldLines[i - 1] === newLines[j - 1]) {
+      result.unshift({ type: "context", line: oldLines[i - 1] });
+      i--;
+      j--;
+    } else if (j > 0 && (i === 0 || dp[i][j - 1] >= dp[i - 1][j])) {
+      result.unshift({ type: "add", line: newLines[j - 1] });
+      j--;
+    } else {
+      result.unshift({ type: "remove", line: oldLines[i - 1] });
+      i--;
+    }
+  }
+  const eofNewlineChange = detectEofNewlineChange(oldText, newText, oldLines, newLines);
+  if (eofNewlineChange) result.push(createEofNewlineDiffLine(eofNewlineChange));
+  return result;
+}
+function editSnippetToUnifiedDiff(filePath, oldText, newText) {
+  const lines = computeLineDiff(oldText, newText);
+  const out = [`--- ${filePath}`, `+++ ${filePath}`];
+  for (const d of lines) {
+    if (d.eofNewlineChange) {
+      const previous = out.at(-1);
+      if (previous?.startsWith(" ")) {
+        const line = previous.slice(1);
+        out.pop();
+        if (d.eofNewlineChange === "added") {
+          out.push(`-${line}`, "\", `+${line}`);
+        } else {
+          out.push(`-${line}`, `+${line}`, "\");
+        }
+        continue;
+      }
+    }
+    if (d.type === "add") out.push(`+${d.line}`);
+    else if (d.type === "remove") out.push(`-${d.line}`);
+    else out.push(` ${d.line}`);
+  }
+  return out.join("\n");
+}
+
 // ../types/src/artifacts.ts
 init_zod();
 var ArtifactMetaSchema = external_exports.object({
@@ -28419,52 +28512,6 @@ function enrichAcpPermissionRpcResultFromRequestParams(result, params) {
 import { mkdirSync, readFileSync as readFileSync2, writeFileSync } from "node:fs";
 import { dirname as dirname3 } from "node:path";
 
-// src/files/diff/unified-diff.ts
-function computeLineDiff(oldText, newText) {
-  const oldLines = oldText.split("\n");
-  const newLines = newText.split("\n");
-  const m = oldLines.length;
-  const n = newLines.length;
-  const dp = Array(m + 1);
-  for (let i2 = 0; i2 <= m; i2++) dp[i2] = Array(n + 1).fill(0);
-  for (let i2 = 1; i2 <= m; i2++) {
-    for (let j2 = 1; j2 <= n; j2++) {
-      if (oldLines[i2 - 1] === newLines[j2 - 1]) {
-        dp[i2][j2] = dp[i2 - 1][j2 - 1] + 1;
-      } else {
-        dp[i2][j2] = Math.max(dp[i2 - 1][j2], dp[i2][j2 - 1]);
-      }
-    }
-  }
-  const result = [];
-  let i = m;
-  let j = n;
-  while (i > 0 || j > 0) {
-    if (i > 0 && j > 0 && oldLines[i - 1] === newLines[j - 1]) {
-      result.unshift({ type: "context", line: oldLines[i - 1] });
-      i--;
-      j--;
-    } else if (j > 0 && (i === 0 || dp[i][j - 1] >= dp[i - 1][j])) {
-      result.unshift({ type: "add", line: newLines[j - 1] });
-      j--;
-    } else {
-      result.unshift({ type: "remove", line: oldLines[i - 1] });
-      i--;
-    }
-  }
-  return result;
-}
-function editSnippetToUnifiedDiff(filePath, oldText, newText) {
-  const lines = computeLineDiff(oldText, newText);
-  const out = [`--- ${filePath}`, `+++ ${filePath}`];
-  for (const d of lines) {
-    if (d.type === "add") out.push(`+${d.line}`);
-    else if (d.type === "remove") out.push(`-${d.line}`);
-    else out.push(` ${d.line}`);
-  }
-  return out.join("\n");
-}
-
 // src/agents/acp/safe-fs-path.ts
 import * as path13 from "node:path";
 function resolveSafePathUnderCwd(cwd, filePath) {
@@ -36750,12 +36797,16 @@ async function hydrateUnifiedPatchWithFileContext(patch, filePath, repoGitCwd, p
 }
 
 // src/git/changes/unified-diff-for-file.ts
+function patchTextFromGitDiffOutput(raw) {
+  if (raw.trim() === "") return void 0;
+  return normalizePatchContent(raw);
+}
 async function unifiedDiffForFile(repoCwd, pathInRepo, change) {
   const g = cliSimpleGit(repoCwd);
   const args = change === "added" ? ["diff", "--no-color", "HEAD", "--", pathInRepo] : change === "removed" ? ["diff", "--no-color", "HEAD", "--", pathInRepo] : ["diff", "--no-color", "HEAD", "--", pathInRepo];
   const raw = await g.raw([...args]).catch(() => "");
-  const t = String(raw).trim();
-  return t ? truncatePatch(t) : void 0;
+  const patch = patchTextFromGitDiffOutput(String(raw));
+  return patch ? truncatePatch(patch) : void 0;
 }
 
 // src/git/changes/list-changed-files-for-repo.ts