@buildautomaton/cli 0.1.52 → 0.1.53

package/dist/index.js

@@ -23402,6 +23402,11 @@ var BRIDGE_MCP_TOOL_LABELS = {
   [GET_PARENT_SESSION_TURN_TRANSCRIPT_TOOL]: "Read parent session transcript"
 };
 
+// ../types/src/prompts/server.ts
+function isRunnableBridgePromptTurnServerState(state) {
+  return state === "queued" || state === "requeued" || state === "requeued_with_revert";
+}
+
 // ../types/src/claude-code-permission-mode.ts
 var CLAUDE_CODE_PERMISSION_MODES = [
   "default",
@@ -24711,7 +24716,7 @@ function installBridgeProcessResilience() {
 }
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.52".length > 0 ? "0.1.52" : "0.0.0-dev";
+var CLI_VERSION = "0.1.53".length > 0 ? "0.1.53" : "0.0.0-dev";
 
 // src/connection/heartbeat/constants.ts
 var BRIDGE_APP_HEARTBEAT_INTERVAL_MS = 1e4;
@@ -34614,24 +34619,45 @@ function truncatePatch(s) {
 }
 
 // src/git/changes/patch/unified-diff-for-file.ts
+var RENAME_DIFF_ARGS = ["-M", "--find-renames"];
+function devNullPath() {
+  return process.platform === "win32" ? "NUL" : "/dev/null";
+}
 function patchTextFromGitDiffOutput(raw) {
   if (raw.trim() === "") return void 0;
   return normalizePatchContent(raw);
 }
+async function rawGitDiff(g, args) {
+  return String(await g.raw([...args]).catch(() => ""));
+}
+async function unifiedDiffAgainstHead(g, pathInRepo, change, movedFromPathInRepo) {
+  const args = change === "moved" && movedFromPathInRepo ? ["diff", "--no-color", ...RENAME_DIFF_ARGS, "HEAD", "--", movedFromPathInRepo, pathInRepo] : change === "removed" ? ["diff", "--no-color", ...RENAME_DIFF_ARGS, "HEAD", "--", pathInRepo] : ["diff", "--no-color", ...RENAME_DIFF_ARGS, "HEAD", "--", pathInRepo];
+  return patchTextFromGitDiffOutput(await rawGitDiff(g, args));
+}
+async function unifiedDiffForAddedUntrackedFile(g, pathInRepo) {
+  const raw = await rawGitDiff(g, [
+    "diff",
+    "--no-color",
+    ...RENAME_DIFF_ARGS,
+    "--no-index",
+    "--",
+    devNullPath(),
+    pathInRepo
+  ]);
+  return patchTextFromGitDiffOutput(raw);
+}
 async function unifiedDiffForFile(repoCwd, pathInRepo, change, movedFromPathInRepo) {
   const g = cliSimpleGit(repoCwd);
-  const renameArgs = ["-M", "--find-renames"];
-  const args = change === "moved" && movedFromPathInRepo ? ["diff", "--no-color", ...renameArgs, "HEAD", "--", movedFromPathInRepo, pathInRepo] : change === "removed" ? ["diff", "--no-color", ...renameArgs, "HEAD", "--", pathInRepo] : ["diff", "--no-color", ...renameArgs, "HEAD", "--", pathInRepo];
-  const raw = await g.raw([...args]).catch(() => "");
-  const patch = patchTextFromGitDiffOutput(String(raw));
+  let patch = await unifiedDiffAgainstHead(g, pathInRepo, change, movedFromPathInRepo);
+  if (!patch && change === "added") {
+    patch = await unifiedDiffForAddedUntrackedFile(g, pathInRepo);
+  }
   return patch ? truncatePatch(patch) : void 0;
 }
 async function unifiedDiffForFileInRange(repoCwd, range, pathInRepo, change, movedFromPathInRepo) {
   const g = cliSimpleGit(repoCwd);
-  const renameArgs = ["-M", "--find-renames"];
-  const args = change === "moved" && movedFromPathInRepo ? ["diff", "--no-color", ...renameArgs, "-U20000", range, "--", movedFromPathInRepo, pathInRepo] : ["diff", "--no-color", ...renameArgs, "-U20000", range, "--", pathInRepo];
-  const raw = await g.raw([...args]).catch(() => "");
-  const patch = patchTextFromGitDiffOutput(String(raw));
+  const args = change === "moved" && movedFromPathInRepo ? ["diff", "--no-color", ...RENAME_DIFF_ARGS, "-U20000", range, "--", movedFromPathInRepo, pathInRepo] : ["diff", "--no-color", ...RENAME_DIFF_ARGS, "-U20000", range, "--", pathInRepo];
+  const patch = patchTextFromGitDiffOutput(await rawGitDiff(g, args));
   return patch ? truncatePatch(patch) : void 0;
 }
 
@@ -34809,7 +34835,7 @@ async function parentForCommitDiff(g, sha) {
 }
 
 // src/git/changes/listing/rename-diff-args.ts
-var RENAME_DIFF_ARGS = ["-M", "--find-renames"];
+var RENAME_DIFF_ARGS2 = ["-M", "--find-renames"];
 
 // src/git/changes/rows/pick-preferred-changed-file-row.ts
 function rowRank(row) {
@@ -34862,7 +34888,7 @@ async function listChangedFilesForCommit(repoGitCwd, repoRelPath, commitSha, opt
   const g = cliSimpleGit(repoGitCwd);
   const normRel = normalizeRepoRelPath(repoRelPath);
   const [nameStatusRaw, numstatRaw] = await Promise.all([
-    g.raw(["diff-tree", "--no-commit-id", "--name-status", "-r", ...RENAME_DIFF_ARGS, commitSha]).catch(() => ""),
+    g.raw(["diff-tree", "--no-commit-id", "--name-status", "-r", ...RENAME_DIFF_ARGS2, commitSha]).catch(() => ""),
     g.raw(["show", "--numstat", "--format=format:", commitSha]).catch(() => "")
   ]);
   const parsed = parseDiffOutput(String(nameStatusRaw), String(numstatRaw));
@@ -35134,8 +35160,8 @@ async function enrichWorkingTreeFileRows(options) {
 async function listChangedFilesForRepo(repoGitCwd, repoRelPath, options = {}) {
   const g = cliSimpleGit(repoGitCwd);
   const [nameStatusRaw, numstatRaw, untrackedRaw] = await Promise.all([
-    g.raw(["diff", ...RENAME_DIFF_ARGS, "--name-status", "HEAD"]).catch(() => ""),
-    g.raw(["diff", ...RENAME_DIFF_ARGS, "HEAD", "--numstat"]).catch(() => ""),
+    g.raw(["diff", ...RENAME_DIFF_ARGS2, "--name-status", "HEAD"]).catch(() => ""),
+    g.raw(["diff", ...RENAME_DIFF_ARGS2, "HEAD", "--numstat"]).catch(() => ""),
     g.raw(["ls-files", "--others", "--exclude-standard"]).catch(() => "")
   ]);
   const parsed = parseDiffOutput(String(nameStatusRaw), String(numstatRaw));
@@ -37870,12 +37896,16 @@ var handleAgentConfigMessage = (msg, deps) => {
 // src/prompt-turn-queue/client-report.ts
 function sendPromptQueueClientReport(ws, queues) {
   if (!ws) return false;
-  sendWsMessage(ws, { type: "prompt_queue_client_report", queues });
+  const wireQueues = {};
+  for (const [queueKey, rows] of Object.entries(queues)) {
+    wireQueues[queueKey] = rows.map((r) => ({ turnId: r.turnId, clientState: r.cliState }));
+  }
+  sendWsMessage(ws, { type: "prompt_queue_client_report", queues: wireQueues });
   return true;
 }
 
 // src/prompt-turn-queue/disk-store.ts
-var MERGEABLE_SERVER_STATES = /* @__PURE__ */ new Set([
+var MERGEABLE_BRIDGE_SERVER_STATES = /* @__PURE__ */ new Set([
   "queued",
   "requeued",
   "requeued_with_revert",
@@ -37907,7 +37937,7 @@ async function writePersistedQueue(file2) {
     );
   });
 }
-async function mergeServerQueueSnapshot(queueKey, serverTurns) {
+async function mergeBridgeServerQueueSnapshot(queueKey, serverTurns) {
   const prev = await readPersistedQueue(queueKey);
   const turns = [];
   for (const raw of serverTurns) {
@@ -37916,19 +37946,19 @@ async function mergeServerQueueSnapshot(queueKey, serverTurns) {
     const turnId = typeof o.turnId === "string" ? o.turnId : "";
     const sessionId = typeof o.sessionId === "string" ? o.sessionId : "";
     const turnOrd = typeof o.turnOrd === "number" ? o.turnOrd : Number(o.turnOrd) || 0;
-    const serverState = o.serverState;
-    const lastClientState = o.lastClientState ?? null;
+    const bridgeServerState = o.serverState ?? o.bridgeServerState;
+    const lastCliState = o.lastClientState ?? o.lastCliState ?? null;
     const payload = o.payload && typeof o.payload === "object" ? o.payload : {};
     if (!turnId || !sessionId) continue;
-    if (!MERGEABLE_SERVER_STATES.has(String(serverState))) continue;
+    if (!MERGEABLE_BRIDGE_SERVER_STATES.has(String(bridgeServerState))) continue;
     const old = prev?.turns.find((t) => t.turnId === turnId);
-    const mergedClient = old?.lastClientState === "running" && lastClientState == null ? "running" : lastClientState;
+    const mergedCli = old?.lastCliState === "running" && lastCliState == null ? "running" : lastCliState;
     turns.push({
       turnId,
       sessionId,
       turnOrd,
-      serverState,
-      lastClientState: mergedClient,
+      bridgeServerState,
+      lastCliState: mergedCli,
       payload
     });
   }
@@ -37966,15 +37996,12 @@ function dispatchLocalPrompt(next, deps) {
 }
 
 // src/prompt-turn-queue/runner/queue-selection.ts
-function isRunnableServerState(s) {
-  return s === "queued" || s === "requeued" || s === "requeued_with_revert";
-}
 function pickNextRunnableTurn(turns) {
   for (const t of turns) {
-    if (t.serverState === "discarded" || t.serverState === "stopping") continue;
-    if (t.serverState === "cancel_requested") continue;
-    if (!isRunnableServerState(t.serverState)) continue;
-    if (t.lastClientState === "running" || t.lastClientState === "stopped" || t.lastClientState === "failed" || t.lastClientState === "cancelled") {
+    if (t.bridgeServerState === "discarded" || t.bridgeServerState === "stopping") continue;
+    if (t.bridgeServerState === "cancel_requested") continue;
+    if (!isRunnableBridgePromptTurnServerState(t.bridgeServerState)) continue;
+    if (t.lastCliState === "running" || t.lastCliState === "stopped" || t.lastCliState === "failed" || t.lastCliState === "cancelled") {
       continue;
     }
     return t;
@@ -37982,7 +38009,7 @@ function pickNextRunnableTurn(turns) {
   return null;
 }
 function hasRunningTurn(turns) {
-  return turns.some((t) => t.lastClientState === "running");
+  return turns.some((t) => t.lastCliState === "running");
 }
 
 // src/prompt-turn-queue/runner/run-id-queue-key-map.ts
@@ -37999,7 +38026,7 @@ function deleteRunIdQueueKey(runId) {
   return queueKey;
 }
 function syncRunningTurnQueueKeys(turns, queueKey) {
-  for (const running of turns.filter((t) => t.lastClientState === "running")) {
+  for (const running of turns.filter((t) => t.lastCliState === "running")) {
     runIdToQueueKey.set(running.turnId, queueKey);
   }
 }
@@ -38007,7 +38034,7 @@ function syncRunningTurnQueueKeys(turns, queueKey) {
 // src/prompt-turn-queue/runner/run-local-revert-before-queued-prompt.ts
 import fs37 from "node:fs";
 async function runLocalRevertBeforeQueuedPrompt(next, deps) {
-  if (next.serverState !== "requeued_with_revert") return true;
+  if (next.bridgeServerState !== "requeued_with_revert") return true;
   const sid = next.sessionId;
   const pl = next.payload;
   const tid = typeof pl.snapshotRevertTurnId === "string" && pl.snapshotRevertTurnId.trim() !== "" ? pl.snapshotRevertTurnId.trim() : next.turnId;
@@ -38037,9 +38064,9 @@ async function finalizePromptTurnOnBridge(getWs, runId, success2, opts) {
   if (!f) return false;
   const t = f.turns.find((x) => x.turnId === runId);
   if (!t) return false;
-  t.lastClientState = opts?.terminalClientState ?? (success2 ? "stopped" : "failed");
+  t.lastCliState = opts?.terminalCliState ?? (success2 ? "stopped" : "failed");
   await writePersistedQueue(f);
-  sendPromptQueueClientReport(getWs(), { [queueKey]: [{ turnId: runId, clientState: t.lastClientState }] });
+  sendPromptQueueClientReport(getWs(), { [queueKey]: [{ turnId: runId, cliState: t.lastCliState }] });
   return true;
 }
 
@@ -38050,7 +38077,7 @@ async function applyPromptQueueStateFromServer(msg, deps) {
   const getWs = deps.getWs;
   for (const [queueKey, serverTurns] of Object.entries(raw)) {
     if (!Array.isArray(serverTurns)) continue;
-    const file2 = await mergeServerQueueSnapshot(queueKey, serverTurns);
+    const file2 = await mergeBridgeServerQueueSnapshot(queueKey, serverTurns);
     await writePersistedQueue(file2);
   }
   for (const [queueKey, serverTurns] of Object.entries(raw)) {
@@ -38063,14 +38090,14 @@ async function applyPromptQueueStateFromServer(msg, deps) {
     if (!Array.isArray(serverTurns)) continue;
     const file2 = await readPersistedQueue(queueKey);
     if (!file2) continue;
-    const cancelRow = file2.turns.find((t) => t.serverState === "cancel_requested" && t.lastClientState === "running");
+    const cancelRow = file2.turns.find((t) => t.bridgeServerState === "cancel_requested" && t.lastCliState === "running");
     if (cancelRow) {
       const localCancelHandled = await deps.acpManager.cancelRun(cancelRow.turnId);
       if (!localCancelHandled) {
         deps.log(
-          `[Queue] server cancel_requested for ${cancelRow.turnId.slice(0, 8)}\u2026 but no local agent run is active (e.g. after CLI restart); marking cancelled and notifying bridge.`
+          `[Queue] bridge server cancel_requested for ${cancelRow.turnId.slice(0, 8)}\u2026 but no local agent run is active (e.g. after CLI restart); marking cancelled and notifying bridge.`
         );
-        await finalizePromptTurnOnBridge(deps.getWs, cancelRow.turnId, false, { terminalClientState: "cancelled" });
+        await finalizePromptTurnOnBridge(deps.getWs, cancelRow.turnId, false, { terminalCliState: "cancelled" });
         const ws = deps.getWs();
         if (ws && cancelRow.sessionId) {
           sendWsMessage(ws, {
@@ -38095,16 +38122,16 @@ async function applyPromptQueueStateFromServer(msg, deps) {
     const next = pickNextRunnableTurn(file2.turns);
     if (!next) continue;
     if (!await runLocalRevertBeforeQueuedPrompt(next, deps)) {
-      next.lastClientState = "failed";
+      next.lastCliState = "failed";
       await writePersistedQueue(file2);
-      sendPromptQueueClientReport(getWs(), { [queueKey]: [{ turnId: next.turnId, clientState: "failed" }] });
+      sendPromptQueueClientReport(getWs(), { [queueKey]: [{ turnId: next.turnId, cliState: "failed" }] });
       continue;
     }
-    next.lastClientState = "running";
+    next.lastCliState = "running";
     await writePersistedQueue(file2);
     setRunIdQueueKey(next.turnId, queueKey);
     startedThisTick.add(next.turnId);
-    report[queueKey] = [{ turnId: next.turnId, clientState: "running" }];
+    report[queueKey] = [{ turnId: next.turnId, cliState: "running" }];
   }
   if (Object.keys(report).length > 0) {
     sendPromptQueueClientReport(getWs(), report);
@@ -38113,7 +38140,7 @@ async function applyPromptQueueStateFromServer(msg, deps) {
     if (!Array.isArray(serverTurns)) continue;
     const file2 = await readPersistedQueue(queueKey);
     if (!file2) continue;
-    const running = file2.turns.find((t) => t.lastClientState === "running");
+    const running = file2.turns.find((t) => t.lastCliState === "running");
     if (!running || !startedThisTick.has(running.turnId)) continue;
     if (getRunIdQueueKey(running.turnId) !== queueKey) continue;
     dispatchLocalPrompt(running, deps);
@@ -38140,7 +38167,7 @@ function createBridgePromptSenders(deps, getWs) {
         getWs,
         typeof pr.runId === "string" ? pr.runId : void 0,
         pr.success === true,
-        cancelled ? { terminalClientState: "cancelled" } : void 0
+        cancelled ? { terminalCliState: "cancelled" } : void 0
       ).catch(() => {
       });
     }