@buildautomaton/cli 0.1.41 → 0.1.43

package/dist/cli.js

@@ -25174,7 +25174,7 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.41".length > 0 ? "0.1.41" : "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";
@@ -27435,18 +27435,6 @@ async function closeBridgeConnection(state, acpManager, devServerManager, log2)
   say("Shutdown complete.");
 }
 
-// src/agents/acp/acp-idle-disconnect-ms.ts
-var DEFAULT_ACP_IDLE_DISCONNECT_MS = 10 * 60 * 1e3;
-function resolveAcpIdleDisconnectMs() {
-  const raw = process.env.BUILDAUTOMATON_ACP_IDLE_DISCONNECT_MS;
-  if (raw === "0") return 0;
-  if (raw != null && raw.trim() !== "") {
-    const parsed = Number(raw);
-    if (Number.isFinite(parsed) && parsed >= 0) return parsed;
-  }
-  return DEFAULT_ACP_IDLE_DISCONNECT_MS;
-}
-
 // src/agents/acp/acp-prompt-routing-registry.ts
 var AcpPromptRoutingRegistry = class {
   runs = /* @__PURE__ */ new Map();
@@ -27496,9 +27484,7 @@ function createAcpManagerContext(options) {
     acpAgents: /* @__PURE__ */ new Map(),
     promptRouting: new AcpPromptRoutingRegistry(),
     runDispatch: /* @__PURE__ */ new Map(),
-    pendingCancelRunIds: /* @__PURE__ */ new Set(),
-    idleDisconnectTimers: /* @__PURE__ */ new Map(),
-    idleDisconnectMs: options.idleDisconnectMs
+    pendingCancelRunIds: /* @__PURE__ */ new Set()
   };
 }
 
@@ -27917,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({
@@ -28433,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) {
@@ -30846,55 +30879,8 @@ async function ensureAcpClient(options) {
   return state.acpStartPromise;
 }
 
-// src/agents/acp/manager/idle-disconnect.ts
-function hasActiveWorkForAcpAgent(ctx, acpAgentKey) {
-  if (ctx.promptRouting.getStreamingRunId(acpAgentKey)) return true;
-  for (const meta of ctx.runDispatch.values()) {
-    if (meta.acpAgentKey === acpAgentKey) return true;
-  }
-  return false;
-}
-function clearIdleDisconnectTimer(ctx, acpAgentKey) {
-  const timer = ctx.idleDisconnectTimers.get(acpAgentKey);
-  if (timer == null) return;
-  clearTimeout(timer);
-  ctx.idleDisconnectTimers.delete(acpAgentKey);
-}
-function disconnectIdleAcpAgent(ctx, acpAgentKey) {
-  clearIdleDisconnectTimer(ctx, acpAgentKey);
-  if (hasActiveWorkForAcpAgent(ctx, acpAgentKey)) return;
-  const state = ctx.acpAgents.get(acpAgentKey);
-  if (!state?.acpHandle && !state?.acpStartPromise) {
-    ctx.acpAgents.delete(acpAgentKey);
-    return;
-  }
-  const handle = state.acpHandle;
-  void (async () => {
-    try {
-      await handle?.disconnectGracefully();
-    } catch {
-    }
-    invalidateAcpClientState(state);
-    ctx.acpAgents.delete(acpAgentKey);
-    logDebug(`[Agent] Idle disconnect (${acpAgentKey.split("::")[0] ?? acpAgentKey})`);
-  })();
-}
-function scheduleIdleDisconnect(ctx, acpAgentKey) {
-  if (ctx.idleDisconnectMs <= 0) return;
-  clearIdleDisconnectTimer(ctx, acpAgentKey);
-  const timer = setTimeout(() => {
-    ctx.idleDisconnectTimers.delete(acpAgentKey);
-    disconnectIdleAcpAgent(ctx, acpAgentKey);
-  }, ctx.idleDisconnectMs);
-  timer.unref?.();
-  ctx.idleDisconnectTimers.set(acpAgentKey, timer);
-}
-
 // src/agents/acp/manager/disconnect-all.ts
 async function disconnectAll(ctx) {
-  for (const acpAgentKey of ctx.idleDisconnectTimers.keys()) {
-    clearIdleDisconnectTimer(ctx, acpAgentKey);
-  }
   await Promise.all(
     [...ctx.acpAgents.values()].map(async (state) => {
       try {
@@ -36205,7 +36191,6 @@ function handlePrompt(ctx, opts) {
   }
   const activeAcpAgentKey = acpAgentKey;
   ctx.pendingCancelRunIds.delete(activeRunId);
-  clearIdleDisconnectTimer(ctx, activeAcpAgentKey);
   ctx.promptRouting.registerRun({ sessionId, runId: activeRunId });
   ctx.runDispatch.set(activeRunId, { acpAgentKey: activeAcpAgentKey });
   async function run() {
@@ -36288,7 +36273,6 @@ function handlePrompt(ctx, opts) {
     ctx.promptRouting.unregisterRun(activeRunId);
     ctx.runDispatch.delete(activeRunId);
     ctx.pendingCancelRunIds.delete(activeRunId);
-    scheduleIdleDisconnect(ctx, activeAcpAgentKey);
   });
 }
 
@@ -36306,8 +36290,7 @@ function logPromptReceivedFromBridge(ctx, opts) {
 async function createAcpManager(options) {
   const ctx = createAcpManagerContext({
     log: options.log,
-    reportAgentCapabilities: options.reportAgentCapabilities,
-    idleDisconnectMs: resolveAcpIdleDisconnectMs()
+    reportAgentCapabilities: options.reportAgentCapabilities
   });
   return {
     setPreferredAgentType(agentType) {
@@ -36814,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