@buildautomaton/cli 0.1.76 → 0.1.78

package/dist/cli.js

@@ -8413,7 +8413,11 @@ var init_migrate_cli_sqlite = __esm({
 });
 
 // src/sqlite/cli-database.ts
-var cliSqlite, safeCloseCliSqliteDatabase, closeAllCliSqliteConnections, openCliSqliteConnection, withCliSqliteSync, withCliSqlite, ensureCliSqliteInitialized;
+function closeAllCliSqliteConnections() {
+  legacyImportDoneForPath = null;
+  cliSqlite.closeAllConnections();
+}
+var legacyImportDoneForPath, cliSqlite, safeCloseCliSqliteDatabase, openCliSqliteConnection, withCliSqliteSync, withCliSqlite, ensureCliSqliteInitialized;
 var init_cli_database = __esm({
   "src/sqlite/cli-database.ts"() {
     "use strict";
@@ -8423,16 +8427,19 @@ var init_cli_database = __esm({
     init_import_cli_legacy_disk_data();
     init_migrate_cli_sqlite();
     init_sqlite_errors();
+    legacyImportDoneForPath = null;
     cliSqlite = createSqliteDatabaseAccess({
       getPath: getCliSqlitePath,
       ensureParentDir: ensureCliSqliteParentDir,
       migrate: migrateCliSqlite,
       afterOpen: (db, options) => {
+        const sqlitePath = getCliSqlitePath();
+        if (legacyImportDoneForPath === sqlitePath) return;
         importCliSqliteLegacyDiskData(db, options?.logLegacyMigration);
+        legacyImportDoneForPath = sqlitePath;
       }
     });
     safeCloseCliSqliteDatabase = cliSqlite.safeClose;
-    closeAllCliSqliteConnections = cliSqlite.closeAllConnections;
     openCliSqliteConnection = cliSqlite.openConnection;
     withCliSqliteSync = cliSqlite.withSync;
     withCliSqlite = cliSqlite.withAsync;
@@ -31064,7 +31071,7 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.76".length > 0 ? "0.1.76" : "0.0.0-dev";
+var CLI_VERSION = "0.1.78".length > 0 ? "0.1.78" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
@@ -36205,9 +36212,12 @@ function cancelPendingCursorPermissionRequests(pendingRequests2, respond) {
 // src/agents/acp/clients/cursor/create-cursor-acp-handle.ts
 function createCursorAcpHandle(options) {
   let teardownStarted = false;
+  let cancelFallback = null;
   async function disconnectGracefully() {
     if (teardownStarted) return;
     teardownStarted = true;
+    if (cancelFallback) clearTimeout(cancelFallback);
+    cancelFallback = null;
     cancelPendingCursorPermissionRequests(options.pendingRequests, options.wire.respond);
     try {
       await options.transport.cancelSession(options.sessionId);
@@ -36233,7 +36243,17 @@ function createCursorAcpHandle(options) {
     },
     async cancel() {
       cancelPendingCursorPermissionRequests(options.pendingRequests, options.wire.respond);
-      await options.transport.cancelSession(options.sessionId);
+      try {
+        await options.transport.cancelSession(options.sessionId);
+      } catch {
+      }
+      if (cancelFallback) return;
+      cancelFallback = setTimeout(() => {
+        if (options.child.exitCode == null && options.child.signalCode == null) {
+          void disconnectGracefully();
+        }
+      }, 5e3);
+      cancelFallback.unref?.();
     },
     resolveRequest(requestId, result) {
       if (options.pendingRequests.has(requestId)) {
@@ -36788,13 +36808,15 @@ import { existsSync as existsSync4, statSync } from "node:fs";
 // src/git/get-git-repo-root-sync.ts
 import { execFileSync as execFileSync3 } from "node:child_process";
 import * as path28 from "node:path";
+var GIT_LOOKUP_TIMEOUT_MS = 2e3;
 function getGitRepoRootSync(startDir) {
   try {
     const out = execFileSync3("git", ["rev-parse", "--show-toplevel"], {
       cwd: path28.resolve(startDir),
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
-      maxBuffer: 1024 * 1024
+      maxBuffer: 1024 * 1024,
+      timeout: GIT_LOOKUP_TIMEOUT_MS
     }).trim();
     return out ? path28.resolve(out) : null;
   } catch {
@@ -36806,6 +36828,7 @@ function getGitRepoRootSync(startDir) {
 import { execFileSync as execFileSync4 } from "node:child_process";
 import { readFileSync as readFileSync4 } from "node:fs";
 import * as path29 from "node:path";
+var GIT_FILE_READ_TIMEOUT_MS = 2e3;
 function resolveWorkspaceFilePath(sessionParentPath, rawPath) {
   const trimmed2 = rawPath.trim();
   if (!trimmed2) return null;
@@ -36867,7 +36890,8 @@ function readGitHeadBlob(sessionParentPath, displayPath) {
     return execFileSync4("git", ["show", `HEAD:${displayPath}`], {
       cwd: execCwd,
       encoding: "utf8",
-      maxBuffer: 50 * 1024 * 1024
+      maxBuffer: 50 * 1024 * 1024,
+      timeout: GIT_FILE_READ_TIMEOUT_MS
     });
   } catch {
     return "";
@@ -36875,6 +36899,7 @@ function readGitHeadBlob(sessionParentPath, displayPath) {
 }
 
 // src/agents/acp/session-file-change-path-kind.ts
+var GIT_PATH_KIND_TIMEOUT_MS = 2e3;
 function gitHeadPathObjectType(sessionParentPath, displayPath) {
   if (!displayPath || displayPath.includes("..")) return null;
   const gitRoot = getGitRepoRootSync(sessionParentPath);
@@ -36882,7 +36907,8 @@ function gitHeadPathObjectType(sessionParentPath, displayPath) {
   try {
     return execFileSync5("git", ["cat-file", "-t", `HEAD:${displayPath}`], {
       cwd: gitRoot,
-      encoding: "utf8"
+      encoding: "utf8",
+      timeout: GIT_PATH_KIND_TIMEOUT_MS
     }).trim();
   } catch {
     return null;
@@ -37989,6 +38015,73 @@ function augmentPromptResultAuthFields(agentType, errorText) {
   return { agentAuthRequired: true, agentType };
 }
 
+// src/agents/planning/submit-planning-todos-for-turn.ts
+var PLANNING_TODO_SUBMIT_TIMEOUT_MS = 3e3;
+async function submitPlanningTodosForTurn(params) {
+  const token = params.getCloudAccessToken();
+  if (!token.trim()) return { ok: false, error: "Missing cloud access token" };
+  const base = params.cloudApiBaseUrl.replace(/\/$/, "");
+  const url2 = `${base}/internal/sessions/todos/submit`;
+  let res;
+  try {
+    res = await fetch(url2, {
+      method: "POST",
+      signal: AbortSignal.timeout(PLANNING_TODO_SUBMIT_TIMEOUT_MS),
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        sessionId: params.sessionId,
+        turnId: params.turnId,
+        items: params.items
+      })
+    });
+  } catch (error40) {
+    return { ok: false, error: error40 instanceof Error ? error40.message : String(error40) };
+  }
+  if (!res.ok) {
+    const body = await res.json().catch(() => null);
+    return { ok: false, error: body?.error ?? `Planning todo submit failed (${res.status})` };
+  }
+  return { ok: true };
+}
+
+// src/agents/planning/maybe-submit-planning-todos-after-agent-success.ts
+async function maybeSubmitPlanningTodosAfterAgentSuccess(params) {
+  const { sessionId, runId, resultSuccess, output, cloudApiBaseUrl, getCloudAccessToken, log: log2 } = params;
+  const buffered = runId ? getPlanningSessionTurnOutput(runId) : "";
+  const outputFromResult = typeof output === "string" ? output : "";
+  const outputStr = buffered.trim() !== "" ? buffered : outputFromResult;
+  if (!sessionId || !runId || !resultSuccess || outputStr.trim() === "") {
+    return { submitted: false, suppressOutput: false };
+  }
+  if (!cloudApiBaseUrl || !getCloudAccessToken) {
+    return { submitted: false, suppressOutput: false };
+  }
+  const items = parsePlanningTodoAgentJson(outputStr);
+  if (items.length === 0) {
+    return { submitted: false, suppressOutput: false };
+  }
+  const result = await submitPlanningTodosForTurn({
+    sessionId,
+    turnId: runId,
+    items,
+    cloudApiBaseUrl,
+    getCloudAccessToken
+  });
+  if (!result.ok) {
+    log2(`[Agent] Planning todo submit failed: ${result.error}`);
+    return { submitted: false, suppressOutput: false };
+  }
+  if (runId) consumePlanningSessionTurnOutput(runId);
+  log2(`[Agent] Planning session: stored ${items.length} todo(s) via internal API`);
+  return { submitted: true, suppressOutput: true };
+}
+
+// src/agents/acp/prompts/report-post-turn-enrichment.ts
+init_yield_to_event_loop();
+
 // src/git/git-runtime.ts
 init_cli_process_interrupt();
 var activeGitChildProcesses = /* @__PURE__ */ new Set();
@@ -38351,61 +38444,30 @@ async function collectTurnGitDiffFromPreTurnSnapshot(options) {
   });
 }
 
-// src/agents/planning/submit-planning-todos-for-turn.ts
-async function submitPlanningTodosForTurn(params) {
-  const token = params.getCloudAccessToken();
-  if (!token.trim()) return { ok: false, error: "Missing cloud access token" };
-  const base = params.cloudApiBaseUrl.replace(/\/$/, "");
-  const url2 = `${base}/internal/sessions/todos/submit`;
-  const res = await fetch(url2, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${token}`,
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({
-      sessionId: params.sessionId,
-      turnId: params.turnId,
-      items: params.items
-    })
-  });
-  if (!res.ok) {
-    const body = await res.json().catch(() => null);
-    return { ok: false, error: body?.error ?? `Planning todo submit failed (${res.status})` };
-  }
-  return { ok: true };
-}
-
-// src/agents/planning/maybe-submit-planning-todos-after-agent-success.ts
-async function maybeSubmitPlanningTodosAfterAgentSuccess(params) {
-  const { sessionId, runId, resultSuccess, output, cloudApiBaseUrl, getCloudAccessToken, log: log2 } = params;
-  const buffered = runId ? getPlanningSessionTurnOutput(runId) : "";
-  const outputFromResult = typeof output === "string" ? output : "";
-  const outputStr = buffered.trim() !== "" ? buffered : outputFromResult;
-  if (!sessionId || !runId || !resultSuccess || outputStr.trim() === "") {
-    return { submitted: false, suppressOutput: false };
-  }
-  if (!cloudApiBaseUrl || !getCloudAccessToken) {
-    return { submitted: false, suppressOutput: false };
-  }
-  const items = parsePlanningTodoAgentJson(outputStr);
-  if (items.length === 0) {
-    return { submitted: false, suppressOutput: false };
-  }
-  const result = await submitPlanningTodosForTurn({
-    sessionId,
-    turnId: runId,
-    items,
-    cloudApiBaseUrl,
-    getCloudAccessToken
+// src/agents/acp/prompts/report-post-turn-enrichment.ts
+function reportPostTurnEnrichment(options) {
+  void (async () => {
+    const {
+      sessionId,
+      runId,
+      agentCwd,
+      result,
+      sendSessionUpdate,
+      log: log2
+    } = options;
+    await yieldToEventLoop();
+    if (sessionId && runId && sendSessionUpdate && agentCwd && result.success) {
+      await collectTurnGitDiffFromPreTurnSnapshot({
+        sessionId,
+        runId,
+        agentCwd,
+        sendSessionUpdate,
+        log: log2
+      });
+    }
+  })().catch((error40) => {
+    options.log(`[Agent] Post-turn enrichment failed: ${error40 instanceof Error ? error40.message : String(error40)}`);
   });
-  if (!result.ok) {
-    log2(`[Agent] Planning todo submit failed: ${result.error}`);
-    return { submitted: false, suppressOutput: false };
-  }
-  if (runId) consumePlanningSessionTurnOutput(runId);
-  log2(`[Agent] Planning session: stored ${items.length} todo(s) via internal API`);
-  return { submitted: true, suppressOutput: true };
 }
 
 // src/agents/acp/prompts/finalize-and-send-prompt-result.ts
@@ -38425,16 +38487,7 @@ async function finalizeAndSendPromptResult(params) {
     sendSessionUpdate,
     log: log2
   } = params;
-  if (sessionId && runId && sendSessionUpdate && agentCwd && result.success) {
-    await collectTurnGitDiffFromPreTurnSnapshot({
-      sessionId,
-      runId,
-      agentCwd,
-      sendSessionUpdate,
-      log: log2
-    });
-  }
-  const planningTodosSubmit = await maybeSubmitPlanningTodosAfterAgentSuccess({
+  const planningTodosSubmit = isPlanningSession ? await maybeSubmitPlanningTodosAfterAgentSuccess({
     sessionId,
     runId,
     resultSuccess: result.success === true,
@@ -38442,11 +38495,11 @@ async function finalizeAndSendPromptResult(params) {
     cloudApiBaseUrl,
     getCloudAccessToken,
     log: log2
-  });
+  }) : { suppressOutput: false };
+  const planningFallbackOutput = !planningTodosSubmit.suppressOutput && isPlanningSession && runId ? consumePlanningSessionTurnOutput(runId) : "";
   const errStr = typeof result.error === "string" ? result.error : void 0;
   const resultStop = typeof result.stopReason === "string" ? result.stopReason.trim() : "";
   const cancelledByAgent = resultStop.toLowerCase() === "cancelled" || errStr != null && isUserEndedSessionTurnErrorText(errStr);
-  const planningFallbackOutput = !planningTodosSubmit.suppressOutput && isPlanningSession && runId ? consumePlanningSessionTurnOutput(runId) : "";
   sendResult({
     type: "prompt_result",
     id: promptId,
@@ -38467,6 +38520,14 @@ async function finalizeAndSendPromptResult(params) {
       );
     }
   }
+  void reportPostTurnEnrichment({
+    sessionId,
+    runId,
+    agentCwd,
+    result,
+    sendSessionUpdate,
+    log: log2
+  });
 }
 
 // src/agents/acp/build-forked-session-agent-prompt.ts
@@ -38865,6 +38926,7 @@ async function resolveSendPromptImages(params) {
 }
 
 // src/agents/acp/prompts/send-prompt-to-agent.ts
+var SLOW_ACP_PROMPT_MS = 5e3;
 async function sendPromptToAgent(options) {
   const {
     handle,
@@ -38911,7 +38973,12 @@ async function sendPromptToAgent(options) {
       sendResult(imagesResolved.errorResult);
       return;
     }
+    const promptStartedAt = Date.now();
     const result = await handle.sendPrompt(prepared.agentPromptText, imagesResolved.sendOpts);
+    const promptDurationMs = Date.now() - promptStartedAt;
+    if (promptDurationMs >= SLOW_ACP_PROMPT_MS) {
+      log2(`[Agent] ACP session/prompt completed after ${promptDurationMs}ms.`);
+    }
     await finalizeAndSendPromptResult({
       result,
       sessionId,
@@ -38923,7 +38990,6 @@ async function sendPromptToAgent(options) {
       followUpCatalogPromptId,
       cloudApiBaseUrl,
       getCloudAccessToken,
-      e2ee,
       sendResult,
       sendSessionUpdate,
       log: log2
@@ -38946,16 +39012,6 @@ async function sendPromptToAgent(options) {
   }
 }
 
-// src/agents/acp/manager/get-acp-agent-state.ts
-function getAcpSessionAgentState(ctx, acpSessionAgentKey) {
-  let state = ctx.acpAgents.get(acpSessionAgentKey);
-  if (!state) {
-    state = createEmptyAcpClientState();
-    ctx.acpAgents.set(acpSessionAgentKey, state);
-  }
-  return state;
-}
-
 // src/agents/acp/manager/handle-pending-prompt-cancel.ts
 async function handlePendingPromptCancel(params) {
   const { ctx, activeRunId, promptId, sessionId, handle, sendResult } = params;
@@ -38979,94 +39035,104 @@ async function handlePendingPromptCancel(params) {
   return true;
 }
 
-// src/agents/acp/manager/run-acp-prompt.ts
-async function runAcpPrompt(ctx, runCtx, opts) {
-  const {
-    promptText,
-    promptId,
-    sessionId,
-    mode,
-    agentConfig,
-    sessionParentPath,
-    sendResult,
-    sendSessionUpdate,
-    followUpCatalogPromptId,
-    cloudApiBaseUrl,
-    getCloudAccessToken,
-    e2ee,
-    attachments,
-    isNewSession
-  } = opts;
-  const { activeRunId, activeAcpAgentKey, activeAcpSessionAgentKey, preferredForPrompt } = runCtx;
-  const acpAgentState = getAcpSessionAgentState(ctx, activeAcpSessionAgentKey);
-  const handle = await ensureAcpClient({
-    state: acpAgentState,
-    acpAgentKey: activeAcpAgentKey,
-    preferredAgentType: preferredForPrompt,
-    mode,
-    agentConfig: agentConfig ?? null,
-    sessionParentPath,
-    resolveRouting: () => ctx.promptRouting.resolveRouting(activeAcpSessionAgentKey),
-    cloudSessionId: sessionId,
-    bridgeAccessPort: ctx.getBridgeAccessPort(),
-    sendSessionUpdate,
-    sendRequest: sendSessionUpdate,
-    log: ctx.log,
-    reportAgentCapabilities: ctx.reportAgentCapabilities
-  });
-  if (!handle) {
-    const errMsg = acpAgentState.lastAcpStartError || "No agent configured. Register local agents on this bridge in the app.";
-    const evaluated = Boolean(preferredForPrompt && errMsg.trim());
-    const suggestsAuth = evaluated ? localAgentErrorSuggestsAuth(preferredForPrompt, errMsg) : false;
-    const auth = suggestsAuth && preferredForPrompt ? { agentAuthRequired: true, agentType: preferredForPrompt } : {};
-    sendResult({
+// src/agents/acp/manager/dispatch-acp-prompt.ts
+async function dispatchAcpPrompt(ctx, runCtx, opts, handle) {
+  const { activeRunId, activeAcpSessionAgentKey, preferredForPrompt } = runCtx;
+  if (!ctx.promptRouting.isRegisteredRun(activeRunId)) {
+    opts.sendResult({
       type: "prompt_result",
-      id: promptId,
-      ...sessionId ? { sessionId } : {},
+      id: opts.promptId,
+      ...opts.sessionId ? { sessionId: opts.sessionId } : {},
       runId: activeRunId,
       success: false,
-      error: errMsg,
-      ...auth
+      error: "Prompt dispatch was superseded before the agent started."
     });
     return;
   }
-  if (!ctx.promptRouting.isRegisteredRun(activeRunId)) {
-    return;
-  }
   const cancelled = await handlePendingPromptCancel({
     ctx,
     activeRunId,
-    promptId,
-    sessionId,
+    promptId: opts.promptId,
+    sessionId: opts.sessionId,
     handle,
-    sendResult
+    sendResult: opts.sendResult
   });
   if (cancelled) return;
   ctx.promptRouting.setStreamingRunId(activeAcpSessionAgentKey, activeRunId);
   try {
     await sendPromptToAgent({
       handle,
-      promptText,
-      promptId,
-      sessionId,
+      promptText: opts.promptText,
+      promptId: opts.promptId,
+      sessionId: opts.sessionId,
       runId: activeRunId,
       agentType: preferredForPrompt,
-      agentCwd: resolveSessionParentPathForAgentProcess(sessionParentPath),
-      sendResult,
-      sendSessionUpdate,
+      agentCwd: resolveSessionParentPathForAgentProcess(opts.sessionParentPath),
+      sendResult: opts.sendResult,
+      sendSessionUpdate: opts.sendSessionUpdate,
       log: ctx.log,
-      followUpCatalogPromptId,
-      cloudApiBaseUrl,
-      getCloudAccessToken,
-      e2ee,
-      attachments,
-      isNewSession
+      followUpCatalogPromptId: opts.followUpCatalogPromptId,
+      cloudApiBaseUrl: opts.cloudApiBaseUrl,
+      getCloudAccessToken: opts.getCloudAccessToken,
+      e2ee: opts.e2ee,
+      attachments: opts.attachments,
+      isNewSession: opts.isNewSession
     });
   } finally {
     ctx.promptRouting.clearStreamingRunId(activeAcpSessionAgentKey, activeRunId);
   }
 }
 
+// src/agents/acp/manager/get-acp-agent-state.ts
+function getAcpSessionAgentState(ctx, acpSessionAgentKey) {
+  let state = ctx.acpAgents.get(acpSessionAgentKey);
+  if (!state) {
+    state = createEmptyAcpClientState();
+    ctx.acpAgents.set(acpSessionAgentKey, state);
+  }
+  return state;
+}
+
+// src/agents/acp/manager/ensure-acp-prompt-client.ts
+async function ensureAcpPromptClient(ctx, runCtx, opts) {
+  const state = getAcpSessionAgentState(ctx, runCtx.activeAcpSessionAgentKey);
+  const handle = await ensureAcpClient({
+    state,
+    acpAgentKey: runCtx.activeAcpAgentKey,
+    preferredAgentType: runCtx.preferredForPrompt,
+    mode: opts.mode,
+    agentConfig: opts.agentConfig ?? null,
+    sessionParentPath: opts.sessionParentPath,
+    resolveRouting: () => ctx.promptRouting.resolveRouting(runCtx.activeAcpSessionAgentKey),
+    cloudSessionId: opts.sessionId,
+    bridgeAccessPort: ctx.getBridgeAccessPort(),
+    sendSessionUpdate: opts.sendSessionUpdate,
+    sendRequest: opts.sendSessionUpdate,
+    log: ctx.log,
+    reportAgentCapabilities: ctx.reportAgentCapabilities
+  });
+  if (handle) return handle;
+  const error40 = state.lastAcpStartError || "No agent configured. Register local agents on this bridge in the app.";
+  const agentType = runCtx.preferredForPrompt;
+  const requiresAuth = Boolean(agentType && localAgentErrorSuggestsAuth(agentType, error40));
+  opts.sendResult({
+    type: "prompt_result",
+    id: opts.promptId,
+    ...opts.sessionId ? { sessionId: opts.sessionId } : {},
+    runId: runCtx.activeRunId,
+    success: false,
+    error: error40,
+    ...requiresAuth && agentType ? { agentAuthRequired: true, agentType } : {}
+  });
+  return null;
+}
+
+// src/agents/acp/manager/run-acp-prompt.ts
+async function runAcpPrompt(ctx, runCtx, opts) {
+  const handle = await ensureAcpPromptClient(ctx, runCtx, opts);
+  if (handle) await dispatchAcpPrompt(ctx, runCtx, opts, handle);
+}
+
 // src/agents/acp/manager/handle-prompt.ts
 function handlePrompt(ctx, opts) {
   const { promptId, sessionId, runId, mode, agentType, agentConfig, sendResult } = opts;
@@ -49485,9 +49551,13 @@ import * as fs50 from "node:fs";
 import * as path71 from "node:path";
 
 // src/git/snapshot/git.ts
+var SNAPSHOT_GIT_TIMEOUT_MS = 5e3;
 async function gitStashCreate(repoRoot, log2) {
   try {
-    const { stdout } = await execGitFile(["stash", "create"], { cwd: repoRoot });
+    const { stdout } = await execGitFile(["stash", "create"], {
+      cwd: repoRoot,
+      timeout: SNAPSHOT_GIT_TIMEOUT_MS
+    });
     return stdout.trim();
   } catch (e) {
     log2(
@@ -49498,7 +49568,10 @@ async function gitStashCreate(repoRoot, log2) {
 }
 async function gitUntrackedPaths(repoRoot, log2) {
   try {
-    const { stdout } = await execGitFile(["ls-files", "--others", "--exclude-standard"], { cwd: repoRoot });
+    const { stdout } = await execGitFile(["ls-files", "--others", "--exclude-standard"], {
+      cwd: repoRoot,
+      timeout: SNAPSHOT_GIT_TIMEOUT_MS
+    });
     return stdout.split("\n").map((l) => l.trim()).filter(Boolean);
   } catch (e) {
     log2(
@@ -51924,9 +51997,6 @@ function setRunIdQueueKey(runId, queueKey) {
   runIdToQueueKey.set(runId, queueKey);
   locallyDispatchedRunIds.add(runId);
 }
-function isLocallyDispatchedRun(runId) {
-  return locallyDispatchedRunIds.has(runId);
-}
 function deleteRunIdQueueKey(runId) {
   const queueKey = runIdToQueueKey.get(runId);
   runIdToQueueKey.delete(runId);
@@ -51953,11 +52023,39 @@ async function dispatchStartedPromptQueueRuns(entries, started, deps) {
 
 // src/prompt-turn-queue/runner/handle-prompt-queue-cancellations.ts
 init_yield_to_event_loop();
+
+// src/prompt-turn-queue/client-report.ts
+function sendPromptQueueClientReport(ws, queues) {
+  if (!ws) return false;
+  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/runner/finalize-prompt-turn-on-bridge.ts
+async function finalizePromptTurnOnBridge(getWs, runId, success2, opts) {
+  if (!runId) return false;
+  const queueKey = deleteRunIdQueueKey(runId);
+  if (!queueKey) return false;
+  const f = await readPersistedQueue(queueKey);
+  if (!f) return false;
+  const t = f.turns.find((x) => x.turnId === runId);
+  if (!t) return false;
+  t.lastCliState = opts?.terminalCliState ?? (success2 ? "stopped" : "failed");
+  await writePersistedQueue(f);
+  sendPromptQueueClientReport(getWs(), { [queueKey]: [{ turnId: runId, cliState: t.lastCliState }] });
+  return true;
+}
+
+// src/prompt-turn-queue/runner/handle-prompt-queue-cancellations.ts
 async function handlePromptQueueCancellations(entries, deps) {
   for (const [queueKey] of entries) {
     const file2 = await readPersistedQueue(queueKey);
     const turn = file2?.turns.find((row) => row.bridgeServerState === "cancel_requested" && row.lastCliState === "running");
-    if (!turn || getRunIdQueueKey(turn.turnId) !== queueKey || !isLocallyDispatchedRun(turn.turnId)) {
+    if (!turn || getRunIdQueueKey(turn.turnId) !== queueKey) {
       await yieldToEventLoop();
       continue;
     }
@@ -51966,7 +52064,8 @@ async function handlePromptQueueCancellations(entries, deps) {
       await yieldToEventLoop();
       continue;
     }
-    deps.log(`[Queue] cancel_requested for ${turn.turnId.slice(0, 8)}\u2026 but no local ACP run remains.`);
+    deps.log(`[Queue] No local ACP run remains for ${turn.turnId.slice(0, 8)}\u2026; reconciling cancelled turn.`);
+    await finalizePromptTurnOnBridge(deps.getWs, turn.turnId, false, { terminalCliState: "cancelled" });
     await yieldToEventLoop();
   }
 }
@@ -51994,17 +52093,6 @@ function promptQueueSnapshotEntries(queues) {
 // src/prompt-turn-queue/runner/start-prompt-queue-runs.ts
 init_yield_to_event_loop();
 
-// src/prompt-turn-queue/client-report.ts
-function sendPromptQueueClientReport(ws, queues) {
-  if (!ws) return false;
-  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/runner/queue-selection.ts
 function pickNextRunnableTurn(turns) {
   for (const t of turns) {
@@ -52168,29 +52256,20 @@ async function startPromptQueueRuns(entries, deps) {
 }
 
 // src/prompt-turn-queue/runner/apply-prompt-queue-state-from-server.ts
+var SLOW_QUEUE_SYNC_MS = 2e3;
 async function applyPromptQueueStateFromServer(msg, deps) {
   const raw = msg.queues;
   if (!raw || typeof raw !== "object") return;
+  const startedAt = Date.now();
   const entries = promptQueueSnapshotEntries(raw);
   await persistPromptQueueSnapshot(entries);
   await handlePromptQueueCancellations(entries, deps);
   const started = await startPromptQueueRuns(entries, deps);
   await dispatchStartedPromptQueueRuns(entries, started, deps);
-}
-
-// src/prompt-turn-queue/runner/finalize-prompt-turn-on-bridge.ts
-async function finalizePromptTurnOnBridge(getWs, runId, success2, opts) {
-  if (!runId) return false;
-  const queueKey = deleteRunIdQueueKey(runId);
-  if (!queueKey) return false;
-  const f = await readPersistedQueue(queueKey);
-  if (!f) return false;
-  const t = f.turns.find((x) => x.turnId === runId);
-  if (!t) return false;
-  t.lastCliState = opts?.terminalCliState ?? (success2 ? "stopped" : "failed");
-  await writePersistedQueue(f);
-  sendPromptQueueClientReport(getWs(), { [queueKey]: [{ turnId: runId, cliState: t.lastCliState }] });
-  return true;
+  const durationMs = Date.now() - startedAt;
+  if (durationMs >= SLOW_QUEUE_SYNC_MS) {
+    deps.log(`[Queue] Queue state sync and dispatch took ${durationMs}ms.`);
+  }
 }
 
 // src/agents/acp/from-bridge/bridge-prompt-wiring.ts
@@ -52267,59 +52346,93 @@ function parseWorktreeBaseBranches(msg) {
   return Object.keys(out).length > 0 ? out : void 0;
 }
 
-// src/agents/acp/from-bridge/bridge-prompt-preamble.ts
+// src/agents/acp/from-bridge/parse-follow-up-prompt-fields.ts
+function parseFollowUpFieldsFromPromptMessage(msg) {
+  const value = msg.followUpCatalogPromptId;
+  return {
+    followUpCatalogPromptId: typeof value === "string" && value.trim() !== "" ? value.trim() : null
+  };
+}
+
+// src/agents/acp/from-bridge/prepare-bridge-prompt-git-state.ts
 import { execFile as execFile8 } from "node:child_process";
 import { promisify as promisify9 } from "node:util";
+
+// src/agents/acp/from-bridge/git-state-preparation-timeout.ts
+async function awaitGitStatePreparation(options) {
+  const { label, timeoutMs, work, fallback, log: log2 } = options;
+  let timer;
+  try {
+    return await Promise.race([
+      work,
+      new Promise((resolve37) => {
+        timer = setTimeout(() => {
+          log2(`[Agent] ${label} exceeded ${timeoutMs}ms; continuing without it.`);
+          resolve37(fallback);
+        }, timeoutMs);
+        timer.unref?.();
+      })
+    ]);
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
+
+// src/agents/acp/from-bridge/prepare-bridge-prompt-git-state.ts
 var execFileAsync7 = promisify9(execFile8);
+var GIT_STATE_DISCOVERY_TIMEOUT_MS = 2e3;
 async function readGitBranch(cwd) {
   try {
-    const { stdout } = await execFileAsync7("git", ["branch", "--show-current"], { cwd, maxBuffer: 64 * 1024 });
-    const b = stdout.trim();
-    return b || null;
+    const { stdout } = await execFileAsync7("git", ["branch", "--show-current"], {
+      cwd,
+      maxBuffer: 64 * 1024,
+      timeout: GIT_STATE_DISCOVERY_TIMEOUT_MS
+    });
+    return stdout.trim() || null;
   } catch {
     return null;
   }
 }
-async function runBridgePromptPreamble(params) {
+async function prepareBridgePromptGitState(params) {
   const { getWs, log: log2, sessionWorktreeManager, sessionId, runId, effectiveCwd } = params;
-  const s = getWs();
-  const repoCheckoutPaths = await sessionWorktreeManager.ensureRepoCheckoutPathsForSessionAsync(sessionId);
+  const repoCheckoutPaths = await awaitGitStatePreparation({
+    label: "Session worktree discovery",
+    timeoutMs: GIT_STATE_DISCOVERY_TIMEOUT_MS,
+    work: sessionWorktreeManager.ensureRepoCheckoutPathsForSessionAsync(sessionId),
+    fallback: void 0,
+    log: log2
+  });
   const repoRoots = await resolveSnapshotRepoRoots({
     worktreePaths: repoCheckoutPaths,
     fallbackCwd: effectiveCwd,
     sessionId: sessionId?.trim() || void 0,
     log: log2
   });
-  if (s && sessionId) {
-    const usesWt = sessionWorktreeManager.usesWorktreeSession(sessionId);
-    const cliGitBranch = repoRoots.length > 0 ? await readGitBranch(effectiveCwd) : null;
-    const isolatedSessionParentPath = sessionWorktreeManager.getIsolatedSessionParentPathForSession(sessionId);
-    sendWsMessage(s, {
+  const socket = getWs();
+  if (socket && sessionId) {
+    const usesWorktree = sessionWorktreeManager.usesWorktreeSession(sessionId);
+    sendWsMessage(socket, {
       type: "session_git_context_report",
       sessionId,
-      cliGitBranch,
-      agentUsesWorktree: usesWt,
-      sessionParent: usesWt ? "worktrees_root" : "bridge_root",
-      sessionParentPath: usesWt ? isolatedSessionParentPath ?? effectiveCwd : getBridgeRoot()
+      cliGitBranch: repoRoots.length > 0 ? await readGitBranch(effectiveCwd) : null,
+      agentUsesWorktree: usesWorktree,
+      sessionParent: usesWorktree ? "worktrees_root" : "bridge_root",
+      sessionParentPath: usesWorktree ? sessionWorktreeManager.getIsolatedSessionParentPathForSession(sessionId) ?? effectiveCwd : getBridgeRoot()
     });
   }
-  if (s && sessionId && runId) {
-    const cap = repoRoots.length > 0 ? await capturePreTurnSnapshot({ runId, repoRoots, agentCwd: effectiveCwd, log: log2 }) : { ok: false, error: "No git repos" };
-    sendWsMessage(s, {
+  if (socket && sessionId && runId) {
+    const snapshot = repoRoots.length > 0 ? await capturePreTurnSnapshot({ runId, repoRoots, agentCwd: effectiveCwd, log: log2 }) : { ok: false };
+    sendWsMessage(socket, {
       type: "pre_turn_snapshot_report",
       sessionId,
       turnId: runId,
-      captured: cap.ok
+      captured: snapshot.ok
     });
   }
 }
-function parseFollowUpFieldsFromPromptMessage(msg) {
-  const followUpCatalogPromptId = typeof msg.followUpCatalogPromptId === "string" && msg.followUpCatalogPromptId.trim() !== "" ? msg.followUpCatalogPromptId.trim() : null;
-  return { followUpCatalogPromptId };
-}
 
-// src/agents/acp/from-bridge/handle-bridge-prompt/run-preamble-and-prompt.ts
-async function runPreambleAndPrompt(params) {
+// src/agents/acp/from-bridge/handle-bridge-prompt/prepare-git-state-and-run-prompt.ts
+async function prepareGitStateAndRunPrompt(params) {
   const {
     deps,
     msg,
@@ -52338,7 +52451,7 @@ async function runPreambleAndPrompt(params) {
     senders: { sendResult, sendSessionUpdate }
   } = params;
   const effectiveCwd = resolveSessionParentPathForAgentProcess(resolvedCwd);
-  await runBridgePromptPreamble({
+  await prepareBridgePromptGitState({
     getWs,
     log: log2,
     sessionWorktreeManager,
@@ -52382,17 +52495,14 @@ function handleBridgePrompt(msg, deps) {
     log2(
       `[Bridge service] Prompt ignored: empty or missing prompt text (session ${typeof msg.sessionId === "string" ? msg.sessionId.slice(0, 8) : "\u2014"}\u2026, run ${typeof msg.runId === "string" ? msg.runId.slice(0, 8) : "\u2014"}\u2026).`
     );
-    senders.sendBridgeMessage(
-      {
-        type: "prompt_result",
-        ...promptId ? { id: promptId } : {},
-        ...sessionId ? { sessionId } : {},
-        ...runId ? { runId } : {},
-        success: false,
-        error: "Empty or missing prompt text from the bridge; this turn was not sent to the agent."
-      },
-      ["error"]
-    );
+    senders.sendResult({
+      type: "prompt_result",
+      ...promptId ? { id: promptId } : {},
+      ...sessionId ? { sessionId } : {},
+      ...runId ? { runId } : {},
+      success: false,
+      error: "Empty or missing prompt text from the bridge; this turn was not sent to the agent."
+    });
     return;
   }
   const isNewSession = msg.isNewSession === true;
@@ -52412,7 +52522,7 @@ function handleBridgePrompt(msg, deps) {
     sessionParentPath,
     ...worktreeBaseBranches ? { worktreeBaseBranches } : {}
   }).then(
-    (cwd) => runPreambleAndPrompt({
+    (cwd) => prepareGitStateAndRunPrompt({
       deps,
       msg,
       getWs,
@@ -52431,7 +52541,7 @@ function handleBridgePrompt(msg, deps) {
     })
   ).catch((err) => {
     log2(`[Agent] Session parent path resolve failed: ${err instanceof Error ? err.message : String(err)}`);
-    void runPreambleAndPrompt({
+    void prepareGitStateAndRunPrompt({
       deps,
       msg,
       getWs,