nightralph 0.0.54 → 0.0.56

package/dist/index.js

@@ -5,7 +5,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 // src/index.ts
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { existsSync as existsSync7, readFileSync as readFileSync7 } from "node:fs";
-import { dirname as dirname6, join as join9 } from "node:path";
+import { basename as basename6, dirname as dirname6, join as join9 } from "node:path";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { select } from "@inquirer/prompts";
@@ -973,6 +973,106 @@ async function mergeWave(opts) {
 }
 __name(mergeWave, "mergeWave");
 
+// src/stats.ts
+var SUBAGENT_TOOLS = /* @__PURE__ */ new Set(["Agent", "Task"]);
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+__name(isRecord, "isRecord");
+function emptyStreamStats() {
+  return { stats: { subagents: 0 }, seenToolIds: /* @__PURE__ */ new Set() };
+}
+__name(emptyStreamStats, "emptyStreamStats");
+function nextStreamStats(state, obj) {
+  if (!isRecord(obj)) return state;
+  if (obj.type === "assistant") return countSubagents(state, obj);
+  if (obj.type === "result") return applyResult(state, obj);
+  return state;
+}
+__name(nextStreamStats, "nextStreamStats");
+function countSubagents(state, obj) {
+  if (obj.parent_tool_use_id != null) return state;
+  const message = obj.message;
+  if (!isRecord(message) || !Array.isArray(message.content)) {
+    return state;
+  }
+  const ids = [];
+  for (const block of message.content) {
+    if (!isRecord(block) || block.type !== "tool_use") continue;
+    if (typeof block.name !== "string" || !SUBAGENT_TOOLS.has(block.name)) continue;
+    if (typeof block.id !== "string") continue;
+    if (state.seenToolIds.has(block.id)) continue;
+    if (ids.includes(block.id)) continue;
+    ids.push(block.id);
+  }
+  if (ids.length === 0) return state;
+  return {
+    stats: {
+      ...state.stats,
+      subagents: state.stats.subagents + ids.length
+    },
+    seenToolIds: /* @__PURE__ */ new Set([...state.seenToolIds, ...ids])
+  };
+}
+__name(countSubagents, "countSubagents");
+function applyResult(state, obj) {
+  const cost = obj.total_cost_usd;
+  const hasCost = typeof cost === "number" && Number.isFinite(cost);
+  const subagentStats = obj.subagent_stats;
+  const spawned = isRecord(subagentStats) ? subagentStats.spawned : void 0;
+  const hasSpawned = typeof spawned === "number" && Number.isInteger(spawned) && spawned >= 0;
+  if (!hasCost && !hasSpawned) return state;
+  const subagents = hasSpawned ? spawned : state.stats.subagents;
+  const costUsd = hasCost ? cost : state.stats.costUsd;
+  if (subagents === state.stats.subagents && costUsd === state.stats.costUsd) return state;
+  return {
+    stats: costUsd === void 0 ? { subagents } : { subagents, costUsd },
+    seenToolIds: state.seenToolIds
+  };
+}
+__name(applyResult, "applyResult");
+function addStats(total, run) {
+  const subagents = total.subagents + (run.subagents ?? 0);
+  if (total.costUsd === void 0 && run.costUsd === void 0) {
+    return { subagents };
+  }
+  return {
+    subagents,
+    costUsd: (total.costUsd ?? 0) + (run.costUsd ?? 0)
+  };
+}
+__name(addStats, "addStats");
+function formatStats(stats) {
+  if (!stats) return null;
+  if (stats.subagents === 0 && stats.costUsd === void 0) {
+    return null;
+  }
+  const count = `${stats.subagents} ` + (stats.subagents === 1 ? "subagent" : "subagents");
+  return stats.costUsd === void 0 ? count : `${count}, $${stats.costUsd.toFixed(2)}`;
+}
+__name(formatStats, "formatStats");
+function emptyRunStats() {
+  return { agentRuns: 0, withCost: 0, subagents: 0, costUsd: 0 };
+}
+__name(emptyRunStats, "emptyRunStats");
+function addRun(run, result) {
+  return {
+    agentRuns: run.agentRuns + 1,
+    withCost: run.withCost + (result.costUsd === void 0 ? 0 : 1),
+    subagents: run.subagents + (result.subagents ?? 0),
+    costUsd: run.costUsd + (result.costUsd ?? 0)
+  };
+}
+__name(addRun, "addRun");
+function renderRunStats(run) {
+  if (run.agentRuns === 0) return null;
+  if (run.withCost === 0 && run.subagents === 0) return null;
+  const runs = `${run.agentRuns} agent ` + (run.agentRuns === 1 ? "run" : "runs");
+  const partial = run.withCost < run.agentRuns ? ` (cost from ${run.withCost} of ${run.agentRuns} runs)` : "";
+  return `Subagents: ${run.subagents} started across ${runs}, cost $${run.costUsd.toFixed(2)}${partial}`;
+}
+__name(renderRunStats, "renderRunStats");
+
 // src/display.ts
 var ESC = "\x1B[";
 var ansi = {
@@ -1034,10 +1134,9 @@ var MAX_MESSAGE_BUFFER = 200;
 var ANSI_RE = /\x1b\[[0-9;?]*[A-Za-z]/g;
 function rowText(ticket) {
   const label = ticketLabel(ticket);
-  if (ticket.status !== "blocked" || !ticket.blockedBy?.length) {
-    return label;
-  }
-  return `${label} (blocked by ${ticket.blockedBy.join(", ")})`;
+  const base = ticket.status === "blocked" && ticket.blockedBy?.length ? `${label} (blocked by ${ticket.blockedBy.join(", ")})` : label;
+  const suffix = formatStats(ticket.stats);
+  return suffix === null ? base : `${base} - ${suffix}`;
 }
 __name(rowText, "rowText");
 function fitLine(line, width) {
@@ -1166,6 +1265,12 @@ var StatusDisplay = class {
     ticket.blockedBy = [...blockedBy];
     this.render();
   }
+  setTicketStats(num, feature, stats) {
+    const ticket = this.findTicket(num, feature);
+    if (!ticket) return;
+    ticket.stats = { ...stats };
+    this.render();
+  }
   log(message) {
     if (!this.wave) {
       this.config.stream.write(message + "\n");
@@ -1304,6 +1409,8 @@ Wave ${waveNum}${pct}: ` + tickets.map((t) => ticketLabel(t)).join(", ")
   }
   setBlocked(_num, _feature, _blockedBy) {
   }
+  setTicketStats(_num, _feature, _stats) {
+  }
   log(message) {
     console.log(message);
   }
@@ -1453,6 +1560,8 @@ __name(sanitize, "sanitize");
 function renderAgentSummary(run, effort) {
   const effortLine = effort ? `Effort: ${effort}.` : "";
   const exitLine = `Agent exit: ${run.exitCode}.`;
+  const subagentsLine = run.subagents === void 0 ? "" : `Subagents: ${run.subagents}.`;
+  const costLine = run.costUsd === void 0 ? "" : `Cost: $${run.costUsd.toFixed(2)}.`;
   const itemsText = run.completedItems.length > 0 ? run.completedItems.map(
     (item) => `"${sanitize(item)}"`
   ).join(", ") + "." : "none.";
@@ -1460,6 +1569,8 @@ function renderAgentSummary(run, effort) {
   return [
     effortLine,
     exitLine,
+    subagentsLine,
+    costLine,
     itemsLine
   ].filter(Boolean).join(" ");
 }
@@ -1749,6 +1860,18 @@ function installRule(installCmd) {
   ];
 }
 __name(installRule, "installRule");
+function subagentRule(preferSubagent, readOnly = false) {
+  if (!preferSubagent) return [];
+  return [
+    `- Hand read-only work to subagents: exploring the codebase, searching code, and experiments or test runs whose output would flood your context. Subagents default to the ${preferSubagent} model.`,
+    "- A subagent starts with no context. Brief each one with the objective, what you already know, its boundaries, and the reply you expect (file:line references, or pass/fail with the relevant output).",
+    ...readOnly ? [] : [
+      "- Subagents never edit files or run git commands that write. You make every edit and every commit."
+    ],
+    "- Do not delegate a lookup that takes a single tool call."
+  ];
+}
+__name(subagentRule, "subagentRule");
 function testGateRule(testCmd, subject) {
   if (testCmd === "") {
     return `- Before each commit, run the tests relevant to what you changed. Do not commit with failing tests. The orchestrator runs no test command for this ${subject}.`;
@@ -1896,6 +2019,7 @@ function renderReviewPrompt(opts) {
     "- Read any AGENTS.md in or above the directories the change touches, plus CONTEXT.md and the relevant docs/adr/ entries if they exist. Treat their contracts and the spec above as the standard the code must meet.",
     "- Look for correctness bugs, missing or weak tests, and code that breaks a documented contract. Ignore style preferences.",
     "- You may run the tests or the type checker to confirm a suspicion.",
+    ...subagentRule(opts.preferSubagent, true),
     "- Do NOT edit, stage, or commit code. Anything you change here is discarded.",
     ...CONFINEMENT_RULES,
     "",
@@ -1950,6 +2074,7 @@ function renderFixPrompt(opts) {
     readDocsRule("findings"),
     "- Fix ONLY the listed findings. Do not fix unrelated problems you notice.",
     ...installRule(opts.installCmd),
+    ...subagentRule(opts.preferSubagent),
     "- Use /tdd for every finding: write a failing test that shows the problem, then write only enough code to make it pass, then refactor.",
     testGateRule(opts.testCmd, "fix"),
     LINT_RULE,
@@ -2229,7 +2354,8 @@ async function runReviewer(opts, deps, range) {
           exclude: reviewExcludeFor(
             opts.repoRoot,
             opts.reviewPath
-          )
+          ),
+          preferSubagent: opts.preferSubagent
         }),
         agentCmd: opts.agentCmd,
         model: opts.model,
@@ -2239,6 +2365,7 @@ async function runReviewer(opts, deps, range) {
         label: "review",
         maxTurns: opts.maxTurns,
         effort,
+        preferSubagent: opts.preferSubagent,
         onLine: opts.log
       });
       const text = collectNotes(wt.worktreePath, FINDINGS_FILE);
@@ -2308,7 +2435,8 @@ async function runFixer(opts, deps, findings) {
           findings,
           testCmd: opts.testCmd,
           installCmd: opts.installCmd,
-          previous
+          previous,
+          preferSubagent: opts.preferSubagent
         }),
         agentCmd: opts.agentCmd,
         model: opts.model,
@@ -2323,6 +2451,7 @@ async function runFixer(opts, deps, findings) {
         label: "review-fix",
         maxTurns: opts.maxTurns,
         effort,
+        preferSubagent: opts.preferSubagent,
         onLine: opts.log
       });
       const notes = collectNotes(wt.worktreePath);
@@ -2457,6 +2586,149 @@ Reviewing ${from.slice(0, 7)}..${to.slice(0, 7)}`);
 }
 __name(runReviewPass, "runReviewPass");
 
+// src/blockers.ts
+var FIELD_RE = /\*\*Blocked by:\*\*/i;
+var NEXT_FIELD_RE = /^\s*(?:[-*]\s+)?\*\*[^*\n]+:\*\*/;
+var HEADING_RE = /^\s*#{1,6}\s/;
+var CHECKLIST_RE = /^\s*[-*+]\s+\[[ xX]\]/;
+var TOKEN_RE = /[A-Za-z0-9_-]+/g;
+function endsField(line) {
+  return line.trim() === "" || NEXT_FIELD_RE.test(line) || HEADING_RE.test(line) || CHECKLIST_RE.test(line);
+}
+__name(endsField, "endsField");
+function fieldText(body) {
+  const lines = body.split(/\r?\n/);
+  const start = lines.findIndex((l) => FIELD_RE.test(l));
+  if (start === -1) return null;
+  const first = lines[start];
+  const m = FIELD_RE.exec(first);
+  const parts = [first.slice(m.index + m[0].length)];
+  for (const line of lines.slice(start + 1)) {
+    if (endsField(line)) break;
+    parts.push(line);
+  }
+  return parts.join("\n");
+}
+__name(fieldText, "fieldText");
+function stripNotes(text) {
+  const chars = [...text];
+  const drop = new Array(chars.length).fill(false);
+  const ticks = [];
+  chars.forEach((ch, i) => {
+    if (ch === "`") ticks.push(i);
+  });
+  for (let i = 0; i + 1 < ticks.length; i += 2) {
+    for (let j = ticks[i]; j <= ticks[i + 1]; j++) {
+      drop[j] = true;
+    }
+  }
+  const open = [];
+  chars.forEach((ch, i) => {
+    if (drop[i]) return;
+    if (ch === "(") {
+      open.push(i);
+    } else if (ch === ")" && open.length > 0) {
+      const from = open.pop();
+      for (let j = from; j <= i; j++) drop[j] = true;
+    }
+  });
+  return chars.map((ch, i) => drop[i] ? " " : ch).join("");
+}
+__name(stripNotes, "stripNotes");
+function looksLikeFeature(word) {
+  const segments = word.split("/");
+  return (segments.length > 1 || word.includes("-")) && /[a-z]/.test(word) && segments.every((s) => /^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(s));
+}
+__name(looksLikeFeature, "looksLikeFeature");
+function wordBefore(text, start) {
+  let i = start;
+  while (i > 0 && /\s/.test(text[i - 1])) i--;
+  if (i === start) return null;
+  const end = i;
+  while (i > 0 && /[A-Za-z0-9_/-]/.test(text[i - 1])) i--;
+  return i === end ? null : text.slice(i, end);
+}
+__name(wordBefore, "wordBefore");
+function parseBlockerField(body, knownFeatures) {
+  const text = fieldText(body);
+  if (text === null) return { refs: [], typos: [] };
+  const clean = stripNotes(text);
+  if (/^\s*none\b/i.test(clean)) return { refs: [], typos: [] };
+  const refs = [];
+  const typos = [];
+  const seen = /* @__PURE__ */ new Set();
+  const add = /* @__PURE__ */ __name((num, feature) => {
+    const id = `${feature ?? ""}:${num}`;
+    if (seen.has(id)) return;
+    seen.add(id);
+    refs.push(feature === void 0 ? { num } : { feature, num });
+  }, "add");
+  for (const m of clean.matchAll(TOKEN_RE)) {
+    const word = m[0];
+    if (/^\d+(?:-\d+)*$/.test(word)) {
+      const before = wordBefore(clean, m.index ?? 0);
+      let feature;
+      if (before !== null && knownFeatures.has(before)) {
+        feature = before;
+      } else if (before !== null && looksLikeFeature(before) && !typos.includes(before)) {
+        typos.push(before);
+      }
+      for (const n of word.split("-").map(Number)) add(n, feature);
+    }
+  }
+  return { refs, typos };
+}
+__name(parseBlockerField, "parseBlockerField");
+function refId(feature, num) {
+  return `${feature}:${num}`;
+}
+__name(refId, "refId");
+function resolveBlockers(raw, ownFeature, selected, lookup) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const r of raw) {
+    const feature = r.feature ?? ownFeature;
+    const id = refId(feature, r.num);
+    if (seen.has(id)) continue;
+    seen.add(id);
+    const nums = selected.get(feature);
+    if (nums) {
+      out.push({
+        feature,
+        num: r.num,
+        where: nums.has(r.num) ? "run" : "missing"
+      });
+      continue;
+    }
+    const status = lookup(feature, r.num);
+    if (status === void 0) {
+      out.push({ feature, num: r.num, where: "missing" });
+    } else {
+      out.push({
+        feature,
+        num: r.num,
+        where: status === "done" ? "done" : "pending",
+        status
+      });
+    }
+  }
+  return out;
+}
+__name(resolveBlockers, "resolveBlockers");
+function provisionalRefs(raw, ownFeature) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const r of raw) {
+    const feature = r.feature ?? ownFeature;
+    const id = refId(feature, r.num);
+    if (seen.has(id)) continue;
+    seen.add(id);
+    out.push({ feature, num: r.num, where: "run" });
+  }
+  return out;
+}
+__name(provisionalRefs, "provisionalRefs");
+
 // src/orchestrator.ts
 var execFileAsync4 = promisify4(execFile4);
 function formatErrorMessage(error) {
@@ -2527,21 +2799,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 = readdirSync2(dir).filter((f) => TICKET_RE.test(f)).sort((a, b) => a.localeCompare(
     b,
     void 0,
@@ -2558,7 +2816,10 @@ function scanTickets(dir, feature = "") {
       filepath,
       body,
       status: parseStatus(body),
-      blockers: parseBlockers(body),
+      blockers: provisionalRefs(
+        parseBlockerField(body, knownFeatures).refs,
+        feature
+      ),
       feature
     };
   });
@@ -2568,15 +2829,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");
@@ -2585,14 +2866,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);
@@ -2604,9 +2890,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;
 }
@@ -2786,6 +3072,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,
@@ -2821,6 +3108,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");
@@ -2829,7 +3117,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}`
     );
@@ -2853,11 +3141,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 };
@@ -2890,9 +3174,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);
@@ -2934,40 +3216,37 @@ function getProviderArgs(cmd) {
   return PROVIDER_ARGS[name] ?? [];
 }
 __name(getProviderArgs, "getProviderArgs");
-function formatStreamLine(line) {
-  let obj;
-  try {
-    obj = JSON.parse(line);
-  } catch {
-    return line;
-  }
+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 = "";
@@ -3120,10 +3399,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 = spawn2(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 });
@@ -3141,10 +3425,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}`;
@@ -3236,7 +3536,12 @@ function spawnAgent(opts) {
       rlErr.close();
       logStream.end();
       if (promptFile) cleanupPromptFile(promptFile);
-      resolve3({ exitCode, completedItems, timedOut });
+      resolve3({
+        exitCode,
+        completedItems,
+        timedOut,
+        ...isClaude ? streamStats.stats : {}
+      });
     }
     __name(finish, "finish");
     proc.on("exit", (code) => {
@@ -3280,7 +3585,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)) {
@@ -3296,6 +3601,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(
@@ -3307,7 +3613,7 @@ Prompt for first ready ticket (${firstReady[0].filename}):
       renderPrompt(
         specBody,
         firstReady[0],
-        { testCmd }
+        { testCmd, preferSubagent }
       )
     );
   }
@@ -3353,7 +3659,8 @@ Prompt for first ready ticket (${firstReady[0].filename}):
         firstReady[0],
         {
           testCmd: opts.testCmd,
-          installCmd: opts.installCmd
+          installCmd: opts.installCmd,
+          preferSubagent: opts.preferSubagent
         }
       )
     );
@@ -3369,6 +3676,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}`
   );
@@ -3469,7 +3779,10 @@ async function respawnAndRetryMerge(opts) {
   const prompt = renderMergePrompt(
     opts.specBody,
     opts.ticket,
-    { installCmd: opts.installCmd }
+    {
+      installCmd: opts.installCmd,
+      preferSubagent: opts.preferSubagent
+    }
   );
   const logPath2 = join6(
     opts.logsDir,
@@ -3488,8 +3801,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) {
@@ -3574,17 +3889,29 @@ function attemptLogPath(logsDir, ticket, attempt, ext) {
   return join6(logsDir, `${stem}${suffix}${ext}`);
 }
 __name(attemptLogPath, "attemptLogPath");
+function historyFor(learningsPath, ticket) {
+  const featureDir = dirname4(dirname4(ticket.filepath));
+  const scratchDir = ticket.feature ? join6(featureDir, ...ticket.feature.split("/").map(() => "..")) : dirname4(featureDir);
+  const others = new Set(
+    ticket.blockers.map((r) => r.feature).filter((f) => f !== ticket.feature)
+  );
+  const entries = [
+    ...readEntries(learningsPath),
+    ...[...others].flatMap((f) => readEntries(
+      join6(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)}`
@@ -3661,7 +3988,8 @@ async function runTicketAttempt(opts) {
           opts.learningsPath,
           ticket,
           d
-        )
+        ),
+        preferSubagent: opts.preferSubagent
       }
     ),
     agentCmd: opts.agentCmd,
@@ -3677,8 +4005,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);
@@ -3691,7 +4022,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(
@@ -3859,6 +4192,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,
@@ -3883,7 +4220,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(
@@ -3941,15 +4283,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(
@@ -3978,26 +4382,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);
 }
@@ -4016,7 +4448,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);
   }
 }
@@ -4028,7 +4463,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) {
   mkdirSync3(logsDir, { recursive: true });
   const d = display ?? createDisplay();
   const maxAttempts = (retries ?? DEFAULT_RETRIES) + 1;
@@ -4042,6 +4477,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(
@@ -4072,7 +4508,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$/,
@@ -4084,6 +4520,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,
@@ -4094,8 +4542,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(
@@ -4122,8 +4573,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 };
       }
@@ -4182,8 +4636,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 };
 }
@@ -4270,6 +4727,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(
@@ -4311,12 +4772,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) => {
@@ -4536,7 +4999,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);
@@ -4693,10 +5158,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,
         relative2(repoRoot, opts.review.reviewPath)
@@ -4712,8 +5185,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();
@@ -4797,6 +5273,86 @@ function findFeatureDirs(cwd) {
   return results;
 }
 __name(findFeatureDirs, "findFeatureDirs");
+function knownFeatureNames(scratchDir) {
+  const names = /* @__PURE__ */ new Set();
+  const walk = /* @__PURE__ */ __name((rel) => {
+    const dir = rel === "" ? scratchDir : join8(scratchDir, rel);
+    for (const e of readdirSync3(dir, { withFileTypes: true })) {
+      if (!e.isDirectory() || e.name === "issues") continue;
+      const name = rel === "" ? e.name : `${rel}/${e.name}`;
+      if (existsSync6(join8(scratchDir, name, "issues"))) {
+        names.add(name);
+      }
+      walk(name);
+    }
+  }, "walk");
+  if (existsSync6(scratchDir)) walk("");
+  return names;
+}
+__name(knownFeatureNames, "knownFeatureNames");
+function loadSelection(scratchDir, names) {
+  const known = knownFeatureNames(scratchDir);
+  const issuesDir = /* @__PURE__ */ __name((name) => join8(scratchDir, name, "issues"), "issuesDir");
+  const tickets = [];
+  const selected = /* @__PURE__ */ new Map();
+  for (const name of new Set(names)) {
+    const dir = issuesDir(name);
+    const found = existsSync6(dir) ? scanTickets(dir, name, known) : [];
+    selected.set(name, new Set(found.map((t) => t.num)));
+    tickets.push(...found);
+  }
+  const outside = /* @__PURE__ */ new Map();
+  const lookup = /* @__PURE__ */ __name((feature, num) => {
+    if (!known.has(feature)) return void 0;
+    let statuses = outside.get(feature);
+    if (!statuses) {
+      statuses = new Map(
+        scanTickets(issuesDir(feature), feature).map((t) => [t.num, t.status])
+      );
+      outside.set(feature, statuses);
+    }
+    return statuses.get(num);
+  }, "lookup");
+  const warnings = [];
+  for (const t of tickets) {
+    const parsed = parseBlockerField(t.body, known);
+    t.blockers = resolveBlockers(
+      parsed.refs,
+      t.feature,
+      selected,
+      lookup
+    );
+    const ticket = ticketLabel(t);
+    for (const word of parsed.typos) {
+      warnings.push({ ticket, kind: "typo", text: word });
+    }
+    for (const ref of t.blockers) {
+      if (ref.where !== "missing") continue;
+      warnings.push({
+        ticket,
+        kind: "missing",
+        text: blockerLabel(ref)
+      });
+    }
+  }
+  return { tickets, warnings };
+}
+__name(loadSelection, "loadSelection");
+function featureCounts(scratchDir, name) {
+  const { tickets, warnings } = loadSelection(scratchDir, [name]);
+  return {
+    ready: findReadyTickets(tickets).length,
+    total: tickets.length,
+    badBlockers: warnings.filter((w) => w.kind === "missing").length
+  };
+}
+__name(featureCounts, "featureCounts");
+function featureChoiceLabel(scratchDir, name) {
+  const c = featureCounts(scratchDir, name);
+  const bad = c.badBlockers === 0 ? "" : `, ${c.badBlockers} bad blocker` + (c.badBlockers === 1 ? "" : "s");
+  return `${name} (${c.ready}/${c.total} ready${bad})`;
+}
+__name(featureChoiceLabel, "featureChoiceLabel");
 var ALL_VALUE = "__all__";
 async function resolveIssuesDir(specName, cwd = process.cwd()) {
   if (specName) {
@@ -4819,14 +5375,11 @@ async function resolveIssuesDir(specName, cwd = process.cwd()) {
     console.log(`Using feature: ${f.name}`);
     return [{ dir: f.dir, spec: f.spec, name: f.name }];
   }
-  const featureChoices = features.map((f) => {
-    const tickets = scanTickets(f.dir);
-    const ready = findReadyTickets(tickets).length;
-    return {
-      name: `${f.name} (${ready}/${tickets.length} ready)`,
-      value: f.name
-    };
-  });
+  const scratchDir = join8(cwd, ".scratch");
+  const featureChoices = features.map((f) => ({
+    name: featureChoiceLabel(scratchDir, f.name),
+    value: f.name
+  }));
   while (true) {
     const selected = await checkbox({
       message: "Which features?",
@@ -4933,6 +5486,9 @@ yargs(hideBin(process.argv)).scriptName("nightralph").usage("$0 <command>").comm
     type: "string",
     choices: ALL_EFFORT_LEVELS,
     describe: "Starting effort level. Omitted = provider default. Retries step up from here."
+  }).option("prefer-subagent", {
+    type: "string",
+    describe: 'claude only: model that subagents default to (CLAUDE_CODE_SUBAGENT_MODEL), plus a prompt rule to hand read-only work to them. "" disables it.'
   }).option("retries", {
     type: "number",
     default: DEFAULT_RETRIES,
@@ -4962,6 +5518,7 @@ yargs(hideBin(process.argv)).scriptName("nightralph").usage("$0 <command>").comm
       stopOnConflict: argv.X,
       maxTurns: argv.maxTurns ?? argv.turns,
       effort: argv.effort,
+      preferSubagent: argv.preferSubagent,
       retries: argv.retries,
       retryDelay: argv.retryDelay,
       concurrency: argv.concurrency,
@@ -5006,6 +5563,8 @@ function loadTickets(selections, log) {
   let firstFeatureName = "";
   let firstLogsDir = "";
   const missing = [];
+  const valid = [];
+  const specs = /* @__PURE__ */ new Map();
   for (const selection of selections) {
     const { dir, spec, name } = selection;
     if (!existsSync7(dir)) {
@@ -5016,11 +5575,18 @@ function loadTickets(selections, log) {
       missing.push(`Spec file not found: ${spec}`);
       continue;
     }
-    const specBody = stripSpecSection(
+    specs.set(name, stripSpecSection(
       readFileSync7(spec, "utf8"),
       "User Stories"
-    );
-    const tickets = scanTickets(dir, name);
+    ));
+    valid.push(selection);
+  }
+  const loaded = valid.length > 0 ? loadSelection(
+    join9(process.cwd(), ".scratch"),
+    valid.map((s) => s.name)
+  ) : { tickets: [], warnings: [] };
+  for (const { dir, spec, name } of valid) {
+    const tickets = loaded.tickets.filter((t) => t.feature === name);
     if (tickets.length === 0) {
       log(
         `No ticket files found for ${name}. Skipping.`
@@ -5030,23 +5596,7 @@ function loadTickets(selections, log) {
     log(
       `[${name}] Found ${tickets.length} tickets`
     );
-    const knownNums = new Set(
-      tickets.map((t) => t.num)
-    );
-    for (const t of tickets) {
-      const unknown = t.blockers.filter(
-        (b) => !knownNums.has(b)
-      );
-      if (unknown.length > 0) {
-        log(
-          `${t.filename}: blockers [${unknown.join(", ")}] not found in directory`
-        );
-      }
-      t.blockers = t.blockers.filter(
-        (b) => knownNums.has(b)
-      );
-    }
-    specBodies.set(name, specBody);
+    specBodies.set(name, specs.get(name));
     progressPaths.set(
       name,
       join9(dirname6(dir), "progress.md")
@@ -5065,7 +5615,8 @@ function loadTickets(selections, log) {
     issuesDirs,
     firstFeatureName,
     firstLogsDir,
-    missing
+    missing,
+    warnings: loaded.warnings
   };
 }
 __name(loadTickets, "loadTickets");
@@ -5078,7 +5629,7 @@ function loadTicketsOrExit(selections) {
   return loaded;
 }
 __name(loadTicketsOrExit, "loadTicketsOrExit");
-function failStaleResume(plan, problems) {
+function checkoutLaunchBranch(plan) {
   try {
     execFileSync2(
       "git",
@@ -5087,6 +5638,10 @@ function failStaleResume(plan, problems) {
     );
   } catch {
   }
+}
+__name(checkoutLaunchBranch, "checkoutLaunchBranch");
+function failStaleResume(plan, problems) {
+  checkoutLaunchBranch(plan);
   const n = plan.behind;
   console.error(
     `Cannot resume ${plan.branch}: ${problems.join("; ")}. It is ${n} commit${n === 1 ? "" : "s"} behind ${plan.launchBranch}. Merge ${plan.launchBranch} into it, or delete it with \`git branch -D ${plan.branch}\`. Back on ${plan.launchBranch}.`
@@ -5094,6 +5649,25 @@ function failStaleResume(plan, problems) {
   process.exit(2);
 }
 __name(failStaleResume, "failStaleResume");
+function stopNothingReady(plan, loaded) {
+  checkoutLaunchBranch(plan);
+  console.log(
+    `Nothing to run on ${plan.branch}. Back on ${plan.launchBranch}.
+` + renderNothingReady(loaded.allTickets, loaded.warnings)
+  );
+  process.exit(0);
+}
+__name(stopNothingReady, "stopNothingReady");
+function willResume(features) {
+  const root = getRepoRoot();
+  const name = planIntegrationBranch(
+    getCurrentBranch(root),
+    getDefaultBranch(root),
+    features
+  );
+  return name !== null && localBranchExists(root, name);
+}
+__name(willResume, "willResume");
 function reviewPathFor(issuesDirs) {
   const featureDir = dirname6(issuesDirs[0]);
   return issuesDirs.length === 1 ? join9(featureDir, "review.md") : join9(dirname6(featureDir), "review.md");
@@ -5105,6 +5679,14 @@ async function runExecute(argv) {
   );
   let loaded = loadTicketsOrExit(selections);
   if (loaded.allTickets.length === 0) return;
+  const resuming = /* @__PURE__ */ __name(() => !argv.dryRun && isGitRepo() && willResume([...loaded.specBodies.keys()]), "resuming");
+  if (nothingReady(loaded.allTickets) && !resuming()) {
+    console.log(renderNothingReady(
+      loaded.allTickets,
+      loaded.warnings
+    ));
+    return;
+  }
   const providerPath = resolveExecutable(argv.provider);
   const providerIsPath = argv.provider.includes("/");
   const providerMissing = providerIsPath ? "not found or not executable" : "not found on PATH";
@@ -5115,6 +5697,14 @@ async function runExecute(argv) {
     process.exit(2);
   }
   const agentCmd = providerIsPath ? providerPath ?? argv.provider : argv.provider;
+  let preferSubagent = argv.preferSubagent || void 0;
+  const providerName = basename6(argv.provider);
+  if (preferSubagent && providerName !== "claude") {
+    console.warn(
+      `--prefer-subagent not supported by ${providerName}, skipping`
+    );
+    preferSubagent = void 0;
+  }
   const isolated = isGitRepo();
   const featureNames = [...loaded.specBodies.keys()];
   let plan = null;
@@ -5144,6 +5734,9 @@ async function runExecute(argv) {
       if (loaded.allTickets.length === 0) {
         failStaleResume(plan, ["no tickets"]);
       }
+      if (nothingReady(loaded.allTickets)) {
+        stopNothingReady(plan, loaded);
+      }
     }
   }
   const {
@@ -5183,7 +5776,8 @@ async function runExecute(argv) {
         effort: argv.effort,
         retries: argv.retries,
         retryDelay: argv.retryDelay,
-        concurrency: argv.concurrency
+        concurrency: argv.concurrency,
+        preferSubagent
       });
       console.log(
         describeIntegrationBranch(
@@ -5194,7 +5788,12 @@ async function runExecute(argv) {
       const reviewState = argv.review === false ? "off" : "on";
       console.log(`Review:       ${reviewState}`);
     } else {
-      dryRun(allTickets, fallbackSpec, testCmd);
+      dryRun(
+        allTickets,
+        fallbackSpec,
+        testCmd,
+        preferSubagent
+      );
     }
     return;
   }
@@ -5227,7 +5826,9 @@ async function runExecute(argv) {
       retries: argv.retries,
       retryDelay: argv.retryDelay,
       concurrency: argv.concurrency,
+      preferSubagent,
       progressPaths,
+      warnings: loaded.warnings,
       review: argv.review === false ? void 0 : {
         reviewPath: reviewPathFor(loaded.issuesDirs),
         forkedFrom: plan?.forkedFrom ?? void 0
@@ -5247,7 +5848,9 @@ async function runExecute(argv) {
       argv.effort,
       argv.retries,
       argv.retryDelay,
-      argv.concurrency
+      argv.concurrency,
+      loaded.warnings,
+      preferSubagent
     );
   }
   if (!result.allDone) {