squadrant 0.16.3 → 0.16.4

package/dist/index.js

@@ -2332,13 +2332,14 @@ function projectHealth(input) {
   const { project, now, captainName, captainStopped, commandPresent, crews } = input;
   const out = [];
   const captainState = input.captainState ?? (captainStopped === true ? "stopped" : captainStopped === false ? "alive" : "unknown");
+  const deferral = input.captainDeferral;
   out.push({
     kind: "captain",
     project,
     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" : 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) \u2014 draft/ghost text blocking captain pane; input never touched, delivers automatically once cleared` : void 0
   });
   if (commandPresent !== null) {
     out.push({
@@ -3005,6 +3006,8 @@ function buildContext(opts) {
     opencodeBridge: null,
     cmuxEventsBridge: null,
     telegramBridge: void 0,
+    notifyFault: opts.notifyFault ?? (() => {
+    }),
     lifecycleSources: opts.lifecycleSources ?? [],
     broadcast: () => {
     },
@@ -3345,7 +3348,7 @@ var init_captain_delivery = __esm({
         const seq = entry.seq;
         const deferCount = this.deferCounts.get(seq) ?? 0;
         const stable = (this.stableCounts.get(seq) ?? 0) >= this.opts.stableProbePolls;
-        const probe = stable || deferCount >= this.opts.maxDefers;
+        const probe = stable;
         try {
           await send(msg, probe ? { probe: true } : void 0);
           this.deferCounts.delete(seq);
@@ -3469,7 +3472,9 @@ async function runLivenessTick(deps) {
   }
 }
 function createDelivery(ctx, daemonCmux) {
-  const { stateRoot, store, log, livenessRegistry, isPidAlive, opts } = ctx;
+  const { stateRoot, store, log, livenessRegistry, isPidAlive, opts, telegramBridge } = ctx;
+  const notifyFault = ctx.notifyFault ?? (() => {
+  });
   const defaultNotify = async (args) => {
     try {
       await appendToMailbox({
@@ -3492,6 +3497,7 @@ function createDelivery(ctx, daemonCmux) {
   const cfg = loadConfig();
   const deliveries = /* @__PURE__ */ new Map();
   const deliveryStats = (project) => deliveries.get(project)?.stats();
+  const stuckNotified = /* @__PURE__ */ new Set();
   const sessionStartMs = Date.now();
   let delivering = false;
   const deliveryCore = async () => {
@@ -3563,6 +3569,18 @@ function createDelivery(ctx, daemonCmux) {
           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.`;
+        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);
+      }
     }
   };
   const deliveryTick = async () => {
@@ -3839,7 +3857,12 @@ function startDaemon(ctx, opts, pkgVersion) {
         captainStopped: null,
         captainState: deriveCaptainState(capEntry),
         commandPresent: null,
-        crews: store.list(project)
+        crews: store.list(project),
+        // #579/#484 Gap 3: surface the same deferral stats already exposed to
+        // the snapshot (line ~135 below) on the health row too, so `squadrant
+        // doctor` / `squadrant status --detailed` show a stuck delivery with
+        // zero configuration.
+        captainDeferral: deliveryStats(project)
       }));
     }
     return out;
@@ -4740,6 +4763,14 @@ function createTelegramBridge(opts) {
     s.offset = next;
     saveState(stateRoot, s);
   }
+  async function sendToTopic(project, text) {
+    let threadId = loadState(stateRoot).topics[topicKey(project)];
+    if (threadId === void 0) {
+      threadId = await client.createForumTopic(cfg.supergroupId, topicName(project));
+      setTopic(stateRoot, project, threadId);
+    }
+    await client.sendMessage(cfg.supergroupId, threadId, text);
+  }
   async function deliverOutbound(project, ev) {
     const resolved = resolveNotify(cfg.notify, loadProjectOverride(project, configRoot));
     const live = loadState(stateRoot).notify[project];
@@ -4748,12 +4779,10 @@ function createTelegramBridge(opts) {
       return;
     if (!tierIncludes(resolved.crew, ev.type))
       return;
-    let threadId = loadState(stateRoot).topics[topicKey(project)];
-    if (threadId === void 0) {
-      threadId = await client.createForumTopic(cfg.supergroupId, topicName(project));
-      setTopic(stateRoot, project, threadId);
-    }
-    await client.sendMessage(cfg.supergroupId, threadId, formatLifecycle(project, ev));
+    await sendToTopic(project, formatLifecycle(project, ev));
+  }
+  async function deliverRawOutbound(project, text) {
+    await sendToTopic(project, text);
   }
   function resolveLiveNotify(project) {
     const resolved = resolveNotify(cfg.notify, loadProjectOverride(project, configRoot));
@@ -5061,6 +5090,11 @@ function createTelegramBridge(opts) {
         log(`telegram outbound failed project=${project}: ${e.message}`);
       });
     },
+    pushRaw(project, text) {
+      void deliverRawOutbound(project, text).catch((e) => {
+        log(`telegram raw push failed project=${project}: ${e.message}`);
+      });
+    },
     health() {
       return { polling: running, lastSuccessfulPollAt, lastError, lastErrorAt };
     }
@@ -6738,7 +6772,8 @@ var init_runtimes = __esm({
 });
 
 // packages/workspaces/dist/notifiers/cmux.js
-import { execFileSync as execFileSync6, execSync as execSync2 } from "child_process";
+import { execFile as execFileCb, execSync as execSync2 } from "child_process";
+import { promisify as promisify2 } from "util";
 function createCmuxNotifier(_scope) {
   return {
     name: "cmux",
@@ -6755,13 +6790,15 @@ function createCmuxNotifier(_scope) {
       }
     },
     async notify(message) {
-      execFileSync6("squadrant", ["runtime", "send", "--command", message], { encoding: "utf-8", timeout: CMUX_TIMEOUT });
+      await execFile3("squadrant", ["runtime", "send", "--command", message], { encoding: "utf-8", timeout: CMUX_TIMEOUT });
     }
   };
 }
+var execFile3;
 var init_cmux2 = __esm({
   "packages/workspaces/dist/notifiers/cmux.js"() {
     init_cmux();
+    execFile3 = promisify2(execFileCb);
   }
 });
 
@@ -10799,9 +10836,18 @@ function progressBar(completed, total) {
 }
 function captainIndicator(state) {
   if (state === "alive" || state === "stale") return chalk6.green("\u25CF");
+  if (state === "stopped") return chalk6.magenta("\u23FB");
   if (state === void 0 || state === "unknown") return chalk6.dim("?");
   return chalk6.dim("\u25CB");
 }
+function formatProjectRow(name, captainName, fm, statusMdState, captainState) {
+  const sessionIndicator = captainIndicator(captainState);
+  const captainDisplay = `${captainName.padEnd(11)} ${sessionIndicator}`;
+  const crew = statusMdState === "ok" ? String(fm.active_crew ?? 0).padEnd(6) : chalk6.dim("?").padEnd(6);
+  const progress = statusMdState === "ok" ? progressBar(fm.tasks_completed ?? 0, fm.tasks_total ?? 0).padEnd(25) : statusMdState === "unreadable" ? chalk6.red("status.md unreadable").padEnd(25) : chalk6.dim("no notes").padEnd(25);
+  const updated = statusMdState === "ok" ? timeAgo(fm.last_updated) : chalk6.dim("\u2014");
+  return `  ${name.padEnd(18)} ${captainDisplay}  ${crew} ${progress} ${updated}`;
+}
 var statusCommand = new Command4("status").description("Show status of all projects from spoke vault status files").option("--detailed", "also show live per-component service health from the daemon (#77)").action(async (opts) => {
   const config = loadConfig();
   const projects = Object.entries(config.projects);
@@ -10826,28 +10872,19 @@ var statusCommand = new Command4("status").description("Show status of all proje
   console.log(chalk6.dim("  " + "\u2500".repeat(85)));
   for (const [name, project] of projects) {
     const workspace = registry.forProject(name, config);
-    if (!await workspace.exists("status.md")) {
-      console.log(`  ${name.padEnd(18)} ${chalk6.dim("no status.md")}`);
-      continue;
-    }
     let fm = {};
-    try {
-      const raw = await workspace.read("status.md");
-      fm = matter2(raw).data;
-    } catch {
-      console.log(`  ${name.padEnd(18)} ${chalk6.red("error reading status.md")}`);
-      continue;
+    let statusMdState = "missing";
+    if (await workspace.exists("status.md")) {
+      try {
+        const raw = await workspace.read("status.md");
+        fm = matter2(raw).data;
+        statusMdState = "ok";
+      } catch {
+        statusMdState = "unreadable";
+      }
     }
-    const sessionIndicator = captainIndicator(captainStateByProject.get(name));
-    const captainDisplay = `${project.captainName.padEnd(11)} ${sessionIndicator}`;
-    const crew = String(fm.active_crew ?? 0).padEnd(6);
-    const progress = progressBar(
-      fm.tasks_completed ?? 0,
-      fm.tasks_total ?? 0
-    ).padEnd(25);
-    const updated = timeAgo(fm.last_updated);
     console.log(
-      `  ${name.padEnd(18)} ${captainDisplay}  ${crew} ${progress} ${updated}`
+      formatProjectRow(name, project.captainName, fm, statusMdState, captainStateByProject.get(name))
     );
   }
   console.log("");
@@ -11982,7 +12019,7 @@ init_dist();
 import { join as join22 } from "path";
 import { homedir as homedir17 } from "os";
 import { existsSync as existsSync11, readFileSync as readFileSync14 } from "fs";
-import { execFile as execFile3 } from "child_process";
+import { execFile as execFile4 } from "child_process";
 var DEFAULT_TIMEOUT_MS = 2e3;
 var AGENT_CLIS = ["claude", "codex", "gemini", "opencode"];
 function withTimeout2(p, ms) {
@@ -12099,7 +12136,7 @@ function defaultProbeRunners() {
   return {
     probeCmuxBin: () => new Promise((resolve3) => {
       try {
-        execFile3(resolveCmuxBin(), ["--version"], { timeout: 1500 }, (err) => resolve3(!err));
+        execFile4(resolveCmuxBin(), ["--version"], { timeout: 1500 }, (err) => resolve3(!err));
       } catch {
         resolve3(false);
       }