@mu-crew/mu 3.9.0 → 3.10.1

package/dist/extension/mu-pi.js

@@ -175,6 +175,12 @@ function labelStem(label) {
   const stem = label.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 20).replace(/-+$/, "");
   return stem || void 0;
 }
+var MODEL_RE = /^[A-Za-z0-9._:/@+-]+$/;
+function modelCommand(cli, model, env = process.env) {
+  const override = env[`MU_${cli.toUpperCase().replace(/-/g, "_")}_COMMAND`];
+  const base = override && override.trim() !== "" ? override.trim() : cli;
+  return `${base} --model ${model}`;
+}
 function registerDelegate(pi, run = defaultRunner()) {
   if (!delegateEnabled()) return;
   const inflight = /* @__PURE__ */ new Map();
@@ -182,7 +188,6 @@ function registerDelegate(pi, run = defaultRunner()) {
   const queue = [];
   let queueSeq = 0;
   const failed = /* @__PURE__ */ new Set();
-  const reserved = /* @__PURE__ */ new Set();
   let ui;
   let lastPending = 0;
   const reportPending = () => {
@@ -209,7 +214,6 @@ function registerDelegate(pi, run = defaultRunner()) {
   };
   const forget = (name) => {
     inflight.delete(name);
-    reserved.delete(name);
     drain();
     showStatus();
   };
@@ -248,63 +252,60 @@ function registerDelegate(pi, run = defaultRunner()) {
     }
   };
   const failure = (what, r) => new Error(`${what} failed (exit ${r.code}): ${(r.stderr || r.stdout).trim()}`);
-  async function pickName(stem) {
-    const r = await mu(["agent", "list", "-w", W, "--json"]);
-    const agents = json(r)?.agents;
-    const taken = new Set(
-      Array.isArray(agents) ? agents.map((a) => a.name).filter((n) => n) : []
-    );
-    if (Array.isArray(agents)) {
+  function pruneFailed() {
+    if (failed.size === 0) return;
+    void mu(["agent", "list", "-w", W, "--json"]).then((r) => {
+      const agents = json(r)?.agents;
+      if (!Array.isArray(agents)) return;
+      const taken = new Set(agents.map((a) => a.name));
       for (const f of [...failed]) if (!taken.has(f)) failed.delete(f);
       showStatus();
-    }
-    for (let n = 1; ; n++) {
-      const name = stem ? n === 1 ? `delegate-${stem}` : `delegate-${stem}-${n}` : `delegate-${n}`;
-      if (!taken.has(name) && !reserved.has(name)) {
-        reserved.add(name);
-        return name;
-      }
-    }
+    });
   }
-  async function spawn(params, cwd, signal) {
+  async function spawn(params, text, cwd, signal) {
+    signal?.throwIfAborted();
+    pruneFailed();
     const stem = labelStem(params.label);
-    for (let attempt = 0; ; attempt++) {
-      signal?.throwIfAborted();
-      const name = await pickName(stem);
-      const args = ["agent", "spawn", name, "-w", W, "--json"];
-      if (params.workspace === true) args.push("--workspace");
-      else if (cwd) args.push("--cwd", cwd);
-      if (typeof params.cli === "string" && params.cli) args.push("--cli", params.cli);
-      const r = await mu(args);
-      if (signal?.aborted && r.code === 0) {
-        reserved.delete(name);
-        await mu(["agent", "close", name, "-w", W]);
-        signal.throwIfAborted();
-      }
-      if (r.code !== 0 && /already exists/.test(r.stderr) && attempt < 3) {
-        reserved.delete(name);
-        continue;
-      }
-      if (r.code !== 0) {
-        reserved.delete(name);
-        throw failure("mu agent spawn", r);
-      }
-      const out = json(r) ?? {};
-      if (out.ctl !== "ok") {
-        reserved.delete(name);
-        throw new Error(
-          `${W}/${name} spawned but its control socket is ${String(out.ctl)}, so its answer cannot come back. Pane kept; close it with: mu agent close ${name} -w ${W}`
-        );
-      }
-      const steps = Array.isArray(out.nextSteps) ? out.nextSteps : [];
-      const attach = steps.map((s) => s).find((s) => s.intent === "Attach the pane")?.command;
-      const wsPath = out.workspace?.path;
-      return {
-        name,
-        ...typeof attach === "string" ? { attach } : {},
-        ...typeof wsPath === "string" ? { workspace: wsPath } : {}
-      };
+    const base = stem ? `delegate-${stem}` : "delegate-1";
+    const args = ["agent", "spawn", base, "-w", W, "--next-free", "--send", text, "--json"];
+    if (params.workspace === true) args.push("--workspace");
+    else if (cwd) args.push("--cwd", cwd);
+    const cli = typeof params.cli === "string" && params.cli ? params.cli : void 0;
+    if (cli) args.push("--cli", cli);
+    if (typeof params.model === "string" && params.model)
+      args.push("--command", modelCommand(cli ?? "pi", params.model));
+    const r = await mu(args);
+    const out = json(r);
+    const spawned = out?.agent?.name;
+    if (typeof spawned !== "string") throw failure("mu agent spawn", r);
+    const name = spawned;
+    if (signal?.aborted) {
+      await mu(["agent", "close", name, "-w", W]);
+      signal.throwIfAborted();
+    }
+    if (out?.ctl !== "ok") {
+      throw new Error(
+        `${W}/${name} spawned but its control socket is ${String(out?.ctl)}, so its answer cannot come back. Pane kept; close it with: mu agent close ${name} -w ${W}`
+      );
     }
+    const sent = out.send;
+    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}`;
+      const why = typeof sent?.message === "string" ? sent.message : (r.stderr || r.stdout).trim();
+      throw new Error(`mu agent send to ${W}/${name} failed (exit ${r.code}): ${why}. ${pane}`);
+    }
+    const steps = Array.isArray(out.nextSteps) ? out.nextSteps : [];
+    const attach = steps.map((s) => s).find((s) => s.intent === "Attach the pane")?.command;
+    const wsPath = out.workspace?.path;
+    return {
+      name,
+      // A pi just spawned has settled no run, so 0 is exact when an older
+      // extension's reply carries no runs.
+      runs: typeof sent.runs === "number" ? sent.runs : 0,
+      ...typeof attach === "string" ? { attach } : {},
+      ...typeof wsPath === "string" ? { workspace: wsPath } : {}
+    };
   }
   const recordLabel = (params, name) => typeof params.label === "string" && params.label.trim() ? params.label.trim() : name;
   async function resolveRecord(raw) {
@@ -400,7 +401,14 @@ ${recorded}` : message,
         cwd = typeof params.cwd === "string" && params.cwd ? params.cwd : ctx?.cwd ?? process.cwd();
         if (!isDir(cwd)) throw new Error(`mu_delegate: cwd ${cwd} is not a directory`);
       }
-      const { name, attach, workspace } = await spawn(params, cwd, signal);
+      const { name, runs, attach, workspace } = await spawn(
+        params,
+        brief ? `${brief}
+
+${task}` : task,
+        cwd,
+        signal
+      );
       const entry = {
         abort: new AbortController(),
         cancelling: false,
@@ -410,43 +418,21 @@ ${recorded}` : message,
       freeSlot();
       showStatus();
       const started = Date.now();
-      const waitArgs = (after) => [
-        "agent",
-        "wait",
-        name,
-        "-w",
-        W,
-        "--json",
-        "--timeout",
-        String(timeoutS),
-        ...after !== void 0 ? ["--after-runs", String(after)] : []
-      ];
-      const plain = new AbortController();
-      entry.abort.signal.addEventListener("abort", () => plain.abort(), { once: true });
-      let waiting = mu(waitArgs(), plain.signal);
-      const sent = await mu([
-        "agent",
-        "send",
-        name,
-        brief ? `${brief}
-
-${task}` : task,
-        "-w",
-        W,
-        "--json"
-      ]);
-      if (sent.code !== 0) {
-        plain.abort();
-        forget(name);
-        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}`;
-        throw new Error(`${failure(`mu agent send to ${W}/${name}`, sent).message}. ${pane}`);
-      }
-      const runs = json(sent)?.runs;
-      if (typeof runs === "number") {
-        plain.abort();
-        waiting = mu(waitArgs(runs), entry.abort.signal);
-      }
+      const waiting = mu(
+        [
+          "agent",
+          "wait",
+          name,
+          "-w",
+          W,
+          "--json",
+          "--timeout",
+          String(timeoutS),
+          "--after-runs",
+          String(runs)
+        ],
+        entry.abort.signal
+      );
       const settle = async (r) => {
         forget(name);
         try {
@@ -536,7 +522,11 @@ ${task}` : task,
         },
         cli: {
           type: "string",
-          description: "Agent CLI key (default pi). Name a configured key such as 'pi_fast' to run a cheaper model."
+          description: "Agent CLI key (default pi). Only keys with $MU_<KEY>_COMMAND set in pi's environment exist; to pick a model, use model instead."
+        },
+        model: {
+          type: "string",
+          description: "Model for the subagent, passed to pi as --model (e.g. 'sonnet', 'openai/gpt-5:high'); appended to the cli's command. Default: the cli's own model. Use it to vary models across a review panel."
         },
         keep: {
           type: "boolean",
@@ -569,6 +559,11 @@ ${task}` : task,
         const cwd = typeof params.cwd === "string" && params.cwd ? params.cwd : ctx?.cwd ?? process.cwd();
         if (!isDir(cwd)) throw new Error(`mu_delegate: cwd ${cwd} is not a directory`);
       }
+      const m = params.model;
+      if (m !== void 0 && !(typeof m === "string" && MODEL_RE.test(m)))
+        throw new Error(
+          `mu_delegate: model must be a pi model id like 'provider/id:thinking' (got ${JSON.stringify(m)})`
+        );
       const record = await resolveRecord(params.record);
       const max = delegateMax();
       if (inflight.size + starting < max) {
@@ -892,6 +887,54 @@ function nudgeText(rule, refs) {
     `${refs.length} task(s) IN_PROGRESS. Next: mu task wait ${shown} --first --on-stall exit --json${more}`
   ].join("\n");
 }
+function breadcrumb(run, args) {
+  void run(args).catch(() => {
+  });
+}
+function parallelSettle(pi) {
+  const handlers = [];
+  const api = {
+    on(event, handler) {
+      if (event === "agent_before_settle") handlers.push(handler);
+      else pi.on(event, handler);
+    }
+  };
+  let errors = [];
+  return {
+    api,
+    flush() {
+      if (handlers.length === 0) return;
+      pi.on("agent_before_settle", async (event, ctx) => {
+        errors = handlers.map(() => void 0);
+        const results = await Promise.all(
+          handlers.map(async (h, i) => {
+            try {
+              return await h(event, ctx);
+            } catch (err) {
+              errors[i] = [err];
+              return void 0;
+            }
+          })
+        );
+        const fired = results.filter((r) => r !== void 0);
+        if (fired.length === 0) return void 0;
+        const prior = event?.entries ?? [];
+        return {
+          entries: [...prior, ...fired.flatMap((r) => r.entries ?? [])],
+          ...fired.some((r) => r.continue === true) ? { continue: true } : {}
+        };
+      });
+      handlers.forEach((_, i) => {
+        pi.on("agent_before_settle", () => {
+          const err = errors[i];
+          errors[i] = void 0;
+          if (err !== void 0) throw err[0];
+          return void 0;
+        });
+      });
+    }
+  };
+}
 function outcomeOf(event) {
   return typeof event === "object" && event !== null ? event.outcome : void 0;
 }
@@ -923,7 +966,7 @@ function registerNudge(pi, run = defaultRunner(), skillMd = readSkill(), nested
     if (refs === void 0 || refs.length === 0) return;
     const text = nudgeText(rule, refs);
     const logWs = [...armed].find((w) => w !== "");
-    await run([
+    breadcrumb(run, [
       "log",
       ...logWs ? ["-w", logWs] : [],
       "--kind",
@@ -979,7 +1022,7 @@ function registerCloseNudge(pi, run = defaultRunner(), env = process.env, nested
     fired = true;
     const names = await ownedInProgress(run, me.agent, me.workstream);
     if (names === void 0 || names.length === 0) return;
-    await run([
+    breadcrumb(run, [
       "log",
       "-w",
       me.workstream,
@@ -1033,13 +1076,12 @@ function registerRefuteNudge(pi, run = defaultRunner(), nested = notNested) {
     if (fired || armed.size === 0 || nested() || noUI(ctx)) return;
     if (outcomeOf(event) !== "completed") return;
     fired = true;
-    const refs = [];
-    for (const [ref, t] of armed) {
-      if (await briefRefuted(run, t.ws, t.id) === false) refs.push(ref);
-    }
+    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;
     const logWs = [...armed.values()].find((t) => t.ws !== "")?.ws;
-    await run([
+    breadcrumb(run, [
       "log",
       ...logWs ? ["-w", logWs] : [],
       "--kind",
@@ -1060,7 +1102,7 @@ function registerRefuteNudge(pi, run = defaultRunner(), nested = notNested) {
 }
 
 // extension/mu-pi.ts
-var EXT_VERSION = true ? "3.9.0" : void 0;
+var EXT_VERSION = true ? "3.10.1" : void 0;
 var FRESH_COMMAND = "mu-fresh";
 var FRESH_TIMEOUT_MS = 3e4;
 function commandName(name) {
@@ -1203,9 +1245,11 @@ function muPi(pi, run = defaultRunner()) {
   registerDelegate(pi, run);
   registerPrompts(pi);
   const nested = serveCtl(pi);
-  registerNudge(pi, run, void 0, nested);
-  registerCloseNudge(pi, run, process.env, nested);
-  registerRefuteNudge(pi, run, nested);
+  const settle = parallelSettle(pi);
+  registerNudge(settle.api, run, void 0, nested);
+  registerCloseNudge(settle.api, run, process.env, nested);
+  registerRefuteNudge(settle.api, run, nested);
+  settle.flush();
 }
 function serveCtl(pi) {
   const sock = process.env.MU_CTL_SOCK;