@buildautomaton/cli 0.1.22 → 0.1.24

package/dist/cli.js

@@ -25064,7 +25064,7 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.22".length > 0 ? "0.1.22" : "0.0.0-dev";
+var CLI_VERSION = "0.1.24".length > 0 ? "0.1.24" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
@@ -25074,6 +25074,18 @@ var DEFAULT_FIREHOSE_URL = "https://buildautomaton-firehose.fly.dev";
 import * as fs34 from "node:fs";
 import * as path35 from "node:path";
 
+// src/cli-log-level.ts
+var verbosity = "info";
+function setCliLogVerbosity(level) {
+  verbosity = level;
+}
+function getCliLogVerbosity() {
+  return verbosity;
+}
+function isCliTrace() {
+  return verbosity === "trace";
+}
+
 // src/config.ts
 import fs from "node:fs";
 import path from "node:path";
@@ -25442,15 +25454,21 @@ function getBridgeRoot() {
 }
 
 // src/log.ts
-function log(line) {
+function timestampPrefix() {
   const time3 = (/* @__PURE__ */ new Date()).toISOString().slice(11, 19);
-  console.log(`[${time3}] ${line}`);
+  return `[${time3}]`;
+}
+function log(line) {
+  console.log(`${timestampPrefix()} ${line}`);
 }
 function logImmediate(line) {
-  const time3 = (/* @__PURE__ */ new Date()).toISOString().slice(11, 19);
-  process.stdout.write(`[${time3}] ${line}
+  process.stdout.write(`${timestampPrefix()} ${line}
 `);
 }
+function logTrace(line) {
+  if (getCliLogVerbosity() !== "trace") return;
+  console.log(`${timestampPrefix()} [trace] ${line}`);
+}
 
 // src/process-bridge-resilience.ts
 var installed = false;
@@ -25485,7 +25503,7 @@ function applyCliOutboundNetworkPreferences() {
   }
 }
 
-// src/bridge/connection/cli-ws-client.ts
+// src/connection/cli-ws-client.ts
 import https from "node:https";
 var CLI_WEBSOCKET_CLIENT_PING_MS = 25e3;
 function attachWebSocketClientPing(ws, intervalMs) {
@@ -25545,7 +25563,7 @@ function safeSendWebSocketBinary(ws, data) {
   }
 }
 
-// src/bridge/connection/create-ws-bridge.ts
+// src/connection/create-ws-bridge.ts
 var BRIDGE_AUTH_ERROR_HEADER = "x-bridge-auth-error";
 var BRIDGE_AUTH_ERROR_TOKEN_INVALID = "token_invalid";
 function createWsBridge(options) {
@@ -26156,29 +26174,22 @@ async function openBrowser(connectionId, initialWorkspaceId, preferredBridgeName
   }
 }
 
-// src/bridge/connection/reconnect/constants.ts
-var RECONNECT_FIRST_MS = 100;
-var RECONNECT_MAX_MS = 3e4;
+// src/connection/reconnect/constants.ts
 var RECONNECT_QUIET_MS = 2e3;
-function reconnectDelayMs(attemptBeforeIncrement) {
-  return Math.min(RECONNECT_FIRST_MS * 2 ** attemptBeforeIncrement, RECONNECT_MAX_MS);
+var PENDING_AUTH_RECONNECT_FIRST_MS = 100;
+var PENDING_AUTH_RECONNECT_MAX_MS = 3e4;
+function pendingAuthReconnectDelayMs(attemptBeforeIncrement) {
+  return Math.min(PENDING_AUTH_RECONNECT_FIRST_MS * 2 ** attemptBeforeIncrement, PENDING_AUTH_RECONNECT_MAX_MS);
 }
 
-// src/bridge/connection/reconnect/format-reconnect-delay-for-log.ts
+// src/connection/reconnect/format-reconnect-delay-for-log.ts
 function formatReconnectDelayForLog(delayMs) {
   if (delayMs < 1e3) return `${delayMs}ms`;
   const s = delayMs / 1e3;
   return Number.isInteger(s) ? `${s}s` : `${s.toFixed(1)}s`;
 }
 
-// src/bridge/connection/reconnect/log-next-reconnect-attempt.ts
-function logNextReconnectAttempt(log2, serviceLabel, quiet, delayMs, attempt) {
-  if (!quiet.verboseLogs) return;
-  const delayLabel = formatReconnectDelayForLog(delayMs);
-  log2(`${serviceLabel} Next connection attempt in ${delayLabel} (attempt ${attempt}).`);
-}
-
-// src/bridge/connection/ws-close-diagnostics.ts
+// src/connection/ws-close-diagnostics.ts
 function describeWebSocketCloseCode(code) {
   const known = {
     1e3: "normal closure",
@@ -26209,7 +26220,7 @@ function formatWebSocketClose(label, code, reason, extra) {
   return `${label} Disconnected: code=${code} (${describeWebSocketCloseCode(code)})${reasonPart}${extraPart}`;
 }
 
-// src/bridge/connection/reconnect/reconnect-quiet-slot.ts
+// src/connection/reconnect/reconnect-quiet-slot.ts
 function createEmptyReconnectQuietSlot() {
   return { timer: null, verboseLogs: false, pendingCloseLog: null };
 }
@@ -26219,6 +26230,11 @@ function clearReconnectQuietTimer(quiet) {
     quiet.timer = null;
   }
 }
+function abandonReconnectQuietWindow(quiet) {
+  clearReconnectQuietTimer(quiet);
+  quiet.pendingCloseLog = null;
+  quiet.verboseLogs = false;
+}
 function clearReconnectQuietOnSuccessfulConnection(quiet, log2, reconnectedMessage) {
   clearReconnectQuietTimer(quiet);
   quiet.pendingCloseLog = null;
@@ -26239,12 +26255,16 @@ function beginDeferredDisconnectForReconnect(options) {
     shutdownDetail,
     reconnectingDetail,
     quietMs = RECONNECT_QUIET_MS,
-    shouldAbortQuietWindow
+    shouldAbortQuietWindow,
+    silentWhileReconnect = false
   } = options;
   if (!willReconnect) {
     log2(formatWebSocketClose(serviceLabel, code, reason, shutdownDetail));
     return;
   }
+  if (silentWhileReconnect) {
+    return;
+  }
   quiet.pendingCloseLog = { code, reason };
   if (quiet.timer == null) {
     quiet.timer = setTimeout(() => {
@@ -26261,18 +26281,178 @@ function beginDeferredDisconnectForReconnect(options) {
   }
 }
 
-// src/bridge/connection/reconnect/bridge-main-reconnect.ts
-function beginMainBridgeDeferredDisconnect(state, code, reason, log2, willReconnect) {
+// src/connection/reconnect/reconnect-outage-plan.ts
+function createEmptyReconnectOutageTracker() {
+  return {
+    startedAt: null,
+    totalFailures: 0,
+    lastLoggedTierIndex: -1,
+    originalCloseCode: null,
+    originalCloseReason: null
+  };
+}
+function resetReconnectOutageTracker(tracker) {
+  tracker.startedAt = null;
+  tracker.totalFailures = 0;
+  tracker.lastLoggedTierIndex = -1;
+  tracker.originalCloseCode = null;
+  tracker.originalCloseReason = null;
+}
+function reconnectTierIndexForOutageElapsedMs(elapsedMs) {
+  if (elapsedMs < 6e4) return 0;
+  if (elapsedMs < 36e4) return 1;
+  if (elapsedMs < 12e5) return 2;
+  return 3;
+}
+function reconnectDelayMsForOutageElapsedMs(elapsedMs) {
+  if (elapsedMs < 6e4) return 3e3;
+  if (elapsedMs < 36e4) return 1e4;
+  if (elapsedMs < 12e5) return 2e4;
+  return 6e4;
+}
+function disconnectDetail(code, reason) {
+  const r = reason.trim();
+  const reasonPart = r ? ` reason="${r}"` : "";
+  return `code=${code} (${describeWebSocketCloseCode(code)})${reasonPart}`;
+}
+function formatTierPromotionLogLine(parts) {
+  const detail = disconnectDetail(parts.code, parts.reason);
+  return `${parts.serviceLabel} ${parts.disconnectLeadIn}: ${detail}. Trying to re-establish a connection in the background (retry attempts so far: ${parts.totalFailures}).`;
+}
+function planReconnectAfterFailure(tracker, nowMs, serviceLabel, disconnectLeadIn, closeCode, closeReason) {
+  if (tracker.startedAt == null) {
+    tracker.startedAt = nowMs;
+  }
+  if (closeCode != null && tracker.originalCloseCode == null) {
+    tracker.originalCloseCode = closeCode;
+    tracker.originalCloseReason = closeReason ?? "";
+  }
+  tracker.totalFailures += 1;
+  const elapsed = nowMs - tracker.startedAt;
+  const tier = reconnectTierIndexForOutageElapsedMs(elapsed);
+  const delayMs = reconnectDelayMsForOutageElapsedMs(elapsed);
+  let logLine = null;
+  if (tier > tracker.lastLoggedTierIndex) {
+    tracker.lastLoggedTierIndex = tier;
+    const code = tracker.originalCloseCode ?? closeCode ?? 0;
+    const reason = tracker.originalCloseReason ?? closeReason ?? "";
+    logLine = formatTierPromotionLogLine({
+      serviceLabel,
+      disconnectLeadIn,
+      code,
+      reason,
+      totalFailures: tracker.totalFailures
+    });
+  }
+  return { delayMs, logLine };
+}
+
+// src/connection/reconnect/tiered-channel-reconnect.ts
+var BRIDGE_SERVICE_LABEL = "[Bridge service]";
+var BRIDGE_DISCONNECT_LEAD_IN = "Bridge connection was disconnected";
+var PREVIEW_TUNNEL_SERVICE_LABEL = "[Proxy and log service]";
+var PREVIEW_TUNNEL_DISCONNECT_LEAD_IN = "Preview tunnel connection was disconnected";
+var SHUTDOWN_DETAIL = "Not reconnecting (shutting down).";
+var RECONNECTING_DETAIL = "Reconnecting\u2026";
+function applyTieredReconnectPlanAndLog(tracker, log2, serviceLabel, disconnectLeadIn, closeCode, closeReason) {
+  try {
+    const { delayMs, logLine } = planReconnectAfterFailure(
+      tracker,
+      Date.now(),
+      serviceLabel,
+      disconnectLeadIn,
+      closeCode,
+      closeReason
+    );
+    if (logLine) {
+      try {
+        log2(logLine);
+      } catch {
+      }
+    }
+    return delayMs;
+  } catch {
+    return 3e3;
+  }
+}
+function armReconnectDelayTimer(options) {
+  const {
+    delayMs,
+    bumpAttempt,
+    clearTimer,
+    setTimer,
+    shouldAbortBeforeRun,
+    run,
+    reschedule
+  } = options;
+  clearTimer();
+  bumpAttempt();
+  setTimer(
+    setTimeout(() => {
+      setTimer(null);
+      if (shouldAbortBeforeRun()) return;
+      try {
+        run();
+      } catch {
+        try {
+          if (!shouldAbortBeforeRun()) {
+            reschedule();
+          }
+        } catch {
+        }
+      }
+    }, delayMs)
+  );
+}
+function beginTieredSilentReconnectDisconnect(options) {
+  const {
+    isClosedByUser,
+    quiet,
+    code,
+    reason,
+    willReconnect,
+    log: log2,
+    serviceLabel,
+    shouldAbortQuietWindow
+  } = options;
   beginDeferredDisconnectForReconnect({
+    isClosedByUser,
+    quiet,
+    code,
+    reason,
+    willReconnect,
+    log: log2,
+    serviceLabel,
+    shutdownDetail: SHUTDOWN_DETAIL,
+    reconnectingDetail: RECONNECTING_DETAIL,
+    shouldAbortQuietWindow,
+    silentWhileReconnect: willReconnect
+  });
+}
+function clearTieredReconnectChannelOnOpen(options) {
+  const { quiet, outage, clearLastCloseMeta, log: log2, restoredMessage } = options;
+  const hadOutage = outage.startedAt != null || outage.totalFailures > 0;
+  abandonReconnectQuietWindow(quiet);
+  resetReconnectOutageTracker(outage);
+  clearLastCloseMeta();
+  if (hadOutage) {
+    try {
+      log2(restoredMessage);
+    } catch {
+    }
+  }
+}
+
+// src/connection/reconnect/bridge-main-reconnect.ts
+function beginMainBridgeDeferredDisconnect(state, code, reason, log2, willReconnect) {
+  beginTieredSilentReconnectDisconnect({
     isClosedByUser: () => state.closedByUser,
     quiet: state.mainQuiet,
     code,
     reason,
     willReconnect,
     log: log2,
-    serviceLabel: "[Bridge service]",
-    shutdownDetail: "Not reconnecting (shutting down).",
-    reconnectingDetail: "Reconnecting\u2026",
+    serviceLabel: BRIDGE_SERVICE_LABEL,
     shouldAbortQuietWindow: () => {
       const w = state.currentWs;
       return w != null && w.readyState === wrapper_default.OPEN;
@@ -26280,32 +26460,59 @@ function beginMainBridgeDeferredDisconnect(state, code, reason, log2, willReconn
   });
 }
 function clearMainBridgeReconnectQuietOnOpen(state, log2) {
-  clearReconnectQuietOnSuccessfulConnection(state.mainQuiet, log2, "Bridge connection restored.");
+  clearTieredReconnectChannelOnOpen({
+    quiet: state.mainQuiet,
+    outage: state.mainOutage,
+    clearLastCloseMeta: () => {
+      state.lastReconnectCloseMeta = null;
+    },
+    log: log2,
+    restoredMessage: "Bridge connection restored."
+  });
 }
-function scheduleMainBridgeReconnect(state, connect, log2) {
+function scheduleMainBridgeReconnect(state, connect, log2, closeMeta) {
   if (state.closedByUser || state.currentWs != null) return;
-  const delay2 = reconnectDelayMs(state.reconnectAttempt);
-  state.reconnectAttempt += 1;
-  logNextReconnectAttempt(log2, "[Bridge service]", state.mainQuiet, delay2, state.reconnectAttempt);
-  state.reconnectTimeout = setTimeout(() => {
-    state.reconnectTimeout = null;
-    connect();
-  }, delay2);
+  const meta = closeMeta ?? state.lastReconnectCloseMeta ?? void 0;
+  const delay2 = applyTieredReconnectPlanAndLog(
+    state.mainOutage,
+    log2,
+    BRIDGE_SERVICE_LABEL,
+    BRIDGE_DISCONNECT_LEAD_IN,
+    meta?.code,
+    meta?.reason
+  );
+  armReconnectDelayTimer({
+    delayMs: delay2,
+    bumpAttempt: () => {
+      state.reconnectAttempt += 1;
+    },
+    clearTimer: () => {
+      if (state.reconnectTimeout != null) {
+        clearTimeout(state.reconnectTimeout);
+        state.reconnectTimeout = null;
+      }
+    },
+    setTimer: (id) => {
+      state.reconnectTimeout = id;
+    },
+    shouldAbortBeforeRun: () => state.closedByUser || state.currentWs != null,
+    run: connect,
+    reschedule: () => {
+      scheduleMainBridgeReconnect(state, connect, log2);
+    }
+  });
 }
 
-// src/bridge/connection/reconnect/firehose-reconnect.ts
-var PROXY_AND_LOG_SERVICE_LABEL = "[Proxy and log service]";
+// src/connection/reconnect/firehose-reconnect.ts
 function beginFirehoseDeferredDisconnect(ctx, code, reason, log2) {
-  beginDeferredDisconnectForReconnect({
+  beginTieredSilentReconnectDisconnect({
     isClosedByUser: () => ctx.closedByUser,
     quiet: ctx.firehoseQuiet,
     code,
     reason,
     willReconnect: true,
     log: log2,
-    serviceLabel: PROXY_AND_LOG_SERVICE_LABEL,
-    shutdownDetail: "Not reconnecting (shutting down).",
-    reconnectingDetail: "Reconnecting\u2026",
+    serviceLabel: PREVIEW_TUNNEL_SERVICE_LABEL,
     shouldAbortQuietWindow: () => {
       const w = ctx.currentWs;
       if (!w || w.readyState !== wrapper_default.OPEN) return true;
@@ -26314,11 +26521,15 @@ function beginFirehoseDeferredDisconnect(ctx, code, reason, log2) {
   });
 }
 function clearFirehoseReconnectQuietOnOpen(ctx, log2) {
-  clearReconnectQuietOnSuccessfulConnection(
-    ctx.firehoseQuiet,
-    log2,
-    "Preview tunnel restored (local HTTP proxy and dev logs)."
-  );
+  clearTieredReconnectChannelOnOpen({
+    quiet: ctx.firehoseQuiet,
+    outage: ctx.firehoseOutage,
+    clearLastCloseMeta: () => {
+      ctx.lastFirehoseReconnectCloseMeta = null;
+    },
+    log: log2,
+    restoredMessage: "Preview tunnel restored (local HTTP proxy and dev logs)."
+  });
 }
 
 // src/auth/run-pending-auth.ts
@@ -26414,7 +26625,7 @@ function runPendingAuth(options) {
         }
         if (resolved) return;
         beginDeferredPendingCloseLog(code, reason);
-        const delay2 = reconnectDelayMs(reconnectAttempt);
+        const delay2 = pendingAuthReconnectDelayMs(reconnectAttempt);
         reconnectAttempt += 1;
         if (signInQuiet.verboseLogs) {
           const delayLabel = formatReconnectDelayForLog(delay2);
@@ -26459,7 +26670,7 @@ function runPendingAuth(options) {
   };
 }
 
-// src/bridge/connection/close-bridge-connection.ts
+// src/connection/close-bridge-connection.ts
 async function closeBridgeConnection(state, acpManager, devServerManager, log2) {
   const say = log2 ?? logImmediate;
   say("Cleaning up connections\u2026");
@@ -26974,6 +27185,30 @@ var GitRepoMetaSchema = external_exports.object({
   updatedAt: external_exports.string()
 });
 
+// ../types/src/claude-code-permission-mode.ts
+var CLAUDE_CODE_PERMISSION_MODES = [
+  "default",
+  "acceptEdits",
+  "plan",
+  "auto",
+  "dontAsk",
+  "bypassPermissions"
+];
+var MODE_SET = new Set(CLAUDE_CODE_PERMISSION_MODES);
+function isClaudeCodePermissionMode(value) {
+  return MODE_SET.has(value);
+}
+
+// ../types/src/agent-config.ts
+var AGENT_CONFIG_CLAUDE_PERMISSION_MODE_KEY = "claude_permission_mode";
+function getClaudePermissionModeFromAgentConfig(config2) {
+  if (!config2) return null;
+  const raw = config2[AGENT_CONFIG_CLAUDE_PERMISSION_MODE_KEY];
+  if (typeof raw !== "string") return null;
+  const t = raw.trim();
+  return isClaudeCodePermissionMode(t) ? t : null;
+}
+
 // src/git/session-git-queue.ts
 import { execFile as execFile7 } from "node:child_process";
 import { readFile as readFile2, stat as stat2 } from "node:fs/promises";
@@ -31549,10 +31784,28 @@ function gitInstanceFactory(baseDir, options) {
 init_git_response_error();
 var simpleGit = gitInstanceFactory;
 
+// src/git/cli-simple-git.ts
+function cliSimpleGit(baseDir) {
+  const git = simpleGit({ baseDir });
+  git.outputHandler((command, stdout, stderr) => {
+    const trace = isCliTrace();
+    const onChunk = (label) => (chunk) => {
+      const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+      const line = text.replace(/\s+$/, "");
+      if (trace && line) {
+        logTrace(`[git ${command}] ${label}: ${line}`);
+      }
+    };
+    stdout?.on("data", onChunk("stdout"));
+    stderr?.on("data", onChunk("stderr"));
+  });
+  return git;
+}
+
 // src/git/remote-origin-url.ts
 async function getRemoteOriginUrl(gitDir) {
   try {
-    const git = simpleGit(gitDir);
+    const git = cliSimpleGit(gitDir);
     const remotes = await git.getRemotes(true);
     const list = Array.isArray(remotes) ? remotes : [];
     const origin = list.find((r) => r.name === "origin");
@@ -31566,7 +31819,7 @@ async function getRemoteOriginUrl(gitDir) {
 // src/git/is-git-repo.ts
 async function isGitRepoDirectory(dirPath) {
   try {
-    return await simpleGit(dirPath).checkIsRepo();
+    return await cliSimpleGit(dirPath).checkIsRepo();
   } catch {
     return false;
   }
@@ -32259,7 +32512,8 @@ async function createSdkStdioAcpClient(options) {
     onRequest,
     onFileChange,
     killSubprocessAfterCancelMs,
-    onAgentSubprocessExit
+    onAgentSubprocessExit,
+    agentConfig
   } = options;
   const isWindows = process.platform === "win32";
   const child = spawn2(command[0], command.slice(1), {
@@ -32374,6 +32628,20 @@ async function createSdkStdioAcpClient(options) {
         });
         const newSessionRes = await connection.newSession({ cwd, mcpServers: [] });
         const sessionId = newSessionRes.sessionId;
+        if (backendAgentType === "claude-code") {
+          const cfg = agentConfig != null && typeof agentConfig === "object" && !Array.isArray(agentConfig) ? agentConfig : null;
+          const desiredMode = getClaudePermissionModeFromAgentConfig(cfg);
+          const modes = newSessionRes.modes;
+          if (desiredMode != null && modes?.availableModes?.length) {
+            const allowed = modes.availableModes.some((m) => m.id === desiredMode);
+            if (allowed && desiredMode !== modes.currentModeId) {
+              try {
+                await connection.setSessionMode({ sessionId, modeId: desiredMode });
+              } catch {
+              }
+            }
+          }
+        }
         settleResolve({
           sessionId,
           async sendPrompt(prompt, _options) {
@@ -32485,10 +32753,7 @@ async function detectLocalAgentPresence() {
     return false;
   }
 }
-function buildClaudeCodeAcpSpawnCommand(base, sessionMode) {
-  if (!sessionMode) return [...base];
-  const m = sessionMode.trim();
-  if (m === "plan") return [...base, "--permission-mode", "plan"];
+function buildClaudeCodeAcpSpawnCommand(base, _sessionMode) {
   return [...base];
 }
 async function createClaudeCodeAcpClient(options) {
@@ -32951,7 +33216,7 @@ function resolveAgentCommand(preferredAgentType) {
       command,
       label: preferredAgentType,
       createClient: createCursorAcpClient,
-      spawnCommandForSession: (sessionMode) => buildCursorAcpSpawnCommand(command, sessionMode)
+      spawnCommandForSession: (sessionMode, _agentConfig) => buildCursorAcpSpawnCommand(command, sessionMode)
     };
   }
   if (useCodexAcp(preferredAgentType, command)) {
@@ -32959,7 +33224,7 @@ function resolveAgentCommand(preferredAgentType) {
       command,
       label: preferredAgentType,
       createClient: createCodexAcpClient,
-      spawnCommandForSession: (sessionMode) => buildCodexAcpSpawnCommand(command, sessionMode)
+      spawnCommandForSession: (sessionMode, _agentConfig) => buildCodexAcpSpawnCommand(command, sessionMode)
     };
   }
   if (useKiroAcp(preferredAgentType, command)) {
@@ -32967,7 +33232,7 @@ function resolveAgentCommand(preferredAgentType) {
       command,
       label: preferredAgentType,
       createClient: createKiroAcpClient,
-      spawnCommandForSession: (sessionMode) => buildKiroAcpSpawnCommand(command, sessionMode)
+      spawnCommandForSession: (sessionMode, _agentConfig) => buildKiroAcpSpawnCommand(command, sessionMode)
     };
   }
   return {
@@ -33633,7 +33898,7 @@ function buildAcpSessionBridgeHooks(opts) {
 
 // src/agents/acp/ensure-acp-client.ts
 async function ensureAcpClient(options) {
-  const { state, preferredAgentType, mode, sessionParentPath, routing, sendSessionUpdate, sendRequest, log: log2 } = options;
+  const { state, preferredAgentType, mode, agentConfig, sessionParentPath, routing, sendSessionUpdate, sendRequest, log: log2 } = options;
   const targetSessionParentPath = resolveSessionParentPathForAgentProcess(sessionParentPath);
   if (state.acpStartPromise && !state.acpHandle) {
     await state.acpStartPromise;
@@ -33655,8 +33920,9 @@ async function ensureAcpClient(options) {
     state.lastAcpStartError = "No agent type: ensure the app sends agentType on prompts or agent_config for this bridge.";
     return null;
   }
-  const fullCmd = resolved.spawnCommandForSession(mode);
-  const agentKey = `${resolved.label}::${fullCmd.join("\0")}`;
+  const fullCmd = resolved.spawnCommandForSession(mode, agentConfig ?? null);
+  const cacheConfig = agentConfig != null && typeof agentConfig === "object" && !Array.isArray(agentConfig) && Object.keys(agentConfig).length > 0 ? `\0${JSON.stringify(agentConfig, Object.keys(agentConfig).sort())}` : "";
+  const agentKey = `${resolved.label}::${fullCmd.join("\0")}${cacheConfig}`;
   if (state.acpHandle && state.acpAgentKey !== agentKey) {
     try {
       state.acpHandle.disconnect();
@@ -33693,6 +33959,7 @@ async function ensureAcpClient(options) {
     state.acpStartPromise = resolved.createClient({
       command: resolved.command,
       sessionMode: mode,
+      agentConfig: agentConfig ?? null,
       backendAgentType: preferredAgentType,
       onAgentSubprocessExit: () => {
         state.acpHandle = null;
@@ -33754,6 +34021,7 @@ async function createAcpManager(options) {
       runId,
       mode,
       agentType,
+      agentConfig,
       sessionParentPath,
       sendResult: sendResult2,
       sendSessionUpdate,
@@ -33773,6 +34041,7 @@ async function createAcpManager(options) {
         state,
         preferredAgentType: preferredForPrompt,
         mode,
+        agentConfig: agentConfig ?? null,
         sessionParentPath,
         routing: promptRouting,
         sendSessionUpdate,
@@ -33886,7 +34155,7 @@ import * as path14 from "node:path";
 
 // src/git/worktree-add.ts
 async function gitWorktreeAddBranch(mainRepoPath, worktreePath, branch) {
-  const mainGit = simpleGit(mainRepoPath);
+  const mainGit = cliSimpleGit(mainRepoPath);
   await mainGit.raw(["worktree", "add", "-b", branch, worktreePath, "HEAD"]);
 }
 
@@ -33991,7 +34260,7 @@ async function prepareNewSessionWorktrees(options) {
 
 // src/git/rename-branch.ts
 async function gitRenameCurrentBranch(repoDir, newName) {
-  const g = simpleGit(repoDir);
+  const g = cliSimpleGit(repoDir);
   await g.raw(["branch", "-m", newName]);
 }
 
@@ -34034,7 +34303,7 @@ function resolveMainRepoFromWorktreeGitFile(wt) {
 async function gitWorktreeRemoveForce(worktreePath) {
   const mainRepo = resolveMainRepoFromWorktreeGitFile(worktreePath);
   if (mainRepo) {
-    await simpleGit(mainRepo).raw(["worktree", "remove", "--force", worktreePath]);
+    await cliSimpleGit(mainRepo).raw(["worktree", "remove", "--force", worktreePath]);
   } else {
     fs14.rmSync(worktreePath, { recursive: true, force: true });
   }
@@ -34164,7 +34433,7 @@ async function gitLogNotReachableFromBase(g, baseSha, headSha) {
   }
 }
 async function commitsAheadOfRemoteTracking(repoDir) {
-  const g = simpleGit(repoDir);
+  const g = cliSimpleGit(repoDir);
   const headSha = await revParseSafe(g, "HEAD");
   if (!headSha) return 0;
   const baseSha = await resolveBaseShaForUnpushedCommits(g);
@@ -34178,14 +34447,14 @@ async function commitsAheadOfRemoteTracking(repoDir) {
   }
 }
 async function getRepoWorkingTreeStatus(repoDir) {
-  const g = simpleGit(repoDir);
+  const g = cliSimpleGit(repoDir);
   const st = await g.status();
   const hasUncommittedChanges = (st.files?.length ?? 0) > 0;
   const ahead = await commitsAheadOfRemoteTracking(repoDir);
   return { hasUncommittedChanges, hasUnpushedCommits: ahead > 0 };
 }
 async function listUnpushedCommits(repoDir) {
-  const g = simpleGit(repoDir);
+  const g = cliSimpleGit(repoDir);
   const headSha = await revParseSafe(g, "HEAD");
   if (!headSha) return [];
   const baseSha = await resolveBaseShaForUnpushedCommits(g);
@@ -34204,7 +34473,7 @@ async function aggregateSessionPathsWorkingTreeStatus(paths) {
 }
 async function pushAheadOfUpstreamForPaths(paths) {
   for (const p of paths) {
-    const g = simpleGit(p);
+    const g = cliSimpleGit(p);
     const ahead = await commitsAheadOfRemoteTracking(p);
     if (ahead <= 0) continue;
     await g.push();
@@ -34346,7 +34615,7 @@ async function parentForCommitDiff(g, sha) {
   }
 }
 async function listChangedFilesForCommit(repoGitCwd, repoRelPath, commitSha) {
-  const g = simpleGit(repoGitCwd);
+  const g = cliSimpleGit(repoGitCwd);
   const parent = await parentForCommitDiff(g, commitSha);
   const range = `${parent}..${commitSha}`;
   const [nameStatusRaw, numstatRaw] = await Promise.all([
@@ -34421,7 +34690,7 @@ var MAX_HYDRATE_LINES_PER_FILE = 8e4;
 async function readGitBlobLines(repoCwd, pathInRepo) {
   try {
     const rel = pathInRepo.replace(/\\/g, "/");
-    const raw = await simpleGit(repoCwd).show([`HEAD:${rel}`]);
+    const raw = await cliSimpleGit(repoCwd).show([`HEAD:${rel}`]);
     return String(raw).split(/\r?\n/);
   } catch {
     return null;
@@ -34531,7 +34800,7 @@ async function hydrateUnifiedPatchWithFileContext(patch, filePath, repoGitCwd, p
 
 // src/git/working-directory/changes/unified-diff-for-file.ts
 async function unifiedDiffForFile(repoCwd, pathInRepo, change) {
-  const g = simpleGit(repoCwd);
+  const g = cliSimpleGit(repoCwd);
   try {
     let raw;
     if (change === "added") {
@@ -34550,7 +34819,7 @@ async function unifiedDiffForFile(repoCwd, pathInRepo, change) {
 
 // src/git/working-directory/changes/list-changed-files-for-repo.ts
 async function listChangedFilesForRepo(repoGitCwd, repoRelPath) {
-  const g = simpleGit(repoGitCwd);
+  const g = cliSimpleGit(repoGitCwd);
   const [nameStatusRaw, numstatRaw, untrackedRaw] = await Promise.all([
     g.raw(["diff", "--name-status", "HEAD"]).catch(() => ""),
     g.raw(["diff", "HEAD", "--numstat"]).catch(() => ""),
@@ -34635,7 +34904,7 @@ async function getWorkingTreeChangeRepoDetails(options) {
   for (const target of options.commitTargetPaths) {
     const t = path17.resolve(target);
     if (!await isGitRepoDirectory(t)) continue;
-    const g = simpleGit(t);
+    const g = cliSimpleGit(t);
     let branch = "HEAD";
     try {
       branch = (await g.raw(["rev-parse", "--abbrev-ref", "HEAD"])).trim() || "HEAD";
@@ -34686,7 +34955,7 @@ async function getWorkingTreeChangeRepoDetails(options) {
 
 // src/git/commit-and-push.ts
 async function gitCommitAllIfDirty(repoDir, message, options) {
-  const g = simpleGit(repoDir);
+  const g = cliSimpleGit(repoDir);
   const st = await g.status();
   if (!st.files?.length) return;
   const branch = options.branch.trim();
@@ -35473,7 +35742,7 @@ function startFileIndexWatcher(cwd = getBridgeRoot()) {
   };
 }
 
-// src/bridge/connection/create-bridge-connection.ts
+// src/connection/create-bridge-connection.ts
 import * as path34 from "node:path";
 
 // src/dev-servers/manager/dev-server-manager.ts
@@ -36609,7 +36878,17 @@ function tryConsumeBinaryProxyBody(raw, deps) {
 
 // src/firehose/connect-firehose.ts
 function connectFirehose(options) {
-  const { firehoseServerUrl, workspaceId, bridgeName, proxyPorts, log: log2, devServerManager, onOpen, onClose } = options;
+  const {
+    firehoseServerUrl,
+    workspaceId,
+    bridgeName,
+    proxyPorts,
+    log: log2,
+    devServerManager,
+    onOpen,
+    onClose,
+    suppressWebSocketErrors
+  } = options;
   const wsUrl = buildFirehoseCliWsUrl(firehoseServerUrl);
   applyCliOutboundNetworkPreferences();
   const ws = new wrapper_default(wsUrl, buildCliWebSocketClientOptions(wsUrl));
@@ -36654,7 +36933,9 @@ function connectFirehose(options) {
   });
   ws.on("error", (err) => {
     disposeClientPing();
-    logCliWebSocketError(log2, "[Proxy and log service]", err);
+    if (!suppressWebSocketErrors?.()) {
+      logCliWebSocketError(log2, "[Proxy and log service]", err);
+    }
     if (ws.readyState === wrapper_default.CONNECTING || ws.readyState === wrapper_default.OPEN) {
       safeCloseWebSocket(ws);
     }
@@ -36669,7 +36950,7 @@ function connectFirehose(options) {
   };
 }
 
-// src/bridge/connection/attach-firehose-after-identified.ts
+// src/connection/attach-firehose-after-identified.ts
 function attachFirehoseAfterIdentified(ctx, params) {
   const { state, devServerManager, logFn } = ctx;
   function clearFirehoseReconnectTimer() {
@@ -36686,10 +36967,44 @@ function attachFirehoseAfterIdentified(ctx, params) {
       firehoseQuiet: state.firehoseQuiet
     };
   }
+  function scheduleFirehoseRetryAfterDrop(closeMeta) {
+    if (state.closedByUser) return;
+    const meta = closeMeta ?? state.lastFirehoseReconnectCloseMeta ?? void 0;
+    const delay2 = applyTieredReconnectPlanAndLog(
+      state.firehoseOutage,
+      logFn,
+      PREVIEW_TUNNEL_SERVICE_LABEL,
+      PREVIEW_TUNNEL_DISCONNECT_LEAD_IN,
+      meta?.code,
+      meta?.reason
+    );
+    armReconnectDelayTimer({
+      delayMs: delay2,
+      bumpAttempt: () => {
+        state.firehoseReconnectAttempt += 1;
+      },
+      clearTimer: clearFirehoseReconnectTimer,
+      setTimer: (id) => {
+        state.firehoseReconnectTimeout = id;
+      },
+      shouldAbortBeforeRun: () => state.closedByUser,
+      run: () => {
+        const p = state.lastFirehoseParams;
+        if (!p) return;
+        attachFirehoseAfterIdentified(ctx, p);
+      },
+      reschedule: () => {
+        scheduleFirehoseRetryAfterDrop();
+      }
+    });
+  }
   state.lastFirehoseParams = params;
   clearFirehoseReconnectTimer();
   if (state.firehoseReconnectAttempt === 0) {
-    logFn("Connecting to preview tunnel (local HTTP proxy and dev logs)\u2026");
+    try {
+      logFn("Connecting to preview tunnel (local HTTP proxy and dev logs)\u2026");
+    } catch {
+    }
   }
   state.firehoseGeneration += 1;
   const myGen = state.firehoseGeneration;
@@ -36704,47 +37019,47 @@ function attachFirehoseAfterIdentified(ctx, params) {
     proxyPorts: params.proxyPorts,
     log: logFn,
     devServerManager,
+    suppressWebSocketErrors: () => !state.closedByUser && state.firehoseOutage.startedAt != null,
     onOpen: () => {
       if (myGen !== state.firehoseGeneration) return;
-      clearFirehoseReconnectQuietOnOpen({ firehoseQuiet: state.firehoseQuiet }, logFn);
+      try {
+        clearFirehoseReconnectQuietOnOpen(
+          {
+            firehoseQuiet: state.firehoseQuiet,
+            firehoseOutage: state.firehoseOutage,
+            lastFirehoseReconnectCloseMeta: state.lastFirehoseReconnectCloseMeta
+          },
+          logFn
+        );
+      } catch {
+      }
       const logOpenAsFirehoseReconnect = state.firehoseReconnectAttempt > 0;
       state.firehoseReconnectAttempt = 0;
       if (!logOpenAsFirehoseReconnect) {
-        logFn("Connected to preview tunnel (local HTTP proxy and dev logs).");
+        try {
+          logFn("Connected to preview tunnel (local HTTP proxy and dev logs).");
+        } catch {
+        }
       }
     },
     onClose: (code, reason) => {
       if (myGen !== state.firehoseGeneration) return;
       state.firehoseHandle = null;
       if (state.closedByUser) return;
-      beginFirehoseDeferredDisconnect(firehoseCtx(), code, reason, logFn);
-      clearFirehoseReconnectTimer();
-      const delay2 = reconnectDelayMs(state.firehoseReconnectAttempt);
-      state.firehoseReconnectAttempt += 1;
-      logNextReconnectAttempt(
-        logFn,
-        PROXY_AND_LOG_SERVICE_LABEL,
-        state.firehoseQuiet,
-        delay2,
-        state.firehoseReconnectAttempt
-      );
-      state.firehoseReconnectTimeout = setTimeout(() => {
-        state.firehoseReconnectTimeout = null;
-        if (state.closedByUser) return;
-        const p = state.lastFirehoseParams;
-        if (!p) {
-          if (state.firehoseQuiet.verboseLogs) {
-            logFn(`${PROXY_AND_LOG_SERVICE_LABEL} Reconnect skipped: no stored connection parameters.`);
-          }
-          return;
-        }
-        attachFirehoseAfterIdentified(ctx, p);
-      }, delay2);
+      state.lastFirehoseReconnectCloseMeta = { code, reason };
+      try {
+        beginFirehoseDeferredDisconnect(firehoseCtx(), code, reason, logFn);
+      } catch {
+      }
+      try {
+        scheduleFirehoseRetryAfterDrop({ code, reason });
+      } catch {
+      }
     }
   });
 }
 
-// src/bridge/connection/create-bridge-identified-handler.ts
+// src/connection/create-bridge-identified-handler.ts
 function createOnBridgeIdentified(opts) {
   const { devServerManager, firehoseServerUrl, workspaceId, state, logFn } = opts;
   const firehoseCtx = { state, devServerManager, logFn };
@@ -36855,7 +37170,7 @@ async function detectLocalAgentTypes() {
   }
 }
 
-// src/bridge/connection/create-bridge-local-reports.ts
+// src/connection/create-bridge-local-reports.ts
 function createSendLocalSkillsReport(getWs, logFn) {
   return () => {
     setImmediate(() => {
@@ -36888,14 +37203,14 @@ function createReportAutoDetectedAgents(getWs, logFn) {
   };
 }
 
-// src/bridge/connection/build-bridge-url.ts
+// src/connection/build-bridge-url.ts
 function buildBridgeUrl(apiUrl, workspaceId, authToken) {
   const base = apiUrl.startsWith("https") ? apiUrl.replace(/^https/, "wss") : apiUrl.replace(/^http/, "ws");
   const params = new URLSearchParams({ workspaceId, token: authToken });
   return `${base}/ws/bridge?${params.toString()}`;
 }
 
-// src/bridge/connection/report-git-repos.ts
+// src/connection/report-git-repos.ts
 function reportGitRepos(getWs, log2) {
   setImmediate(() => {
     discoverGitRepos().then((repos) => {
@@ -36951,14 +37266,14 @@ function parseApiToBridgeMessage(data, log2) {
   return data;
 }
 
-// src/bridge/routing/handlers/auth-token.ts
+// src/routing/handlers/auth-token.ts
 var handleAuthToken = (msg, { log: log2 }) => {
   if (typeof msg.token !== "string") return;
   log2("Received auth token. Save it for future runs:");
   log2(`  export BUILDAUTOMATON_AUTH_TOKEN="${msg.token}"`);
 };
 
-// src/bridge/routing/handlers/bridge-identified.ts
+// src/routing/handlers/bridge-identified.ts
 var handleBridgeIdentified = (msg, deps) => {
   if (typeof msg.bridgeName !== "string") return;
   deps.onBridgeIdentified({
@@ -36994,7 +37309,7 @@ function handleBridgeAgentConfig(msg, { acpManager }) {
   acpManager.setPreferredAgentType(msg.agents[0].type);
 }
 
-// src/bridge/routing/handlers/agent-config.ts
+// src/routing/handlers/agent-config.ts
 var handleAgentConfigMessage = (msg, deps) => {
   handleBridgeAgentConfig(msg, deps);
 };
@@ -37153,7 +37468,8 @@ function dispatchLocalPrompt(next, deps) {
     ...typeof pl.followUpCatalogPromptId === "string" ? { followUpCatalogPromptId: pl.followUpCatalogPromptId } : {},
     ...Array.isArray(pl.sessionChangeSummaryFilePaths) ? { sessionChangeSummaryFilePaths: pl.sessionChangeSummaryFilePaths } : {},
     ...Array.isArray(pl.sessionChangeSummaryFileSnapshots) ? { sessionChangeSummaryFileSnapshots: pl.sessionChangeSummaryFileSnapshots } : {},
-    ...typeof pl.agentType === "string" && pl.agentType.trim() ? { agentType: pl.agentType.trim() } : {}
+    ...typeof pl.agentType === "string" && pl.agentType.trim() ? { agentType: pl.agentType.trim() } : {},
+    ...pl.agentConfig != null && typeof pl.agentConfig === "object" && !Array.isArray(pl.agentConfig) && Object.keys(pl.agentConfig).length > 0 ? { agentConfig: pl.agentConfig } : {}
   };
   handleBridgePrompt(msg, deps);
 }
@@ -37180,7 +37496,24 @@ async function applyPromptQueueStateFromServer(msg, deps) {
     if (!file2) continue;
     const cancelRow = file2.turns.find((t) => t.serverState === "cancel_requested" && t.lastClientState === "running");
     if (cancelRow) {
-      await deps.acpManager.cancelRun(cancelRow.turnId);
+      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.`
+        );
+        finalizePromptTurnOnBridge(deps.getWs, cancelRow.turnId, false, { terminalClientState: "cancelled" });
+        const ws = deps.getWs();
+        if (ws && cancelRow.sessionId) {
+          sendWsMessage(ws, {
+            type: "prompt_result",
+            sessionId: cancelRow.sessionId,
+            runId: cancelRow.turnId,
+            success: false,
+            error: "Stopped by user",
+            stopReason: "cancelled"
+          });
+        }
+      }
     }
   }
   const report = {};
@@ -37434,6 +37767,7 @@ function handleBridgePrompt(msg, deps) {
   const sessionParentPath = typeof msg.sessionParentPath === "string" && msg.sessionParentPath.trim() ? msg.sessionParentPath.trim() : null;
   const agentType = typeof msg.agentType === "string" && msg.agentType.trim() ? msg.agentType.trim() : void 0;
   const mode = typeof msg.mode === "string" && msg.mode.trim() ? msg.mode.trim() : void 0;
+  const agentConfig = msg.agentConfig != null && typeof msg.agentConfig === "object" && !Array.isArray(msg.agentConfig) ? msg.agentConfig : void 0;
   acpManager.logPromptReceivedFromBridge({ agentType, mode });
   async function preambleAndPrompt(resolvedCwd) {
     const effectiveCwd = resolveSessionParentPathForAgentProcess(resolvedCwd);
@@ -37469,6 +37803,7 @@ function handleBridgePrompt(msg, deps) {
       runId,
       mode,
       agentType,
+      agentConfig,
       sessionParentPath: effectiveCwd,
       sendResult: sendResult2,
       sendSessionUpdate,
@@ -37485,27 +37820,27 @@ function handleBridgePrompt(msg, deps) {
   });
 }
 
-// src/bridge/routing/handlers/prompt.ts
+// src/routing/handlers/prompt.ts
 var handlePromptMessage = (msg, deps) => {
   handleBridgePrompt(msg, deps);
 };
 
-// src/bridge/routing/handlers/prompt-queue-state.ts
+// src/routing/handlers/prompt-queue-state.ts
 var handlePromptQueueStateMessage = (msg, deps) => {
   void applyPromptQueueStateFromServer(msg, deps).catch((err) => {
     deps.log(`[Queue] applyPromptQueueStateFromServer failed: ${err instanceof Error ? err.message : String(err)}`);
   });
 };
 
-// src/agents/acp/from-bridge/handle-bridge-cursor-request-response.ts
-function handleBridgeCursorRequestResponse(msg, { acpManager }) {
+// src/agents/acp/from-bridge/handle-bridge-session-request-response.ts
+function handleBridgeSessionRequestResponse(msg, { acpManager }) {
   if (typeof msg.requestId !== "string") return;
   acpManager.resolveRequest(msg.requestId, msg.result ?? {});
 }
 
-// src/bridge/routing/handlers/cursor-request-response.ts
-var handleCursorRequestResponseMessage = (msg, deps) => {
-  handleBridgeCursorRequestResponse(msg, deps);
+// src/routing/handlers/session-request-response.ts
+var handleSessionRequestResponseMessage = (msg, deps) => {
+  handleBridgeSessionRequestResponse(msg, deps);
 };
 
 // src/skills/preview.ts
@@ -37692,7 +38027,7 @@ function handleSkillCall(msg, socket, log2) {
   });
 }
 
-// src/bridge/routing/handlers/skill-call.ts
+// src/routing/handlers/skill-call.ts
 var handleSkillCallMessage = (msg, { getWs, log: log2 }) => {
   const skillId = typeof msg.skillId === "string" ? msg.skillId : "";
   const operationId = typeof msg.operationId === "string" ? msg.operationId : "";
@@ -38034,7 +38369,7 @@ function handleFileBrowserRequest(msg, socket, e2ee) {
   })();
 }
 
-// src/bridge/routing/handlers/file-browser-messages.ts
+// src/routing/handlers/file-browser-messages.ts
 function handleFileBrowserRequestMessage(msg, { getWs, e2ee }) {
   if (typeof msg.id !== "string" || typeof msg.path !== "string") return;
   const socket = getWs();
@@ -38052,7 +38387,7 @@ function handleFileBrowserSearchMessage(msg, { getWs, e2ee }) {
   handleFileBrowserSearch(msg, socket, e2ee);
 }
 
-// src/bridge/routing/handlers/skill-layout-request.ts
+// src/routing/handlers/skill-layout-request.ts
 function handleSkillLayoutRequest(msg, deps) {
   const socket = deps.getWs();
   const id = typeof msg.id === "string" ? msg.id : "";
@@ -38098,7 +38433,7 @@ function installRemoteSkills(cwd, targetDir, items) {
   }
 }
 
-// src/bridge/routing/handlers/install-skills.ts
+// src/routing/handlers/install-skills.ts
 var handleInstallSkillsMessage = (msg, deps) => {
   const socket = deps.getWs();
   const id = typeof msg.id === "string" ? msg.id : "";
@@ -38119,12 +38454,12 @@ var handleInstallSkillsMessage = (msg, deps) => {
   }
 };
 
-// src/bridge/routing/handlers/refresh-local-skills.ts
+// src/routing/handlers/refresh-local-skills.ts
 var handleRefreshLocalSkills = (_msg, deps) => {
   deps.sendLocalSkillsReport?.();
 };
 
-// src/bridge/routing/handlers/session-git-request.ts
+// src/routing/handlers/session-git-request.ts
 function sendResult(ws, id, payload, e2ee, encryptedFields = []) {
   if (!ws) return;
   const message = { type: "session_git_result", id, ...payload };
@@ -38210,7 +38545,7 @@ var handleSessionGitRequestMessage = (msg, deps) => {
   })();
 };
 
-// src/bridge/routing/handlers/rename-session-branch.ts
+// src/routing/handlers/rename-session-branch.ts
 var handleRenameSessionBranchMessage = (msg, deps) => {
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
   const newBranch = typeof msg.newBranch === "string" ? msg.newBranch : "";
@@ -38218,21 +38553,21 @@ var handleRenameSessionBranchMessage = (msg, deps) => {
   void deps.sessionWorktreeManager.renameSessionBranch(sessionId, newBranch);
 };
 
-// src/bridge/routing/handlers/session-archived.ts
+// src/routing/handlers/session-archived.ts
 var handleSessionArchivedMessage = (msg, deps) => {
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
   if (!sessionId) return;
   void deps.sessionWorktreeManager.removeSessionWorktrees(sessionId);
 };
 
-// src/bridge/routing/handlers/session-discarded.ts
+// src/routing/handlers/session-discarded.ts
 var handleSessionDiscardedMessage = (msg, deps) => {
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
   if (!sessionId) return;
   void deps.sessionWorktreeManager.removeSessionWorktrees(sessionId);
 };
 
-// src/bridge/routing/handlers/revert-turn-snapshot.ts
+// src/routing/handlers/revert-turn-snapshot.ts
 import * as fs33 from "node:fs";
 var handleRevertTurnSnapshotMessage = (msg, deps) => {
   const id = typeof msg.id === "string" ? msg.id : "";
@@ -38264,7 +38599,7 @@ var handleRevertTurnSnapshotMessage = (msg, deps) => {
   })();
 };
 
-// src/bridge/routing/handlers/dev-server-control.ts
+// src/routing/handlers/dev-server-control.ts
 var handleDevServerControl = (msg, deps) => {
   let wire;
   try {
@@ -38279,13 +38614,13 @@ var handleDevServerControl = (msg, deps) => {
   deps.devServerManager?.handleControl(serverId, action);
 };
 
-// src/bridge/routing/handlers/dev-servers-config.ts
+// src/routing/handlers/dev-servers-config.ts
 var handleDevServersConfig = (msg, deps) => {
   const devServers = msg.devServers;
   deps.devServerManager?.applyConfig(devServers ?? []);
 };
 
-// src/bridge/routing/dispatch-bridge-message.ts
+// src/routing/dispatch-bridge-message.ts
 function dispatchBridgeMessage(msg, deps) {
   switch (msg.type) {
     case "auth_token":
@@ -38325,7 +38660,7 @@ function dispatchBridgeMessage(msg, deps) {
       handleRevertTurnSnapshotMessage(msg, deps);
       break;
     case "cursor_request_response":
-      handleCursorRequestResponseMessage(msg, deps);
+      handleSessionRequestResponseMessage(msg, deps);
       break;
     case "skill_call":
       handleSkillCallMessage(msg, deps);
@@ -38348,7 +38683,7 @@ function dispatchBridgeMessage(msg, deps) {
   }
 }
 
-// src/bridge/routing/handle-bridge-message.ts
+// src/routing/handle-bridge-message.ts
 function handleBridgeMessage(data, deps) {
   if (!deps.getWs()) return;
   const msg = parseApiToBridgeMessage(data, deps.log);
@@ -38385,7 +38720,7 @@ async function refreshBridgeTokens(params) {
   }
 }
 
-// src/bridge/connection/main-bridge-ws-lifecycle.ts
+// src/connection/main-bridge-ws-lifecycle.ts
 function createMainBridgeWebSocketLifecycle(params) {
   const {
     state,
@@ -38431,13 +38766,26 @@ function createMainBridgeWebSocketLifecycle(params) {
     }
   }
   function handleClose(code, reason) {
-    const was = state.currentWs;
-    state.currentWs = null;
-    if (was) was.removeAllListeners();
-    const willReconnect = !state.closedByUser;
-    beginMainBridgeDeferredDisconnect(state, code, reason, logFn, willReconnect);
-    if (willReconnect) {
-      scheduleMainBridgeReconnect(state, connect, logFn);
+    try {
+      const was = state.currentWs;
+      state.currentWs = null;
+      if (was) was.removeAllListeners();
+      const willReconnect = !state.closedByUser;
+      beginMainBridgeDeferredDisconnect(state, code, reason, logFn, willReconnect);
+      if (willReconnect) {
+        state.lastReconnectCloseMeta = { code, reason };
+        try {
+          scheduleMainBridgeReconnect(state, connect, logFn, { code, reason });
+        } catch {
+        }
+      }
+    } catch {
+      if (!state.closedByUser) {
+        try {
+          scheduleMainBridgeReconnect(state, connect, logFn);
+        } catch {
+        }
+      }
     }
   }
   function connect() {
@@ -38447,7 +38795,10 @@ function createMainBridgeWebSocketLifecycle(params) {
       state.reconnectTimeout = null;
     }
     if (state.reconnectAttempt === 0) {
-      logFn("Connecting to bridge service\u2026");
+      try {
+        logFn("Connecting to bridge service\u2026");
+      } catch {
+      }
     }
     const prev = state.currentWs;
     if (prev) {
@@ -38463,53 +38814,84 @@ function createMainBridgeWebSocketLifecycle(params) {
       }
       state.currentWs = null;
     }
-    const url2 = buildBridgeUrl(apiUrl, workspaceId, tokens.accessToken);
-    state.currentWs = createWsBridge({
-      url: url2,
-      clientPingIntervalMs: CLI_WEBSOCKET_CLIENT_PING_MS,
-      onAuthInvalid: () => {
-        if (authRefreshInFlight) return;
-        void (async () => {
-          authRefreshInFlight = true;
-          try {
-            if (tokens.refreshToken) {
-              const next = await refreshBridgeTokens({
-                apiUrl,
-                workspaceId,
-                refreshToken: tokens.refreshToken
-              });
-              if (next?.token && next.refreshToken) {
-                tokens.accessToken = next.token;
-                tokens.refreshToken = next.refreshToken;
-                persistTokens?.({ token: tokens.accessToken, refreshToken: tokens.refreshToken });
-                logFn("[Bridge service] Access token refreshed; reconnecting\u2026");
-                state.reconnectAttempt = 0;
-                state.logBridgeOpenAsReconnect = true;
-                authRefreshInFlight = false;
-                connect();
-                return;
+    try {
+      const url2 = buildBridgeUrl(apiUrl, workspaceId, tokens.accessToken);
+      state.currentWs = createWsBridge({
+        url: url2,
+        clientPingIntervalMs: CLI_WEBSOCKET_CLIENT_PING_MS,
+        onAuthInvalid: () => {
+          if (authRefreshInFlight) return;
+          void (async () => {
+            authRefreshInFlight = true;
+            try {
+              if (tokens.refreshToken) {
+                const next = await refreshBridgeTokens({
+                  apiUrl,
+                  workspaceId,
+                  refreshToken: tokens.refreshToken
+                });
+                if (next?.token && next.refreshToken) {
+                  tokens.accessToken = next.token;
+                  tokens.refreshToken = next.refreshToken;
+                  persistTokens?.({ token: tokens.accessToken, refreshToken: tokens.refreshToken });
+                  try {
+                    logFn("[Bridge service] Access token refreshed; reconnecting\u2026");
+                  } catch {
+                  }
+                  state.reconnectAttempt = 0;
+                  resetReconnectOutageTracker(state.mainOutage);
+                  state.lastReconnectCloseMeta = null;
+                  state.logBridgeOpenAsReconnect = true;
+                  authRefreshInFlight = false;
+                  connect();
+                  return;
+                }
               }
+              authRefreshInFlight = false;
+              state.reconnectAttempt = 0;
+              resetReconnectOutageTracker(state.mainOutage);
+              state.lastReconnectCloseMeta = null;
+              onAuthInvalid();
+            } catch {
+              authRefreshInFlight = false;
+              state.reconnectAttempt = 0;
+              resetReconnectOutageTracker(state.mainOutage);
+              state.lastReconnectCloseMeta = null;
+              onAuthInvalid();
             }
-            authRefreshInFlight = false;
-            state.reconnectAttempt = 0;
-            onAuthInvalid();
+          })();
+        },
+        onOpen: handleOpen,
+        onClose: handleClose,
+        onError: (err) => {
+          if (state.mainOutage.startedAt != null) {
+            return;
+          }
+          try {
+            logCliWebSocketError(logFn, "[Bridge service]", err);
           } catch {
-            authRefreshInFlight = false;
-            state.reconnectAttempt = 0;
-            onAuthInvalid();
           }
-        })();
-      },
-      onOpen: handleOpen,
-      onClose: handleClose,
-      onError: (err) => logCliWebSocketError(logFn, "[Bridge service]", err),
-      onMessage: (data) => handleBridgeMessage(data, messageDeps)
-    });
+        },
+        onMessage: (data) => {
+          try {
+            handleBridgeMessage(data, messageDeps);
+          } catch {
+          }
+        }
+      });
+    } catch {
+      if (!state.closedByUser && state.currentWs == null) {
+        try {
+          scheduleMainBridgeReconnect(state, connect, logFn);
+        } catch {
+        }
+      }
+    }
   }
   return { connect };
 }
 
-// src/bridge/connection/create-bridge-connection.ts
+// src/connection/create-bridge-connection.ts
 async function createBridgeConnection(options) {
   const { apiUrl, workspaceId, justAuthenticated, onAuthInvalid, persistTokens } = options;
   const firehoseServerUrl = options.firehoseServerUrl ?? options.proxyServerUrl;
@@ -38521,16 +38903,20 @@ async function createBridgeConnection(options) {
   const state = {
     closedByUser: false,
     reconnectAttempt: 0,
+    lastReconnectCloseMeta: null,
     logBridgeOpenAsReconnect: false,
     reconnectTimeout: null,
     currentWs: null,
     mainQuiet: createEmptyReconnectQuietSlot(),
+    mainOutage: createEmptyReconnectOutageTracker(),
     firehoseHandle: null,
     lastFirehoseParams: null,
     firehoseReconnectTimeout: null,
     firehoseReconnectAttempt: 0,
     firehoseGeneration: 0,
-    firehoseQuiet: createEmptyReconnectQuietSlot()
+    firehoseQuiet: createEmptyReconnectQuietSlot(),
+    firehoseOutage: createEmptyReconnectOutageTracker(),
+    lastFirehoseReconnectCloseMeta: null
   };
   const worktreesRootPath = options.worktreesRootPath ?? defaultWorktreesRootPath();
   const sessionWorktreeManager = new SessionWorktreeManager({
@@ -38792,6 +39178,9 @@ function colorize(color, message) {
   return `${color}${message}${RESET}`;
 }
 async function runCliAction(program2, opts) {
+  const trace = opts.trace === true;
+  const debug2 = opts.debug === true || trace;
+  setCliLogVerbosity(trace ? "trace" : debug2 ? "debug" : "info");
   const positionalUrl = program2.args?.[0];
   const urlFromPositional = typeof positionalUrl === "string" && /^https?:\/\//i.test(positionalUrl) ? positionalUrl : void 0;
   const apiUrlFromCli = opts.apiUrl ?? urlFromPositional;
@@ -38883,7 +39272,7 @@ async function main() {
     "--e2ee-certificates-dir <path>",
     "Directory to load or generate E2EE keys for sessions, files, and logs",
     process.env.BUILDAUTOMATON_E2EE_CERTIFICATES_DIR
-  ).option("--no-config", "Ignore saved config at ~/.buildautomaton/config.json").action(async (opts) => runCliAction(program2, opts));
+  ).option("--no-config", "Ignore saved config at ~/.buildautomaton/config.json").option("--debug", "Print debug-level messages from the CLI").option("--trace", "Print trace-level messages (e.g. git subprocess output); implies --debug").action(async (opts) => runCliAction(program2, opts));
   await program2.parseAsync(process.argv);
 }
 main().catch((err) => {