@buildautomaton/cli 0.1.75 → 0.1.77

package/dist/index.js

@@ -30606,7 +30606,7 @@ function installBridgeProcessResilience() {
 }
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.75".length > 0 ? "0.1.75" : "0.0.0-dev";
+var CLI_VERSION = "0.1.77".length > 0 ? "0.1.77" : "0.0.0-dev";
 
 // src/connection/heartbeat/constants.ts
 var BRIDGE_APP_HEARTBEAT_INTERVAL_MS = 1e4;
@@ -33224,9 +33224,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);
@@ -33252,7 +33255,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)) {
@@ -35008,6 +35021,66 @@ function augmentPromptResultAuthFields(agentType, errorText) {
   return { agentAuthRequired: true, agentType };
 }
 
+// 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
+  });
+  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();
@@ -35344,6 +35417,7 @@ async function loadPreTurnSnapshot(options) {
     }
     return data;
   } catch (e) {
+    if (e.code === "ENOENT") return null;
     log2(
       `[turn-diff] No pre-turn snapshot for run ${runId.slice(0, 8)}\u2026: ${e instanceof Error ? e.message : String(e)}`
     );
@@ -35369,61 +35443,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
@@ -35443,16 +35486,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,
@@ -35460,11 +35494,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,
@@ -35485,6 +35519,14 @@ async function finalizeAndSendPromptResult(params) {
       );
     }
   }
+  void reportPostTurnEnrichment({
+    sessionId,
+    runId,
+    agentCwd,
+    result,
+    sendSessionUpdate,
+    log: log2
+  });
 }
 
 // src/agents/acp/build-forked-session-agent-prompt.ts
@@ -36033,7 +36075,6 @@ async function sendPromptToAgent(options) {
       followUpCatalogPromptId,
       cloudApiBaseUrl,
       getCloudAccessToken,
-      e2ee,
       sendResult,
       sendSessionUpdate,
       log: log2
@@ -36056,16 +36097,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;
@@ -36089,94 +36120,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;
@@ -48869,15 +48910,18 @@ function dispatchLocalPrompt(next, deps) {
 
 // src/prompt-turn-queue/runner/run-id-queue-key-map.ts
 var runIdToQueueKey = /* @__PURE__ */ new Map();
+var locallyDispatchedRunIds = /* @__PURE__ */ new Set();
 function getRunIdQueueKey(runId) {
   return runIdToQueueKey.get(runId);
 }
 function setRunIdQueueKey(runId, queueKey) {
   runIdToQueueKey.set(runId, queueKey);
+  locallyDispatchedRunIds.add(runId);
 }
 function deleteRunIdQueueKey(runId) {
   const queueKey = runIdToQueueKey.get(runId);
   runIdToQueueKey.delete(runId);
+  locallyDispatchedRunIds.delete(runId);
   return queueKey;
 }
 function syncRunningTurnQueueKeys(turns, queueKey) {
@@ -48932,7 +48976,7 @@ 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) {
+    if (!turn || getRunIdQueueKey(turn.turnId) !== queueKey) {
       await yieldToEventLoop();
       continue;
     }
@@ -48941,19 +48985,8 @@ async function handlePromptQueueCancellations(entries, deps) {
       await yieldToEventLoop();
       continue;
     }
-    deps.log(`[Queue] cancel_requested for ${turn.turnId.slice(0, 8)}\u2026 with no local run; marking cancelled.`);
+    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" });
-    const ws = deps.getWs();
-    if (ws && turn.sessionId) {
-      sendWsMessage(ws, {
-        type: "prompt_result",
-        sessionId: turn.sessionId,
-        runId: turn.turnId,
-        success: false,
-        error: "Stopped by user",
-        stopReason: "cancelled"
-      });
-    }
     await yieldToEventLoop();
   }
 }
@@ -49343,17 +49376,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;