squadrant 0.16.5 → 0.17.0

package/dist/squadrantd.js

@@ -60,10 +60,10 @@ var init_snapshot = __esm({
 });
 
 // packages/cli/src/squadrantd.ts
-import { join as join18, dirname as dirname5 } from "path";
-import { homedir as homedir13 } from "os";
+import { join as join19, dirname as dirname5 } from "path";
+import { homedir as homedir14 } from "os";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { readFileSync as readFileSync13, statSync as statSync3 } from "fs";
+import { readFileSync as readFileSync14, statSync as statSync4 } from "fs";
 
 // packages/shared/dist/config.js
 import fs from "fs";
@@ -500,6 +500,11 @@ function nextPendingTool(current, ev, now) {
     return void 0;
   return current;
 }
+function nextPendingMonitor(current, ev, now) {
+  if (ev.note === "agent.hook.PreToolUse" && ev.tool === "Monitor")
+    return { since: now };
+  return current;
+}
 function reduce(rec, ev, now) {
   if (ev.type === "task.reopened") {
     return { ...rec, state: "working", question: void 0, error: void 0, lastHeartbeat: now, lastEvent: ev.type };
@@ -516,14 +521,17 @@ function reduce(rec, ev, now) {
         sessionId: ev.sessionId ?? rec.sessionId,
         question: void 0,
         // resuming after a blocked→reply clears the question
-        pendingTool: void 0
+        pendingTool: void 0,
         // #354: a new turn closes any prior tool window
+        pendingMonitor: void 0
+        // #594a: same reset — a new turn moots any prior watch
       };
     case "task.progress": {
       const pendingTool = nextPendingTool(rec.pendingTool, ev, now);
+      const pendingMonitor = nextPendingMonitor(rec.pendingMonitor, ev, now);
       if (isStickyAttention(rec.state))
-        return { ...rec, lastHeartbeat: now, lastEvent: ev.type, pendingTool };
-      const b = { ...base, pendingTool };
+        return { ...rec, lastHeartbeat: now, lastEvent: ev.type, pendingTool, pendingMonitor };
+      const b = { ...base, pendingTool, pendingMonitor };
       if (rec.state === "awaiting-input" || rec.state === "stalled")
         return { ...stampAttempt(b, {}, now), state: "working" };
       return stampAttempt(b, {}, now);
@@ -537,9 +545,9 @@ function reduce(rec, ev, now) {
     case "task.blocked":
       if (rec.state === "blocked")
         return { ...rec, lastHeartbeat: now, lastEvent: ev.type };
-      return { ...base, state: "blocked", question: ev.question, pendingTool: void 0 };
+      return { ...base, state: "blocked", question: ev.question, pendingTool: void 0, pendingMonitor: void 0 };
     case "task.review":
-      return { ...base, state: "review", reviewNote: ev.message, pendingTool: void 0 };
+      return { ...base, state: "review", reviewNote: ev.message, pendingTool: void 0, pendingMonitor: void 0 };
     case "task.done":
       if (rec.state === "review" && ev.source !== "approve") {
         return { ...rec, lastHeartbeat: now, lastEvent: ev.type };
@@ -554,19 +562,19 @@ function reduce(rec, ev, now) {
     case "task.session":
       return stampAttempt(base, { resumeRef: ev.resumeRef }, now);
     case "task.turn.started":
-      return { ...stampAttempt(base, {}, now), state: "working", pendingTool: void 0 };
+      return { ...stampAttempt(base, {}, now), state: "working", pendingTool: void 0, pendingMonitor: void 0 };
     case "task.turn.completed":
       if (isStickyAttention(rec.state))
         return { ...rec, lastHeartbeat: now, lastEvent: ev.type };
-      if (rec.pendingTool)
+      if (rec.pendingTool || rec.pendingMonitor)
         return stampAttempt(base, {}, now);
-      return { ...stampAttempt(base, {}, now), state: "awaiting-input", pendingTool: void 0 };
+      return { ...stampAttempt(base, {}, now), state: "awaiting-input", pendingTool: void 0, pendingMonitor: void 0 };
     case "task.delta":
       return stampAttempt(base, {}, now);
     // heartbeat-only
     case "task.input.requested":
     case "task.approval.requested":
-      return { ...stampAttempt(base, {}, now), state: "blocked", question: ev.question, pendingTool: void 0 };
+      return { ...stampAttempt(base, {}, now), state: "blocked", question: ev.question, pendingTool: void 0, pendingMonitor: void 0 };
     case "task.reattached":
       return stampAttempt(base, {}, now);
     case "task.first-turn.confirmed":
@@ -587,15 +595,22 @@ function reduce(rec, ev, now) {
 
 // packages/core/dist/watchdog.js
 var TOOL_STALL_BUDGET_MS = 10 * 60 * 1e3;
-function evaluateStall(rec, now, toolStallMs = TOOL_STALL_BUDGET_MS) {
+var MONITOR_STALL_BUDGET_MS = 60 * 60 * 1e3;
+function evaluateStall(rec, now, toolStallMs = TOOL_STALL_BUDGET_MS, monitorStallMs = MONITOR_STALL_BUDGET_MS) {
   if (rec.state !== "working")
     return null;
   if (rec.mode === "interactive") {
-    if (!rec.pendingTool)
-      return null;
-    if (now - rec.pendingTool.since <= toolStallMs)
-      return null;
-    return { ...rec, state: "stalled", lastEvent: "watchdog.tool-stall" };
+    if (rec.pendingTool) {
+      if (now - rec.pendingTool.since <= toolStallMs)
+        return null;
+      return { ...rec, state: "stalled", lastEvent: "watchdog.tool-stall" };
+    }
+    if (rec.pendingMonitor) {
+      if (now - rec.pendingMonitor.since <= monitorStallMs)
+        return null;
+      return { ...rec, state: "stalled", lastEvent: "watchdog.monitor-stall" };
+    }
+    return null;
   }
   const liveness = rec.attempts.at(-1)?.lastHeartbeatAt ?? rec.lastHeartbeat;
   if (now - liveness <= rec.heartbeatBudgetMs)
@@ -605,7 +620,7 @@ function evaluateStall(rec, now, toolStallMs = TOOL_STALL_BUDGET_MS) {
 function recoverStall(rec, now) {
   if (rec.state !== "stalled")
     return null;
-  return { ...rec, state: "working", lastHeartbeat: now, lastEvent: "watchdog.recover", pendingTool: void 0 };
+  return { ...rec, state: "working", lastHeartbeat: now, lastEvent: "watchdog.recover", pendingTool: void 0, pendingMonitor: void 0 };
 }
 
 // packages/core/dist/daemon/reduce.js
@@ -912,7 +927,7 @@ function createDaemon(deps) {
           store.delete(r.project, r.id);
           continue;
         }
-        if (!TERMINAL_STATES.has(r.state)) {
+        if (!TERMINAL_STATES.has(r.state) && !isStickyAttention(r.state)) {
           const ceiling = deps.taskTimeoutMs ?? DEFAULT_TASK_TIMEOUT_MS;
           if (t - r.createdAt > ceiling) {
             const prevState = r.state;
@@ -957,7 +972,7 @@ function createDaemon(deps) {
         const idle = evaluateStall(r, t);
         if (idle) {
           store.put(idle);
-          const synthEvent = idle.pendingTool ? { type: "task.stalled", id: r.id, heartbeatBudgetMs: r.heartbeatBudgetMs, tool: idle.pendingTool.name, elapsedMs: t - idle.pendingTool.since } : { type: "task.stalled", id: r.id, heartbeatBudgetMs: r.heartbeatBudgetMs };
+          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;
         }
@@ -1394,9 +1409,9 @@ function startServer(sockPath, handlerOrCallbacks, onListenError = defaultListen
   return server;
 }
 function isDaemonSocketLive(sockPath, timeoutMs = 500) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     if (!existsSync5(sockPath)) {
-      resolve2(false);
+      resolve3(false);
       return;
     }
     const conn = createConnection(sockPath);
@@ -1405,7 +1420,7 @@ function isDaemonSocketLive(sockPath, timeoutMs = 500) {
         conn.destroy();
       } catch {
       }
-      resolve2(v);
+      resolve3(v);
     };
     const timer = setTimeout(() => finish(false), timeoutMs);
     conn.on("connect", () => {
@@ -1419,7 +1434,7 @@ function isDaemonSocketLive(sockPath, timeoutMs = 500) {
   });
 }
 function sendRequest(sockPath, msg, timeoutMs = 5e3) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const conn = createConnection(sockPath);
     const dec = createDecoder();
     const timer = setTimeout(() => {
@@ -1435,7 +1450,7 @@ function sendRequest(sockPath, msg, timeoutMs = 5e3) {
         if (m._v !== void 0 && m._v !== PROTOCOL_VERSION) {
           reject(new Error(`squadrantd protocol v${m._v}, this client expects v${PROTOCOL_VERSION} \u2014 upgrade squadrantd or this CLI`));
         } else if (m.ok) {
-          resolve2(m.reply);
+          resolve3(m.reply);
         } else {
           reject(new Error(m.error));
         }
@@ -1611,14 +1626,21 @@ function createStore(root) {
   };
 }
 
+// packages/core/dist/work-store.js
+import { homedir as homedir4 } from "os";
+import { join as join7, resolve as resolve2, sep as sep2 } from "path";
+import { randomBytes } from "crypto";
+import { mkdirSync as mkdirSync4, readFileSync as readFileSync6, readdirSync as readdirSync2, renameSync as renameSync2, writeFileSync as writeFileSync5, existsSync as existsSync7, rmSync as rmSync4, statSync as statSync2 } from "fs";
+var WORK_ITEM_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
+
 // packages/core/dist/index.js
 init_snapshot();
 
 // packages/core/dist/launchd.js
 import { execFileSync as execFileSync3 } from "child_process";
-import { mkdirSync as mkdirSync4, writeFileSync as writeFileSync5, readFileSync as readFileSync6, existsSync as existsSync7, openSync, writeSync, closeSync, unlinkSync as unlinkSync2, constants } from "fs";
-import { homedir as homedir4 } from "os";
-import { dirname as dirname3, join as join7 } from "path";
+import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync6, readFileSync as readFileSync7, existsSync as existsSync8, openSync, writeSync, closeSync, unlinkSync as unlinkSync2, constants } from "fs";
+import { homedir as homedir5 } from "os";
+import { dirname as dirname3, join as join8 } from "path";
 import { fileURLToPath } from "url";
 
 // packages/core/dist/crew-pane-reader.js
@@ -1686,13 +1708,13 @@ function makeGate(opts) {
 }
 
 // packages/core/dist/daemon/context.js
-import { homedir as homedir5 } from "os";
-import { join as join8 } from "path";
+import { homedir as homedir6 } from "os";
+import { join as join9 } from "path";
 import { spawn as realSpawn } from "child_process";
-import { writeFileSync as writeFileSync7, mkdirSync as mkdirSync5 } from "fs";
+import { writeFileSync as writeFileSync8, mkdirSync as mkdirSync6 } from "fs";
 
 // packages/core/dist/daemon/liveness-registry.js
-import { writeFileSync as writeFileSync6, readFileSync as readFileSync7, renameSync as renameSync2 } from "fs";
+import { writeFileSync as writeFileSync7, readFileSync as readFileSync8, renameSync as renameSync3 } from "fs";
 var LivenessRegistry = class {
   path;
   readFile;
@@ -1702,14 +1724,14 @@ var LivenessRegistry = class {
     this.path = opts.path;
     this.readFile = opts.readFile ?? ((p) => {
       try {
-        return readFileSync7(p, "utf-8");
+        return readFileSync8(p, "utf-8");
       } catch {
         return void 0;
       }
     });
     this.writeFile = opts.writeFile ?? ((p, c) => {
-      writeFileSync6(`${p}.tmp`, c);
-      renameSync2(`${p}.tmp`, p);
+      writeFileSync7(`${p}.tmp`, c);
+      renameSync3(`${p}.tmp`, p);
     });
   }
   load() {
@@ -1765,18 +1787,18 @@ function defaultIsPidAlive(pid) {
   }
 }
 function buildContext(opts) {
-  const stateRoot = opts.stateRoot ?? join8(homedir5(), ".config", "squadrant", "state");
-  const sockPath = opts.sockPath ?? join8(homedir5(), ".config", "squadrant", "squadrant.sock");
+  const stateRoot = opts.stateRoot ?? join9(homedir6(), ".config", "squadrant", "state");
+  const sockPath = opts.sockPath ?? join9(homedir6(), ".config", "squadrant", "squadrant.sock");
   const store = createStore(stateRoot);
   const bootedAt = Date.now();
   const taskTimeoutMs = loadConfig().defaults.taskTimeoutMs;
   const isPidAlive = opts.isPidAlive ?? defaultIsPidAlive;
   const spawn2 = opts.spawn ?? realSpawn;
-  const resultsDir = join8(stateRoot, "_results");
-  mkdirSync5(resultsDir, { recursive: true });
+  const resultsDir = join9(stateRoot, "_results");
+  mkdirSync6(resultsDir, { recursive: true });
   const writeResult = (id, payload) => {
-    const p = join8(resultsDir, `${id}.txt`);
-    writeFileSync7(p, payload);
+    const p = join9(resultsDir, `${id}.txt`);
+    writeFileSync8(p, payload);
     return p;
   };
   const log = (m) => process.stderr.write(`[squadrantd] ${(/* @__PURE__ */ new Date()).toISOString()} ${m}
@@ -1798,7 +1820,7 @@ function buildContext(opts) {
     inFlightHeadlessIds: /* @__PURE__ */ new Set(),
     activeHeadlessKills: /* @__PURE__ */ new Set(),
     livenessRegistry: (() => {
-      const r = new LivenessRegistry({ path: join8(stateRoot, "liveness.json") });
+      const r = new LivenessRegistry({ path: join9(stateRoot, "liveness.json") });
       r.load();
       return r;
     })(),
@@ -1876,7 +1898,7 @@ function createAttach(ctx) {
 }
 
 // packages/core/dist/daemon/start.js
-import { join as join10, dirname as dirname4 } from "path";
+import { join as join11, dirname as dirname4 } from "path";
 import { readdir } from "fs/promises";
 
 // packages/core/dist/daemon/interactive-probe.js
@@ -2087,9 +2109,11 @@ function buildSurfaceProbe(ctx, probes, daemonCmux) {
 // packages/core/dist/delivery/defer-delivery.js
 var DeferDelivery = class extends Error {
   draft;
-  constructor(draft = null) {
+  reason;
+  constructor(draft = null, reason = "draft") {
     super("deferred: captain composing");
     this.draft = draft;
+    this.reason = reason;
     this.name = "DeferDelivery";
   }
 };
@@ -2107,6 +2131,7 @@ var CaptainDelivery = class {
   deferCounts = /* @__PURE__ */ new Map();
   lastContent = /* @__PURE__ */ new Map();
   stableCounts = /* @__PURE__ */ new Map();
+  lastReason = /* @__PURE__ */ new Map();
   constructor(opts) {
     this.opts = opts;
   }
@@ -2129,29 +2154,40 @@ var CaptainDelivery = class {
       this.deferCounts.delete(seq);
       this.stableCounts.delete(seq);
       this.lastContent.delete(seq);
+      this.lastReason.delete(seq);
       return { delivered: true };
     } catch (e) {
       if (e instanceof DeferDelivery) {
         this.deferCounts.set(seq, deferCount + 1);
         const content = e.draft;
+        let stableCount;
         if (content && content === this.lastContent.get(seq)) {
-          this.stableCounts.set(seq, (this.stableCounts.get(seq) ?? 0) + 1);
+          stableCount = (this.stableCounts.get(seq) ?? 0) + 1;
+          this.stableCounts.set(seq, stableCount);
         } else {
+          stableCount = 0;
           this.stableCounts.set(seq, 0);
         }
         this.lastContent.set(seq, content);
-        return { deferred: true };
+        const reason = e.reason !== "draft" ? e.reason : stableCount >= this.opts.stableProbePolls ? "stable" : "draft";
+        this.lastReason.set(seq, reason);
+        return { deferred: true, reason };
       }
-      return { deferred: true };
+      this.lastReason.set(seq, "unknown");
+      return { deferred: true, reason: "unknown" };
     }
   }
   /** Read-only. Never mutates — safe to poll from the snapshot assembler every tick. */
   stats() {
     let maxDeferCount = 0;
-    for (const c of this.deferCounts.values())
-      if (c > maxDeferCount)
+    let reason;
+    for (const [seq, c] of this.deferCounts) {
+      if (c > maxDeferCount) {
         maxDeferCount = c;
-    return { maxDeferCount, stuck: maxDeferCount >= this.opts.maxDefers };
+        reason = this.lastReason.get(seq);
+      }
+    }
+    return { maxDeferCount, stuck: maxDeferCount >= this.opts.maxDefers, reason };
   }
 };
 
@@ -2251,6 +2287,10 @@ function createDelivery(ctx, daemonCmux) {
   const notifyFault = ctx.notifyFault ?? (() => {
   });
   const defaultNotify = async (args) => {
+    const fresh = store.get(args.project, args.record.id);
+    if (fresh && TERMINAL_STATES.has(fresh.state) && fresh.state !== args.record.state) {
+      return;
+    }
     try {
       await appendToMailbox({
         stateRoot,
@@ -2340,16 +2380,19 @@ function createDelivery(ctx, daemonCmux) {
           log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=delivered`);
           await writeCursor({ stateRoot, project, subscriber: CURSOR_SUBSCRIBER, lastAckedSeq: entry.seq });
         } else {
-          log(`delivery seq=${entry.seq} kind=${entry.kind} outcome=deferred`);
+          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}`);
+          }
           break;
         }
       }
       const stuck = d.stats().stuck;
       if (stuck && !stuckNotified.has(project)) {
         stuckNotified.add(project);
-        const { maxDeferCount } = d.stats();
-        log(`delivery stuck project=${project} deferCount=${maxDeferCount}`);
-        const text = `\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.`;
+        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);
@@ -2448,12 +2491,12 @@ function createServer2(ctx, handlers) {
 
 // packages/core/dist/daemon/snapshot-gather.js
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { join as join9 } from "path";
-import { statSync as statSync2, openSync as openSync2, readSync, closeSync as closeSync2, readdirSync as readdirSync2, readFileSync as readFileSync8 } from "fs";
+import { join as join10 } from "path";
+import { statSync as statSync3, openSync as openSync2, readSync, closeSync as closeSync2, readdirSync as readdirSync3, readFileSync as readFileSync9 } from "fs";
 var SELF_PATH = fileURLToPath2(import.meta.url);
 function distBuiltAt() {
   try {
-    return statSync2(SELF_PATH).mtimeMs;
+    return statSync3(SELF_PATH).mtimeMs;
   } catch {
     return 0;
   }
@@ -2461,7 +2504,7 @@ function distBuiltAt() {
 function gatherLogStats(path19, now, windowMs) {
   let sizeBytes = 0;
   try {
-    sizeBytes = statSync2(path19).size;
+    sizeBytes = statSync3(path19).size;
   } catch {
     return { errorCount: 0, sizeBytes: 0, windowMs };
   }
@@ -2503,9 +2546,9 @@ 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 = join9(stateRoot, project);
+  const dir = join10(stateRoot, project);
   try {
-    for (const n of readdirSync2(dir)) {
+    for (const n of readdirSync3(dir)) {
       if (n.includes(".corrupt.")) {
         corruptCount++;
         continue;
@@ -2513,7 +2556,7 @@ function gatherStoreStats(store, stateRoot, project) {
       if (!n.endsWith(".json"))
         continue;
       try {
-        JSON.parse(readFileSync8(join9(dir, n), "utf-8"));
+        JSON.parse(readFileSync9(join10(dir, n), "utf-8"));
       } catch {
         corruptCount++;
       }
@@ -2526,9 +2569,9 @@ function gatherResults(resultsDir) {
   let fileCount = 0;
   let totalBytes = 0;
   try {
-    for (const n of readdirSync2(resultsDir)) {
+    for (const n of readdirSync3(resultsDir)) {
       try {
-        const s = statSync2(join9(resultsDir, n));
+        const s = statSync3(join10(resultsDir, n));
         if (s.isFile()) {
           fileCount++;
           totalBytes += s.size;
@@ -2617,7 +2660,7 @@ function startDaemon(ctx, opts, pkgVersion) {
     return out;
   }
   async function gatherSnapshotInputs(now) {
-    const logPath2 = join10(dirname4(stateRoot), "squadrantd.log");
+    const logPath2 = join11(dirname4(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 });
@@ -2751,7 +2794,7 @@ function startDaemon(ctx, opts, pkgVersion) {
   };
   let rotationTimer;
   if (rotationInterval > 0) {
-    const inboxPath = join10(stateRoot, "inbox");
+    const inboxPath = join11(stateRoot, "inbox");
     rotationTimer = setInterval(async () => {
       try {
         let entries;
@@ -2794,9 +2837,9 @@ function startDaemon(ctx, opts, pkgVersion) {
       }
       for (const kill of ctx.activeHeadlessKills)
         kill();
-      return new Promise((resolve2) => server.close(() => {
+      return new Promise((resolve3) => server.close(() => {
         log(`exit-complete pid=${process.pid}`);
-        resolve2();
+        resolve3();
       }));
     },
     tickDelivery: deliveryTick,
@@ -2985,7 +3028,7 @@ function createIsCaptainAlive(sock) {
   };
 }
 function createLaunch(cliBin, log) {
-  return (project) => new Promise((resolve2, reject) => {
+  return (project) => new Promise((resolve3, reject) => {
     execFile(process.execPath, [cliBin, "launch", project, "--headless"], { timeout: 3e4 }, (err, stdout, stderr) => {
       const output = capOutput(stdout ?? "", stderr ?? "");
       if (err) {
@@ -2995,7 +3038,7 @@ function createLaunch(cliBin, log) {
       }
       if (output !== "(no output)")
         log?.(`launch ${project}: ${output}`);
-      resolve2();
+      resolve3();
     });
   });
 }
@@ -3117,10 +3160,10 @@ function findProjectByThread(stateRoot, threadId) {
   for (const [key, id] of Object.entries(s.topics)) {
     if (id !== threadId)
       continue;
-    const sep2 = key.indexOf("::");
-    if (sep2 === -1)
+    const sep3 = key.indexOf("::");
+    if (sep3 === -1)
       continue;
-    return { project: key.slice(0, sep2), scope: key.slice(sep2 + 2) };
+    return { project: key.slice(0, sep3), scope: key.slice(sep3 + 2) };
   }
   return null;
 }
@@ -3646,16 +3689,16 @@ import fs12 from "fs";
 
 // packages/core/dist/restart-daemon.js
 import { execFileSync as execFileSync4 } from "child_process";
-import { existsSync as existsSync8 } from "fs";
-import { homedir as homedir6 } from "os";
-import { join as join11 } from "path";
-var DEFAULT_SOCK_PATH = join11(homedir6(), ".config", "squadrant", "squadrant.sock");
+import { existsSync as existsSync9 } from "fs";
+import { homedir as homedir7 } from "os";
+import { join as join12 } from "path";
+var DEFAULT_SOCK_PATH = join12(homedir7(), ".config", "squadrant", "squadrant.sock");
 
 // packages/core/dist/group-dispatch.js
 import { randomUUID as randomUUID3 } from "crypto";
-import { homedir as homedir7 } from "os";
-import { join as join12 } from "path";
-var DEFAULT_SOCK_PATH2 = join12(homedir7(), ".config", "squadrant", "squadrant.sock");
+import { homedir as homedir8 } from "os";
+import { join as join13 } from "path";
+var DEFAULT_SOCK_PATH2 = join13(homedir8(), ".config", "squadrant", "squadrant.sock");
 
 // packages/core/dist/side-session.js
 import fs13 from "fs";
@@ -3772,8 +3815,8 @@ var AppServerClient = class extends EventEmitter {
     const info = this.opts.clientInfo ?? { name: "squadrant", version: "0" };
     const id = this.nextId++;
     const env = { jsonrpc: "2.0", id, method: "initialize", params: { clientInfo: info } };
-    const res = await new Promise((resolve2, reject) => {
-      this.pending.set(id, { resolve: resolve2, reject });
+    const res = await new Promise((resolve3, reject) => {
+      this.pending.set(id, { resolve: resolve3, reject });
       this.proc.stdin.write(JSON.stringify(env) + "\n");
     });
     this.proc.stdin.write(JSON.stringify({ jsonrpc: "2.0", method: "initialized" }) + "\n");
@@ -3806,13 +3849,13 @@ var AppServerClient = class extends EventEmitter {
     const turnId = ack?.turn?.id;
     if (typeof turnId !== "string")
       throw new Error(`turn/start: unexpected ack shape (no turn.id): ${JSON.stringify(ack).slice(0, 200)}`);
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       const onNote = (n) => {
         if (n.params?.turn?.id !== turnId)
           return;
         if (n.method === "turn/completed") {
           cleanup();
-          resolve2({ turnId });
+          resolve3({ turnId });
         }
         if (n.method === "turn/failed") {
           cleanup();
@@ -3863,8 +3906,8 @@ var AppServerClient = class extends EventEmitter {
       throw new Error("AppServerClient not started");
     const id = this.nextId++;
     const env = { jsonrpc: "2.0", id, method, params: params ?? {} };
-    return new Promise((resolve2, reject) => {
-      this.pending.set(id, { resolve: resolve2, reject });
+    return new Promise((resolve3, reject) => {
+      this.pending.set(id, { resolve: resolve3, reject });
       this.proc.stdin.write(JSON.stringify(env) + "\n");
     });
   }
@@ -3992,11 +4035,11 @@ function toSnapshot(ev) {
 
 // packages/agents/dist/codex/config.js
 import { readFile as readFile5 } from "fs/promises";
-import { homedir as homedir8 } from "os";
-import { join as join13 } from "path";
+import { homedir as homedir9 } from "os";
+import { join as join14 } from "path";
 async function resolveCodexModel() {
-  const home = process.env["CODEX_HOME"] ?? join13(homedir8(), ".codex");
-  const configPath = join13(home, "config.toml");
+  const home = process.env["CODEX_HOME"] ?? join14(homedir9(), ".codex");
+  const configPath = join14(home, "config.toml");
   let text;
   try {
     text = await readFile5(configPath, "utf8");
@@ -4309,11 +4352,11 @@ function buildCodexDeveloperInstructions(rec) {
 ${directive}` : directive;
 }
 function withTimeout(p, ms, msg) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const t = setTimeout(() => reject(new Error(msg)), ms);
     p.then((v) => {
       clearTimeout(t);
-      resolve2(v);
+      resolve3(v);
     }, (e) => {
       clearTimeout(t);
       reject(e);
@@ -4485,9 +4528,9 @@ var OpencodeSseBridge = class {
 
 // packages/agents/dist/interactive/claude.js
 import { execSync as execSync6 } from "child_process";
-import { readFileSync as readFileSync9 } from "fs";
-import { homedir as homedir9 } from "os";
-import { join as join14 } from "path";
+import { readFileSync as readFileSync10 } from "fs";
+import { homedir as homedir10 } from "os";
+import { join as join15 } from "path";
 var nextAskUserQuestionRequestId = Date.now();
 
 // packages/agents/dist/headless/types.js
@@ -4620,14 +4663,14 @@ function runHeadless(opts) {
     if (err.length > ERR_CAP)
       err = err.slice(err.length - ERR_CAP);
   });
-  const result = new Promise((resolve2) => {
+  const result = new Promise((resolve3) => {
     child.once("error", (e) => {
       if (debounceTimer) {
         clearTimeout(debounceTimer);
         debounceTimer = null;
       }
       opts.emit({ type: "task.failed", id: opts.id, error: `spawn error: ${e.message}`, exitCode: void 0 });
-      resolve2();
+      resolve3();
     });
     child.on("close", (code) => {
       if (chunksSinceProgress > 0)
@@ -4644,7 +4687,7 @@ function runHeadless(opts) {
         const ref = opts.writeResult ? opts.writeResult(opts.id, res.payload ?? "") : "";
         opts.emit({ type: "task.done", id: opts.id, resultRef: ref, parseWarning: res.parseWarning });
       }
-      resolve2();
+      resolve3();
     });
   });
   return { result, kill: () => child.kill("SIGTERM") };
@@ -4660,7 +4703,7 @@ var CmuxTimeoutError = class extends Error {
   }
 };
 function cmux(args) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     execFile2(
       resolveCmuxBin(),
       args,
@@ -4674,19 +4717,19 @@ function cmux(args) {
           reject(err.code === "ETIMEDOUT" ? new CmuxTimeoutError(args.join(" ")) : err);
           return;
         }
-        resolve2(stdout.trim());
+        resolve3(stdout.trim());
       }
     );
   });
 }
 function cmuxStdin(args, input) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const child = execFile2(resolveCmuxBin(), args, { encoding: "utf-8", timeout: CMUX_TIMEOUT, env: { ...process.env, CMUX_QUIET: "1" } }, (err, stdout) => {
       if (err) {
         reject(err.code === "ETIMEDOUT" ? new CmuxTimeoutError(args.join(" ")) : err);
         return;
       }
-      resolve2(stdout.trim());
+      resolve3(stdout.trim());
     });
     child.stdin.end(input);
   });
@@ -5049,9 +5092,9 @@ function createCmuxDriver() {
       }
       const draft = parseDraftFromScreen(screen);
       if (draft === null)
-        throw new DeferDelivery(null);
+        throw new DeferDelivery(null, "no-box");
       if (hasModalOptionList(screen))
-        throw new DeferDelivery(null);
+        throw new DeferDelivery(null, "modal");
       if (draft === "") {
         await deliver();
         return;
@@ -5245,7 +5288,7 @@ var NotifierRegistry = class {
 
 // packages/workspaces/dist/workspaces/obsidian.js
 import fs16 from "fs/promises";
-import { existsSync as existsSync9 } from "fs";
+import { existsSync as existsSync10 } from "fs";
 import path17 from "path";
 
 // packages/workspaces/dist/cmux-daemon/events-bridge.js
@@ -5314,12 +5357,12 @@ var CmuxEventsBridge = class {
         continue;
       }
       this.child = child;
-      await new Promise((resolve2) => {
+      await new Promise((resolve3) => {
         let settled = false;
         const done = () => {
           if (!settled) {
             settled = true;
-            resolve2();
+            resolve3();
           }
         };
         child.stdout?.on("data", (b) => this.onData(b));
@@ -5383,9 +5426,9 @@ var CmuxEventsBridge = class {
 };
 
 // packages/workspaces/dist/cmux-daemon/daemon-cmux.js
-import { readdirSync as readdirSync3, readFileSync as readFileSync10 } from "fs";
-import { join as join15 } from "path";
-import { homedir as homedir10 } from "os";
+import { readdirSync as readdirSync4, readFileSync as readFileSync11 } from "fs";
+import { join as join16 } from "path";
+import { homedir as homedir11 } from "os";
 
 // packages/workspaces/dist/cmux-daemon/store-fingerprint.js
 function roleFromTemplate(args) {
@@ -5504,22 +5547,22 @@ var DaemonCmux = class {
    * file failed to read/parse — see the class doc above.
    */
   async liveness() {
-    const dir = process.env.CMUX_AGENT_HOOK_STATE_DIR ?? join15(homedir10(), ".cmuxterm");
+    const dir = process.env.CMUX_AGENT_HOOK_STATE_DIR ?? join16(homedir11(), ".cmuxterm");
     const projects = loadConfig().projects;
     let files;
     try {
-      files = readdirSync3(dir).filter((f) => f.endsWith("-hook-sessions.json") && !f.endsWith(".lock"));
+      files = readdirSync4(dir).filter((f) => f.endsWith("-hook-sessions.json") && !f.endsWith(".lock"));
     } catch (e) {
       throw new Error(`liveness: could not read cmux state dir ${dir}: ${e.message}`);
     }
-    return readLivenessSnapshot(files, (f) => readFileSync10(join15(dir, f), "utf-8"), projects);
+    return readLivenessSnapshot(files, (f) => readFileSync11(join16(dir, f), "utf-8"), projects);
   }
 };
 
 // packages/workspaces/dist/cmux-daemon/cmux-store-source.js
-import { join as join16 } from "path";
-import { homedir as homedir11 } from "os";
-import { watch, readdirSync as readdirSync4, readFileSync as readFileSync11, existsSync as existsSync10 } from "fs";
+import { join as join17 } from "path";
+import { homedir as homedir12 } from "os";
+import { watch, readdirSync as readdirSync5, readFileSync as readFileSync12, existsSync as existsSync11 } from "fs";
 var CmuxStoreSource = class {
   name = "cmux-store";
   stateDir;
@@ -5540,12 +5583,12 @@ var CmuxStoreSource = class {
   active = false;
   lastError = null;
   constructor(opts = {}) {
-    this.stateDir = opts.stateDir ?? process.env.CMUX_AGENT_HOOK_STATE_DIR ?? join16(homedir11(), ".cmuxterm");
+    this.stateDir = opts.stateDir ?? process.env.CMUX_AGENT_HOOK_STATE_DIR ?? join17(homedir12(), ".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 ?? existsSync10;
+    this.fileExists = opts.fileExists ?? existsSync11;
     this.watchDir = opts.watchDir ?? defaultWatchDir;
     this.scheduleTimer = opts.scheduleTimer ?? setTimeout;
     this.cancelTimer = opts.cancelTimer ?? clearTimeout;
@@ -5602,7 +5645,7 @@ var CmuxStoreSource = class {
   }
   scanFile(filename) {
     const deps = this.deps;
-    const filePath = join16(this.stateDir, filename);
+    const filePath = join17(this.stateDir, filename);
     const lockPath = `${filePath}.lock`;
     if (this.fileExists(lockPath)) {
       this.log(`cmux-store: skipping ${filename} (locked)`);
@@ -5668,14 +5711,14 @@ function defaultIsPidAlive2(pid) {
 }
 function defaultListFiles(dir) {
   try {
-    return readdirSync4(dir).filter((f) => f.endsWith("-hook-sessions.json") && !f.endsWith(".lock"));
+    return readdirSync5(dir).filter((f) => f.endsWith("-hook-sessions.json") && !f.endsWith(".lock"));
   } catch {
     return [];
   }
 }
 function defaultReadFile(path19) {
   try {
-    return readFileSync11(path19, "utf-8");
+    return readFileSync12(path19, "utf-8");
   } catch {
     return void 0;
   }
@@ -5690,9 +5733,9 @@ function defaultWatchDir(dir, cb) {
 }
 
 // packages/workspaces/dist/native-hooks/native-hook-source.js
-import { join as join17 } from "path";
-import { homedir as homedir12 } from "os";
-import { mkdirSync as mkdirSync6, readFileSync as readFileSync12, writeFileSync as writeFileSync8 } from "fs";
+import { join as join18 } from "path";
+import { homedir as homedir13 } from "os";
+import { mkdirSync as mkdirSync7, readFileSync as readFileSync13, writeFileSync as writeFileSync9 } from "fs";
 var CLAUDE_HOOK_EVENTS = [
   ["SessionStart", "session-start"],
   ["UserPromptSubmit", "prompt-submit"],
@@ -5704,7 +5747,7 @@ var CLAUDE_HOOK_EVENTS = [
 ];
 var DEFAULT_HOOK_CMD = "squadrant hooks";
 function installClaudeHooks(opts = {}) {
-  const settingsPath = opts.settingsPath ?? join17(homedir12(), ".claude", "settings.json");
+  const settingsPath = opts.settingsPath ?? join18(homedir13(), ".claude", "settings.json");
   const hookCmd = opts.hookCmd ?? DEFAULT_HOOK_CMD;
   const readFile6 = opts.readFile ?? defaultReadFile2;
   const writeFile5 = opts.writeFile ?? defaultWriteFile;
@@ -5712,6 +5755,7 @@ function installClaudeHooks(opts = {}) {
   });
   let settings = {};
   const raw = readFile6(settingsPath);
+  const hadExistingSettings = raw !== void 0;
   if (raw) {
     try {
       settings = JSON.parse(raw);
@@ -5724,6 +5768,7 @@ function installClaudeHooks(opts = {}) {
   }
   const hooks = settings.hooks;
   let changed = false;
+  const repaired = [];
   for (const [eventName, sub, matcher] of CLAUDE_HOOK_EVENTS) {
     if (!Array.isArray(hooks[eventName])) {
       hooks[eventName] = [];
@@ -5735,6 +5780,26 @@ function installClaudeHooks(opts = {}) {
     if (!alreadyPresent) {
       entries.push({ matcher: hookMatcher, hooks: [{ type: "command", command, timeout: 10 }] });
       changed = true;
+      repaired.push(`${eventName}/${sub}`);
+    }
+  }
+  if (repaired.length > 0 && hadExistingSettings) {
+    log(`native-hook: repaired ${repaired.length} missing squadrant hook(s) in ${settingsPath} [${repaired.join(", ")}] \u2014 WARNING: blocked-signalling or lifecycle tracking may have been broken until this run`);
+  }
+  if (opts.claudeEnv && Object.keys(opts.claudeEnv).length > 0) {
+    if (typeof settings.env !== "object" || settings.env === null || Array.isArray(settings.env)) {
+      settings.env = {};
+    }
+    const env = settings.env;
+    for (const [key, value] of Object.entries(opts.claudeEnv)) {
+      if (key in env) {
+        if (env[key] !== value) {
+          log(`native-hook: claudeEnv key '${key}' already set to '${String(env[key])}' in ${settingsPath} \u2014 not overwriting with '${value}'`);
+        }
+        continue;
+      }
+      env[key] = value;
+      changed = true;
     }
   }
   if (changed) {
@@ -5771,9 +5836,9 @@ var NativeHookSource = class {
   cache = /* @__PURE__ */ new Map();
   active = false;
   constructor(opts = {}) {
-    this.hookInstall = opts.hookInstall ?? {};
     this.log = opts.log ?? (() => {
     });
+    this.hookInstall = { log: this.log, ...opts.hookInstall };
   }
   start(deps) {
     this.deps = deps;
@@ -5852,14 +5917,14 @@ function extractDetail(sub, payload) {
 }
 function defaultReadFile2(path19) {
   try {
-    return readFileSync12(path19, "utf-8");
+    return readFileSync13(path19, "utf-8");
   } catch {
     return void 0;
   }
 }
 function defaultWriteFile(path19, content) {
-  mkdirSync6(path19.replace(/\/[^/]+$/, ""), { recursive: true });
-  writeFileSync8(path19, content, "utf-8");
+  mkdirSync7(path19.replace(/\/[^/]+$/, ""), { recursive: true });
+  writeFileSync9(path19, content, "utf-8");
 }
 
 // packages/workspaces/dist/crew-pane.js
@@ -5983,12 +6048,12 @@ async function maybeBroadcastDaemonRestart(opts) {
 
 // packages/cli/src/squadrantd.ts
 var SELF_PATH2 = fileURLToPath3(import.meta.url);
-var CLI_BIN = join18(dirname5(SELF_PATH2), "index.js");
-var DAEMON_SOCK = join18(homedir13(), ".config", "squadrant", "squadrant.sock");
+var CLI_BIN = join19(dirname5(SELF_PATH2), "index.js");
+var DAEMON_SOCK = join19(homedir14(), ".config", "squadrant", "squadrant.sock");
 function readPkgVersion() {
   try {
-    const pkgPath = join18(dirname5(SELF_PATH2), "..", "package.json");
-    return JSON.parse(readFileSync13(pkgPath, "utf-8")).version ?? "unknown";
+    const pkgPath = join19(dirname5(SELF_PATH2), "..", "package.json");
+    return JSON.parse(readFileSync14(pkgPath, "utf-8")).version ?? "unknown";
   } catch {
     return "unknown";
   }
@@ -6081,11 +6146,11 @@ function startSquadrantd(opts = {}) {
         (r) => r.mode === "interactive" && !TERMINAL_STATES.has(r.state) && r.cwd === hook.cwd
       );
     },
-    cursorFile: join18(stateRoot, "cmux-events.seq"),
+    cursorFile: join19(stateRoot, "cmux-events.seq"),
     log
   });
   const cmuxStoreSource = new CmuxStoreSource({ log });
-  const nativeHookSource = new NativeHookSource({ log });
+  const nativeHookSource = new NativeHookSource({ log, hookInstall: { claudeEnv: loadConfig().defaults.claudeEnv } });
   ctx.codexDriver = codexDriver;
   ctx.opencodeBridge = opencodeBridge;
   ctx.cmuxEventsBridge = cmuxEventsBridge;
@@ -6240,7 +6305,7 @@ ${buildCompletionProtocol(rec.id, rec.project)}`;
   }
   if (!process.env.VITEST) {
     try {
-      const buildMtimeMs = statSync3(SELF_PATH2).mtimeMs;
+      const buildMtimeMs = statSync4(SELF_PATH2).mtimeMs;
       const restartConfig = loadConfig();
       const registry = new RuntimeRegistry({ cmux: createCmuxDriver() });
       void maybeBroadcastDaemonRestart({
@@ -6293,7 +6358,7 @@ if (process.argv[1] && process.argv[1].endsWith("squadrantd.js")) {
       process.stdout.write("squadrantd: launchd-managed daemon entry (no CLI args). Use `squadrant` for commands.\n");
       process.exit(0);
     }
-    const sock = join18(homedir13(), ".config", "squadrant", "squadrant.sock");
+    const sock = join19(homedir14(), ".config", "squadrant", "squadrant.sock");
     if (await isDaemonSocketLive(sock)) {
       process.stderr.write(`[squadrantd] refusing to start: a live daemon already owns ${sock}
 `);