@mu-crew/mu 3.12.0 → 3.13.1

package/dist/extension/mu-pi.js

@@ -75,6 +75,7 @@ function delegateStatus(running, starting = 0, queued = 0, failed = 0, pending =
 var DELEGATE_TIMEOUT_S = 3600;
 var DELEGATE_MAX_DEFAULT = 16;
 var DELEGATE_QUEUE_FACTOR = 4;
+var PRUNE_FAILED_MS = 3e4;
 function delegateMax(env = process.env) {
   const n = Number(env.MU_DELEGATE_MAX);
   return Number.isInteger(n) && n > 0 ? n : DELEGATE_MAX_DEFAULT;
@@ -188,13 +189,26 @@ ${agent.lastText ?? ""}`;
       ].join("\n");
     case "died":
       return `${who} died${took} before answering. ${fate}${ws}${evBlock}${tailBlock}`;
+    case "blocked": {
+      const b = agent.blocked;
+      const dialog = `${b?.kind ?? "dialog"}${b?.title ? ` "${b.title}"` : ""}`;
+      const lines = [
+        `${who} is blocked on a ${dialog} dialog${took} and has NOT finished; stopped waiting, so its answer will not arrive here. ${fate}${ws}`,
+        "Answer the dialog in its pane (attach), then wait again; or close it and record the check as UNVERIFIED.",
+        ...ev,
+        ...look,
+        `Wait again: mu agent wait ${name} -w ${W} --json${agent.afterRuns !== void 0 ? ` --after-runs ${agent.afterRuns}` : ""}`,
+        `Close: mu agent close ${name} -w ${W}`
+      ];
+      return `${lines.join("\n")}${tailBlock}`;
+    }
     case "timeout":
     case "pending":
       return [
         `${who} is still running after ${timeoutS}s; stopped waiting, so its answer will not arrive here. ${fate}${ws}`,
         ...ev,
         ...look,
-        `Wait again: mu agent wait ${name} -w ${W} --json`
+        `Wait again: mu agent wait ${name} -w ${W} --json${agent.afterRuns !== void 0 ? ` --after-runs ${agent.afterRuns}` : ""}`
       ].join("\n");
     default:
       return `${who}: mu agent wait gave no result. ${fate}${ws}${evBlock}${tailBlock}`;
@@ -264,12 +278,13 @@ function modelCommand(cli, model, env = process.env) {
   return `${base} --model ${shellArg(model)}`;
 }
 function registerDelegate(pi, run = defaultRunner()) {
-  if (!delegateEnabled()) return;
+  if (!delegateEnabled()) return { answerPending: () => false };
   const inflight = /* @__PURE__ */ new Map();
   let starting = 0;
   const queue = [];
   let queueSeq = 0;
   const failed = /* @__PURE__ */ new Set();
+  let lastPruneAt = 0;
   const arriving = /* @__PURE__ */ new Map();
   let deliverySeq = 0;
   let ui;
@@ -359,6 +374,9 @@ function registerDelegate(pi, run = defaultRunner()) {
   const failure = (what, r) => new Error(`${what} failed (exit ${r.code}): ${(r.stderr || r.stdout).trim()}`);
   function pruneFailed() {
     if (failed.size === 0) return;
+    const now = Date.now();
+    if (now - lastPruneAt < PRUNE_FAILED_MS) return;
+    lastPruneAt = now;
     void mu(["agent", "list", "-w", W, "--json"]).then((r) => {
       const agents = json(r)?.agents;
       if (!Array.isArray(agents)) return;
@@ -394,6 +412,12 @@ function registerDelegate(pi, run = defaultRunner()) {
       );
     }
     const sent = out.send;
+    if (sent?.ok !== true && sent?.error === "AgentSendIndeterminateError") {
+      const why = typeof sent.message === "string" ? sent.message : "no reply";
+      throw new Error(
+        `mu agent send to ${W}/${name}: delivery unknown (${why}). Pane kept; do NOT resend blindly. Check with: mu agent read ${name} -w ${W} -n 20 (or attach), then close it with: mu agent close ${name} -w ${W}`
+      );
+    }
     if (sent?.ok !== true) {
       const c = await mu(["agent", "close", name, "-w", W]);
       const pane = c.code === 0 ? "Pane closed." : `Pane kept; close it with: mu agent close ${name} -w ${W}`;
@@ -446,30 +470,32 @@ function registerDelegate(pi, run = defaultRunner()) {
     const outcome = agent?.outcome;
     const tail = outcome === "done" || outcome === "timeout" || outcome === "pending" || outcome === "error" ? void 0 : (await mu(["agent", "read", name, "-n", "50", "-w", W])).stdout;
     let pane = { closed: false, why: "keep: true" };
-    if (outcome !== "done" && outcome !== "empty")
+    let closing;
+    if (outcome === "blocked") pane = { closed: false, why: "waiting on a dialog" };
+    else if (outcome !== "done" && outcome !== "empty")
       pane = { closed: false, why: "kept as evidence" };
-    else if (!keep) {
-      const c = await mu(["agent", "close", name, "-w", W]);
-      pane = c.code === 0 ? { closed: true } : { closed: false, why: `close refused: ${(c.stderr || c.stdout).trim()}` };
-    }
+    else if (!keep) closing = mu(["agent", "close", name, "-w", W]);
+    const recording = record ? writeRecord(
+      record.target,
+      name,
+      recordNote(record.label, name, outcome, agent?.lastText, extras.elapsedMs ?? 0)
+    ) : void 0;
+    const [closed, recorded] = await Promise.all([closing, recording]);
+    if (closed)
+      pane = closed.code === 0 ? { closed: true } : { closed: false, why: `close refused: ${(closed.stderr || closed.stdout).trim()}` };
     if (outcome === "error" && !pane.closed) {
       failed.add(name);
       showStatus();
     }
     if (outcome !== "done") {
       const sessionFile = agent?.sessionFile ?? extras.sessionFile;
-      const partial = sessionFile ? partialCopy(name, sessionFile) : void 0;
+      const partial = sessionFile && outcome !== "blocked" ? partialCopy(name, sessionFile) : void 0;
       extras = {
         ...extras,
         ...sessionFile ? { sessionFile } : {},
         ...partial ? { partial } : {}
       };
     }
-    const recorded = record ? await writeRecord(
-      record.target,
-      name,
-      recordNote(record.label, name, outcome, agent?.lastText, extras.elapsedMs ?? 0)
-    ) : void 0;
     const message = delegateMessage(name, agent, pane, { ...extras, ...tail ? { tail } : {} });
     const content = recorded ? `${message}
 
@@ -868,6 +894,7 @@ ${evidence.join("\n")}`;
     else process.stderr.write(`mu: ${msg}
 `);
   });
+  return { answerPending: () => arriving.size > 0 };
 }
 
 // extension/nudge.ts
@@ -881,6 +908,10 @@ var MARK_START = "<!-- mu:keep-driving -->";
 var MARK_END = "<!-- /mu:keep-driving -->";
 var WAIT_HINT_MAX = 8;
 var notNested = () => false;
+var noHold = () => void 0;
+function withQueuedInput(hold) {
+  return (ctx) => ctx?.hasPendingMessages?.() ? "answer" : hold(ctx);
+}
 function noUI(ctx) {
   return ctx?.hasUI === false;
 }
@@ -1053,25 +1084,29 @@ function dispatchedTasks(command) {
   return out;
 }
 async function inProgress(run, workstreams) {
-  const named = workstreams.filter((w) => w !== "");
-  const args = ["state", "--json", "--events", "0"];
-  for (const w of named) args.push("-w", w);
-  const r = await run(args);
-  if (r.code !== 0) return void 0;
-  let json;
-  try {
-    json = JSON.parse(r.stdout);
-  } catch {
-    return void 0;
-  }
-  const cards = json.workstreams ?? [json];
-  const refs = [];
-  for (const ws of cards) {
-    for (const t of ws.inProgress ?? []) {
-      if (t.name) refs.push(`${ws.workstreamName ?? ""}/${t.name}`);
-    }
-  }
-  return refs;
+  const results = await Promise.all(
+    workstreams.map(async (w) => {
+      const r = await run([
+        "task",
+        "list",
+        "--status",
+        "IN_PROGRESS",
+        "--json",
+        "--sort",
+        "recency",
+        ...w ? ["-w", w] : []
+      ]);
+      if (r.code !== 0) return void 0;
+      try {
+        const items = JSON.parse(r.stdout).items ?? [];
+        return items.flatMap((t) => t.name ? [`${t.workstreamName ?? w}/${t.name}`] : []);
+      } catch {
+        return void 0;
+      }
+    })
+  );
+  if (results.some((r) => r === void 0)) return void 0;
+  return [...new Set(results.flatMap((r) => r ?? []))];
 }
 function nudgeText(rule, refs) {
   const shown = refs.slice(0, WAIT_HINT_MAX).join(" ");
@@ -1086,7 +1121,7 @@ function breadcrumb(run, args) {
   void run(args).catch(() => {
   });
 }
-function parallelSettle(pi) {
+function parallelSettle(pi, hold = noHold) {
   const handlers = [];
   const api = {
     on(event, handler) {
@@ -1111,7 +1146,15 @@ function parallelSettle(pi) {
             }
           })
         );
-        const fired = results.filter((r) => r !== void 0);
+        const late = hold(ctx);
+        const fired = results.flatMap((r) => {
+          if (r === void 0) return [];
+          if (late === "answer" || late === "blocked" && r.continue === true) {
+            r.yielded?.();
+            return [];
+          }
+          return [r];
+        });
         if (fired.length === 0) return void 0;
         const prior = event?.entries ?? [];
         return {
@@ -1138,7 +1181,7 @@ function bashCommand(event) {
   const e = event;
   return e.toolName === "bash" && typeof e.input?.command === "string" ? e.input.command : void 0;
 }
-function registerNudge(pi, run = defaultRunner(), skillMd = readSkill(), nested = notNested) {
+function registerNudge(pi, run = defaultRunner(), skillMd = readSkill(), nested = notNested, hold = noHold) {
   if (!nudgeEnabled()) return;
   const rule = skillMd === void 0 ? void 0 : keepDrivingRule(skillMd);
   if (rule === void 0) return;
@@ -1153,12 +1196,16 @@ function registerNudge(pi, run = defaultRunner(), skillMd = readSkill(), nested
     if (cmd === void 0) return;
     for (const ws of dispatchedWorkstreams(cmd) ?? []) armed.add(ws);
   });
-  pi.on("agent_before_settle", async (event) => {
-    if (fired || armed.size === 0 || nested()) return;
+  pi.on("agent_before_settle", async (event, ctx) => {
+    if (fired || armed.size === 0 || nested() || hold(ctx)) return;
     if (outcomeOf(event) !== "completed") return;
     fired = true;
     const refs = await inProgress(run, [...armed]);
     if (refs === void 0 || refs.length === 0) return;
+    if (hold(ctx)) {
+      fired = false;
+      return;
+    }
     const text = nudgeText(rule, refs);
     const logWs = [...armed].find((w) => w !== "");
     breadcrumb(run, [
@@ -1172,7 +1219,10 @@ function registerNudge(pi, run = defaultRunner(), skillMd = readSkill(), nested
       entries: [
         { type: "custom_message", customType: NUDGE_MESSAGE_TYPE, content: text, display: true }
       ],
-      continue: true
+      continue: true,
+      yielded: () => {
+        fired = false;
+      }
     };
   });
 }
@@ -1203,7 +1253,7 @@ function closeNudgeText(workstream, names) {
     "If you are blocked or need an answer, say so in one line and stop; the orchestrator will read your pane."
   ].join("\n");
 }
-function registerCloseNudge(pi, run = defaultRunner(), env = process.env, nested = notNested) {
+function registerCloseNudge(pi, run = defaultRunner(), env = process.env, nested = notNested, hold = noHold) {
   if (!nudgeEnabled(env)) return;
   const me = workerIdentity(env);
   if (me === void 0) return;
@@ -1212,11 +1262,15 @@ function registerCloseNudge(pi, run = defaultRunner(), env = process.env, nested
     fired = false;
   });
   pi.on("agent_before_settle", async (event, ctx) => {
-    if (fired || nested() || noUI(ctx)) return;
+    if (fired || nested() || noUI(ctx) || hold(ctx)) return;
     if (outcomeOf(event) !== "completed") return;
     fired = true;
     const names = await ownedInProgress(run, me.agent, me.workstream);
     if (names === void 0 || names.length === 0) return;
+    if (hold(ctx)) {
+      fired = false;
+      return;
+    }
     breadcrumb(run, [
       "log",
       "-w",
@@ -1234,7 +1288,10 @@ function registerCloseNudge(pi, run = defaultRunner(), env = process.env, nested
           display: true
         }
       ],
-      continue: true
+      continue: true,
+      yielded: () => {
+        fired = false;
+      }
     };
   });
 }
@@ -1252,8 +1309,9 @@ async function briefRefuted(run, ws, id) {
 function refuteNudgeText(refs) {
   return `[mu] dispatched ${refs.join(", ")} with an unrefuted brief: refute it (delegate, record) or note REFUTE-EXEMPT: <why>`;
 }
-function registerRefuteNudge(pi, run = defaultRunner(), nested = notNested) {
+function registerRefuteNudge(pi, run = defaultRunner(), nested = notNested, hold = noHold) {
   if (!nudgeEnabled()) return;
+  const answerDue = (ctx) => hold(ctx) === "answer";
   const armed = /* @__PURE__ */ new Map();
   let fired = false;
   pi.on("input", () => {
@@ -1268,13 +1326,17 @@ function registerRefuteNudge(pi, run = defaultRunner(), nested = notNested) {
     }
   });
   pi.on("agent_before_settle", async (event, ctx) => {
-    if (fired || armed.size === 0 || nested() || noUI(ctx)) return;
+    if (fired || armed.size === 0 || nested() || noUI(ctx) || answerDue(ctx)) return;
     if (outcomeOf(event) !== "completed") return;
     fired = true;
     const tasks = [...armed];
     const refuted = await Promise.all(tasks.map(([, t]) => briefRefuted(run, t.ws, t.id)));
     const refs = tasks.flatMap(([ref], i) => refuted[i] === false ? [ref] : []);
     if (refs.length === 0) return;
+    if (answerDue(ctx)) {
+      fired = false;
+      return;
+    }
     const logWs = [...armed.values()].find((t) => t.ws !== "")?.ws;
     breadcrumb(run, [
       "log",
@@ -1291,13 +1353,16 @@ function registerRefuteNudge(pi, run = defaultRunner(), nested = notNested) {
           content: refuteNudgeText(refs),
           display: true
         }
-      ]
+      ],
+      yielded: () => {
+        fired = false;
+      }
     };
   });
 }
 
 // extension/mu-pi.ts
-var EXT_VERSION = true ? "3.12.0" : void 0;
+var EXT_VERSION = true ? "3.13.1" : void 0;
 var FRESH_COMMAND = "mu-fresh";
 var FRESH_TIMEOUT_MS = 3e4;
 function commandName(name) {
@@ -1387,6 +1452,50 @@ function capText(text) {
   return `${cut.replace(/\uFFFD$/, "")}
 ${LAST_TEXT_TRUNCATED}`;
 }
+var UI_PROMPTS = /* @__PURE__ */ Symbol.for("mu.pi.uiPrompts");
+function uiPrompts() {
+  const g = globalThis;
+  g[UI_PROMPTS] ??= { open: [], since: 0 };
+  return g[UI_PROMPTS];
+}
+function uiBlocked() {
+  const u = uiPrompts();
+  const top = u.open[u.open.length - 1];
+  if (!top) return void 0;
+  return {
+    kind: top.kind,
+    ...top.title !== void 0 ? { title: top.title } : {},
+    since: u.since
+  };
+}
+function isUiBlocked() {
+  return uiPrompts().open.length > 0;
+}
+function promptOf(event) {
+  const e = typeof event === "object" && event !== null ? event : {};
+  const kind = typeof e.kind === "string" ? e.kind : "custom";
+  const title = typeof e.title === "string" && e.title !== "" ? e.title : void 0;
+  return { kind, ...title !== void 0 ? { title } : {} };
+}
+function trackUiPrompts(pi, onStart = () => {
+}) {
+  pi.on("ui_prompt_start", (e) => {
+    const u = uiPrompts();
+    if (u.open.length === 0) u.since = Date.now();
+    u.open.push(promptOf(e));
+    onStart();
+  });
+  pi.on("session_start", () => {
+    uiPrompts().open.length = 0;
+  });
+  pi.on("ui_prompt_end", (e) => {
+    const u = uiPrompts();
+    const { kind } = promptOf(e);
+    let i = u.open.length - 1;
+    while (i >= 0 && u.open[i]?.kind !== kind) i--;
+    u.open.splice(i >= 0 ? i : u.open.length - 1, 1);
+  });
+}
 function inodeOf(path) {
   try {
     return statSync2(path).ino;
@@ -1437,18 +1546,24 @@ function registerPrompts(pi) {
   });
 }
 function muPi(pi, run = defaultRunner()) {
-  registerDelegate(pi, run);
+  const delegates = registerDelegate(pi, run);
   registerPrompts(pi);
   const nested = serveCtl(pi);
-  const settle = parallelSettle(pi);
-  registerNudge(settle.api, run, void 0, nested);
-  registerCloseNudge(settle.api, run, process.env, nested);
-  registerRefuteNudge(settle.api, run, nested);
+  const hold = withQueuedInput(
+    () => delegates.answerPending() ? "answer" : isUiBlocked() ? "blocked" : void 0
+  );
+  const settle = parallelSettle(pi, hold);
+  registerNudge(settle.api, run, void 0, nested, hold);
+  registerCloseNudge(settle.api, run, process.env, nested, hold);
+  registerRefuteNudge(settle.api, run, nested, hold);
   settle.flush();
 }
 function serveCtl(pi) {
   const sock = process.env.MU_CTL_SOCK;
-  if (!sock) return () => false;
+  if (!sock) {
+    trackUiPrompts(pi);
+    return () => false;
+  }
   const sockPath = sock;
   const piVersion = detectPiVersion();
   const map = sharedMap();
@@ -1471,7 +1586,15 @@ function serveCtl(pi) {
     since: g.since,
     runs: g.runs,
     pending: g.ctx?.hasPendingMessages() ?? false,
-    ...sessionFileOf(g.ctx)
+    ...sessionFileOf(g.ctx),
+    ...blockedField()
+  });
+  const blockedField = () => {
+    const b = uiBlocked();
+    return b ? { blocked: b } : {};
+  };
+  trackUiPrompts(pi, () => {
+    for (const w of [...g.waiters]) w("blocked");
   });
   const settleFresh = (r) => {
     const f = g.fresh;
@@ -1513,7 +1636,7 @@ function serveCtl(pi) {
     g.lastError = g.endError;
     g.endError = void 0;
     g.sessionFile = sessionFileOf(c).sessionFile;
-    for (const w of [...g.waiters]) w();
+    for (const w of [...g.waiters]) w("settle");
   });
   pi.registerCommand(FRESH_COMMAND, {
     description: "mu internal: new session + the prompt mu queued (run by mu agent send --fresh)",
@@ -1643,11 +1766,19 @@ function serveCtl(pi) {
       case "command":
         return command(req);
       case "wait":
-        return wait(num(req, "afterRuns"), num(req, "timeoutMs"), conn);
+        return wait(
+          num(req, "afterRuns"),
+          num(req, "timeoutMs"),
+          conn,
+          req.returnOnBlocked === true
+        );
       case "abort":
         if (!g.ctx) return fail("no pi context yet");
-        g.ctx.abort();
-        return { v: V, ok: true, state: g.state };
+        {
+          const wasBusy = !g.ctx.isIdle();
+          if (wasBusy) g.ctx.abort();
+          return { v: V, ok: true, state: g.state, wasBusy };
+        }
       case "interrupt":
         return interrupt(req, conn);
       default:
@@ -1675,10 +1806,18 @@ function serveCtl(pi) {
     ...g.lastError !== void 0 ? { lastError: g.lastError } : {},
     ...g.sessionFile !== void 0 ? { sessionFile: g.sessionFile } : {}
   });
-  function wait(afterRuns, timeoutMs, conn) {
+  function wait(afterRuns, timeoutMs, conn, onBlocked = false) {
     if (afterRuns !== void 0 && g.runs > afterRuns && g.state === "idle") {
-      return Promise.resolve({ v: V, ok: true, ...status(), ...settledRun() });
+      return Promise.resolve({
+        v: V,
+        ok: true,
+        ...status(),
+        ...settledRun(),
+        ended: "settled"
+      });
     }
+    const blockedReply = () => ({ v: V, ok: true, ...status(), ended: "blocked" });
+    if (onBlocked && isUiBlocked()) return Promise.resolve(blockedReply());
     return new Promise((resolve) => {
       let timer;
       const done = (r) => {
@@ -1687,9 +1826,13 @@ function serveCtl(pi) {
         conn.off("close", onClose);
         resolve(r);
       };
-      const waiter = () => {
+      const waiter = (why) => {
+        if (why === "blocked") {
+          if (onBlocked) done(blockedReply());
+          return;
+        }
         if (afterRuns !== void 0 && g.runs <= afterRuns) return;
-        done({ v: V, ok: true, ...status(), ...settledRun() });
+        done({ v: V, ok: true, ...status(), ...settledRun(), ended: "settled" });
       };
       const onClose = () => done(fail("client closed"));
       g.waiters.add(waiter);
@@ -1811,8 +1954,10 @@ export {
   LIVE_PROBE_MS,
   commandName,
   muPi as default,
+  isUiBlocked,
   lastAssistantError,
   lastAssistantText,
-  promptsDir
+  promptsDir,
+  uiBlocked
 };
 //# sourceMappingURL=mu-pi.js.map