@mu-crew/mu 4.2.1 → 4.2.2

package/dist/cli.js

@@ -47,6 +47,6 @@ function enableCompileCacheIn(dir, enable = nodeEnable ?? null) {
 
 // src/main.ts
 enableCompileCacheIn(join(defaultStateDir(), "compile-cache"));
-var { runCli } = await import("./cli-H3VVCP7M.js");
+var { runCli } = await import("./cli-HKBFJISN.js");
 await runCli(process.argv);
 //# sourceMappingURL=cli.js.map

package/dist/extension/mu-pi.js

@@ -1728,16 +1728,7 @@ function outcomeOf(event) {
 }
 var SETTLE_DRAIN_MS = 3e3;
 var SETTLE_WAIT_ARGS = ["wait", "--first", "--on-stall", "exit", "--json"];
-var SETTLE_READY_ARGS = [
-  "wait",
-  "--first",
-  "--on-stall",
-  "exit",
-  "--timeout",
-  "1",
-  "--json"
-];
-var READY_MAX = 50;
+var HUMAN_STOP_DRAIN = "A human stop is open (mu human-needed). Collect and merge what you already started; start nothing new (no `mu next`, no spawn, no new delegate, no restart of a stalled or dead worker: tell the human). The settle keeps waiting while work you own is still running, and ends the turn when nothing is.";
 var ESC = /^\u001b(\[27(;\d+)*u)?$/;
 function envelopeOf(stdout) {
   try {
@@ -1881,11 +1872,10 @@ function registerNudge(pi, run = defaultRunner(), skillMd = readSkill(), nested
         return {
           blocks: [
             `Delegate answer: call ${callId}. Its row is unreadable here: mu delegates show ${callId}`
-          ],
-          stop: false
+          ]
         };
       const wave = c.wave;
-      if (!wave) return { blocks: [await answerBlock(mu, c, REPORT_CAP)], stop: false };
+      if (!wave) return { blocks: [await answerBlock(mu, c, REPORT_CAP)] };
       const listed = async () => {
         const v = await mu(["delegates", "list", "--wave", wave, "--json"]);
         const items = v?.ok === true ? v.data?.items : void 0;
@@ -1893,7 +1883,6 @@ function registerNudge(pi, run = defaultRunner(), skillMd = readSkill(), nested
       };
       const after = [];
       const notices = new Set(noticesOf(first));
-      let stop = false;
       let rows = await listed();
       let picture = pictureOf(first);
       const owedRow = (r) => PENDING_STATES.has(r.state) || r.state !== "refused" && !shown.has(r.callId) && picture?.has(r.callId) !== false;
@@ -1912,11 +1901,10 @@ function registerNudge(pi, run = defaultRunner(), skillMd = readSkill(), nested
         for (const n of noticesOf(d)) notices.add(n);
         picture = pictureOf(d);
         if (d.timedOut === true) continue;
-        if (Array.isArray(d.humanNeeds) && d.humanNeeds.length > 0) stop = true;
         const id = firingDelegate(d);
         const sibling = id !== void 0 && rows.some((x) => x.callId === id);
         if (id !== void 0) shown.add(id);
-        if (sibling && !stop) {
+        if (sibling) {
           rows = await listed();
           continue;
         }
@@ -1933,46 +1921,9 @@ ${JSON.stringify(d)}`);
       );
       return {
         blocks: [waveSummary(wave, rows), ...bodies, ...after],
-        stop,
         wave: { label: wave, complete, notices: [...notices] }
       };
     };
-    const ready = async () => {
-      const blocks = [];
-      const shown = [];
-      for (let i = 0; i < READY_MAX && !ctl.signal.aborted; i++) {
-        const started = Date.now();
-        const r = await wait(SETTLE_READY_ARGS);
-        const v = envelopeOf(r.stdout);
-        if (v?.ok === false && v.error === "WaitNothingError") {
-          delivered({ before: started });
-          break;
-        }
-        const d = v?.ok === true ? v.data : void 0;
-        if (d === void 0) {
-          const why = (r.stdout.trim() || r.stderr.trim()).slice(0, 2e3);
-          blocks.push(`mu wait failed (exit ${r.code}): ${why}`);
-          break;
-        }
-        if (d.drained === true) delivered({ before: started });
-        if (d.interrupted === true || d.drained === true || d.timedOut === true) break;
-        blocks.push(JSON.stringify(d));
-        const id = firingDelegate(d);
-        if (id === void 0) continue;
-        shown.push(id);
-        const c = await call2(id);
-        blocks.push(
-          c === void 0 ? `Delegate answer: call ${id}. Its row is unreadable here: mu delegates show ${id}` : await answerBlock(mu, c, REPORT_CAP)
-        );
-      }
-      if (shown.length > 0) delivered(shown);
-      if (blocks.length === 0) return void 0;
-      const text = [
-        "[mu] A human stop is open (mu human-needed), so the settle did not wait. It showed what was already ready:",
-        ...blocks.flatMap((b) => ["", b])
-      ].join("\n");
-      return { entries: [entry(text)], receipt: true };
-    };
     let result;
     try {
       result = await (async () => {
@@ -1987,7 +1938,6 @@ ${JSON.stringify(d)}`);
                 )
               ]
             };
-          if (needs > 0) return ready();
           const started = Date.now();
           const r = await wait(SETTLE_WAIT_ARGS);
           const v = envelopeOf(r.stdout);
@@ -2008,16 +1958,22 @@ ${JSON.stringify(d)}`);
           const got = callId === void 0 ? void 0 : await answers(callId, shown, d);
           const blocks = got?.blocks ?? [];
           if (shown.size > 0) delivered([...shown]);
-          const humanStop = Array.isArray(d.humanNeeds) && d.humanNeeds.length > 0;
-          const stop = humanStop || got?.stop === true;
+          const stops = Array.isArray(d.humanNeeds) ? d.humanNeeds : [];
+          const humanStop = needs > 0 || stops.length > 0;
           const ran = `Work you own is still running, so the settle ran \`mu ${SETTLE_WAIT_ARGS.join(" ")}\` for you.`;
           const w = got?.wave;
-          const head = w !== void 0 && !humanStop ? [
+          const head = w !== void 0 ? [
             w.complete ? `${ran} It waited until wave ${w.label} was in:` : `${ran} It waited for wave ${w.label}, which is not all in (below):`,
             ...w.notices.map((n) => `Notice: ${n}`)
           ] : [`${ran} Its result:`, JSON.stringify(d)];
-          const text = [`[mu] ${rule}`, "", ...head, ...blocks.flatMap((b) => ["", b])].join("\n");
-          return { entries: [entry(text)], ...stop ? {} : { continue: true }, receipt: true };
+          const lead = humanStop ? [
+            `[mu] ${HUMAN_STOP_DRAIN}`,
+            ...stops.flatMap(
+              (h) => typeof h.reason === "string" ? [`Stop: ${h.reason}`] : []
+            )
+          ] : [`[mu] ${rule}`];
+          const text = [...lead, "", ...head, ...blocks.flatMap((b) => ["", b])].join("\n");
+          return { entries: [entry(text)], continue: true, receipt: true };
         }
       })();
     } finally {
@@ -2102,7 +2058,7 @@ function registerCloseNudge(pi, run = defaultRunner(), env = process.env, nested
 }
 
 // extension/mu-pi.ts
-var EXT_VERSION = true ? "4.2.1" : void 0;
+var EXT_VERSION = true ? "4.2.2" : void 0;
 var FRESH_COMMAND = "mu-fresh";
 var FRESH_TIMEOUT_MS = 3e4;
 function commandName(name) {