nightralph 0.0.54 → 0.0.56

package/dist/orchestrator.js

@@ -50,6 +50,7 @@ import { runTestCmd } from "./testcmd.js";
 import {
   readDocsRule,
   installRule,
+  subagentRule,
   testGateRule,
   LINT_RULE,
   integrityRule,
@@ -59,6 +60,15 @@ import {
   agentsMdRule
 } from "./rules.js";
 import { runReviewPass, renderReviewSummary } from "./review.js";
+import {
+  addRun,
+  addStats,
+  emptyRunStats,
+  emptyStreamStats,
+  isRecord,
+  nextStreamStats,
+  renderRunStats
+} from "./stats.js";
 import {
   EFFORT_LADDERS,
   escalateEffort,
@@ -84,6 +94,10 @@ import {
   selectHistory,
   tailLines
 } from "./learnings.js";
+import {
+  parseBlockerField,
+  provisionalRefs
+} from "./blockers.js";
 function formatErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
@@ -152,21 +166,7 @@ function parseStatus(body) {
   return m ? m[1].trim().toLowerCase() : "";
 }
 __name(parseStatus, "parseStatus");
-function parseBlockers(body) {
-  const m = body.match(/\*\*Blocked by:\*\*\s*(.+)/i);
-  if (!m) return [];
-  const text = m[1];
-  if (/none/i.test(text)) return [];
-  const nums = [];
-  const re = /(\d+)/g;
-  let match;
-  while (match = re.exec(text)) {
-    nums.push(Number(match[1]));
-  }
-  return nums;
-}
-__name(parseBlockers, "parseBlockers");
-function scanTickets(dir, feature = "") {
+function scanTickets(dir, feature = "", knownFeatures = /* @__PURE__ */ new Set()) {
   const files = readdirSync(dir).filter((f) => TICKET_RE.test(f)).sort((a, b) => a.localeCompare(
     b,
     void 0,
@@ -183,7 +183,10 @@ function scanTickets(dir, feature = "") {
       filepath,
       body,
       status: parseStatus(body),
-      blockers: parseBlockers(body),
+      blockers: provisionalRefs(
+        parseBlockerField(body, knownFeatures).refs,
+        feature
+      ),
       feature
     };
   });
@@ -193,15 +196,35 @@ function ticketKey(feature, num) {
   return `${feature}:${num}`;
 }
 __name(ticketKey, "ticketKey");
+function blockerSatisfied(ref, doneKeys) {
+  switch (ref.where) {
+    case "run":
+      return doneKeys.has(ticketKey(ref.feature, ref.num));
+    case "done":
+      return true;
+    case "pending":
+    case "missing":
+      return false;
+  }
+}
+__name(blockerSatisfied, "blockerSatisfied");
+function blockerLabel(ref) {
+  const nn = String(ref.num).padStart(2, "0");
+  const base = ref.feature ? `${ref.feature}/${nn}` : nn;
+  if (ref.where === "pending") {
+    return `${base} (${ref.status ?? "not done"}, not in run)`;
+  }
+  if (ref.where === "missing") return `${base} (not found)`;
+  return base;
+}
+__name(blockerLabel, "blockerLabel");
 function findReadyTickets(tickets) {
   const doneKeys = new Set(
     tickets.filter((t) => t.status === "done").map((t) => ticketKey(t.feature, t.num))
   );
   return tickets.filter((t) => {
     if (t.status !== "ready-for-agent") return false;
-    return t.blockers.every(
-      (b) => doneKeys.has(ticketKey(t.feature, b))
-    );
+    return t.blockers.every((r) => blockerSatisfied(r, doneKeys));
   });
 }
 __name(findReadyTickets, "findReadyTickets");
@@ -210,14 +233,19 @@ function findBlockedTickets(tickets, failedKeys) {
     tickets.map((t) => [ticketKey(t.feature, t.num), t])
   );
   function collectDead(ticket, visited, found) {
-    for (const b of ticket.blockers) {
-      const key = ticketKey(ticket.feature, b);
+    for (const ref of ticket.blockers) {
+      const key = ticketKey(ref.feature, ref.num);
       if (visited.has(key)) continue;
       visited.add(key);
+      if (ref.where === "done") continue;
+      if (ref.where === "pending" || ref.where === "missing") {
+        found.set(key, ref);
+        continue;
+      }
       const blocker = byKey.get(key);
       if (!blocker || blocker.status === "done") continue;
       if (failedKeys.has(key) || blocker.status !== "ready-for-agent") {
-        found.add(key);
+        found.set(key, ref);
         continue;
       }
       collectDead(blocker, visited, found);
@@ -229,9 +257,9 @@ function findBlockedTickets(tickets, failedKeys) {
     const key = ticketKey(t.feature, t.num);
     if (t.status !== "ready-for-agent") continue;
     if (failedKeys.has(key)) continue;
-    const found = /* @__PURE__ */ new Set();
+    const found = /* @__PURE__ */ new Map();
     collectDead(t, /* @__PURE__ */ new Set([key]), found);
-    if (found.size > 0) blocked.set(key, [...found]);
+    if (found.size > 0) blocked.set(key, [...found.values()]);
   }
   return blocked;
 }
@@ -411,6 +439,7 @@ function renderPrompt(specBody, ticket, opts) {
     "- Work ONLY on this ticket. Do not fix unrelated problems you notice.",
     "- Do NOT research external APIs or services via web search. Use the spec and ticket body as your sole reference for API shapes.",
     ...installRule(opts.installCmd),
+    ...subagentRule(opts.preferSubagent),
     "- Use /tdd for every checklist item. For each item, write a failing test at the seams named in the spec's Testing Decisions section, then write only enough code to make it pass, then refactor. For a checklist item that is pure scaffolding, config, or docs (where a test adds no value), skip test-first and record that decision in your notes file.",
     testGateRule(opts.testCmd, "ticket"),
     LINT_RULE,
@@ -446,6 +475,7 @@ function renderMergePrompt(specBody, ticket, opts = {}) {
     "",
     "Do NOT re-implement the ticket from scratch.",
     ...installRule(opts.installCmd),
+    ...subagentRule(opts.preferSubagent),
     "Do NOT read or modify files outside your current directory (the worktree).",
     "Do NOT run git push."
   ].join("\n");
@@ -454,7 +484,7 @@ __name(renderMergePrompt, "renderMergePrompt");
 function listTickets(tickets) {
   console.log("\nTickets:");
   for (const t of tickets) {
-    const blockerStr = t.blockers.length > 0 ? `blocked by [${t.blockers.join(", ")}]` : "no blockers";
+    const blockerStr = t.blockers.length > 0 ? `blocked by [${t.blockers.map(blockerLabel).join(", ")}]` : "no blockers";
     console.log(
       `  ${t.filename} (${t.status}) ${blockerStr}`
     );
@@ -478,11 +508,7 @@ function* simulateWaves(tickets) {
       if (sim.get(key) !== "ready-for-agent") {
         return false;
       }
-      return t.blockers.every(
-        (b) => doneKeys.has(
-          ticketKey(t.feature, b)
-        )
-      );
+      return t.blockers.every((r) => blockerSatisfied(r, doneKeys));
     });
     if (ready.length === 0) break;
     yield { wave, ready };
@@ -515,9 +541,7 @@ function detectDeadlocks(tickets) {
         (t) => ticketKey(t.feature, t.num) === key
       );
       if (ticket.blockers.every(
-        (b) => doneKeys.has(
-          ticketKey(ticket.feature, b)
-        )
+        (r) => blockerSatisfied(r, doneKeys)
       )) {
         doneKeys.add(key);
         readyKeys.delete(key);
@@ -560,39 +584,46 @@ function getProviderArgs(cmd) {
 }
 __name(getProviderArgs, "getProviderArgs");
 function formatStreamLine(line) {
-  let obj;
+  let value;
   try {
-    obj = JSON.parse(line);
+    value = JSON.parse(line);
   } catch {
     return line;
   }
+  return formatStreamObject(value);
+}
+__name(formatStreamLine, "formatStreamLine");
+function formatStreamObject(value) {
+  if (!isRecord(value)) return null;
+  const obj = value;
   if (obj.type === "assistant") {
-    const msg = obj.message;
-    const content = msg?.content;
+    if (obj.parent_tool_use_id != null) return null;
+    const msg = isRecord(obj.message) ? obj.message : void 0;
+    const content = Array.isArray(msg?.content) ? msg.content : void 0;
     if (!content) return null;
     for (const block of content) {
-      if (block.type === "text") {
-        return String(block.text);
-      }
+      if (!isRecord(block)) continue;
+      if (block.type !== "text") continue;
+      if (typeof block.text === "string") return block.text;
     }
     return null;
   }
   if (obj.type === "result") {
-    const sub = obj.subtype ?? "done";
-    const cost = obj.total_cost_usd;
-    const costStr = cost != null ? ` ($${cost.toFixed(2)})` : "";
+    const sub = typeof obj.subtype === "string" ? obj.subtype : "done";
+    const cost = typeof obj.total_cost_usd === "number" ? obj.total_cost_usd : void 0;
+    const costStr = cost !== void 0 ? ` ($${cost.toFixed(2)})` : "";
     return `${sub}${costStr}`;
   }
   if (obj.type === "system") {
-    const sub = obj.subtype;
+    const sub = typeof obj.subtype === "string" ? obj.subtype : void 0;
     if (sub === "api_retry") {
-      const error = obj.error;
-      return `retry: ${error ?? "unknown"}`;
+      const error = typeof obj.error === "string" ? obj.error : "unknown";
+      return `retry: ${error}`;
     }
   }
   return null;
 }
-__name(formatStreamLine, "formatStreamLine");
+__name(formatStreamObject, "formatStreamObject");
 function createPiStreamFormatter() {
   const calls = /* @__PURE__ */ new Map();
   let textBuf = "";
@@ -745,10 +776,15 @@ function spawnAgent(opts) {
     opts.logPath,
     { flags: "w" }
   );
+  const env = isClaude && opts.preferSubagent ? {
+    ...process.env,
+    CLAUDE_CODE_SUBAGENT_MODEL: opts.preferSubagent
+  } : void 0;
   const proc = spawn(opts.agentCmd, args, {
     stdio: ["pipe", "pipe", "pipe"],
     cwd: opts.cwd,
-    detached: true
+    detached: true,
+    ...env ? { env } : {}
   });
   if (proc.pid !== void 0) runningAgents.add(proc.pid);
   proc.stdout.pipe(logStream, { end: false });
@@ -766,10 +802,26 @@ function spawnAgent(opts) {
     }
   }
   __name(collectCompleted, "collectCompleted");
+  let streamStats = emptyStreamStats();
+  function formatClaudeLine(line) {
+    let obj;
+    try {
+      obj = JSON.parse(line);
+    } catch {
+      return line;
+    }
+    const next = nextStreamStats(streamStats, obj);
+    if (next !== streamStats) {
+      streamStats = next;
+      opts.onStats?.(next.stats);
+    }
+    return formatStreamObject(obj);
+  }
+  __name(formatClaudeLine, "formatClaudeLine");
   const rl = createInterface({ input: proc.stdout });
   rl.on("line", (line) => {
     if (isClaude) {
-      const formatted = formatStreamLine(line);
+      const formatted = formatClaudeLine(line);
       if (formatted !== null) {
         collectCompleted(formatted);
         const output = `${prefix}${formatted}`;
@@ -861,7 +913,12 @@ function spawnAgent(opts) {
       rlErr.close();
       logStream.end();
       if (promptFile) cleanupPromptFile(promptFile);
-      resolve({ exitCode, completedItems, timedOut });
+      resolve({
+        exitCode,
+        completedItems,
+        timedOut,
+        ...isClaude ? streamStats.stats : {}
+      });
     }
     __name(finish, "finish");
     proc.on("exit", (code) => {
@@ -905,7 +962,7 @@ function spawnAgent(opts) {
   });
 }
 __name(spawnAgent, "spawnAgent");
-function dryRun(tickets, specBody, testCmd) {
+function dryRun(tickets, specBody, testCmd, preferSubagent) {
   listTickets(tickets);
   console.log("\nSimulated wave order:");
   for (const { wave, ready } of simulateWaves(tickets)) {
@@ -921,6 +978,7 @@ function dryRun(tickets, specBody, testCmd) {
   }
   console.log(`
 Test command: ${testCmd || "(none)"}`);
+  console.log(`Prefer subagent: ${preferSubagent || "(none)"}`);
   const firstReady = findReadyTickets(tickets);
   if (firstReady.length > 0) {
     console.log(
@@ -932,7 +990,7 @@ Prompt for first ready ticket (${firstReady[0].filename}):
       renderPrompt(
         specBody,
         firstReady[0],
-        { testCmd }
+        { testCmd, preferSubagent }
       )
     );
   }
@@ -978,7 +1036,8 @@ Prompt for first ready ticket (${firstReady[0].filename}):
         firstReady[0],
         {
           testCmd: opts.testCmd,
-          installCmd: opts.installCmd
+          installCmd: opts.installCmd,
+          preferSubagent: opts.preferSubagent
         }
       )
     );
@@ -994,6 +1053,9 @@ Test command: ${opts.testCmd || "(none)"}`
   console.log(
     `Effort:       ${opts.effort ?? "(provider default)"}`
   );
+  console.log(
+    `Prefer subagent: ${opts.preferSubagent || "(none)"}`
+  );
   console.log(
     `Retries:      ${opts.retries ?? DEFAULT_RETRIES}`
   );
@@ -1094,7 +1156,10 @@ async function respawnAndRetryMerge(opts) {
   const prompt = renderMergePrompt(
     opts.specBody,
     opts.ticket,
-    { installCmd: opts.installCmd }
+    {
+      installCmd: opts.installCmd,
+      preferSubagent: opts.preferSubagent
+    }
   );
   const logPath = join(
     opts.logsDir,
@@ -1113,8 +1178,10 @@ async function respawnAndRetryMerge(opts) {
     cwd: opts.worktreePath,
     label,
     maxTurns: opts.maxTurns,
+    preferSubagent: opts.preferSubagent,
     onLine: opts.onLine
   });
+  opts.onAgentRun?.(result);
   if (result.exitCode !== 0) {
     const msg2 = `  ${opts.ticket.filename}: respawned agent exited ${result.exitCode}`;
     if (opts.onLine) {
@@ -1199,17 +1266,29 @@ function attemptLogPath(logsDir, ticket, attempt, ext) {
   return join(logsDir, `${stem}${suffix}${ext}`);
 }
 __name(attemptLogPath, "attemptLogPath");
+function historyFor(learningsPath, ticket) {
+  const featureDir = dirname(dirname(ticket.filepath));
+  const scratchDir = ticket.feature ? join(featureDir, ...ticket.feature.split("/").map(() => "..")) : dirname(featureDir);
+  const others = new Set(
+    ticket.blockers.map((r) => r.feature).filter((f) => f !== ticket.feature)
+  );
+  const entries = [
+    ...readEntries(learningsPath),
+    ...[...others].flatMap((f) => readEntries(
+      join(scratchDir, f, "learnings.md")
+    ))
+  ];
+  return renderHistory(selectHistory(entries, {
+    key: ticketKey(ticket.feature, ticket.num),
+    blockerKeys: ticket.blockers.map((r) => {
+      return ticketKey(r.feature, r.num);
+    })
+  }));
+}
+__name(historyFor, "historyFor");
 function buildHistory(learningsPath, ticket, d) {
   try {
-    return renderHistory(selectHistory(
-      readEntries(learningsPath),
-      {
-        key: ticketKey(ticket.feature, ticket.num),
-        blockerKeys: ticket.blockers.map((b) => {
-          return ticketKey(ticket.feature, b);
-        })
-      }
-    ));
+    return historyFor(learningsPath, ticket);
   } catch (err) {
     d.log(
       `  ${ticket.filename}: could not read learnings: ${formatErrorMessage(err)}`
@@ -1286,7 +1365,8 @@ async function runTicketAttempt(opts) {
           opts.learningsPath,
           ticket,
           d
-        )
+        ),
+        preferSubagent: opts.preferSubagent
       }
     ),
     agentCmd: opts.agentCmd,
@@ -1302,8 +1382,11 @@ async function runTicketAttempt(opts) {
     label: ticket.filename.replace(/\.md$/, ""),
     maxTurns: opts.maxTurns,
     effort: opts.effort,
+    preferSubagent: opts.preferSubagent,
+    onStats: opts.onStats,
     onLine: /* @__PURE__ */ __name((line) => d.log(line), "onLine")
   });
+  opts.onAgentRun?.(agentResult);
   let notes = null;
   try {
     notes = collectNotes(worktree.worktreePath);
@@ -1316,7 +1399,9 @@ async function runTicketAttempt(opts) {
     exitCode: agentResult.exitCode,
     completedItems: agentResult.completedItems,
     timedOut: agentResult.timedOut,
-    notes
+    notes,
+    ...agentResult.subagents === void 0 ? {} : { subagents: agentResult.subagents },
+    ...agentResult.costUsd === void 0 ? {} : { costUsd: agentResult.costUsd }
   };
   if (agentResult.timedOut) {
     d.log(
@@ -1484,6 +1569,10 @@ function recordAttempt(opts) {
 __name(recordAttempt, "recordAttempt");
 async function runTicketAttempts(opts) {
   const { ticket, d } = opts;
+  let prior = { subagents: 0 };
+  const showStats = /* @__PURE__ */ __name((stats) => {
+    d.setTicketStats(ticket.num, ticket.feature, stats);
+  }, "showStats");
   return runWithRetries({
     maxAttempts: opts.retries + 1,
     retryDelay: opts.retryDelay,
@@ -1508,7 +1597,12 @@ async function runTicketAttempts(opts) {
       outcome = await runTicketAttempt({
         ...opts,
         attempt,
-        effort
+        effort,
+        onStats: /* @__PURE__ */ __name((stats) => showStats(addStats(prior, stats)), "onStats"),
+        onAgentRun: /* @__PURE__ */ __name((result) => {
+          prior = addStats(prior, result);
+          opts.onAgentRun?.(result);
+        }, "onAgentRun")
       });
     } catch (error) {
       d.log(
@@ -1566,15 +1660,77 @@ function indentFilenames(tickets) {
   return tickets.map((t) => `  ${t.filename}`).join("\n");
 }
 __name(indentFilenames, "indentFilenames");
-function renderFinishSummary(tickets, totalCompleted, failedKeys) {
+function explainOpen(tickets, failedKeys, warnings) {
   const remaining = tickets.filter(
     (t) => t.status === "ready-for-agent"
   );
+  const open = remaining.filter(
+    (t) => !failedKeys.has(ticketKey(t.feature, t.num))
+  );
+  const dead = findBlockedTickets(tickets, failedKeys);
+  const deadRefs = /* @__PURE__ */ __name((t) => dead.get(ticketKey(t.feature, t.num)) ?? [], "deadRefs");
+  const lines = [];
   const human = tickets.filter((t) => t.status === HUMAN_STATUS);
-  const humanNums = new Set(human.map((t) => t.num));
-  const blockedByHuman = remaining.filter(
-    (t) => !failedKeys.has(ticketKey(t.feature, t.num)) && t.blockers.some((b) => humanNums.has(b))
+  if (human.length > 0) {
+    const humanKeys = new Set(
+      human.map((t) => ticketKey(t.feature, t.num))
+    );
+    const blockedByHuman = open.filter((t) => deadRefs(t).some(
+      (r) => humanKeys.has(ticketKey(r.feature, r.num))
+    ));
+    const noun = human.length === 1 ? "ticket is" : "tickets are";
+    lines.push(
+      "",
+      (remaining.length === 0 && failedKeys.size === 0 ? `All remaining ${noun} marked ${HUMAN_STATUS}. ` : `${human.length} ${noun} marked ${HUMAN_STATUS}. `) + "nightralph only runs ready-for-agent tickets, so an agent cannot finish these:",
+      indentFilenames(human)
+    );
+    if (blockedByHuman.length > 0) {
+      const n = blockedByHuman.length;
+      lines.push(
+        `${n} ready-for-agent ticket${n === 1 ? " is" : "s are"} blocked until they are done:`,
+        indentFilenames(blockedByHuman)
+      );
+    }
+    lines.push(
+      "Do that work by hand, then set each ticket's **Status:** to done" + (blockedByHuman.length > 0 ? " and run nightralph again." : ".")
+    );
+  }
+  const blockers = [];
+  const outside = open.filter(
+    (t) => deadRefs(t).some((r) => r.where === "pending")
   );
+  if (outside.length > 0) {
+    const n = outside.length;
+    blockers.push(
+      `${n} ready-for-agent ticket${n === 1 ? " waits" : "s wait"} on tickets outside this run. Select those features too, or finish them first:`,
+      ...outside.map((t) => `  ${ticketLabel(toRef(t))} waits on ` + deadRefs(t).filter((r) => r.where === "pending").map(blockerLabel).join(", "))
+    );
+  }
+  const missing = open.flatMap((t) => t.blockers.filter((r) => r.where === "missing").map((r) => `  ${ticketLabel(toRef(t))}: ${blockerLabel(r)}`));
+  if (missing.length > 0) {
+    const n = missing.length;
+    blockers.push(
+      `${n} blocker reference${n === 1 ? "" : "s"} match no ticket. Fix the **Blocked by:** line:`,
+      ...missing
+    );
+  }
+  const typos = warnings.filter((w) => w.kind === "typo");
+  if (typos.length > 0) {
+    const n = typos.length;
+    blockers.push(
+      `${n} word${n === 1 ? "" : "s"} in a **Blocked by:** line look${n === 1 ? "s" : ""} like a feature name but match no .scratch/<name>/issues directory:`,
+      ...typos.map((w) => `  ${w.ticket}: ${w.text}`)
+    );
+  }
+  if (blockers.length > 0) lines.push("", ...blockers);
+  return lines;
+}
+__name(explainOpen, "explainOpen");
+function renderFinishSummary(tickets, totalCompleted, failedKeys, warnings = []) {
+  const remaining = tickets.filter(
+    (t) => t.status === "ready-for-agent"
+  );
+  const human = tickets.filter((t) => t.status === HUMAN_STATUS);
   const counts = `Finished: ${totalCompleted} completed` + (remaining.length > 0 ? `, ${remaining.length} remaining` : "") + (failedKeys.size > 0 ? `, ${failedKeys.size} failed` : "") + (human.length > 0 ? `, ${human.length} need a human` : "");
   const lines = [counts];
   const features = new Set(
@@ -1603,26 +1759,54 @@ function renderFinishSummary(tickets, totalCompleted, failedKeys) {
       lines.push(detail);
     }
   }
-  if (human.length === 0) return lines.join("\n");
-  const noun = human.length === 1 ? "ticket is" : "tickets are";
-  lines.push(
-    "",
-    (remaining.length === 0 && failedKeys.size === 0 ? `All remaining ${noun} marked ${HUMAN_STATUS}. ` : `${human.length} ${noun} marked ${HUMAN_STATUS}. `) + "nightralph only runs ready-for-agent tickets, so an agent cannot finish these:",
-    indentFilenames(human)
+  lines.push(...explainOpen(tickets, failedKeys, warnings));
+  return lines.join("\n");
+}
+__name(renderFinishSummary, "renderFinishSummary");
+function nothingReady(tickets) {
+  return findReadyTickets(tickets).length === 0 && tickets.some((t) => t.status === "ready-for-agent");
+}
+__name(nothingReady, "nothingReady");
+function renderNothingReady(tickets, warnings) {
+  const lines = [
+    "Nothing to run: every ready-for-agent ticket is waiting on a blocker.",
+    ...explainOpen(tickets, /* @__PURE__ */ new Set(), warnings)
+  ];
+  const dead = findBlockedTickets(tickets, /* @__PURE__ */ new Set());
+  const byKey = new Map(
+    tickets.map((t) => [ticketKey(t.feature, t.num), t])
   );
-  if (blockedByHuman.length > 0) {
-    const n = blockedByHuman.length;
+  const other = [];
+  for (const [key, refs] of dead) {
+    const stuck = refs.flatMap((r) => {
+      const b = byKey.get(ticketKey(r.feature, r.num));
+      return b && b.status !== HUMAN_STATUS ? [`${ticketLabel(toRef(b))} (${b.status})`] : [];
+    });
+    const t = byKey.get(key);
+    if (t && stuck.length > 0) {
+      other.push(
+        `  ${ticketLabel(toRef(t))} waits on ` + stuck.join(", ")
+      );
+    }
+  }
+  if (other.length > 0) {
     lines.push(
-      `${n} ready-for-agent ticket${n === 1 ? " is" : "s are"} blocked until they are done:`,
-      indentFilenames(blockedByHuman)
+      "",
+      "These tickets wait on tickets that are not ready-for-agent:",
+      ...other,
+      "Set those tickets to ready-for-agent or done, or fix the **Blocked by:** lines."
+    );
+  }
+  const cycle = detectDeadlocks(tickets).filter((t) => !dead.has(ticketKey(t.feature, t.num)));
+  if (cycle.length > 0) {
+    lines.push(
+      "",
+      "Deadlocked tickets (waiting on each other): " + cycle.map((t) => ticketLabel(toRef(t))).join(", ") + ". Fix their **Blocked by:** lines."
     );
   }
-  lines.push(
-    "Do that work by hand, then set each ticket's **Status:** to done" + (blockedByHuman.length > 0 ? " and run nightralph again." : ".")
-  );
   return lines.join("\n");
 }
-__name(renderFinishSummary, "renderFinishSummary");
+__name(renderNothingReady, "renderNothingReady");
 function sessionTickets(tickets) {
   return [...tickets].filter((t) => t.status === "ready-for-agent").sort((a, b) => a.feature.localeCompare(b.feature) || a.num - b.num);
 }
@@ -1641,7 +1825,10 @@ function reportBlocked(d, tickets, failedKeys) {
   )) {
     const ticket = byKey.get(key);
     if (!ticket) continue;
-    const labels = dead.map((k) => byKey.get(k)).filter((t) => t !== void 0).map((t) => ticketLabel(toRef(t)));
+    const labels = dead.map((ref) => {
+      const t = byKey.get(ticketKey(ref.feature, ref.num));
+      return t ? ticketLabel(toRef(t)) : blockerLabel(ref);
+    });
     d.setBlocked(ticket.num, ticket.feature, labels);
   }
 }
@@ -1653,7 +1840,7 @@ function runProgress(tickets) {
   };
 }
 __name(runProgress, "runProgress");
-async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, testCmd, display, maxTurns, effort, retries, retryDelay, concurrency) {
+async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, testCmd, display, maxTurns, effort, retries, retryDelay, concurrency, warnings = [], preferSubagent) {
   mkdirSync(logsDir, { recursive: true });
   const d = display ?? createDisplay();
   const maxAttempts = (retries ?? DEFAULT_RETRIES) + 1;
@@ -1667,6 +1854,7 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
   let waveNum = 0;
   const failedKeys = /* @__PURE__ */ new Set();
   const session = sessionTickets(tickets);
+  let runStats = emptyRunStats();
   while (true) {
     if (waveNum > 0) reportBlocked(d, tickets, failedKeys);
     const ready = findReadyTickets(tickets).filter(
@@ -1697,7 +1885,7 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
         const prompt = renderPrompt(
           specBody,
           t,
-          { testCmd }
+          { testCmd, preferSubagent }
         );
         const label = t.filename.replace(
           /\.md$/,
@@ -1709,6 +1897,18 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
           t.feature
         );
         d.log(`  Starting ${t.filename}`);
+        let prior = { subagents: 0 };
+        const onStats = /* @__PURE__ */ __name((stats) => {
+          d.setTicketStats(
+            t.num,
+            t.feature,
+            addStats(prior, stats)
+          );
+        }, "onStats");
+        const tally = /* @__PURE__ */ __name((r) => {
+          prior = addStats(prior, r);
+          runStats = addRun(runStats, r);
+        }, "tally");
         let level = effort;
         let result = await spawnAgent({
           prompt,
@@ -1719,8 +1919,11 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
           label,
           maxTurns,
           effort: level,
+          preferSubagent,
+          onStats,
           onLine: /* @__PURE__ */ __name((line) => d.log(line), "onLine")
         });
+        tally(result);
         for (let attempt = 2; result.exitCode !== 0 && !result.timedOut && attempt <= maxAttempts; attempt++) {
           if (isKnown) {
             level = escalateEffort(
@@ -1747,8 +1950,11 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
             label,
             maxTurns,
             effort: level,
+            preferSubagent,
+            onStats,
             onLine: /* @__PURE__ */ __name((line) => d.log(line), "onLine")
           });
+          tally(result);
         }
         return { ticket: t, result };
       }
@@ -1807,8 +2013,11 @@ No tickets completed this wave. ${remaining2.length} ready ticket${remaining2.le
   d.log("\n" + renderFinishSummary(
     tickets,
     totalCompleted,
-    failedKeys
+    failedKeys,
+    warnings
   ));
+  const statsLine = renderRunStats(runStats);
+  if (statsLine) d.log(statsLine);
   d.cleanup();
   return { allDone: remaining.length === 0 };
 }
@@ -1895,6 +2104,10 @@ async function runWavesIsolated(opts) {
   let waveNum = 0;
   const failedKeys = /* @__PURE__ */ new Set();
   const session = sessionTickets(opts.tickets);
+  let runStats = emptyRunStats();
+  const onAgentRun = /* @__PURE__ */ __name((result) => {
+    runStats = addRun(runStats, result);
+  }, "onAgentRun");
   while (true) {
     if (waveNum > 0) reportBlocked(d, opts.tickets, failedKeys);
     const ready = findReadyTickets(opts.tickets).filter(
@@ -1936,12 +2149,14 @@ async function runWavesIsolated(opts) {
         installCmd: opts.installCmd,
         maxTurns: opts.maxTurns,
         effort: opts.effort,
+        preferSubagent: opts.preferSubagent,
         learningsPath: learningsPathFor(
           tracker.pathFor(t.feature)
         ),
         retries,
         retryDelay,
-        d
+        d,
+        onAgentRun
       })
     );
     const touched = new Set(ready.map((t) => {
@@ -2161,7 +2376,9 @@ async function runWavesIsolated(opts) {
             testCmd: opts.testCmd,
             installCmd: opts.installCmd,
             maxTurns: opts.maxTurns,
-            onLine: /* @__PURE__ */ __name((msg) => d.log(msg), "onLine")
+            preferSubagent: opts.preferSubagent,
+            onLine: /* @__PURE__ */ __name((msg) => d.log(msg), "onLine"),
+            onAgentRun
           }) : false;
           if (recovered) {
             markDone(ticket);
@@ -2318,10 +2535,18 @@ No tickets completed this wave. ${remaining2.length} ready ticket${remaining2.le
         installCmd: opts.installCmd,
         maxTurns: opts.maxTurns,
         effort: opts.effort,
+        preferSubagent: opts.preferSubagent,
         retries,
         retryDelay,
         log: /* @__PURE__ */ __name((msg) => d.log(msg), "log")
-      }, { spawnAgent, registry: runningAgents });
+      }, {
+        spawnAgent: /* @__PURE__ */ __name(async (spawnOpts) => {
+          const result = await spawnAgent(spawnOpts);
+          onAgentRun(result);
+          return result;
+        }, "spawnAgent"),
+        registry: runningAgents
+      });
       reviewLine = renderReviewSummary(
         outcome,
         relative(repoRoot, opts.review.reviewPath)
@@ -2337,8 +2562,11 @@ Review failed: ${formatErrorMessage(err)}`);
   d.log("\n" + renderFinishSummary(
     opts.tickets,
     totalCompleted,
-    failedKeys
+    failedKeys,
+    opts.warnings ?? []
   ));
+  const statsLine = renderRunStats(runStats);
+  if (statsLine) d.log(statsLine);
   if (reviewLine) d.log(reviewLine);
   d.log(`Work is on ${baseBranch}`);
   d.cleanup();
@@ -2355,6 +2583,8 @@ export {
   HUMAN_STATUS,
   TICKET_RE,
   TOOL_USE_RE,
+  blockerLabel,
+  blockerSatisfied,
   checkItems,
   createPiStreamFormatter,
   dryRun,
@@ -2365,15 +2595,17 @@ export {
   formatErrorMessage,
   formatStreamLine,
   getProviderArgs,
+  historyFor,
   killProcessGroup,
   killRunningAgents,
   lookupSpec,
   markDone,
-  parseBlockers,
+  nothingReady,
   parseStatus,
   parseTicketFilename,
   renderFinishSummary,
   renderMergePrompt,
+  renderNothingReady,
   renderPrompt,
   retryDelayFor2 as retryDelayFor,
   runPool,