nightralph 0.0.48 → 0.0.52

package/dist/orchestrator.js

@@ -27,6 +27,8 @@ import {
 } from "./worktree.js";
 import {
   generateProgress,
+  generateMultiFeatureProgress,
+  createProgressTracker,
   readProgress,
   mergeProgress,
   writeProgress,
@@ -124,7 +126,7 @@ function parseBlockers(body) {
   return nums;
 }
 __name(parseBlockers, "parseBlockers");
-function scanTickets(dir) {
+function scanTickets(dir, feature = "") {
   const files = readdirSync(dir).filter((f) => TICKET_RE.test(f)).sort((a, b) => a.localeCompare(
     b,
     void 0,
@@ -141,18 +143,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");
@@ -296,6 +305,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 ----",
@@ -363,58 +377,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");
@@ -868,7 +896,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}`);
     }
@@ -1088,10 +1117,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 }
     ),
@@ -1221,7 +1259,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;
@@ -1245,24 +1287,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` : "") + (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)
   );
-  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;
+  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(
@@ -1295,28 +1363,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(
@@ -1332,7 +1406,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({
@@ -1383,8 +1461,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}`
         );
@@ -1394,13 +1478,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."
@@ -1419,7 +1509,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 };
@@ -1441,45 +1531,97 @@ async function runWavesIsolated(opts) {
       "Working tree is dirty; commit or stash changes before running"
     );
   }
-  const progressPath = join(
+  const features = new Set(
+    opts.tickets.map((t) => t.feature).filter(Boolean)
+  );
+  const multiFeature = features.size > 1 && opts.progressPaths !== void 0;
+  const fallbackProgressPath = join(
     dirname(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(
@@ -1491,6 +1633,7 @@ async function runWavesIsolated(opts) {
         repoName,
         baseBranch,
         specBody: opts.specBody,
+        specBodies: opts.specBodies,
         agentCmd: opts.agentCmd,
         model: opts.model,
         timeout: opts.timeout,
@@ -1508,86 +1651,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
         );
@@ -1597,11 +1758,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,
@@ -1611,9 +1773,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({
@@ -1623,32 +1786,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,
@@ -1656,16 +1822,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,
@@ -1678,18 +1849,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
             );
@@ -1706,7 +1881,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`
             );
@@ -1715,15 +1892,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
             );
@@ -1736,7 +1913,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(
@@ -1755,7 +1933,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."
@@ -1774,7 +1954,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 };
@@ -1801,6 +1981,7 @@ export {
   getProviderArgs,
   killProcessGroup,
   killRunningAgents,
+  lookupSpec,
   markDone,
   parseBlockers,
   parseStatus,
@@ -1814,6 +1995,7 @@ export {
   runWavesIsolated,
   scanTickets,
   spawnAgent,
-  stripSpecSection
+  stripSpecSection,
+  ticketKey
 };
 //# sourceMappingURL=orchestrator.js.map