@mu-crew/mu 3.8.1 → 3.10.0

package/dist/extension/mu-pi.js

@@ -182,7 +182,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 +208,6 @@ function registerDelegate(pi, run = defaultRunner()) {
   };
   const forget = (name) => {
     inflight.delete(name);
-    reserved.delete(name);
     drain();
     showStatus();
   };
@@ -248,63 +246,57 @@ 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);
+    if (typeof params.cli === "string" && params.cli) args.push("--cli", params.cli);
+    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 +392,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 +409,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 {
@@ -501,7 +478,7 @@ ${task}` : task,
       };
     } finally {
       freeSlot();
-      if (queuedAs) drain();
+      drain();
     }
   }
   pi.registerTool({
@@ -711,25 +688,31 @@ function readSkill() {
   }
   return void 0;
 }
+var ENV_ASSIGN = /^[A-Za-z_][A-Za-z0-9_]*=/;
+function muArgs(words) {
+  let at = 0;
+  while (at < words.length && ENV_ASSIGN.test(words[at] ?? "")) at++;
+  const cmd = words[at];
+  if (cmd !== "mu" && !cmd?.endsWith("/mu")) return void 0;
+  return words.slice(at + 1);
+}
 function dispatchedWorkstreams(command) {
   const found = /* @__PURE__ */ new Set();
   for (const words of shellSegments(command)) {
-    const at = words.findIndex((w) => w === "mu" || w.endsWith("/mu"));
-    if (at < 0) continue;
-    const [noun, verb] = [words[at + 1], words[at + 2]];
-    const isSendSpawn = noun === "agent" && (verb === "send" || verb === "spawn");
-    const isClaimFor = noun === "task" && verb === "claim" && words.includes("--for");
-    if (!isSendSpawn && !isClaimFor) continue;
+    const args = muArgs(words);
+    if (args === void 0) continue;
+    const claim = claimOf(args);
+    if (claim !== void 0) {
+      if (claim.ws !== "scratch") found.add(claim.ws);
+      continue;
+    }
+    if (args[0] !== "agent" || args[1] !== "send" && args[1] !== "spawn") continue;
     let ws = "";
-    for (let k = at + 3; k < words.length; k++) {
-      const w = words[k] ?? "";
-      if (w === "-w" || w === "--workstream") ws = words[k + 1] ?? "";
+    for (let k = 2; k < args.length; k++) {
+      const w = args[k] ?? "";
+      if (w === "-w" || w === "--workstream") ws = args[k + 1] ?? "";
       else if (w.startsWith("--workstream=")) ws = w.slice("--workstream=".length);
     }
-    if (ws === "" && isClaimFor) {
-      const ref = words[at + 3] ?? "";
-      if (ref.includes("/")) ws = ref.split("/")[0] ?? "";
-    }
     if (ws !== "scratch") found.add(ws);
   }
   return found.size > 0 ? [...found] : void 0;
@@ -739,6 +722,8 @@ function shellSegments(command) {
   const segs = [];
   let words = [];
   let word;
+  const heredocs = [];
+  let arithEnd = -1;
   const endWord = () => {
     if (word !== void 0) words.push(word);
     word = void 0;
@@ -748,6 +733,18 @@ function shellSegments(command) {
     if (words.length > 0) segs.push(words);
     words = [];
   };
+  const skipHeredocs = (i) => {
+    for (const h of heredocs.splice(0)) {
+      while (i < command.length) {
+        const eol = command.indexOf("\n", i + 1);
+        const end = eol < 0 ? command.length : eol;
+        const line = command.slice(i + 1, end);
+        i = end;
+        if ((h.strip ? line.replace(/^\t+/, "") : line) === h.delim) break;
+      }
+    }
+    return i;
+  };
   for (let i = 0; i < command.length; i++) {
     const c = command[i] ?? "";
     if (c === "'" || c === '"') {
@@ -755,11 +752,34 @@ function shellSegments(command) {
       const end = close < 0 ? command.length : close;
       word = (word ?? "") + command.slice(i + 1, end);
       i = end;
+    } else if (c === "\\" && command[i + 1] === "\n") {
+      i++;
     } else if (c === "\\" && i + 1 < command.length) {
       word = (word ?? "") + command[++i];
+    } else if (c === "#" && word === void 0) {
+      const eol = command.indexOf("\n", i);
+      i = (eol < 0 ? command.length : eol) - 1;
+    } else if (c === "(" && command[i + 1] === "(" && i > arithEnd) {
+      arithEnd = arithmeticEnd(command, i);
+      word = `${word ?? ""}((`;
+      i++;
+    } else if (command.startsWith("<<<", i)) {
+      endWord();
+      i += 2;
+    } else if (c === "<" && command[i + 1] === "<" && i > arithEnd) {
+      endWord();
+      const m = /^<<(-?)[ \t]*('([^']*)'|"([^"]*)"|[^\s;&|<>()]+)/.exec(command.slice(i));
+      if (!m) {
+        i++;
+        continue;
+      }
+      const delim = m[3] ?? m[4] ?? (m[2] ?? "").replace(/\\/g, "");
+      heredocs.push({ delim, strip: m[1] === "-" });
+      i += m[0].length - 1;
     } else if (c === ";" || c === "|" || c === "\n" || c === "&" && command[i + 1] === "&") {
       if (c !== ";" && c !== "\n" && command[i + 1] === c) i++;
       endSeg();
+      if (c === "\n" && heredocs.length > 0) i = skipHeredocs(i);
     } else if (/\s/.test(c)) {
       endWord();
     } else {
@@ -769,30 +789,53 @@ function shellSegments(command) {
   endSeg();
   return segs;
 }
+function arithmeticEnd(command, open) {
+  let depth = 0;
+  for (let i = open + 2; i < command.length; i++) {
+    const c = command[i];
+    if (c === "'" || c === '"') {
+      const close = command.indexOf(c, i + 1);
+      if (close < 0) return -1;
+      i = close;
+    } else if (c === "\\") {
+      i++;
+    } else if (c === "(") {
+      depth++;
+    } else if (c === ")") {
+      if (depth > 0) depth--;
+      else return command[i + 1] === ")" ? i + 1 : -1;
+    }
+  }
+  return -1;
+}
+function claimOf(args) {
+  if (args[0] !== "task" || args[1] !== "claim") return void 0;
+  let ws = "";
+  let id;
+  let isFor = false;
+  for (let k = 2; k < args.length; k++) {
+    const w = args[k] ?? "";
+    const [opt, eq] = w.startsWith("--") && w.includes("=") ? w.split("=", 2) : [w, void 0];
+    if (opt === "--for" || opt === "-f") isFor = true;
+    if (opt === "-w" || opt === "--workstream") ws = eq ?? args[k + 1] ?? "";
+    if (CLAIM_VALUE_OPTS.has(opt ?? "")) {
+      if (eq === void 0) k++;
+    } else if (id === void 0 && !w.startsWith("-")) id = w;
+  }
+  if (!isFor || id === void 0) return void 0;
+  const slash = id.indexOf("/");
+  if (slash >= 0) {
+    if (ws === "") ws = id.slice(0, slash);
+    id = id.slice(slash + 1);
+  }
+  return { ws, id };
+}
 function dispatchedTasks(command) {
   const out = [];
   for (const words of shellSegments(command)) {
-    if (words[0] !== "mu" && !words[0]?.endsWith("/mu")) continue;
-    if (words[1] !== "task" || words[2] !== "claim") continue;
-    let ws = "";
-    let id;
-    let isFor = false;
-    for (let k = 3; k < words.length; k++) {
-      const w = words[k] ?? "";
-      const [opt, eq] = w.startsWith("--") && w.includes("=") ? w.split("=", 2) : [w, void 0];
-      if (opt === "--for" || opt === "-f") isFor = true;
-      if (opt === "-w" || opt === "--workstream") ws = eq ?? words[k + 1] ?? "";
-      if (CLAIM_VALUE_OPTS.has(opt ?? "")) {
-        if (eq === void 0) k++;
-      } else if (id === void 0 && !w.startsWith("-")) id = w;
-    }
-    if (!isFor || id === void 0) continue;
-    const slash = id.indexOf("/");
-    if (slash >= 0) {
-      if (ws === "") ws = id.slice(0, slash);
-      id = id.slice(slash + 1);
-    }
-    if (ws !== "scratch") out.push({ ws, id });
+    const args = muArgs(words);
+    const claim = args === void 0 ? void 0 : claimOf(args);
+    if (claim !== void 0 && claim.ws !== "scratch") out.push(claim);
   }
   return out;
 }
@@ -826,6 +869,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;
 }
@@ -857,7 +948,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",
@@ -913,7 +1004,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,
@@ -967,13 +1058,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",
@@ -994,7 +1084,7 @@ function registerRefuteNudge(pi, run = defaultRunner(), nested = notNested) {
 }
 
 // extension/mu-pi.ts
-var EXT_VERSION = true ? "3.8.1" : void 0;
+var EXT_VERSION = true ? "3.10.0" : void 0;
 var FRESH_COMMAND = "mu-fresh";
 var FRESH_TIMEOUT_MS = 3e4;
 function commandName(name) {
@@ -1137,9 +1227,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;