@mu-crew/mu 3.6.0 → 3.6.2

package/dist/cli.js

@@ -5188,6 +5188,7 @@ function mapMurmurState(token, since) {
       break;
     case "idle":
     case "done":
+    case "error":
     case "crashed":
       state = "needs_input";
       break;
@@ -5241,7 +5242,7 @@ function remoteReading(agent, panes) {
       (entry) => typeof entry === "object" && entry !== null && "kind" in entry && typeof entry.kind === "string" ? [entry.kind] : []
     )
   ) : /* @__PURE__ */ new Set();
-  const state = kinds.has("crashed") ? "needs_input" : kinds.has("blocked") ? "needs_permission" : kinds.has("done") ? "needs_input" : row2.activity === "running" ? "busy" : "needs_input";
+  const state = kinds.has("crashed") || kinds.has("error") ? "needs_input" : kinds.has("blocked") ? "needs_permission" : kinds.has("done") ? "needs_input" : row2.activity === "running" ? "busy" : "needs_input";
   return {
     state,
     source: "murmur",
@@ -5299,7 +5300,8 @@ async function readAgentStates(agents, opts = {}) {
         source: "ctl",
         since: probe.status.since,
         alive: true,
-        ctl: "ok"
+        ctl: "ok",
+        pending: probe.status.pending
       });
     } else {
       failed.set(agentKey(agent), probe?.kind === "missing" ? "missing" : "refused");
@@ -7346,6 +7348,7 @@ async function waitForTasks(db, input, opts) {
   const timeoutMs = opts.timeoutMs ?? 6e5;
   const pollMs = opts.pollMs ?? 1e3;
   const stuckAfterMs = opts.stuckAfterMs ?? DEFAULT_STUCK_AFTER_MS;
+  const ctlStuckAfterMs = opts.ctlStuckAfterMs ?? DEFAULT_CTL_STUCK_AFTER_MS;
   const onStall = opts.onStall ?? "warn";
   const deadline = timeoutMs > 0 ? Date.now() + timeoutMs : Number.POSITIVE_INFINITY;
   for (const ref of refs) {
@@ -7373,8 +7376,10 @@ async function waitForTasks(db, input, opts) {
     ctlBrokenSince.delete(ownerKey);
     stuckLabel.delete(ownerKey);
     if (reading?.state !== "needs_input" || reading.since === null) return null;
+    const viaCtl = reading.source === "ctl" && reading.ctl === "ok";
+    if (viaCtl && reading.pending === true) return null;
     const ageMs2 = Date.now() - reading.since;
-    return ageMs2 >= stuckAfterMs ? ageMs2 : null;
+    return ageMs2 >= (viaCtl ? ctlStuckAfterMs : stuckAfterMs) ? ageMs2 : null;
   };
   const snapshot2 = async () => {
     const refStates = [];
@@ -7450,7 +7455,7 @@ async function waitForTasks(db, input, opts) {
     if (isDone(snap)) return snap;
   }
 }
-var currentWaitSleep, pollCount, DEFAULT_STUCK_AFTER_MS, defaultStuckWarn, currentStuckWarn;
+var currentWaitSleep, pollCount, DEFAULT_STUCK_AFTER_MS, DEFAULT_CTL_STUCK_AFTER_MS, defaultStuckWarn, currentStuckWarn;
 var init_wait = __esm({
   "src/tasks/wait.ts"() {
     "use strict";
@@ -7461,6 +7466,7 @@ var init_wait = __esm({
     currentWaitSleep = (ms) => new Promise((resolve9) => setTimeout(resolve9, ms));
     pollCount = 0;
     DEFAULT_STUCK_AFTER_MS = 12e4;
+    DEFAULT_CTL_STUCK_AFTER_MS = 5e3;
     defaultStuckWarn = (msg) => {
       process.stderr.write(msg);
     };
@@ -19418,6 +19424,7 @@ async function cmdTaskWait(db, ids, opts) {
   const timeoutMs = opts.timeout !== void 0 ? opts.timeout * 1e3 : 6e5;
   const stuckAfterMs = opts.stuckAfter !== void 0 ? opts.stuckAfter * 1e3 : DEFAULT_STUCK_AFTER_MS;
   const sdkOpts = { timeoutMs, stuckAfterMs };
+  if (opts.stuckAfter !== void 0) sdkOpts.ctlStuckAfterMs = stuckAfterMs;
   if (statusOpt !== void 0) sdkOpts.status = statusOpt;
   if (wantAny) sdkOpts.any = true;
   let ownerReadings = /* @__PURE__ */ new Map();
@@ -20183,7 +20190,7 @@ function wireTaskCommands(program) {
     "alias for --any that ALSO prints the firing ref's qualified id to stdout and populates `firing` in --json (which --any leaves null). Use to drive a single-shot dispatch loop: `closed=$(mu task wait a b --first --json | jq -r .firing.qualifiedId)`."
   ).option("--timeout <seconds>", "max seconds to wait (0 = forever, default 600)", parseLines).option(
     "--stuck-after <seconds>",
-    "the TRIGGER: mark an IN_PROGRESS task as needing attention when its owner has been in needs_input for >= N seconds since their last status change (0 = disable, default 120). needs_input has several causes \u2014 the worker may have finished without closing, be waiting on an answer, or be sitting at a prompt \u2014 so the warning names the observation and points at `mu agent read <owner>`, which is the next move in every case. The default ACTION is `exit` (exit 7); see --on-stall warn to keep polling instead.",
+    "the TRIGGER: mark an IN_PROGRESS task as needing attention when its owner has been in needs_input for >= N seconds since their last status change (0 = disable; default 120, or 5 for a pi owner read over its control socket, whose idle is exact and comes after the close nudge; an explicit value applies to every owner). needs_input has several causes \u2014 the worker may have finished without closing, be waiting on an answer, or be sitting at a prompt \u2014 so the warning names the observation and points at `mu agent read <owner>`, which is the next move in every case. The default ACTION is `exit` (exit 7); see --on-stall warn to keep polling instead.",
     parseLines
   ).option(
     "--on-stall <action>",