nightralph 0.0.48 → 0.0.50

package/dist/index.js

@@ -7,7 +7,7 @@ import { existsSync as existsSync5, readFileSync as readFileSync5 } from "node:f
 import { dirname as dirname4, join as join6 } from "node:path";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import { select as select2 } from "@inquirer/prompts";
+import { select } from "@inquirer/prompts";
 
 // src/setup.ts
 import {
@@ -257,18 +257,19 @@ async function branchExists(repoRoot, branchName) {
 __name(branchExists, "branchExists");
 function buildBranchName(repoName, ticket) {
   const num = String(ticket.num).padStart(2, "0");
-  return `${repoName}--${num}-${ticket.slug}`;
+  const prefix = ticket.feature ? `${ticket.feature}-` : "";
+  return `${repoName}--${prefix}${num}-${ticket.slug}`;
 }
 __name(buildBranchName, "buildBranchName");
 async function createWorktreeNow(opts) {
   const { repoRoot, repoName, baseBranch, ticket } = opts;
   const branchName = buildBranchName(repoName, ticket);
+  const num = String(ticket.num).padStart(2, "0");
+  const prefix = ticket.feature ? `${ticket.feature}-` : "";
   const worktreePath = join2(
     repoRoot,
     "..",
-    `${repoName}.${String(
-      ticket.num
-    ).padStart(2, "0")}-${ticket.slug}`
+    `${repoName}.${prefix}${num}-${ticket.slug}`
   );
   if (existsSync2(worktreePath)) {
     try {
@@ -403,6 +404,39 @@ function generateProgress(feature, tickets) {
   };
 }
 __name(generateProgress, "generateProgress");
+function generateMultiFeatureProgress(tickets) {
+  const byFeature = /* @__PURE__ */ new Map();
+  for (const t of tickets) {
+    const key = t.feature || "";
+    const arr = byFeature.get(key) ?? [];
+    arr.push(t);
+    byFeature.set(key, arr);
+  }
+  const result = /* @__PURE__ */ new Map();
+  for (const [feat, ft] of byFeature) {
+    result.set(feat, generateProgress(feat, ft));
+  }
+  return result;
+}
+__name(generateMultiFeatureProgress, "generateMultiFeatureProgress");
+function createProgressTracker(opts) {
+  return {
+    dataFor(feature) {
+      return opts.dataMap.get(feature) ?? opts.fallbackData;
+    },
+    pathFor(feature) {
+      return opts.progressPaths.get(feature) ?? opts.fallbackPath;
+    }
+  };
+}
+__name(createProgressTracker, "createProgressTracker");
+function isSpecComplete(progressPath) {
+  const data = readProgress(progressPath);
+  if (!data) return false;
+  if (data.tickets.length === 0) return false;
+  return data.tickets.every((t) => t.done);
+}
+__name(isSpecComplete, "isSpecComplete");
 function readProgress(progressPath) {
   let content;
   try {
@@ -478,8 +512,8 @@ function renderProgress(data) {
     ""
   ];
   for (const ticket of data.tickets) {
-    const checkbox = ticket.done ? "[x]" : "[ ]";
-    lines.push(`- ${checkbox} ${ticket.filename}`);
+    const checkbox2 = ticket.done ? "[x]" : "[ ]";
+    lines.push(`- ${checkbox2} ${ticket.filename}`);
     if (ticket.done || ticket.exitCode !== null) {
       if (ticket.branch) {
         lines.push(
@@ -788,6 +822,14 @@ var color = {
     return `${ESC}2m${text}${ESC}0m`;
   }
 };
+function ticketLabel(ticket) {
+  if (ticket.feature) {
+    const padded = String(ticket.num).padStart(2, "0");
+    return `${ticket.feature}/${padded}`;
+  }
+  return ticket.filename;
+}
+__name(ticketLabel, "ticketLabel");
 var FILLED_DOT = "\u25CF";
 var EMPTY_DOT = "\u25CB";
 var SEPARATOR_WIDTH = 50;
@@ -883,9 +925,11 @@ var StatusDisplay = class {
     }
     this.render();
   }
-  setTicketStatus(num, status) {
+  setTicketStatus(num, status, feature) {
     if (!this.wave) return;
-    const ticket = this.wave.tickets.find((t) => t.num === num);
+    const ticket = feature ? this.wave.tickets.find(
+      (t) => t.num === num && t.feature === feature
+    ) : this.wave.tickets.find((t) => t.num === num);
     if (ticket) {
       ticket.status = status;
       if (status === "in-progress") {
@@ -951,7 +995,10 @@ var StatusDisplay = class {
     if (tickets.length <= availableRows) {
       for (const ticket of tickets) {
         const dot = renderDot(ticket.status);
-        const name = fitLine(ticket.filename, width - 2);
+        const name = fitLine(
+          ticketLabel(ticket),
+          width - 2
+        );
         output += `${dot} ${name}
 `;
       }
@@ -996,7 +1043,10 @@ var StatusDisplay = class {
       );
       for (const ticket of visibleTickets) {
         const dot = renderDot(ticket.status);
-        const name = fitLine(ticket.filename, width - 2);
+        const name = fitLine(
+          ticketLabel(ticket),
+          width - 2
+        );
         output += `${dot} ${name}
 `;
       }
@@ -1037,10 +1087,10 @@ var PlainDisplay = class {
     const pct = progress && progress.total > 0 ? ` (${progress.completed}/${progress.total} done)` : "";
     console.log(
       `
-Wave ${waveNum}${pct}: ` + tickets.map((t) => t.filename).join(", ")
+Wave ${waveNum}${pct}: ` + tickets.map((t) => ticketLabel(t)).join(", ")
     );
   }
-  setTicketStatus(_num, _status) {
+  setTicketStatus(_num, _status, _feature) {
   }
   log(message) {
     console.log(message);
@@ -1212,7 +1262,7 @@ function parseBlockers(body) {
   return nums;
 }
 __name(parseBlockers, "parseBlockers");
-function scanTickets(dir) {
+function scanTickets(dir, feature = "") {
   const files = readdirSync2(dir).filter((f) => TICKET_RE.test(f)).sort((a, b) => a.localeCompare(
     b,
     void 0,
@@ -1229,18 +1279,25 @@ function scanTickets(dir) {
       filepath,
       body,
       status: parseStatus(body),
-      blockers: parseBlockers(body)
+      blockers: parseBlockers(body),
+      feature
     };
   });
 }
 __name(scanTickets, "scanTickets");
+function ticketKey(feature, num) {
+  return `${feature}:${num}`;
+}
+__name(ticketKey, "ticketKey");
 function findReadyTickets(tickets) {
-  const doneNums = new Set(
-    tickets.filter((t) => t.status === "done").map((t) => t.num)
+  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) => doneNums.has(b));
+    return t.blockers.every(
+      (b) => doneKeys.has(ticketKey(t.feature, b))
+    );
   });
 }
 __name(findReadyTickets, "findReadyTickets");
@@ -1384,6 +1441,11 @@ function stripSpecSection(specBody, heading) {
   return out.join("\n");
 }
 __name(stripSpecSection, "stripSpecSection");
+function lookupSpec(specBodies, fallback, feature) {
+  if (!feature || !specBodies) return fallback;
+  return specBodies.get(feature) ?? fallback;
+}
+__name(lookupSpec, "lookupSpec");
 function renderPrompt(specBody, ticket, opts) {
   return [
     "---- SPEC CONTEXT ----",
@@ -1451,58 +1513,72 @@ function listTickets(tickets) {
 __name(listTickets, "listTickets");
 function* simulateWaves(tickets) {
   const sim = new Map(
-    tickets.map((t) => [t.num, t.status])
+    tickets.map((t) => [
+      ticketKey(t.feature, t.num),
+      t.status
+    ])
   );
   let wave = 1;
   while (true) {
-    const doneNums = new Set(
-      [...sim.entries()].filter(([, s]) => s === "done").map(([n]) => n)
+    const doneKeys = new Set(
+      [...sim.entries()].filter(([, s]) => s === "done").map(([k]) => k)
     );
     const ready = [...tickets].filter((t) => {
-      if (sim.get(t.num) !== "ready-for-agent") {
+      const key = ticketKey(t.feature, t.num);
+      if (sim.get(key) !== "ready-for-agent") {
         return false;
       }
       return t.blockers.every(
-        (b) => doneNums.has(b)
+        (b) => doneKeys.has(
+          ticketKey(t.feature, b)
+        )
       );
     });
     if (ready.length === 0) break;
     yield { wave, ready };
     for (const t of ready) {
-      sim.set(t.num, "done");
+      sim.set(
+        ticketKey(t.feature, t.num),
+        "done"
+      );
     }
     wave++;
   }
 }
 __name(simulateWaves, "simulateWaves");
 function detectDeadlocks(tickets) {
-  const doneNums = /* @__PURE__ */ new Set();
-  const ready = /* @__PURE__ */ new Set();
+  const doneKeys = /* @__PURE__ */ new Set();
+  const readyKeys = /* @__PURE__ */ new Set();
   for (const t of tickets) {
+    const key = ticketKey(t.feature, t.num);
     if (t.status === "ready-for-agent") {
-      ready.add(t.num);
+      readyKeys.add(key);
     } else if (t.status === "done") {
-      doneNums.add(t.num);
+      doneKeys.add(key);
     }
   }
   let changed = true;
   while (changed) {
     changed = false;
-    for (const num of ready) {
+    for (const key of readyKeys) {
       const ticket = tickets.find(
-        (t) => t.num === num
+        (t) => ticketKey(t.feature, t.num) === key
       );
       if (ticket.blockers.every(
-        (b) => doneNums.has(b)
+        (b) => doneKeys.has(
+          ticketKey(ticket.feature, b)
+        )
       )) {
-        doneNums.add(num);
-        ready.delete(num);
+        doneKeys.add(key);
+        readyKeys.delete(key);
         changed = true;
       }
     }
   }
-  return [...ready].map(
-    (num) => tickets.find((t) => t.num === num)
+  return [...readyKeys].map(
+    (key) => tickets.find(
+      (t) => ticketKey(t.feature, t.num) === key
+    )
   );
 }
 __name(detectDeadlocks, "detectDeadlocks");
@@ -1956,7 +2032,8 @@ function dryRunIsolated(opts) {
         opts.repoName,
         t
       );
-      const worktreePath = `../${opts.repoName}.${num}-${t.slug}`;
+      const prefix = t.feature ? `${t.feature}.` : "";
+      const worktreePath = `../${opts.repoName}.${prefix}${num}-${t.slug}`;
       console.log(`    worktree: ${worktreePath}`);
       console.log(`    branch:   ${branchName}`);
     }
@@ -2176,10 +2253,19 @@ async function runTicketAttempt(opts) {
   } catch (error) {
     return { kind: "worktree-error", error };
   }
-  d.setTicketStatus(ticket.num, "in-progress");
+  d.setTicketStatus(
+    ticket.num,
+    "in-progress",
+    ticket.feature
+  );
+  const ticketSpec = lookupSpec(
+    opts.specBodies,
+    opts.specBody,
+    ticket.feature
+  );
   const agentResult = await spawnAgent({
     prompt: renderPrompt(
-      opts.specBody,
+      ticketSpec,
       ticket,
       { testCmd: opts.testCmd }
     ),
@@ -2309,7 +2395,11 @@ async function runTicketAttempts(opts) {
       return { kind: "error", error };
     }
     if (outcome.kind === "ready") {
-      d.setTicketStatus(ticket.num, "awaiting-merge");
+      d.setTicketStatus(
+        ticket.num,
+        "awaiting-merge",
+        ticket.feature
+      );
       return outcome;
     }
     if (outcome.kind === "worktree-error") return outcome;
@@ -2333,24 +2423,50 @@ function indentFilenames(tickets) {
   return tickets.map((t) => `  ${t.filename}`).join("\n");
 }
 __name(indentFilenames, "indentFilenames");
-function renderFinishSummary(tickets, totalCompleted, failedNums) {
+function renderFinishSummary(tickets, totalCompleted, failedKeys) {
   const remaining = tickets.filter(
     (t) => t.status === "ready-for-agent"
   );
   const human = tickets.filter((t) => t.status === HUMAN_STATUS);
   const humanNums = new Set(human.map((t) => t.num));
   const blockedByHuman = remaining.filter(
-    (t) => !failedNums.has(t.num) && t.blockers.some((b) => humanNums.has(b))
+    (t) => !failedKeys.has(ticketKey(t.feature, t.num)) && t.blockers.some((b) => humanNums.has(b))
   );
-  const counts = `Finished: ${totalCompleted} completed` + (remaining.length > 0 ? `, ${remaining.length} remaining` : "") + (failedNums.size > 0 ? `, ${failedNums.size} failed` : "") + (human.length > 0 ? `, ${human.length} need a human` : "");
-  if (human.length === 0) return counts;
+  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(
+    tickets.map((t) => t.feature).filter(Boolean)
+  );
+  if (features.size > 1) {
+    lines.push("");
+    for (const feat of [...features].sort()) {
+      const ft = tickets.filter(
+        (t) => t.feature === feat
+      );
+      const done = ft.filter(
+        (t) => t.status === "done"
+      ).length;
+      const failed = ft.filter(
+        (t) => failedKeys.has(
+          ticketKey(t.feature, t.num)
+        )
+      ).length;
+      const rem = ft.filter(
+        (t) => t.status === "ready-for-agent"
+      ).length;
+      let detail = `  ${feat}: ${done} completed`;
+      if (rem > 0) detail += `, ${rem} remaining`;
+      if (failed > 0) detail += `, ${failed} failed`;
+      lines.push(detail);
+    }
+  }
+  if (human.length === 0) return lines.join("\n");
   const noun = human.length === 1 ? "ticket is" : "tickets are";
-  const lines = [
-    counts,
+  lines.push(
     "",
-    (remaining.length === 0 && failedNums.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:",
+    (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(
@@ -2383,28 +2499,34 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
   for (const _ of simulateWaves(tickets)) totalWaves++;
   let totalCompleted = 0;
   let waveNum = 0;
-  const failedNums = /* @__PURE__ */ new Set();
+  const failedKeys = /* @__PURE__ */ new Set();
   while (true) {
     const ready = findReadyTickets(tickets).filter(
-      (t) => !failedNums.has(t.num)
+      (t) => !failedKeys.has(
+        ticketKey(t.feature, t.num)
+      )
     );
     if (ready.length === 0) break;
     waveNum++;
-    const readyNums = new Set(ready.map((t) => t.num));
+    const readyKeys = new Set(
+      ready.map((t) => ticketKey(t.feature, t.num))
+    );
     const remaining2 = tickets.filter(
-      (t) => t.status === "ready-for-agent" && !readyNums.has(t.num)
+      (t) => t.status === "ready-for-agent" && !readyKeys.has(ticketKey(t.feature, t.num))
     );
     d.startWave(
       waveNum,
       totalWaves,
       ready.map((t) => ({
         num: t.num,
-        filename: t.filename
+        filename: t.filename,
+        feature: t.feature
       })),
       runProgress(tickets),
       remaining2.map((t) => ({
         num: t.num,
-        filename: t.filename
+        filename: t.filename,
+        feature: t.feature
       }))
     );
     const results = await runPool(
@@ -2420,7 +2542,11 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
           /\.md$/,
           ""
         );
-        d.setTicketStatus(t.num, "in-progress");
+        d.setTicketStatus(
+          t.num,
+          "in-progress",
+          t.feature
+        );
         d.log(`  Starting ${t.filename}`);
         let level = effort;
         let result = await spawnAgent({
@@ -2471,8 +2597,14 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
       if (r.status === "rejected") continue;
       const { ticket, result } = r.value;
       if (result.exitCode !== 0) {
-        failedNums.add(ticket.num);
-        d.setTicketStatus(ticket.num, "failed");
+        failedKeys.add(
+          ticketKey(ticket.feature, ticket.num)
+        );
+        d.setTicketStatus(
+          ticket.num,
+          "failed",
+          ticket.feature
+        );
         d.log(
           `  ${ticket.filename}: agent exited ${result.exitCode}`
         );
@@ -2482,13 +2614,19 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
       markDone(ticket);
       waveCompleted++;
       totalCompleted++;
-      d.setTicketStatus(ticket.num, "done");
+      d.setTicketStatus(
+        ticket.num,
+        "done",
+        ticket.feature
+      );
       d.log(
         `  ${ticket.filename}: done`
       );
     }
     if (waveCompleted === 0) {
-      const remaining3 = findReadyTickets(tickets).filter((t) => !failedNums.has(t.num));
+      const remaining3 = findReadyTickets(tickets).filter((t) => !failedKeys.has(
+        ticketKey(t.feature, t.num)
+      ));
       if (remaining3.length === 0) {
         d.log(
           "\nNo tickets completed this wave and no ready tickets remain. Stopping."
@@ -2507,7 +2645,7 @@ No tickets completed this wave. ${remaining3.length} ready ticket${remaining3.le
   d.log("\n" + renderFinishSummary(
     tickets,
     totalCompleted,
-    failedNums
+    failedKeys
   ));
   d.cleanup();
   return { allDone: remaining.length === 0 };
@@ -2529,45 +2667,97 @@ async function runWavesIsolated(opts) {
       "Working tree is dirty; commit or stash changes before running"
     );
   }
-  const progressPath = join4(
+  const features = new Set(
+    opts.tickets.map((t) => t.feature).filter(Boolean)
+  );
+  const multiFeature = features.size > 1 && opts.progressPaths !== void 0;
+  const fallbackProgressPath = join4(
     dirname2(opts.logsDir),
     "progress.md"
   );
-  const progress = mergeProgress(
-    generateProgress(opts.featureName, opts.tickets),
-    readProgress(progressPath)
-  );
-  await saveProgress(
-    repoRoot,
-    progressPath,
-    progress,
-    `nightralph: start ${opts.featureName}`,
-    d
-  );
+  let tracker;
+  if (multiFeature) {
+    const multiData = generateMultiFeatureProgress(
+      opts.tickets
+    );
+    const dataMap = /* @__PURE__ */ new Map();
+    for (const [feat, fresh] of multiData) {
+      const path = opts.progressPaths.get(feat) ?? fallbackProgressPath;
+      const merged = mergeProgress(
+        fresh,
+        readProgress(path)
+      );
+      dataMap.set(feat, merged);
+      await saveProgress(
+        repoRoot,
+        path,
+        merged,
+        `nightralph: start ${feat}`,
+        d
+      );
+    }
+    tracker = createProgressTracker({
+      progressPaths: opts.progressPaths,
+      dataMap,
+      fallbackPath: fallbackProgressPath,
+      fallbackData: generateProgress(
+        opts.featureName,
+        []
+      )
+    });
+  } else {
+    const progressPath = fallbackProgressPath;
+    const progress = mergeProgress(
+      generateProgress(
+        opts.featureName,
+        opts.tickets
+      ),
+      readProgress(progressPath)
+    );
+    await saveProgress(
+      repoRoot,
+      progressPath,
+      progress,
+      `nightralph: start ${opts.featureName}`,
+      d
+    );
+    tracker = createProgressTracker({
+      progressPaths: /* @__PURE__ */ new Map(),
+      dataMap: /* @__PURE__ */ new Map(),
+      fallbackPath: progressPath,
+      fallbackData: progress
+    });
+  }
   let totalCompleted = 0;
   let waveNum = 0;
-  const failedNums = /* @__PURE__ */ new Set();
+  const failedKeys = /* @__PURE__ */ new Set();
   while (true) {
     const ready = findReadyTickets(opts.tickets).filter(
-      (t) => !failedNums.has(t.num)
+      (t) => !failedKeys.has(
+        ticketKey(t.feature, t.num)
+      )
     );
     if (ready.length === 0) break;
     waveNum++;
-    const readyNums = new Set(ready.map((t) => t.num));
+    const readyKeys = new Set(
+      ready.map((t) => ticketKey(t.feature, t.num))
+    );
     const remaining2 = opts.tickets.filter(
-      (t) => t.status === "ready-for-agent" && !readyNums.has(t.num)
+      (t) => t.status === "ready-for-agent" && !readyKeys.has(ticketKey(t.feature, t.num))
     );
     d.startWave(
       waveNum,
       totalWaves,
       ready.map((t) => ({
         num: t.num,
-        filename: t.filename
+        filename: t.filename,
+        feature: t.feature
       })),
       runProgress(opts.tickets),
       remaining2.map((t) => ({
         num: t.num,
-        filename: t.filename
+        filename: t.filename,
+        feature: t.feature
       }))
     );
     const settled = await runPool(
@@ -2579,6 +2769,7 @@ async function runWavesIsolated(opts) {
         repoName,
         baseBranch,
         specBody: opts.specBody,
+        specBodies: opts.specBodies,
         agentCmd: opts.agentCmd,
         model: opts.model,
         timeout: opts.timeout,
@@ -2596,86 +2787,104 @@ async function runWavesIsolated(opts) {
     );
     let waveCompleted = 0;
     const successfulBranches = [];
-    const ticketsByNum = /* @__PURE__ */ new Map();
-    const worktreePathsByNum = /* @__PURE__ */ new Map();
+    const ticketsByKey = /* @__PURE__ */ new Map();
+    const worktreePathsByKey = /* @__PURE__ */ new Map();
+    const branchToKey = /* @__PURE__ */ new Map();
     for (let i = 0; i < outcomes.length; i++) {
       const outcome = outcomes[i];
       const ticket = ready[i];
+      const key = ticketKey(ticket.feature, ticket.num);
       if (outcome.kind === "worktree-error") {
-        failedNums.add(ticket.num);
-        d.setTicketStatus(ticket.num, "failed");
+        failedKeys.add(key);
+        d.setTicketStatus(
+          ticket.num,
+          "failed",
+          ticket.feature
+        );
         d.log(
           `  ${ticket.filename}: failed to create worktree: ${formatErrorMessage(outcome.error)}`
         );
-        checkTicket(progress, ticket.num, {
+        checkTicket(tracker.dataFor(ticket.feature), ticket.num, {
           branch: "",
           exitCode: -1,
           done: false
         });
         await saveProgress(
           repoRoot,
-          progressPath,
-          progress,
+          tracker.pathFor(ticket.feature),
+          tracker.dataFor(ticket.feature),
           `nightralph: ${ticket.filename} worktree error`,
           d
         );
         continue;
       }
       if (outcome.kind === "error") {
-        failedNums.add(ticket.num);
-        d.setTicketStatus(ticket.num, "failed");
+        failedKeys.add(key);
+        d.setTicketStatus(
+          ticket.num,
+          "failed",
+          ticket.feature
+        );
         d.log(
           `  ${ticket.filename}: attempt error: ` + formatErrorMessage(outcome.error)
         );
-        checkTicket(progress, ticket.num, {
+        checkTicket(tracker.dataFor(ticket.feature), ticket.num, {
           branch: outcome.branchName ?? "",
           exitCode: -1,
           done: false
         });
         await saveProgress(
           repoRoot,
-          progressPath,
-          progress,
+          tracker.pathFor(ticket.feature),
+          tracker.dataFor(ticket.feature),
           `nightralph: ${ticket.filename} error`,
           d
         );
         continue;
       }
       if (outcome.kind === "no-commits") {
-        failedNums.add(ticket.num);
-        d.setTicketStatus(ticket.num, "failed");
+        failedKeys.add(key);
+        d.setTicketStatus(
+          ticket.num,
+          "failed",
+          ticket.feature
+        );
         d.log(
           `  ${ticket.filename}: agent exited 0 but made no changes; leaving ticket ready-for-agent`
         );
-        checkTicket(progress, ticket.num, {
+        checkTicket(tracker.dataFor(ticket.feature), ticket.num, {
           branch: outcome.branchName,
           exitCode: 0,
           done: false
         });
         await saveProgress(
           repoRoot,
-          progressPath,
-          progress,
+          tracker.pathFor(ticket.feature),
+          tracker.dataFor(ticket.feature),
           `nightralph: ${ticket.filename} no commits`,
           d
         );
         continue;
       }
       if (outcome.kind === "failed") {
-        failedNums.add(ticket.num);
-        d.setTicketStatus(ticket.num, "failed");
+        failedKeys.add(key);
+        d.setTicketStatus(
+          ticket.num,
+          "failed",
+          ticket.feature
+        );
         if (outcome.reason === "exit") {
           checkItems(ticket, outcome.completedItems);
         }
-        checkTicket(progress, ticket.num, {
+        checkTicket(tracker.dataFor(ticket.feature), ticket.num, {
           branch: outcome.branchName,
           exitCode: outcome.exitCode,
           done: false
         });
         await saveProgress(
           repoRoot,
-          progressPath,
-          progress,
+          tracker.pathFor(ticket.feature),
+          tracker.dataFor(ticket.feature),
           `nightralph: ${ticket.filename} ` + (outcome.reason === "tests" ? "tests failed" : "failed"),
           d
         );
@@ -2685,11 +2894,12 @@ async function runWavesIsolated(opts) {
       d.log(
         `  ${ticket.filename}: agent finished, awaiting merge`
       );
-      ticketsByNum.set(ticket.num, ticket);
-      worktreePathsByNum.set(
-        ticket.num,
+      ticketsByKey.set(key, ticket);
+      worktreePathsByKey.set(
+        key,
         outcome.worktreePath
       );
+      branchToKey.set(outcome.branchName, key);
       successfulBranches.push({
         branch: outcome.branchName,
         ticketNum: ticket.num,
@@ -2699,9 +2909,10 @@ async function runWavesIsolated(opts) {
     if (successfulBranches.length > 0) {
       await commitTicketFiles(
         repoRoot,
-        successfulBranches.map(
-          (sb) => ticketsByNum.get(sb.ticketNum)
-        ),
+        successfulBranches.map((sb) => {
+          const k = branchToKey.get(sb.branch);
+          return ticketsByKey.get(k);
+        }),
         d
       );
       const mergeResult = await mergeWave({
@@ -2711,32 +2922,35 @@ async function runWavesIsolated(opts) {
         strategy: opts.conflictStrategy
       });
       for (const branchResult of mergeResult.merged) {
-        const ticket = ticketsByNum.get(
-          branchResult.ticketNum
+        const bk = branchToKey.get(
+          branchResult.branch
         );
+        const ticket = bk ? ticketsByKey.get(bk) : void 0;
         if (!ticket) continue;
         if (branchResult.merged) {
           markDone(ticket);
           waveCompleted++;
           totalCompleted++;
-          d.setTicketStatus(ticket.num, "done");
+          d.setTicketStatus(
+            ticket.num,
+            "done",
+            ticket.feature
+          );
           d.log(
             `  ${ticket.filename}: done`
           );
-          checkTicket(progress, ticket.num, {
+          checkTicket(tracker.dataFor(ticket.feature), ticket.num, {
             branch: branchResult.branch,
             exitCode: 0
           });
           await saveProgress(
             repoRoot,
-            progressPath,
-            progress,
+            tracker.pathFor(ticket.feature),
+            tracker.dataFor(ticket.feature),
             `nightralph: ${ticket.filename} done`,
             d
           );
-          const worktreePath = worktreePathsByNum.get(
-            ticket.num
-          );
+          const worktreePath = bk ? worktreePathsByKey.get(bk) : void 0;
           if (worktreePath) {
             await removeWorktreeQuietly(
               worktreePath,
@@ -2744,16 +2958,21 @@ async function runWavesIsolated(opts) {
             );
           }
         } else {
-          const worktreePath = worktreePathsByNum.get(
-            ticket.num
+          const wtKey = branchToKey.get(
+            branchResult.branch
           );
+          const worktreePath = wtKey ? worktreePathsByKey.get(wtKey) : void 0;
           const recovered = opts.conflictStrategy === "respawn" && worktreePath ? await respawnAndRetryMerge({
             repoRoot,
             baseBranch,
             branch: branchResult.branch,
             ticket,
             worktreePath,
-            specBody: opts.specBody,
+            specBody: lookupSpec(
+              opts.specBodies,
+              opts.specBody,
+              ticket.feature
+            ),
             agentCmd: opts.agentCmd,
             model: opts.model,
             timeout: opts.timeout,
@@ -2766,18 +2985,22 @@ async function runWavesIsolated(opts) {
             markDone(ticket);
             waveCompleted++;
             totalCompleted++;
-            d.setTicketStatus(ticket.num, "done");
+            d.setTicketStatus(
+              ticket.num,
+              "done",
+              ticket.feature
+            );
             d.log(
               `  ${ticket.filename}: done (resolved via respawn)`
             );
-            checkTicket(progress, ticket.num, {
+            checkTicket(tracker.dataFor(ticket.feature), ticket.num, {
               branch: branchResult.branch,
               exitCode: 0
             });
             await saveProgress(
               repoRoot,
-              progressPath,
-              progress,
+              tracker.pathFor(ticket.feature),
+              tracker.dataFor(ticket.feature),
               `nightralph: ${ticket.filename} done (respawn)`,
               d
             );
@@ -2794,7 +3017,9 @@ async function runWavesIsolated(opts) {
               }
             }
           } else {
-            failedNums.add(ticket.num);
+            failedKeys.add(
+              ticketKey(ticket.feature, ticket.num)
+            );
             d.log(
               `  ${ticket.filename}: merge failed, staying ready-for-agent`
             );
@@ -2803,15 +3028,15 @@ async function runWavesIsolated(opts) {
                 "  git: " + branchResult.stderr.trim()
               );
             }
-            checkTicket(progress, ticket.num, {
+            checkTicket(tracker.dataFor(ticket.feature), ticket.num, {
               branch: branchResult.branch,
               exitCode: 0,
               done: false
             });
             await saveProgress(
               repoRoot,
-              progressPath,
-              progress,
+              tracker.pathFor(ticket.feature),
+              tracker.dataFor(ticket.feature),
               `nightralph: ${ticket.filename} merge failed`,
               d
             );
@@ -2824,7 +3049,8 @@ async function runWavesIsolated(opts) {
 Merge stopped at ${mergeResult.stoppedAt.branch}`
         );
         for (const sb of successfulBranches) {
-          const ticket = ticketsByNum.get(sb.ticketNum);
+          const sbk = branchToKey.get(sb.branch);
+          const ticket = sbk ? ticketsByKey.get(sbk) : void 0;
           if (ticket && ticket.status === "done") continue;
           try {
             await removeWorktree(
@@ -2843,7 +3069,9 @@ Merge stopped at ${mergeResult.stoppedAt.branch}`
     if (waveCompleted === 0) {
       const remaining3 = findReadyTickets(
         opts.tickets
-      ).filter((t) => !failedNums.has(t.num));
+      ).filter((t) => !failedKeys.has(
+        ticketKey(t.feature, t.num)
+      ));
       if (remaining3.length === 0) {
         d.log(
           "\nNo tickets completed this wave and no ready tickets remain. Stopping."
@@ -2862,7 +3090,7 @@ No tickets completed this wave. ${remaining3.length} ready ticket${remaining3.le
   d.log("\n" + renderFinishSummary(
     opts.tickets,
     totalCompleted,
-    failedNums
+    failedKeys
   ));
   d.cleanup();
   return { allDone: remaining.length === 0 };
@@ -2873,7 +3101,7 @@ __name(runWavesIsolated, "runWavesIsolated");
 import { existsSync as existsSync4, readdirSync as readdirSync3 } from "node:fs";
 import { dirname as dirname3, join as join5 } from "node:path";
 import { fileURLToPath } from "node:url";
-import { select } from "@inquirer/prompts";
+import { checkbox, Separator } from "@inquirer/prompts";
 function getScriptDir(metaUrl) {
   return dirname3(fileURLToPath(metaUrl));
 }
@@ -2898,24 +3126,32 @@ function findFeatureDirs(cwd) {
       entry.name,
       "spec.md"
     );
-    if (existsSync4(issuesDir)) {
-      results.push({
-        name: entry.name,
-        dir: issuesDir,
-        spec: specFile
-      });
-    }
+    if (!existsSync4(issuesDir)) continue;
+    const progressFile = join5(
+      scratchDir,
+      entry.name,
+      "progress.md"
+    );
+    if (isSpecComplete(progressFile)) continue;
+    results.push({
+      name: entry.name,
+      dir: issuesDir,
+      spec: specFile
+    });
   }
+  results.sort((a, b) => a.name.localeCompare(b.name));
   return results;
 }
 __name(findFeatureDirs, "findFeatureDirs");
+var ALL_VALUE = "__all__";
 async function resolveIssuesDir(specName, cwd = process.cwd()) {
   if (specName) {
     const featureDir = join5(cwd, ".scratch", specName);
-    return {
+    return [{
       dir: join5(featureDir, "issues"),
-      spec: join5(featureDir, "spec.md")
-    };
+      spec: join5(featureDir, "spec.md"),
+      name: specName
+    }];
   }
   const features = findFeatureDirs(cwd);
   if (features.length === 0) {
@@ -2924,21 +3160,40 @@ async function resolveIssuesDir(specName, cwd = process.cwd()) {
     );
     process.exit(2);
   }
-  let chosen;
   if (features.length === 1) {
-    chosen = features[0];
-    console.log(`Using feature: ${chosen.name}`);
-  } else {
-    const name = await select({
-      message: "Which feature?",
-      choices: features.map((f) => ({
-        name: f.name,
-        value: f.name
-      }))
+    const f = features[0];
+    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
+    };
+  });
+  while (true) {
+    const selected = await checkbox({
+      message: "Which features?",
+      choices: [
+        { name: "All", value: ALL_VALUE },
+        new Separator(),
+        ...featureChoices
+      ]
+    });
+    if (selected.length === 0) {
+      console.log("Select at least one feature");
+      continue;
+    }
+    const names = selected.includes(ALL_VALUE) ? features.map((f) => f.name) : selected;
+    return names.map((name) => {
+      const f = features.find(
+        (ff) => ff.name === name
+      );
+      return { dir: f.dir, spec: f.spec, name: f.name };
     });
-    chosen = features.find((f) => f.name === name);
   }
-  return { dir: chosen.dir, spec: chosen.spec };
 }
 __name(resolveIssuesDir, "resolveIssuesDir");
 
@@ -2949,7 +3204,7 @@ yargs(hideBin(process.argv)).scriptName("nightralph").usage("$0 <command>").comm
   "Install bundled skills and doc templates",
   (y) => y,
   async () => {
-    const tracker = await select2({
+    const tracker = await select({
       message: "Issue tracker format",
       choices: [
         {
@@ -3072,61 +3327,86 @@ function extractFeatureName(spec) {
 }
 __name(extractFeatureName, "extractFeatureName");
 async function runExecute(argv) {
-  const { dir, spec } = await resolveIssuesDir(
+  const selections = await resolveIssuesDir(
     argv.spec
   );
-  if (!existsSync5(dir)) {
-    console.error(`Directory not found: ${dir}`);
-    process.exit(2);
-  }
-  if (!existsSync5(spec)) {
-    console.error(`Spec file not found: ${spec}`);
-    process.exit(2);
-  }
-  const specBody = stripSpecSection(
-    readFileSync5(spec, "utf8"),
-    "User Stories"
-  );
-  const tickets = scanTickets(dir);
-  if (tickets.length === 0) {
-    console.log("No ticket files found. Exiting.");
-    return;
-  }
-  console.log(`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)
+  const allTickets = [];
+  const specBodies = /* @__PURE__ */ new Map();
+  const progressPaths = /* @__PURE__ */ new Map();
+  let firstFeatureName = "";
+  let firstLogsDir = "";
+  for (const selection of selections) {
+    const { dir, spec, name } = selection;
+    if (!existsSync5(dir)) {
+      console.error(
+        `Directory not found: ${dir}`
+      );
+      process.exit(2);
+    }
+    if (!existsSync5(spec)) {
+      console.error(
+        `Spec file not found: ${spec}`
+      );
+      process.exit(2);
+    }
+    const specBody = stripSpecSection(
+      readFileSync5(spec, "utf8"),
+      "User Stories"
+    );
+    const tickets = scanTickets(dir, name);
+    if (tickets.length === 0) {
+      console.log(
+        `No ticket files found for ${name}. Skipping.`
+      );
+      continue;
+    }
+    console.log(
+      `[${name}] Found ${tickets.length} tickets`
+    );
+    const knownNums = new Set(
+      tickets.map((t) => t.num)
     );
-    if (unknown.length > 0) {
-      console.warn(
-        `${t.filename}: blockers [${unknown.join(", ")}] not found in directory`
+    for (const t of tickets) {
+      const unknown = t.blockers.filter(
+        (b) => !knownNums.has(b)
+      );
+      if (unknown.length > 0) {
+        console.warn(
+          `${t.filename}: blockers [${unknown.join(", ")}] not found in directory`
+        );
+      }
+      t.blockers = t.blockers.filter(
+        (b) => knownNums.has(b)
       );
     }
-    t.blockers = t.blockers.filter(
-      (b) => knownNums.has(b)
+    specBodies.set(name, specBody);
+    progressPaths.set(
+      name,
+      join6(dirname4(dir), "progress.md")
     );
+    allTickets.push(...tickets);
+    if (!firstFeatureName) {
+      firstFeatureName = extractFeatureName(spec);
+      firstLogsDir = join6(dirname4(dir), "logs");
+    }
   }
-  const logsDir = join6(dirname4(dir), "logs");
+  if (allTickets.length === 0) return;
   const timeout = argv.timeout ?? 900;
   const testCmd = argv.testCmd || detectTestCmd(
     isGitRepo() ? getRepoRoot() : process.cwd()
   ) || "npm test";
-  const featureName = extractFeatureName(spec);
   const conflictStrategy = argv.stopOnConflict ? "stop" : "respawn";
-  const progressPath = join6(
-    dirname4(dir),
-    "progress.md"
-  );
+  const logsDir = firstLogsDir;
+  const fallbackSpec = specBodies.values().next().value;
   if (argv.dryRun) {
     if (isGitRepo()) {
       const repoName = getRepoName();
       dryRunIsolated({
-        tickets,
-        specBody,
+        tickets: allTickets,
+        specBody: fallbackSpec,
         repoName,
         conflictStrategy,
-        progressPath,
+        progressPath: progressPaths.values().next().value,
         testCmd,
         effort: argv.effort,
         retries: argv.retries,
@@ -3134,7 +3414,7 @@ async function runExecute(argv) {
         concurrency: argv.concurrency
       });
     } else {
-      dryRun(tickets, specBody, testCmd);
+      dryRun(allTickets, fallbackSpec, testCmd);
     }
     return;
   }
@@ -3150,13 +3430,14 @@ async function runExecute(argv) {
   let result;
   if (isGitRepo()) {
     result = await runWavesIsolated({
-      tickets,
-      specBody,
+      tickets: allTickets,
+      specBody: fallbackSpec,
+      specBodies,
       agentCmd: argv.provider,
       model: argv.model ?? null,
       timeout,
       logsDir,
-      featureName,
+      featureName: firstFeatureName,
       conflictStrategy,
       display,
       testCmd,
@@ -3164,12 +3445,13 @@ async function runExecute(argv) {
       effort: argv.effort,
       retries: argv.retries,
       retryDelay: argv.retryDelay,
-      concurrency: argv.concurrency
+      concurrency: argv.concurrency,
+      progressPaths
     });
   } else {
     result = await runWaves(
-      tickets,
-      specBody,
+      allTickets,
+      fallbackSpec,
       argv.provider,
       argv.model ?? null,
       timeout,