squadrant 0.19.0 → 0.19.1

package/dist/squadrantd.js

@@ -804,8 +804,9 @@ function isStickyAttention(state) {
 function nextPendingTool(current, ev, now) {
   if (ev.note === "agent.hook.PreToolUse")
     return { name: ev.tool ?? "tool", since: now };
-  if (ev.note === "posttooluse" || ev.note === "agent.hook.UserPromptSubmit")
+  if (ev.note === "posttooluse" || ev.note === "agent.hook.PostToolUse" || ev.note === "agent.hook.UserPromptSubmit") {
     return void 0;
+  }
   return current;
 }
 function nextPendingMonitor(current, ev, now) {
@@ -908,6 +909,7 @@ function reduce(rec, ev, now) {
     case "task.stalled":
     case "task.idle":
     case "task.quiet":
+    case "task.warn":
     case "task.timeout":
     case "task.reconcile-failed":
       return rec;
@@ -929,6 +931,15 @@ function evaluateStall(rec, now, toolStallMs = TOOL_STALL_BUDGET_MS, monitorStal
     if (rec.pendingTool) {
       if (now - rec.pendingTool.since <= toolStallMs)
         return null;
+      if (rec.lastEvent === "task.turn.completed") {
+        return {
+          ...rec,
+          state: "awaiting-input",
+          pendingTool: void 0,
+          pendingMonitor: void 0,
+          lastEvent: "watchdog.tool-stall-recovered"
+        };
+      }
       return { ...rec, state: "stalled", lastEvent: "watchdog.tool-stall" };
     }
     if (rec.pendingMonitor) {
@@ -1250,7 +1261,7 @@ function createDaemon(deps) {
             }
           }
         }
-        if (!TERMINAL_STATES.has(r.state) && !isStickyAttention(r.state)) {
+        if (!TERMINAL_STATES.has(r.state) && !isStickyAttention(r.state) && r.state !== "awaiting-input") {
           const ceiling = deps.taskTimeoutMs ?? DEFAULT_TASK_TIMEOUT_MS;
           const refTime = r.workingStretchStartedAt ?? r.createdAt;
           if (t - refTime > ceiling) {
@@ -1296,6 +1307,11 @@ function createDaemon(deps) {
         const idle = evaluateStall(r, t);
         if (idle) {
           store.put(idle);
+          if (idle.state === "awaiting-input") {
+            const recoveredEvent = { type: "task.turn.completed", id: r.id, turnId: "watchdog-recover" };
+            firePush(deps, r.project, r.state, idle, recoveredEvent, lastCaptainTurnAt.get(r.id));
+            continue;
+          }
           const synthEvent = idle.pendingTool ? { type: "task.stalled", id: r.id, heartbeatBudgetMs: r.heartbeatBudgetMs, tool: idle.pendingTool.name, elapsedMs: t - idle.pendingTool.since } : idle.pendingMonitor ? { type: "task.stalled", id: r.id, heartbeatBudgetMs: r.heartbeatBudgetMs, tool: "Monitor", elapsedMs: t - idle.pendingMonitor.since } : { type: "task.stalled", id: r.id, heartbeatBudgetMs: r.heartbeatBudgetMs };
           firePush(deps, r.project, r.state, idle, synthEvent, lastCaptainTurnAt.get(r.id));
           continue;
@@ -1403,6 +1419,7 @@ var init_reduce = __esm({
       "task.stalled",
       "task.idle",
       "task.quiet",
+      "task.warn",
       "task.timeout",
       "task.reconcile-failed",
       "task.cancelled",
@@ -1901,7 +1918,18 @@ function projectHealth(input) {
     ref: captainName,
     state: captainState,
     lastSeenMs: null,
-    detail: captainState === "stopped" ? "captain workspace closed \u2014 crews reaped; delivery paused" : captainState === "gone" ? "captain process died (crash) \u2014 crews reaped" : deferral?.stuck ? `\u26A0\uFE0F delivery stuck (${deferral.maxDeferCount}+ retries) \u2014 draft/ghost text blocking captain pane; input never touched, delivers automatically once cleared` : void 0
+    detail: captainState === "stopped" ? "captain workspace closed \u2014 crews reaped; delivery paused" : captainState === "gone" ? "captain process died (crash) \u2014 crews reaped" : deferral?.stuck ? `\u26A0\uFE0F delivery stuck (${deferral.maxDeferCount}+ retries, reason: ${deferral.reason ?? "unknown"})` : void 0
+  });
+  const deliveryState = captainState === "stopped" ? "stopped" : deferral?.stuck || deferral && deferral.maxDeferCount > 0 ? "stale" : "alive";
+  const deliveryDetail = captainState === "stopped" ? "delivery paused (captain stopped)" : deferral?.stuck ? `\u26A0\uFE0F delivery stuck (${deferral.maxDeferCount}+ retries, reason: ${deferral.reason ?? "unknown"})` : deferral && deferral.maxDeferCount > 0 ? `delivery deferred (${deferral.maxDeferCount} retries, reason: ${deferral.reason ?? "unknown"})` : void 0;
+  out.push({
+    kind: "delivery",
+    project,
+    ref: "delivery",
+    state: deliveryState,
+    lastSeenMs: null,
+    detail: deliveryDetail,
+    stuck: deferral?.stuck
   });
   if (commandPresent !== null) {
     out.push({
@@ -2003,8 +2031,23 @@ function createStore(root) {
   };
   const projDir = (p) => assertUnderRoot(join6(root, safeSegment("project", p)));
   const taskFile = (p, id) => assertUnderRoot(join6(projDir(p), `${safeSegment("id", id)}.json`));
+  const readRecord = (project, id) => {
+    const f = taskFile(project, id);
+    if (!existsSync6(f))
+      return void 0;
+    try {
+      return JSON.parse(readFileSync4(f, "utf-8"));
+    } catch {
+      return void 0;
+    }
+  };
   return {
     put(rec) {
+      const existing = readRecord(rec.project, rec.id);
+      if (existing && TERMINAL_STATES.has(existing.state) && TERMINAL_STATES.has(rec.state) && (existing.state !== rec.state || existing.lastEvent !== rec.lastEvent)) {
+        console.error(`[squadrant] REJECTED terminal\u2192terminal overwrite of ${rec.project}/${rec.id}: already ${existing.state}/${existing.lastEvent} \u2014 refusing ${rec.state}/${rec.lastEvent}; original terminal record preserved (#595)`);
+        return;
+      }
       mkdirSync2(projDir(rec.project), { recursive: true });
       const dest = taskFile(rec.project, rec.id);
       const tmp = `${dest}.tmp`;
@@ -2012,14 +2055,7 @@ function createStore(root) {
       renameSync(tmp, dest);
     },
     get(project, id) {
-      const f = taskFile(project, id);
-      if (!existsSync6(f))
-        return void 0;
-      try {
-        return JSON.parse(readFileSync4(f, "utf-8"));
-      } catch {
-        return void 0;
-      }
+      return readRecord(project, id);
     },
     list(project) {
       const d = projDir(project);
@@ -2058,6 +2094,7 @@ function createStore(root) {
 }
 var init_store = __esm({
   "packages/core/dist/store.js"() {
+    init_dist();
   }
 });
 
@@ -2424,7 +2461,7 @@ function computeDaemonDrift(nodeBin) {
   const foreignInstall = detectForeignInstall(parsedCurrent, entry, parsedCurrent !== null && existsSync8(parsedCurrent.daemonEntry));
   return { plistPath: p, target, desired, current, changed, programChanged, foreignInstall };
 }
-function applyDaemonDrift(drift) {
+function reconcilePlistAndService(drift) {
   if (drift.changed) {
     mkdirSync4(dirname2(drift.plistPath), { recursive: true });
     writeFileSync5(drift.plistPath, drift.desired);
@@ -2440,8 +2477,47 @@ function applyDaemonDrift(drift) {
     execFileSync3("launchctl", ["bootstrap", `gui/${uid}`, drift.plistPath], { stdio: "ignore" });
   } catch {
   }
+}
+function applyDaemonDrift(drift) {
+  reconcilePlistAndService(drift);
   execFileSync3("launchctl", ["kickstart", drift.target], { stdio: "ignore" });
 }
+function getDaemonPid(target) {
+  try {
+    const out = execFileSync3("launchctl", ["print", target], { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] });
+    const m = out.match(/\bpid\s*=\s*(\d+)/);
+    return m ? parseInt(m[1], 10) : null;
+  } catch {
+    return null;
+  }
+}
+function forceKickstartAndVerify(target, opts = {}) {
+  const pollAttempts = opts.pollAttempts ?? 15;
+  const pollDelayMs = opts.pollDelayMs ?? 300;
+  const kickstartRetries = opts.kickstartRetries ?? 5;
+  const kickstartRetryDelayMs = opts.kickstartRetryDelayMs ?? 300;
+  const pidBefore = getDaemonPid(target);
+  for (let i = 0; i < kickstartRetries; i++) {
+    try {
+      execFileSync3("launchctl", ["kickstart", "-k", target], { stdio: "ignore" });
+      break;
+    } catch (e) {
+      if (i === kickstartRetries - 1)
+        throw e;
+      Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, kickstartRetryDelayMs);
+    }
+  }
+  let pidAfter = null;
+  for (let i = 0; i < pollAttempts; i++) {
+    pidAfter = getDaemonPid(target);
+    if (pidAfter !== null && pidAfter !== pidBefore)
+      break;
+    if (i < pollAttempts - 1) {
+      Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, pollDelayMs);
+    }
+  }
+  return { target, pidBefore, pidAfter, restarted: pidAfter !== null && pidAfter !== pidBefore };
+}
 function isOperatorInitiatedCommand(topLevelArg) {
   return topLevelArg !== void 0 && OPERATOR_INITIATED_COMMANDS.has(topLevelArg);
 }
@@ -2483,11 +2559,18 @@ function printForeignInstallError(foreign) {
   Two squadrant installs on this machine will keep fighting over the daemon (#670). Uninstall the one you don't use, then run \`squadrant heal daemon\` to reconcile.
 `;
 }
-function reregisterDaemon(nodeBin = process.execPath) {
-  if (!tryAcquireDaemonLock())
-    return;
+function reregisterDaemon(nodeBin = process.execPath, kickstartOpts = {}) {
+  if (!tryAcquireDaemonLock()) {
+    throw new Error("could not acquire the daemon lock \u2014 another squadrant process is already restarting the daemon");
+  }
   try {
-    applyDaemonDrift(computeDaemonDrift(nodeBin));
+    const drift = computeDaemonDrift(nodeBin);
+    reconcilePlistAndService(drift);
+    const result = forceKickstartAndVerify(drift.target, kickstartOpts);
+    if (!result.restarted) {
+      throw new Error(`daemon did not restart (pid before=${result.pidBefore ?? "none"}, after=${result.pidAfter ?? "none"}) \u2014 \`launchctl kickstart -k ${drift.target}\` ran but the pid never changed`);
+    }
+    return result;
   } finally {
     releaseDaemonLock();
   }
@@ -2875,6 +2958,10 @@ function detectTrailingQuestion(text) {
     return lastLine;
   return null;
 }
+function isQuotedLine(raw) {
+  const noAnsi = raw.replace(/\[[0-9;]*m/g, "");
+  return QUOTED_PREFIX_RE.test(noAnsi);
+}
 function stripChrome(raw) {
   let line = raw.replace(/\[[0-9;]*m/g, "");
   line = line.replace(/^[\s│┃▏▕|]+/, "").replace(/[\s│┃▏▕|]+$/, "");
@@ -2933,8 +3020,11 @@ function classifyPaneTail(tail) {
   if (q)
     return { kind: "question", text: q };
   let errLine = null;
-  for (const c of cleaned) {
-    if (c != null && ERROR_BANNER_RE.some((re) => re.test(c)))
+  for (let i = 0; i < cleaned.length; i++) {
+    const c = cleaned[i];
+    if (c == null || isQuotedLine(raw[i]))
+      continue;
+    if (ERROR_BANNER_RE.some((re) => re.test(c)))
       errLine = c;
   }
   if (errLine)
@@ -2977,6 +3067,22 @@ function createInteractiveProbe(deps) {
       const verdict = classifyPaneTail(tail);
       if (!verdict)
         continue;
+      if (verdict.kind === "error") {
+        const alive = deps.checkAlive ? await deps.checkAlive(rec) : "unknown";
+        if (alive !== "gone") {
+          const message = `CREW WARN ${rec.name}: pane shows an error string \u2014 crew still ${alive}, not terminalized (pane-detected): ${verdict.text}`;
+          deps.log(`probe -> ${message}`);
+          if (deps.notify) {
+            const warnEvent = { type: "task.warn", id: rec.id, message };
+            try {
+              await deps.notify({ project: rec.project, message, record: rec, event: warnEvent });
+            } catch (e) {
+              deps.log(`probe notify failed for ${rec.id}: ${e.message}`);
+            }
+          }
+          continue;
+        }
+      }
       const event = verdict.kind === "error" ? {
         type: "task.failed",
         id: rec.id,
@@ -2998,7 +3104,7 @@ function createInteractiveProbe(deps) {
   }
   return { tick };
 }
-var STALE_THRESHOLD_MS, PROBE_QUIET_MS, ERROR_BANNER_RE, OPTION_RE, PICKER_FOOTER_RE, PURE_CHROME_RE, STATUS_LINE_RE;
+var STALE_THRESHOLD_MS, PROBE_QUIET_MS, ERROR_BANNER_RE, OPTION_RE, PICKER_FOOTER_RE, PURE_CHROME_RE, STATUS_LINE_RE, QUOTED_PREFIX_RE;
 var init_interactive_probe = __esm({
   "packages/core/dist/daemon/interactive-probe.js"() {
     STALE_THRESHOLD_MS = 5 * 60 * 1e3;
@@ -3014,6 +3120,7 @@ var init_interactive_probe = __esm({
     PICKER_FOOTER_RE = /↑↓\s*select|enter\s+submit|esc\s+dismiss/i;
     PURE_CHROME_RE = /^[\s─━│┃╭╮╰╯┌┐└┘├┤┬┴┼═║╔╗╚╝╠╣╦╩╬▁▂▃▄▅▆▇█▔▏▕]+$/;
     STATUS_LINE_RE = /accept edits on|shift\+tab|⏵⏵|\? for shortcuts|esc to interrupt|tokens? (used|left)|context left/i;
+    QUOTED_PREFIX_RE = /^\s*(?:[┃│▏▕]|>|[+-]|\d+[\t:→])\s/;
   }
 });
 
@@ -3029,6 +3136,7 @@ function createProbes(ctx) {
   };
   function buildInteractiveProbe(deps) {
     const directPaneReader = createDirectCrewPaneReader(deps.cmux, captainNameForProject);
+    const checkAlive = createDirectSurfaceLivenessProbe(deps.cmux, captainNameForProject);
     const probe = createInteractiveProbe({
       project: "_all_",
       listTasks: async () => store.listAll(),
@@ -3040,7 +3148,9 @@ function createProbes(ctx) {
         }
       },
       now: () => Date.now(),
-      log
+      log,
+      checkAlive,
+      notify: ctx.notify
     });
     let probing = false;
     return async () => {
@@ -3420,6 +3530,7 @@ async function runCrewSpawn(input, config, deps) {
   const crewRole = config.defaults.roles?.crew;
   const configModel = crewRole && crewRole.agent === agent.name ? crewRole.model : void 0;
   const crewModel = input.model ?? route?.model ?? configModel;
+  const crewThinking = input.thinking ?? config.defaults.roles?.crew?.thinking;
   if (agentName !== "claude") {
     deps.onModelResolved?.({ agentName, model: crewModel });
   }
@@ -3455,7 +3566,8 @@ async function runCrewSpawn(input, config, deps) {
       // crew apart from an unrelated session instead of an auto-derived cwd
       // basename (only the claude driver reads this — other agents ignore it).
       sessionName: crewSessionName(input.project, name),
-      ...crewModel ? { model: crewModel } : {}
+      ...crewModel ? { model: crewModel } : {},
+      ...crewThinking ? { thinking: crewThinking } : {}
     });
     const direction2 = input.direction ?? "tab";
     const title2 = titleFor(input.project, name);
@@ -3463,7 +3575,13 @@ async function runCrewSpawn(input, config, deps) {
     const envPrefix = `SQUADRANT_CREW_TASK_ID=${rec.id} SQUADRANT_CREW_PROJECT=${input.project}`;
     await deps.runtime.sendToPane(pane2, `cd ${shellQuote(spawnCwd)} && ${envPrefix} ${niceCrewCommand(cliCommand2)}`);
     const preLaunchScreen = await deps.runtime.readPaneScreen(pane2) ?? "";
-    const claudeResult = await deps.sendFirstTurn(pane2, `${firstTurnTask}
+    let claudeFirstTurn = firstTurnTask;
+    if (Buffer.byteLength(claudeFirstTurn, "utf8") > FIRST_TURN_INLINE_MAX_BYTES) {
+      const spillFile = path9.join(os4.tmpdir(), `squadrant-task-${rec.id}.md`);
+      fs9.writeFileSync(spillFile, claudeFirstTurn, "utf8");
+      claudeFirstTurn = `Full task is at ${spillFile} \u2014 cat it and follow it exactly.`;
+    }
+    const claudeResult = await deps.sendFirstTurn(pane2, `${claudeFirstTurn}
 
 ${buildCompletionProtocol(rec.id, input.project)}`, preLaunchScreen);
     if (!claudeResult.delivered) {
@@ -3563,7 +3681,7 @@ async function runCrewSend(project, name, message, runtime, workspaceId, deps, o
   if (!crew) {
     throw new Error(`Crew '${name}' not found for ${project}. Run 'squadrant crew list ${project}'.`);
   }
-  const blockedByModalMessage = () => `Crew '${name}' has an interactive prompt open (AskUserQuestion/permission) \u2014 message NOT delivered, to avoid confirming its default option. Wait for the prompt to close, then re-send with 'squadrant crew send ${project} ${name}'.`;
+  const blockedByModalMessage = () => `Crew '${name}' has an interactive prompt open (AskUserQuestion/permission) \u2014 message NOT delivered, to avoid confirming its default option. To answer it deliberately: squadrant crew read ${project} ${name} to see the options, then squadrant crew answer ${project} ${name} <n>.`;
   if (deps.isBlockedByModal && await deps.isBlockedByModal(crew)) {
     throw new Error(blockedByModalMessage());
   }
@@ -3577,10 +3695,12 @@ async function runCrewSend(project, name, message, runtime, workspaceId, deps, o
     const heldForMin = Math.round((Date.now() - task.operatorHold.since) / 6e4);
     throw new Error(`Crew '${name}' is under operator takeover (held ${heldForMin}m${task.operatorHold.note ? `: ${task.operatorHold.note}` : ""}). The operator is working in that tab \u2014 sending a message disrupts their conversation. Ask them to run 'squadrant crew handback ${project} ${name}', or pass --force if they told you to.`);
   }
+  let reopened = false;
   try {
     if (task) {
       if (TERMINAL_STATES.has(task.state)) {
         await deps.emitEvent(project, { type: "task.reopened", id: task.id });
+        reopened = true;
       } else if (task.state === "blocked" || task.state === "awaiting-input" || task.state === "review") {
         await deps.emitEvent(project, { type: "task.started", id: task.id });
       }
@@ -3606,7 +3726,7 @@ async function runCrewSend(project, name, message, runtime, workspaceId, deps, o
       throw new Error(`Message to crew '${name}' is held: ${outcome.reason}. Resolve it in the crew's session, then re-send.`);
     }
     if (!fallsBackToPane(outcome)) {
-      return;
+      return { reopened };
     }
   }
   if (mode === "shadow" && channel && task) {
@@ -3629,7 +3749,7 @@ async function runCrewSend(project, name, message, runtime, workspaceId, deps, o
     if (!paneOk) {
       throw new Error(`Message not delivered to crew '${name}' \u2014 the paste/submit could not be confirmed. Re-send with 'squadrant crew send ${project} ${name}'.`);
     }
-    return;
+    return { reopened };
   }
   const { delivered, blockedByModal } = await deliver(crew, message);
   if (blockedByModal) {
@@ -3638,6 +3758,7 @@ async function runCrewSend(project, name, message, runtime, workspaceId, deps, o
   if (!delivered) {
     throw new Error(`Message not delivered to crew '${name}' \u2014 the paste/submit could not be confirmed. Re-send with 'squadrant crew send ${project} ${name}'.`);
   }
+  return { reopened };
 }
 async function runCrewRead(project, name, runtime, workspaceId) {
   const crew = await findCrewPane(runtime, workspaceId, project, name);
@@ -3740,7 +3861,7 @@ async function runCrewList(project, runtime, workspaceId) {
     surfaceId: c.surfaceId
   }));
 }
-var CC_SOCKS_DIR, TEMPLATES_DIR, STATE_ROOT, CLOSE_LOOKUP_RETRIES, CLOSE_LOOKUP_RETRY_DELAY_MS;
+var CC_SOCKS_DIR, FIRST_TURN_INLINE_MAX_BYTES, TEMPLATES_DIR, STATE_ROOT, CLOSE_LOOKUP_RETRIES, CLOSE_LOOKUP_RETRY_DELAY_MS;
 var init_crew_spawn = __esm({
   "packages/core/dist/crew-spawn.js"() {
     init_control_channel();
@@ -3749,6 +3870,7 @@ var init_crew_spawn = __esm({
     init_crew_protocol();
     init_crew_lifecycle();
     CC_SOCKS_DIR = "/tmp/cc-socks";
+    FIRST_TURN_INLINE_MAX_BYTES = 1200;
     TEMPLATES_DIR = path9.join(os4.homedir(), ".config", "squadrant", "templates");
     STATE_ROOT = path9.join(os4.homedir(), ".config", "squadrant", "state");
     CLOSE_LOOKUP_RETRIES = 3;
@@ -3795,13 +3917,16 @@ var init_captain_channel = __esm({
 function discoverCaptainSurface(surfaces, captainTitle) {
   return surfaces.find((s) => s.title === captainTitle) ?? null;
 }
-function reapOrphanedCrews(store, project) {
+async function reapOrphanedCrews(store, project, isSurfaceAlive) {
   let reaped = 0;
   for (const r of store.list(project)) {
     if (TERMINAL_STATES.has(r.state))
       continue;
     if (r.mode !== "interactive")
       continue;
+    const liveness = await isSurfaceAlive(r);
+    if (liveness !== "gone")
+      continue;
     store.put({ ...r, state: "cancelled", lastEvent: "captain-stopped" });
     reaped++;
   }
@@ -3855,10 +3980,13 @@ async function runLivenessTick(deps) {
     const prev = deps.registry.get(project);
     if (prev && prev.lastState === "start")
       entry.startedAt = prev.startedAt;
+    const prevState = deriveCaptainState(prev);
     deps.registry.apply(entry);
     if (winner.pid != null)
       deps.registry.setPidAlive(project, deps.isPidAlive(winner.pid), now);
-    logEntry(deps.log, project, deps.registry.get(project));
+    const updated = deps.registry.get(project);
+    if (deriveCaptainState(updated) !== prevState)
+      logEntry(deps.log, project, updated);
   }
   for (const e of deps.registry.all()) {
     if (e.role !== "captain" || e.lastState !== "start" || seen.has(e.project))
@@ -3876,12 +4004,13 @@ async function runLivenessTick(deps) {
         continue;
       const state = deriveCaptainState(e);
       if (state === "stopped" || state === "gone")
-        deps.reap(e.project);
+        await deps.reap(e.project);
     }
   }
 }
-function createDelivery(ctx, daemonCmux) {
+function createDelivery(ctx, daemonCmux, isSurfaceAlive) {
   const { stateRoot, store, log, livenessRegistry, isPidAlive, opts, telegramBridge } = ctx;
+  const surfaceProbe = isSurfaceAlive ?? (async () => "unknown");
   const notifyFault = ctx.notifyFault ?? (() => {
   });
   const defaultNotify = async (args) => {
@@ -3904,12 +4033,22 @@ function createDelivery(ctx, daemonCmux) {
     }
   };
   if (!daemonCmux) {
-    return { defaultNotify, deliveryTick: void 0, deliveryStats: () => void 0 };
+    return { defaultNotify, deliveryTick: void 0, deliveryStats: () => void 0, inFlightDelivery: () => null };
   }
   const cmux2 = daemonCmux;
   const cfg = loadConfig();
   const deliveries = /* @__PURE__ */ new Map();
   const deliveryStats = (project) => deliveries.get(project)?.stats();
+  const lastDeferred = /* @__PURE__ */ new Map();
+  const inFlightDelivery = () => {
+    let worst = null;
+    for (const [project, v] of lastDeferred) {
+      if (!worst || v.deferCount > worst.deferCount)
+        worst = { project, ...v };
+    }
+    return worst;
+  };
+  const projectBackoff = /* @__PURE__ */ new Map();
   const stuckNotified = /* @__PURE__ */ new Set();
   const sessionStartMs = Date.now();
   let delivering = false;
@@ -3920,8 +4059,8 @@ function createDelivery(ctx, daemonCmux) {
       isPidAlive,
       now: () => Date.now(),
       log,
-      reap: (project) => {
-        const reaped = reapOrphanedCrews(store, project);
+      reap: async (project) => {
+        const reaped = await reapOrphanedCrews(store, project, surfaceProbe);
         if (reaped > 0) {
           const title = cfg.projects?.[project]?.captainName ?? `${project}-captain`;
           log(`captain ${title}: reaped ${reaped} orphaned crew(s)`);
@@ -3937,82 +4076,116 @@ function createDelivery(ctx, daemonCmux) {
       cfg.commandName
     ])];
     for (const project of allProjects) {
-      const projCfg = cfg.projects?.[project];
-      const captainTitle = project === cfg.commandName ? cfg.commandName : projCfg?.captainName ?? `${project}-captain`;
-      const wsId = cmux2.findWorkspaceId ? await cmux2.findWorkspaceId(captainTitle) : null;
-      let surface = null;
-      if (wsId) {
-        const surfaces = await cmux2.listSurfaces(wsId);
-        surface = discoverCaptainSurface(surfaces, captainTitle);
-      }
-      if (!surface)
-        surface = injectedSurfaces[project] ?? null;
-      if (!surface)
-        continue;
-      const cursor = await readCursor({ stateRoot, project, subscriber: CURSOR_SUBSCRIBER });
-      const lastAcked = cursor?.lastAckedSeq ?? 0;
-      let d = deliveries.get(project);
-      if (!d) {
-        d = new CaptainDelivery({
-          maxDefers: cfg.delivery?.maxDeferDeliveries ?? 300,
-          stableProbePolls: cfg.delivery?.stableProbePolls ?? 3
-        });
-        deliveries.set(project, d);
-      }
-      for await (const entry of readFromCursor({ stateRoot, project, fromSeq: lastAcked + 1 })) {
-        if (new Date(entry.ts).getTime() < sessionStartMs - STALE_THRESHOLD_MS) {
-          if (!TERMINAL_KINDS.has(entry.kind)) {
-            const isExemptMessage = entry.kind === "captain.message" && entry.payload?.source !== "daemon";
-            if (!isExemptMessage) {
-              log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=stale-skipped`);
-              await writeCursor({ stateRoot, project, subscriber: CURSOR_SUBSCRIBER, lastAckedSeq: entry.seq });
-              continue;
+      try {
+        const backoff = projectBackoff.get(project);
+        if (backoff && Date.now() < backoff.nextAttemptAt)
+          continue;
+        const projCfg = cfg.projects?.[project];
+        const captainTitle = project === cfg.commandName ? cfg.commandName : projCfg?.captainName ?? `${project}-captain`;
+        let surface = null;
+        const resolveCaptainSurface = async () => {
+          const wsId = cmux2.findWorkspaceId ? await cmux2.findWorkspaceId(captainTitle) : null;
+          if (!wsId)
+            return injectedSurfaces[project] ?? null;
+          const surfaces = await cmux2.listSurfaces(wsId);
+          return discoverCaptainSurface(surfaces, captainTitle) ?? injectedSurfaces[project] ?? null;
+        };
+        surface = await resolveCaptainSurface();
+        if (!surface)
+          continue;
+        const cursor = await readCursor({ stateRoot, project, subscriber: CURSOR_SUBSCRIBER });
+        const lastAcked = cursor?.lastAckedSeq ?? 0;
+        let d = deliveries.get(project);
+        if (!d) {
+          d = new CaptainDelivery({
+            maxDefers: cfg.delivery?.maxDeferDeliveries ?? 300,
+            stableProbePolls: cfg.delivery?.stableProbePolls ?? 3
+          });
+          deliveries.set(project, d);
+        }
+        for await (const entry of readFromCursor({ stateRoot, project, fromSeq: lastAcked + 1 })) {
+          if (new Date(entry.ts).getTime() < sessionStartMs - STALE_THRESHOLD_MS) {
+            if (!TERMINAL_KINDS.has(entry.kind)) {
+              const isExemptMessage = entry.kind === "captain.message" && entry.payload?.source !== "daemon";
+              if (!isExemptMessage) {
+                log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=stale-skipped`);
+                await writeCursor({ stateRoot, project, subscriber: CURSOR_SUBSCRIBER, lastAckedSeq: entry.seq });
+                continue;
+              }
+              log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=stale-exempt-deliver`);
+            } else {
+              log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=stale-terminal-deliver`);
+            }
+          }
+          const result = await d.deliver(entry, async (text, sendOpts) => {
+            let handledByChannel = false;
+            try {
+              const mode = ctx.captainChannelMode?.() ?? "off";
+              const r = await deliverToCaptain(project, text, {
+                channel: ctx.captainChannel,
+                mode,
+                log
+              });
+              handledByChannel = r.handled;
+            } catch (e) {
+              log(`captain-channel ${project}: threw, falling back to pane \u2014 ${e.message}`);
+            }
+            if (handledByChannel) {
+              return;
+            }
+            try {
+              return await cmux2.send(surface, text, sendOpts);
+            } catch (e) {
+              if (!(e instanceof DeferDelivery) || e.reason !== "probe-failed")
+                throw e;
+              const next = await resolveCaptainSurface();
+              const same = next !== null && next.workspaceId === surface.workspaceId && next.surfaceId === surface.surfaceId;
+              if (!next || same) {
+                log(`delivery project=${project}: probe-failed but surface re-resolution found ${next ? "the same dead surface" : "no captain surface"} \u2014 deferring`);
+                throw e;
+              }
+              log(`delivery project=${project}: probe-failed on ${surface.workspaceId}/${surface.surfaceId} \u2014 re-resolved to ${next.workspaceId}/${next.surfaceId}, retrying`);
+              surface = next;
+              return cmux2.send(next, text, sendOpts);
             }
-            log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=stale-exempt-deliver`);
+          });
+          if ("delivered" in result) {
+            log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=delivered`);
+            await writeCursor({ stateRoot, project, subscriber: CURSOR_SUBSCRIBER, lastAckedSeq: entry.seq });
+            lastDeferred.delete(project);
+            projectBackoff.delete(project);
           } else {
-            log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=stale-terminal-deliver`);
+            const { maxDeferCount, stuck: stuck2 } = d.stats();
+            if (maxDeferCount === 1 || maxDeferCount % 30 === 0) {
+              log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=deferred project=${project} reason=${result.reason}`);
+            }
+            lastDeferred.set(project, { seq: entry.seq, deferCount: maxDeferCount });
+            if (stuck2) {
+              const streak = (projectBackoff.get(project)?.streak ?? 0) + 1;
+              const backoffMs = Math.min(6e4, 1e3 * 2 ** streak);
+              projectBackoff.set(project, { nextAttemptAt: Date.now() + backoffMs, streak });
+            }
+            break;
           }
         }
-        const result = await d.deliver(entry, async (text, sendOpts) => {
-          let handledByChannel = false;
+        const stuck = d.stats().stuck;
+        if (stuck && !stuckNotified.has(project)) {
+          stuckNotified.add(project);
+          const { maxDeferCount, reason } = d.stats();
+          log(`delivery stuck project=${project} deferCount=${maxDeferCount} reason=${reason ?? "unknown"}`);
+          const text = STUCK_ALERT_TEXT[reason ?? "unknown"](maxDeferCount);
           try {
-            const mode = ctx.captainChannelMode?.() ?? "off";
-            const r = await deliverToCaptain(project, text, {
-              channel: ctx.captainChannel,
-              mode,
-              log
-            });
-            handledByChannel = r.handled;
+            await appendCaptainMessage({ stateRoot, project, text, source: "daemon" });
           } catch (e) {
-            log(`captain-channel ${project}: threw, falling back to pane \u2014 ${e.message}`);
-          }
-          if (handledByChannel) {
-            return;
-          }
-          return cmux2.send(surface, text, sendOpts);
-        });
-        if ("delivered" in result) {
-          log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=delivered`);
-          await writeCursor({ stateRoot, project, subscriber: CURSOR_SUBSCRIBER, lastAckedSeq: entry.seq });
-        } else {
-          const { maxDeferCount } = d.stats();
-          if (maxDeferCount === 1 || maxDeferCount % 30 === 0) {
-            log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=deferred project=${project} reason=${result.reason}`);
+            log(`delivery stuck alert failed project=${project}: ${e.message}`);
           }
-          break;
+          Promise.resolve(notifyFault(project, text)).catch((e) => log(`delivery stuck fault-notify failed project=${project}: ${e.message}`));
+          telegramBridge?.pushRaw(project, text);
+        } else if (!stuck && stuckNotified.has(project)) {
+          stuckNotified.delete(project);
         }
-      }
-      const stuck = d.stats().stuck;
-      if (stuck && !stuckNotified.has(project)) {
-        stuckNotified.add(project);
-        const { maxDeferCount, reason } = d.stats();
-        log(`delivery stuck project=${project} deferCount=${maxDeferCount} reason=${reason ?? "unknown"}`);
-        const text = reason === "modal" ? `\u26A0\uFE0F DELIVERY STUCK: a modal question is open in your captain pane and has blocked pending notification(s) for ${maxDeferCount}+ retries. This keeps retrying safely and will deliver automatically once you answer or dismiss it.` : `\u26A0\uFE0F DELIVERY STUCK: an in-progress draft (or ghost text) in your input box has blocked pending notification(s) for ${maxDeferCount}+ retries. Your input is never touched \u2014 this keeps retrying safely and will deliver automatically once you submit or clear it.`;
-        appendCaptainMessage({ stateRoot, project, text, source: "daemon" }).catch((e) => log(`delivery stuck alert failed project=${project}: ${e.message}`));
-        Promise.resolve(notifyFault(project, text)).catch((e) => log(`delivery stuck fault-notify failed project=${project}: ${e.message}`));
-        telegramBridge?.pushRaw(project, text);
-      } else if (!stuck && stuckNotified.has(project)) {
-        stuckNotified.delete(project);
+      } catch (e) {
+        log(`delivery project=${project}: unhandled error \u2014 ${e.message}`);
       }
     }
   };
@@ -4026,19 +4199,28 @@ function createDelivery(ctx, daemonCmux) {
       delivering = false;
     }
   };
-  return { defaultNotify, deliveryTick, deliveryStats };
+  return { defaultNotify, deliveryTick, deliveryStats, inFlightDelivery };
 }
-var CURSOR_SUBSCRIBER, TERMINAL_KINDS;
+var CURSOR_SUBSCRIBER, TERMINAL_KINDS, STUCK_ALERT_TEXT;
 var init_delivery_loop = __esm({
   "packages/core/dist/daemon/delivery-loop.js"() {
     init_mailbox();
     init_captain_delivery();
+    init_defer_delivery();
     init_dist();
     init_interactive_probe();
     init_liveness2();
     init_captain_channel();
     CURSOR_SUBSCRIBER = "captain";
     TERMINAL_KINDS = /* @__PURE__ */ new Set(["task.done", "task.failed", "task.cancelled", "task.blocked"]);
+    STUCK_ALERT_TEXT = {
+      "no-box": (n) => `\u26A0\uFE0F DELIVERY STUCK: your captain pane's input box could not be confirmed visible (an overlay, menu, or scrolled view may be covering it) and has blocked pending notification(s) for ${n}+ retries. This keeps retrying safely and will deliver automatically once the input box is visible again.`,
+      modal: (n) => `\u26A0\uFE0F DELIVERY STUCK: a modal question is open in your captain pane and has blocked pending notification(s) for ${n}+ retries. This keeps retrying safely and will deliver automatically once you answer or dismiss it.`,
+      draft: (n) => `\u26A0\uFE0F DELIVERY STUCK: an in-progress draft (or ghost text) in your input box has blocked pending notification(s) for ${n}+ retries. Your input is never touched \u2014 this keeps retrying safely and will deliver automatically once you submit or clear it.`,
+      "probe-failed": (n) => `\u26A0\uFE0F DELIVERY STUCK: reading your captain pane failed (stale/dead surface reference or cmux unavailable) and has blocked pending notification(s) for ${n}+ retries. Delivery re-resolves the pane automatically; if this persists after a captain restart, bounce the daemon to refresh its surface references.`,
+      stable: (n) => `\u26A0\uFE0F DELIVERY STUCK: pending notification(s) have been blocked for ${n}+ retries. This keeps retrying safely and will deliver automatically once the blocker clears.`,
+      unknown: (n) => `\u26A0\uFE0F DELIVERY STUCK: pending notification(s) have been blocked for ${n}+ retries. This keeps retrying safely and will deliver automatically once the blocker clears.`
+    };
   }
 });
 
@@ -4126,10 +4308,72 @@ var init_server = __esm({
   }
 });
 
+// packages/core/dist/daemon/exit-marker.js
+import { readFileSync as readFileSync8, writeFileSync as writeFileSync8, unlinkSync as unlinkSync3, existsSync as existsSync9 } from "fs";
+import { join as join11 } from "path";
+function exitMarkerPath(stateRoot) {
+  return join11(stateRoot, "exit-marker.json");
+}
+function writeExitMarker(stateRoot, marker, log) {
+  try {
+    writeFileSync8(exitMarkerPath(stateRoot), JSON.stringify(marker));
+  } catch (e) {
+    log(`exit marker write failed: ${e.message}`);
+  }
+}
+function consumeExitMarker(stateRoot, now = Date.now) {
+  const p = exitMarkerPath(stateRoot);
+  if (!existsSync9(p))
+    return { marker: null };
+  let marker = null;
+  try {
+    marker = JSON.parse(readFileSync8(p, "utf-8"));
+  } catch {
+    marker = null;
+  }
+  try {
+    unlinkSync3(p);
+  } catch {
+  }
+  if (!marker)
+    return { marker: null };
+  const gapMs = Math.max(0, now() - new Date(marker.ts).getTime());
+  return { marker, gapMs };
+}
+function runningMarkerPath(stateRoot) {
+  return join11(stateRoot, "running-marker.json");
+}
+function writeRunningMarker(stateRoot, marker, log) {
+  try {
+    writeFileSync8(runningMarkerPath(stateRoot), JSON.stringify(marker));
+  } catch (e) {
+    log(`running marker write failed: ${e.message}`);
+  }
+}
+function readRunningMarker(stateRoot) {
+  try {
+    return JSON.parse(readFileSync8(runningMarkerPath(stateRoot), "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function removeRunningMarker(stateRoot, log) {
+  try {
+    unlinkSync3(runningMarkerPath(stateRoot));
+  } catch (e) {
+    if (e.code !== "ENOENT")
+      log(`running marker remove failed: ${e.message}`);
+  }
+}
+var init_exit_marker = __esm({
+  "packages/core/dist/daemon/exit-marker.js"() {
+  }
+});
+
 // packages/core/dist/daemon/snapshot-gather.js
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { join as join11 } from "path";
-import { statSync as statSync3, openSync as openSync2, readSync, closeSync as closeSync2, readdirSync as readdirSync3, readFileSync as readFileSync8 } from "fs";
+import { join as join12 } from "path";
+import { statSync as statSync3, openSync as openSync2, readSync, closeSync as closeSync2, readdirSync as readdirSync3, readFileSync as readFileSync9 } from "fs";
 function distBuiltAt() {
   try {
     return statSync3(SELF_PATH).mtimeMs;
@@ -4182,7 +4426,7 @@ function gatherStoreStats(store, stateRoot, project) {
   for (const r of store.list(project))
     byState[r.state] = (byState[r.state] ?? 0) + 1;
   let corruptCount = 0;
-  const dir = join11(stateRoot, project);
+  const dir = join12(stateRoot, project);
   try {
     for (const n of readdirSync3(dir)) {
       if (n.includes(".corrupt.")) {
@@ -4192,7 +4436,7 @@ function gatherStoreStats(store, stateRoot, project) {
       if (!n.endsWith(".json"))
         continue;
       try {
-        JSON.parse(readFileSync8(join11(dir, n), "utf-8"));
+        JSON.parse(readFileSync9(join12(dir, n), "utf-8"));
       } catch {
         corruptCount++;
       }
@@ -4207,7 +4451,7 @@ function gatherResults(resultsDir) {
   try {
     for (const n of readdirSync3(resultsDir)) {
       try {
-        const s = statSync3(join11(resultsDir, n));
+        const s = statSync3(join12(resultsDir, n));
         if (s.isFile()) {
           fileCount++;
           totalBytes += s.size;
@@ -4227,19 +4471,20 @@ var init_snapshot_gather = __esm({
 });
 
 // packages/core/dist/daemon/start.js
-import { join as join12, dirname as dirname3 } from "path";
+import { join as join13, dirname as dirname3 } from "path";
 import { readdir } from "fs/promises";
 function startDaemon(ctx, opts, pkgVersion) {
   const { stateRoot, store, log, isPidAlive, resultsDir, taskTimeoutMs, inFlightHeadlessIds, activeHeadlessKills, broadcast, cancelPromotionsFor } = ctx;
   const { daemonCmux } = ctx;
   const probes = createProbes(ctx);
-  const { defaultNotify, deliveryTick: initialDeliveryTick, deliveryStats } = createDelivery(ctx, daemonCmux);
+  const surfaceProbe = buildSurfaceProbe(ctx, probes, daemonCmux);
+  const { defaultNotify, deliveryTick: initialDeliveryTick, deliveryStats, inFlightDelivery } = createDelivery(ctx, daemonCmux, surfaceProbe);
   const baseNotify = opts.notify ?? defaultNotify;
   const notify = ctx.telegramBridge ? async (args) => {
     await baseNotify(args);
     ctx.telegramBridge.pushLifecycle(args.project, args.event);
   } : baseNotify;
-  const surfaceProbe = buildSurfaceProbe(ctx, probes, daemonCmux);
+  ctx.notify = notify;
   const ingest = (project) => (e) => void ctx.d.handle({ kind: "event", project, event: e });
   const d = createDaemon({
     store,
@@ -4303,7 +4548,7 @@ function startDaemon(ctx, opts, pkgVersion) {
     return out;
   }
   async function gatherSnapshotInputs(now) {
-    const logPath2 = join12(dirname3(stateRoot), "squadrantd.log");
+    const logPath2 = join13(dirname3(stateRoot), "squadrantd.log");
     const tier2Projects = opts.registeredProjects ?? Object.keys(loadConfig().projects);
     const projects = await Promise.all(tier2Projects.map(async (project) => {
       const cursor = await readCursor({ stateRoot, project, subscriber: CURSOR_SUBSCRIBER2 });
@@ -4396,6 +4641,33 @@ function startDaemon(ctx, opts, pkgVersion) {
   })();
   const server = createServer2(ctx, { buildHealth, gatherSnapshotInputs, cancelPromotionsFor, broadcast });
   log(`boot pid=${process.pid} version=${pkgVersion} socket=${ctx.sockPath} stateRoot=${stateRoot}`);
+  const bootTs = (/* @__PURE__ */ new Date()).toISOString();
+  {
+    const sendDownAlert = (minutes, reasonText) => {
+      const text = `\u26A0\uFE0F daemon was down for ${minutes} min (last exit reason=${reasonText})`;
+      const alertProjects = opts.registeredProjects ?? Object.keys(loadConfig().projects);
+      for (const project of alertProjects) {
+        appendCaptainMessage({ stateRoot, project, text, source: "daemon" }).catch((e) => log(`boot-gap alert failed project=${project}: ${e.message}`));
+      }
+    };
+    const { marker, gapMs } = consumeExitMarker(stateRoot);
+    const prevRunning = readRunningMarker(stateRoot);
+    if (marker) {
+      log(`previous exit ts=${marker.ts} reason=${marker.reason} gap=${((gapMs ?? 0) / 1e3).toFixed(1)}s`);
+      if ((gapMs ?? 0) > 6e4)
+        sendDownAlert(Math.round((gapMs ?? 0) / 6e4), marker.reason);
+    } else if (prevRunning) {
+      const lastHeartbeatMs = new Date(prevRunning.lastHeartbeatTs).getTime();
+      const uncleanGapMs = Math.max(0, Date.now() - lastHeartbeatMs);
+      log(`previous exit: UNCLEAN (no marker; last heartbeat ${prevRunning.lastHeartbeatTs}, gap=${(uncleanGapMs / 1e3).toFixed(1)}s)`);
+      if (uncleanGapMs > 6e4) {
+        sendDownAlert(Math.round(uncleanGapMs / 6e4), "unclean/unknown \u2014 no exit marker, likely SIGKILL/OOM/power-loss");
+      }
+    } else {
+      log("previous exit: none (clean or first boot)");
+    }
+    writeRunningMarker(stateRoot, { pid: process.pid, bootTs, lastHeartbeatTs: bootTs }, log);
+  }
   let deliveryTick = initialDeliveryTick;
   let probeTick;
   if (daemonCmux) {
@@ -4436,9 +4708,10 @@ function startDaemon(ctx, opts, pkgVersion) {
     keepCount: opts.mailboxConfig?.keepCount ?? 3
   };
   let rotationTimer;
+  let rotationTick;
   if (rotationInterval > 0) {
-    const inboxPath = join12(stateRoot, "inbox");
-    rotationTimer = setInterval(async () => {
+    const inboxPath = join13(stateRoot, "inbox");
+    rotationTick = async () => {
       try {
         let entries;
         try {
@@ -4451,13 +4724,23 @@ function startDaemon(ctx, opts, pkgVersion) {
           await rotateIfNeeded({ stateRoot, project, ...mboxCfg });
       } catch (e) {
         log(`rotation timer error: ${e.message}`);
+      } finally {
+        writeRunningMarker(stateRoot, { pid: process.pid, bootTs, lastHeartbeatTs: (/* @__PURE__ */ new Date()).toISOString() }, log);
       }
+    };
+    rotationTimer = setInterval(() => {
+      void rotationTick();
     }, rotationInterval);
     rotationTimer.unref?.();
   }
   return {
     stop(reason = "requested") {
-      log(`exit pid=${process.pid} reason=${reason}`);
+      const ppid = process.ppid;
+      const uptimeMs = Math.round(process.uptime() * 1e3);
+      const inFlight = inFlightDelivery();
+      log(`exit pid=${process.pid} reason=${reason} ppid=${ppid} launchd=${ppid === 1} uptimeMs=${uptimeMs} inFlightDelivery=${inFlight ? `${inFlight.project}#${inFlight.seq}(defers=${inFlight.deferCount})` : "none"}`);
+      writeExitMarker(stateRoot, { ts: (/* @__PURE__ */ new Date()).toISOString(), pid: process.pid, reason, ppid, uptimeMs, inFlightDelivery: inFlight }, log);
+      removeRunningMarker(stateRoot, log);
       if (deliveryTimer)
         clearInterval(deliveryTimer);
       if (probeTimer)
@@ -4486,7 +4769,8 @@ function startDaemon(ctx, opts, pkgVersion) {
       }));
     },
     tickDelivery: deliveryTick,
-    tickProbe: probeTick
+    tickProbe: probeTick,
+    tickRotation: rotationTick
   };
 }
 var CURSOR_SUBSCRIBER2, SNAPSHOT_LOG_WINDOW_MS;
@@ -4498,6 +4782,7 @@ var init_start = __esm({
     init_gates();
     init_server();
     init_mailbox();
+    init_exit_marker();
     init_liveness2();
     init_dist();
     init_snapshot_gather();
@@ -5492,9 +5777,9 @@ var init_bridge = __esm({
 
 // packages/core/dist/restart-daemon.js
 import { execFileSync as execFileSync4 } from "child_process";
-import { existsSync as existsSync9 } from "fs";
+import { existsSync as existsSync10 } from "fs";
 function defaultIsRunning() {
-  return existsSync9(DAEMON_SOCK_PATH);
+  return existsSync10(DAEMON_SOCK_PATH);
 }
 function defaultRunKickstart() {
   const uid = process.getuid?.() ?? 0;
@@ -6032,6 +6317,76 @@ var init_side_session = __esm({
   }
 });
 
+// packages/core/dist/crew-answer.js
+function describeOptions(options) {
+  return options.map((o) => `  ${o.highlighted ? "\u276F" : " "} ${o.index}. ${o.label}`).join("\n");
+}
+function resolveOption(options, selector) {
+  const trimmed = selector.trim();
+  if (/^\d+$/.test(trimmed)) {
+    const byIndex = options.find((o) => o.index === Number(trimmed));
+    if (!byIndex) {
+      throw new Error(`No option ${trimmed} in the visible prompt. Visible options:
+${describeOptions(options)}`);
+    }
+    return byIndex;
+  }
+  const lower = trimmed.toLowerCase();
+  const exact = options.filter((o) => o.label.toLowerCase() === lower);
+  if (exact.length === 1)
+    return exact[0];
+  if (exact.length > 1) {
+    throw new Error(`Option text "${selector}" matches multiple options ambiguously:
+${describeOptions(exact)}`);
+  }
+  const prefix = options.filter((o) => o.label.toLowerCase().startsWith(lower));
+  if (prefix.length === 1)
+    return prefix[0];
+  if (prefix.length > 1) {
+    throw new Error(`Option text "${selector}" matches multiple options ambiguously:
+${describeOptions(prefix)}`);
+  }
+  throw new Error(`No option matches "${selector}". Visible options:
+${describeOptions(options)}`);
+}
+async function runCrewAnswer(project, name, option, runtime, workspaceId, deps, opts) {
+  const crew = await findCrewPane(runtime, workspaceId, project, name);
+  if (!crew) {
+    throw new Error(`Crew '${name}' not found for ${project}. Run 'squadrant crew list ${project}'.`);
+  }
+  const options = await deps.readModalOptions(crew);
+  if (!options) {
+    throw new Error(`Crew '${name}' has no interactive option prompt visible right now \u2014 nothing to answer. Read its screen with 'squadrant crew read ${project} ${name}' to check its state.`);
+  }
+  const target = resolveOption(options, option);
+  if (opts?.expect && !target.label.toLowerCase().includes(opts.expect.toLowerCase())) {
+    throw new Error(`Refusing: option ${target.index} is "${target.label}", which does not contain expected text "${opts.expect}". Option order is model-generated and can shift between renders \u2014 re-check with 'squadrant crew read ${project} ${name}'.
+Visible options:
+${describeOptions(options)}`);
+  }
+  const log = deps.log ?? (() => {
+  });
+  log(`\u2192 selecting ${target.index}. "${target.label}"`);
+  const current = options.find((o) => o.highlighted) ?? options[0];
+  const steps = target.index - current.index;
+  const key = steps >= 0 ? "Down" : "Up";
+  for (let i = 0; i < Math.abs(steps); i++) {
+    await runtime.sendKeyToPane(crew, key);
+  }
+  await runtime.sendKeyToPane(crew, "Enter");
+  if (opts?.text) {
+    await runtime.pasteToPane(crew, opts.text);
+    await runtime.sendKeyToPane(crew, "Enter");
+  }
+  const after = await deps.readModalOptions(crew);
+  return { selected: target, closed: after === null };
+}
+var init_crew_answer = __esm({
+  "packages/core/dist/crew-answer.js"() {
+    init_crew_spawn();
+  }
+});
+
 // packages/core/dist/lifecycle-source.js
 function reduceLifecycle(prev, next) {
   if (next.origin === "agent") {
@@ -6066,6 +6421,7 @@ __export(dist_exports, {
   DEFAULT_FIRST_TURN_UNDELIVERED_BUDGET_MS: () => DEFAULT_FIRST_TURN_UNDELIVERED_BUDGET_MS,
   DEFAULT_TASK_TIMEOUT_MS: () => DEFAULT_TASK_TIMEOUT_MS,
   DeferDelivery: () => DeferDelivery,
+  FIRST_TURN_INLINE_MAX_BYTES: () => FIRST_TURN_INLINE_MAX_BYTES,
   GROUP_DISPATCH_WARMUP_POLL_MS: () => GROUP_DISPATCH_WARMUP_POLL_MS,
   GROUP_DISPATCH_WARMUP_TIMEOUT_MS: () => GROUP_DISPATCH_WARMUP_TIMEOUT_MS,
   IDLE_DEBOUNCE_MS: () => IDLE_DEBOUNCE_MS,
@@ -6098,6 +6454,7 @@ __export(dist_exports, {
   classifyHealth: () => classifyHealth,
   closeWorkItem: () => closeWorkItem,
   computeTemplateHash: () => computeTemplateHash,
+  consumeExitMarker: () => consumeExitMarker,
   createAttach: () => createAttach,
   createCrewPaneReader: () => createCrewPaneReader,
   createDaemon: () => createDaemon,
@@ -6138,13 +6495,17 @@ __export(dist_exports, {
   encodeMsg: () => encodeMsg,
   ensureDaemon: () => ensureDaemon,
   evaluateStall: () => evaluateStall,
+  exitMarkerPath: () => exitMarkerPath,
   fallsBackToPane: () => fallsBackToPane,
+  findCrewPane: () => findCrewPane,
   findOpenChildren: () => findOpenChildren,
   findProjectByThread: () => findProjectByThread,
   findWorkItemById: () => findWorkItemById,
+  forceKickstartAndVerify: () => forceKickstartAndVerify,
   formatInbound: () => formatInbound,
   formatInboundReceipt: () => formatInboundReceipt,
   formatLifecycle: () => formatLifecycle,
+  getDaemonPid: () => getDaemonPid,
   healCmdFor: () => healCmdFor,
   isAuthorized: () => isAuthorized,
   isBareSpawn: () => isBareSpawn,
@@ -6179,6 +6540,7 @@ __export(dist_exports, {
   purgeExpiredWorkItems: () => purgeExpiredWorkItems,
   readCursor: () => readCursor,
   readFromCursor: () => readFromCursor,
+  readRunningMarker: () => readRunningMarker,
   reapCrewChildren: () => reapCrewChildren,
   reapOrphanedCrews: () => reapOrphanedCrews,
   reconcileLiveness: () => reconcileLiveness,
@@ -6187,6 +6549,7 @@ __export(dist_exports, {
   reduce: () => reduce,
   reduceLifecycle: () => reduceLifecycle,
   releaseDaemonLock: () => releaseDaemonLock,
+  removeRunningMarker: () => removeRunningMarker,
   renderPlist: () => renderPlist,
   reregisterDaemon: () => reregisterDaemon,
   resolveAgentBinDirs: () => resolveAgentBinDirs,
@@ -6198,6 +6561,7 @@ __export(dist_exports, {
   resolveSetupUserId: () => resolveSetupUserId,
   restartDaemonIfRunning: () => restartDaemonIfRunning,
   rotateIfNeeded: () => rotateIfNeeded,
+  runCrewAnswer: () => runCrewAnswer,
   runCrewClose: () => runCrewClose,
   runCrewList: () => runCrewList,
   runCrewRead: () => runCrewRead,
@@ -6217,6 +6581,7 @@ __export(dist_exports, {
   runTelegramPostSetup: () => runTelegramPostSetup,
   runTelegramSend: () => runTelegramSend,
   runTelegramStatus: () => runTelegramStatus,
+  runningMarkerPath: () => runningMarkerPath,
   sanitizePathForPlist: () => sanitizePathForPlist,
   saveSessions: () => saveSessions,
   saveState: () => saveState,
@@ -6242,6 +6607,8 @@ __export(dist_exports, {
   waitForCaptainDelivery: () => waitForCaptainDelivery,
   waitForWarmup: () => waitForWarmup,
   writeCursor: () => writeCursor,
+  writeExitMarker: () => writeExitMarker,
+  writeRunningMarker: () => writeRunningMarker,
   writeTelegramConfig: () => writeTelegramConfig
 });
 var init_dist2 = __esm({
@@ -6264,6 +6631,7 @@ var init_dist2 = __esm({
     init_attach();
     init_start();
     init_delivery_loop();
+    init_exit_marker();
     init_interactive_probe();
     init_captain_delivery();
     init_defer_delivery();
@@ -6277,6 +6645,7 @@ var init_dist2 = __esm({
     init_launch_workspace();
     init_side_session();
     init_crew_spawn();
+    init_crew_answer();
     init_lifecycle_source();
     init_control_channel();
     init_captain_channel();
@@ -6294,9 +6663,10 @@ init_dist2();
 init_dist2();
 init_dist2();
 init_dist2();
-import { join as join20, dirname as dirname4, resolve as resolve3 } from "path";
+import { join as join22, dirname as dirname4, resolve as resolve3 } from "path";
+import { homedir as homedir13 } from "os";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { readFileSync as readFileSync14, statSync as statSync4, existsSync as existsSync12 } from "fs";
+import { readFileSync as readFileSync15, statSync as statSync4, existsSync as existsSync13 } from "fs";
 
 // packages/agents/dist/drivers/claude.js
 import { execSync as execSync2 } from "child_process";
@@ -6612,10 +6982,10 @@ function toSnapshot(ev) {
 // packages/agents/dist/codex/config.js
 import { readFile as readFile6 } from "fs/promises";
 import { homedir as homedir7 } from "os";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 async function resolveCodexModel() {
-  const home = process.env["CODEX_HOME"] ?? join13(homedir7(), ".codex");
-  const configPath = join13(home, "config.toml");
+  const home = process.env["CODEX_HOME"] ?? join14(homedir7(), ".codex");
+  const configPath = join14(home, "config.toml");
   let text;
   try {
     text = await readFile6(configPath, "utf8");
@@ -7105,9 +7475,9 @@ var OpencodeSseBridge = class {
 
 // packages/agents/dist/interactive/claude.js
 import { execSync as execSync6 } from "child_process";
-import { readFileSync as readFileSync9 } from "fs";
+import { readFileSync as readFileSync10 } from "fs";
 import { homedir as homedir8 } from "os";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 var nextAskUserQuestionRequestId = Date.now();
 
 // packages/agents/dist/headless/types.js
@@ -7271,14 +7641,14 @@ function runHeadless(opts) {
 }
 
 // packages/agents/dist/claude/peer-registry-source.js
-import { readdirSync as readdirSync4, readFileSync as readFileSync10 } from "fs";
-import { join as join16 } from "path";
+import { readdirSync as readdirSync4, readFileSync as readFileSync11 } from "fs";
+import { join as join17 } from "path";
 
 // packages/agents/dist/claude/registry.js
 import fs14 from "fs";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 import { homedir as homedir9 } from "os";
-var CLAUDE_SESSIONS_DIR = join15(homedir9(), ".claude", "sessions");
+var CLAUDE_SESSIONS_DIR = join16(homedir9(), ".claude", "sessions");
 var PID_JSON = /^(\d+)\.json$/;
 function parseRegistryDir(files, readFile7) {
   const out = [];
@@ -7324,7 +7694,7 @@ function readClaudeStatusBySocketPath(socketPath) {
   } catch {
     return void 0;
   }
-  const entries = parseRegistryDir(files, (name) => fs14.readFileSync(join15(CLAUDE_SESSIONS_DIR, name), "utf8"));
+  const entries = parseRegistryDir(files, (name) => fs14.readFileSync(join16(CLAUDE_SESSIONS_DIR, name), "utf8"));
   const entry = entries.find((e) => e.messagingSocketPath === socketPath);
   if (!entry)
     return void 0;
@@ -7356,7 +7726,7 @@ var ClaudePeerRegistrySource = class {
   log;
   constructor(o = {}) {
     this.readdir = o.readdir ?? (() => readdirSync4(CLAUDE_SESSIONS_DIR));
-    this.readFile = o.readFile ?? ((n) => readFileSync10(join16(CLAUDE_SESSIONS_DIR, n), "utf8"));
+    this.readFile = o.readFile ?? ((n) => readFileSync11(join17(CLAUDE_SESSIONS_DIR, n), "utf8"));
     this.isAlive = o.isAlive ?? defaultIsAlive;
     this.now = o.now ?? Date.now;
     this.pollMs = o.pollMs ?? 2e3;
@@ -8133,7 +8503,10 @@ function createCmuxDriver() {
       let screen = "";
       try {
         screen = await cmux(["read-screen", "--workspace", ws, "--surface", sf]);
-      } catch {
+      } catch (e) {
+        process.stderr.write(`[squadrant] read-screen failed for ${ws}/${sf}: ${e.message}
+`);
+        throw new DeferDelivery(null, "probe-failed");
       }
       const draft = parseDraftFromScreen(screen);
       if (draft === null)
@@ -8333,7 +8706,7 @@ var NotifierRegistry = class {
 
 // packages/workspaces/dist/workspaces/obsidian.js
 import fs15 from "fs/promises";
-import { existsSync as existsSync10 } from "fs";
+import { existsSync as existsSync11 } from "fs";
 import path19 from "path";
 
 // packages/workspaces/dist/workspaces/registry.js
@@ -8449,6 +8822,16 @@ var CmuxEventsBridge = class {
     }
     if (f?.type !== "event" || f.category !== "agent")
       return;
+    if (f.name === "agent.hook.PostToolUse") {
+      const p2 = f.payload ?? {};
+      if (p2.phase === "received")
+        return;
+      const rec2 = this.deps.resolve({ cwd: p2.cwd, source: p2._source ?? f.source, sessionId: p2.session_id });
+      if (!rec2)
+        return;
+      this.deps.emit({ type: "task.progress", id: rec2.id, note: f.name });
+      return;
+    }
     const runState = f.name ? deriveRunState(f.name) : null;
     if (!runState)
       return;
@@ -8477,8 +8860,8 @@ var CmuxEventsBridge = class {
 // packages/workspaces/dist/cmux-daemon/daemon-cmux.js
 init_dist2();
 init_dist();
-import { readdirSync as readdirSync5, readFileSync as readFileSync11 } from "fs";
-import { join as join17 } from "path";
+import { readdirSync as readdirSync5, readFileSync as readFileSync12 } from "fs";
+import { join as join18 } from "path";
 import { homedir as homedir10 } from "os";
 
 // packages/workspaces/dist/cmux-daemon/store-fingerprint.js
@@ -8576,7 +8959,7 @@ function readLivenessSnapshot(files, readFile7, projects, argvRecovery = {}) {
 
 // packages/workspaces/dist/cmux-daemon/daemon-cmux.js
 async function readCmuxLiveness() {
-  const dir = process.env.CMUX_AGENT_HOOK_STATE_DIR ?? join17(homedir10(), ".cmuxterm");
+  const dir = process.env.CMUX_AGENT_HOOK_STATE_DIR ?? join18(homedir10(), ".cmuxterm");
   const projects = loadConfig().projects;
   let files;
   try {
@@ -8584,7 +8967,7 @@ async function readCmuxLiveness() {
   } catch (e) {
     throw new Error(`liveness: could not read cmux state dir ${dir}: ${e.message}`);
   }
-  return readLivenessSnapshot(files, (f) => readFileSync11(join17(dir, f), "utf-8"), projects);
+  return readLivenessSnapshot(files, (f) => readFileSync12(join18(dir, f), "utf-8"), projects);
 }
 var DaemonCmux = class {
   driver;
@@ -8647,9 +9030,9 @@ var DaemonCmux = class {
 };
 
 // packages/workspaces/dist/cmux-daemon/cmux-store-source.js
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 import { homedir as homedir11 } from "os";
-import { watch, readdirSync as readdirSync6, readFileSync as readFileSync12, existsSync as existsSync11 } from "fs";
+import { watch, readdirSync as readdirSync6, readFileSync as readFileSync13, existsSync as existsSync12 } from "fs";
 var CmuxStoreSource = class {
   name = "cmux-store";
   stateDir;
@@ -8670,12 +9053,12 @@ var CmuxStoreSource = class {
   active = false;
   lastError = null;
   constructor(opts = {}) {
-    this.stateDir = opts.stateDir ?? process.env.CMUX_AGENT_HOOK_STATE_DIR ?? join18(homedir11(), ".cmuxterm");
+    this.stateDir = opts.stateDir ?? process.env.CMUX_AGENT_HOOK_STATE_DIR ?? join19(homedir11(), ".cmuxterm");
     this.debounceMs = opts.debounceMs ?? 50;
     this.isPidAlive = opts.isPidAlive ?? defaultIsPidAlive2;
     this.listFiles = opts.listFiles ?? defaultListFiles;
     this.readFile = opts.readFile ?? defaultReadFile;
-    this.fileExists = opts.fileExists ?? existsSync11;
+    this.fileExists = opts.fileExists ?? existsSync12;
     this.watchDir = opts.watchDir ?? defaultWatchDir;
     this.scheduleTimer = opts.scheduleTimer ?? setTimeout;
     this.cancelTimer = opts.cancelTimer ?? clearTimeout;
@@ -8732,7 +9115,7 @@ var CmuxStoreSource = class {
   }
   scanFile(filename) {
     const deps = this.deps;
-    const filePath = join18(this.stateDir, filename);
+    const filePath = join19(this.stateDir, filename);
     const lockPath = `${filePath}.lock`;
     if (this.fileExists(lockPath)) {
       this.log(`cmux-store: skipping ${filename} (locked)`);
@@ -8805,7 +9188,7 @@ function defaultListFiles(dir) {
 }
 function defaultReadFile(path21) {
   try {
-    return readFileSync12(path21, "utf-8");
+    return readFileSync13(path21, "utf-8");
   } catch {
     return void 0;
   }
@@ -8820,9 +9203,9 @@ function defaultWatchDir(dir, cb) {
 }
 
 // packages/workspaces/dist/native-hooks/native-hook-source.js
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 import { homedir as homedir12 } from "os";
-import { mkdirSync as mkdirSync6, readFileSync as readFileSync13, writeFileSync as writeFileSync8 } from "fs";
+import { mkdirSync as mkdirSync6, readFileSync as readFileSync14, writeFileSync as writeFileSync9 } from "fs";
 var CLAUDE_HOOK_EVENTS = [
   ["SessionStart", "session-start"],
   ["UserPromptSubmit", "prompt-submit"],
@@ -8834,7 +9217,7 @@ var CLAUDE_HOOK_EVENTS = [
 ];
 var DEFAULT_HOOK_CMD = "squadrant hooks";
 function installClaudeHooks(opts = {}) {
-  const settingsPath = opts.settingsPath ?? join19(homedir12(), ".claude", "settings.json");
+  const settingsPath = opts.settingsPath ?? join20(homedir12(), ".claude", "settings.json");
   const hookCmd = opts.hookCmd ?? DEFAULT_HOOK_CMD;
   const readFile7 = opts.readFile ?? defaultReadFile2;
   const writeFile6 = opts.writeFile ?? defaultWriteFile;
@@ -9004,14 +9387,14 @@ function extractDetail(sub, payload) {
 }
 function defaultReadFile2(path21) {
   try {
-    return readFileSync13(path21, "utf-8");
+    return readFileSync14(path21, "utf-8");
   } catch {
     return void 0;
   }
 }
 function defaultWriteFile(path21, content) {
   mkdirSync6(path21.replace(/\/[^/]+$/, ""), { recursive: true });
-  writeFileSync8(path21, content, "utf-8");
+  writeFileSync9(path21, content, "utf-8");
 }
 
 // packages/workspaces/dist/crew-pane.js
@@ -9139,27 +9522,56 @@ async function maybeBroadcastDaemonRestart(opts) {
 
 // packages/cli/src/lib/captain-channel-factory.ts
 import { createServer as createServer3, connect as netConnect } from "net";
-import { unlinkSync as unlinkSync3 } from "fs";
+import fs16 from "fs";
+import { join as join21 } from "path";
 import { randomUUID as randomUUID5 } from "crypto";
 import chalk2 from "chalk";
 init_dist2();
 var shared;
+var registryEntryPath = () => join21(CLAUDE_SESSIONS_DIR, `${process.pid}.json`);
+function unregisterSenderIdentity() {
+  try {
+    fs16.unlinkSync(registryEntryPath());
+  } catch {
+  }
+}
+function registerSenderIdentity(socketPath) {
+  try {
+    unregisterSenderIdentity();
+    fs16.mkdirSync(CLAUDE_SESSIONS_DIR, { recursive: true });
+    fs16.writeFileSync(
+      registryEntryPath(),
+      JSON.stringify({
+        pid: process.pid,
+        sessionId: randomUUID5(),
+        name: "squadrantd",
+        messagingSocketPath: socketPath,
+        kind: "daemon",
+        peerProtocol: 1
+      })
+    );
+    process.on("exit", unregisterSenderIdentity);
+  } catch {
+  }
+}
 async function sharedReceiptListener() {
   if (shared) return shared;
+  const socketPath = `${CC_SOCKS_DIR}/squadrantd-${process.pid}.sock`;
   const listener = new ClaudeReceiptListener({
-    socketPath: `${CC_SOCKS_DIR}/squadrantd-${process.pid}.sock`,
+    socketPath,
     createServer: (h) => createServer3(h),
     // A UDS path is not cleaned up when a process is killed, so our own leftover
     // must never be the reason we refuse to start.
     unlinkStale: (p) => {
       try {
-        unlinkSync3(p);
+        fs16.unlinkSync(p);
       } catch {
       }
     },
     log: (m) => console.error(chalk2.dim(m))
   });
   await listener.start();
+  registerSenderIdentity(socketPath);
   shared = listener;
   return shared;
 }
@@ -9207,11 +9619,11 @@ async function buildCaptainChannelWithRetry(opts = {}) {
 
 // packages/cli/src/squadrantd.ts
 var SELF_PATH2 = fileURLToPath3(import.meta.url);
-var CLI_BIN = join20(dirname4(SELF_PATH2), "index.js");
+var CLI_BIN = join22(dirname4(SELF_PATH2), "index.js");
 function readPkgVersion() {
   try {
-    const pkgPath = join20(dirname4(SELF_PATH2), "..", "package.json");
-    return JSON.parse(readFileSync14(pkgPath, "utf-8")).version ?? "unknown";
+    const pkgPath = join22(dirname4(SELF_PATH2), "..", "package.json");
+    return JSON.parse(readFileSync15(pkgPath, "utf-8")).version ?? "unknown";
   } catch {
     return "unknown";
   }
@@ -9328,7 +9740,7 @@ function startSquadrantd(opts = {}) {
         (r) => r.mode === "interactive" && !TERMINAL_STATES.has(r.state) && r.cwd === hook.cwd
       );
     },
-    cursorFile: join20(stateRoot, "cmux-events.seq"),
+    cursorFile: join22(stateRoot, "cmux-events.seq"),
     log
   });
   const cmuxStoreSource = new CmuxStoreSource({ log });
@@ -9584,9 +9996,20 @@ function logCrashMarker(kind, err) {
   const message = err instanceof Error ? err.stack ?? err.message : String(err);
   process.stderr.write(`[squadrantd] ${(/* @__PURE__ */ new Date()).toISOString()} ${kind} pid=${process.pid} error=${message}
 `);
-}
-function isMonorepoCheckout(scriptPath, dirExists = existsSync12) {
-  return dirExists(join20(dirname4(resolve3(scriptPath)), "..", "packages"));
+  const stateRoot = join22(homedir13(), ".config", "squadrant", "state");
+  writeExitMarker(stateRoot, {
+    ts: (/* @__PURE__ */ new Date()).toISOString(),
+    pid: process.pid,
+    reason: kind,
+    ppid: process.ppid,
+    uptimeMs: Math.round(process.uptime() * 1e3),
+    inFlightDelivery: null
+    // crash path has no access to the delivery loop's live state
+  }, (m) => process.stderr.write(`[squadrantd] ${(/* @__PURE__ */ new Date()).toISOString()} ${m}
+`));
+}
+function isMonorepoCheckout(scriptPath, dirExists = existsSync13) {
+  return dirExists(join22(dirname4(resolve3(scriptPath)), "..", "packages"));
 }
 function isLinkedWorktree(scriptPath, statFile = (p) => {
   try {
@@ -9595,7 +10018,7 @@ function isLinkedWorktree(scriptPath, statFile = (p) => {
     return void 0;
   }
 }) {
-  const dotGit = join20(dirname4(resolve3(scriptPath)), "..", ".git");
+  const dotGit = join22(dirname4(resolve3(scriptPath)), "..", ".git");
   return statFile(dotGit)?.isFile === true;
 }
 if (process.argv[1] && process.argv[1].endsWith("squadrantd.js")) {