nightralph 0.0.50 → 0.0.53

package/dist/index.js

@@ -837,6 +837,14 @@ var DEFAULT_COLUMNS = 80;
 var MIN_LOG_ROWS = 1;
 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(", ")})`;
+}
+__name(rowText, "rowText");
 function fitLine(line, width) {
   const visible = line.replace(ANSI_RE, "");
   if (visible.length <= width) return line;
@@ -860,13 +868,16 @@ function renderDot(status) {
     case "in-progress":
       return color.yellow(FILLED_DOT);
     // The agent and its test gate are finished; the branch
-    // waits for the rest of the wave before it is merged.
+    // waits for the rest of the wave before it is merged. It
+    // stays cyan through the merge and any conflict respawn.
     case "awaiting-merge":
       return color.cyan(FILLED_DOT);
     case "done":
       return color.green(FILLED_DOT);
     case "failed":
       return color.red(FILLED_DOT);
+    case "blocked":
+      return color.dim(FILLED_DOT);
   }
 }
 __name(renderDot, "renderDot");
@@ -875,8 +886,8 @@ var StatusDisplay = class {
     __name(this, "StatusDisplay");
   }
   wave = null;
-  progress = null;
-  remaining = [];
+  tickets = [];
+  hasRun = false;
   messages = [];
   renderedLines = 0;
   config;
@@ -893,20 +904,28 @@ var StatusDisplay = class {
     const available = termHeight - overhead;
     return Math.max(1, available);
   }
-  startWave(waveNum, totalWaves, tickets, progress, remaining) {
-    this.wave = {
-      waveNum,
-      totalWaves,
-      tickets: tickets.map((t) => ({
-        ...t,
-        status: "pending"
-      }))
-    };
-    this.remaining = (remaining ?? []).map((t) => ({
+  findTicket(num, feature) {
+    const found = feature ? this.tickets.find(
+      (t) => t.num === num && t.feature === feature
+    ) : this.tickets.find((t) => t.num === num);
+    return found ?? null;
+  }
+  startRun(tickets) {
+    this.tickets = tickets.map((t) => ({
       ...t,
       status: "pending"
     }));
-    this.progress = progress ?? null;
+    this.hasRun = true;
+    this.viewportStart = 0;
+  }
+  startWave(waveNum, totalWaves, tickets, _progress) {
+    if (!this.hasRun) {
+      this.startRun(tickets);
+    }
+    this.wave = {
+      waveNum,
+      totalWaves
+    };
     this.messages = [];
     this.viewportStart = 0;
     this.config.stream.write(ansi.cursorHide());
@@ -926,28 +945,31 @@ var StatusDisplay = class {
     this.render();
   }
   setTicketStatus(num, status, feature) {
-    if (!this.wave) return;
-    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") {
-        const ticketIndex = this.wave.tickets.indexOf(ticket);
-        const availableRows = this.getAvailableRows();
-        const totalTickets = this.wave.tickets.length;
-        if (ticketIndex < this.viewportStart) {
-          this.viewportStart = ticketIndex;
-        } else if (ticketIndex >= this.viewportStart + availableRows) {
-          this.viewportStart = ticketIndex - availableRows + 3;
-        }
-        this.viewportStart = Math.max(
-          0,
-          Math.min(this.viewportStart, totalTickets - 1)
-        );
+    const ticket = this.findTicket(num, feature);
+    if (!ticket) return;
+    ticket.status = status;
+    if (status === "in-progress") {
+      const ticketIndex = this.tickets.indexOf(ticket);
+      const availableRows = this.getAvailableRows();
+      const totalTickets = this.tickets.length;
+      if (ticketIndex < this.viewportStart) {
+        this.viewportStart = ticketIndex;
+      } else if (ticketIndex >= this.viewportStart + availableRows) {
+        this.viewportStart = ticketIndex - availableRows + 3;
       }
-      this.render();
+      this.viewportStart = Math.max(
+        0,
+        Math.min(this.viewportStart, totalTickets - 1)
+      );
     }
+    this.render();
+  }
+  setBlocked(num, feature, blockedBy) {
+    const ticket = this.findTicket(num, feature);
+    if (!ticket) return;
+    ticket.status = "blocked";
+    ticket.blockedBy = [...blockedBy];
+    this.render();
   }
   log(message) {
     if (!this.wave) {
@@ -974,59 +996,52 @@ var StatusDisplay = class {
     if (this.renderedLines > 0) {
       output += ansi.eraseLines(this.renderedLines + 1);
     }
-    const doneInWave = this.wave.tickets.filter(
+    const done = this.tickets.filter(
       (t) => t.status === "done"
     ).length;
-    const completed = doneInWave + (this.progress?.completed ?? 0);
-    const total = this.progress?.total ?? this.wave.tickets.length;
-    const pct = total === 0 ? 0 : Math.round(completed / total * 100);
+    const total = this.tickets.length;
+    const pct = total === 0 ? 0 : Math.round(done / total * 100);
     const width = Math.max(
       1,
       (this.config.stream.columns ?? DEFAULT_COLUMNS) - 1
     );
-    output += `Wave ${this.wave.waveNum}/${this.wave.totalWaves} - ${pct}% complete
-`;
+    const header = `Wave ${this.wave.waveNum}/${this.wave.totalWaves} - ${done}/${total} done - ${pct}%`;
+    output += fitLine(header, width) + "\n";
     const availableRows = this.getAvailableRows();
-    const tickets = [
-      ...this.wave.tickets,
-      ...this.remaining
-    ];
     let renderedTicketCount = 0;
-    if (tickets.length <= availableRows) {
-      for (const ticket of tickets) {
+    if (this.tickets.length <= availableRows) {
+      for (const ticket of this.tickets) {
         const dot = renderDot(ticket.status);
-        const name = fitLine(
-          ticketLabel(ticket),
-          width - 2
-        );
+        const text = rowText(ticket);
+        const name = fitLine(text, width - 2);
         output += `${dot} ${name}
 `;
       }
-      renderedTicketCount = tickets.length;
+      renderedTicketCount = this.tickets.length;
     } else {
       this.viewportStart = Math.max(
         0,
         Math.min(
           this.viewportStart,
-          tickets.length - 1
+          this.tickets.length - 1
         )
       );
       let hasMoreAbove = this.viewportStart > 0;
       let tentativeCount = availableRows - (hasMoreAbove ? 1 : 0);
-      let hasMoreBelow = this.viewportStart + tentativeCount < tickets.length;
+      let hasMoreBelow = this.viewportStart + tentativeCount < this.tickets.length;
       let ticketsToShow = Math.max(
         0,
         tentativeCount - (hasMoreBelow ? 1 : 0)
       );
       const maxStart = Math.max(
         0,
-        tickets.length - Math.max(1, ticketsToShow)
+        this.tickets.length - Math.max(1, ticketsToShow)
       );
       if (this.viewportStart > maxStart) {
         this.viewportStart = maxStart;
         hasMoreAbove = this.viewportStart > 0;
         tentativeCount = availableRows - (hasMoreAbove ? 1 : 0);
-        hasMoreBelow = this.viewportStart + tentativeCount < tickets.length;
+        hasMoreBelow = this.viewportStart + tentativeCount < this.tickets.length;
         ticketsToShow = Math.max(
           0,
           tentativeCount - (hasMoreBelow ? 1 : 0)
@@ -1037,21 +1052,19 @@ var StatusDisplay = class {
         output += `  ... ${moreCount} more above
 `;
       }
-      const visibleTickets = tickets.slice(
+      const visibleTickets = this.tickets.slice(
         this.viewportStart,
         this.viewportStart + ticketsToShow
       );
       for (const ticket of visibleTickets) {
         const dot = renderDot(ticket.status);
-        const name = fitLine(
-          ticketLabel(ticket),
-          width - 2
-        );
+        const text = rowText(ticket);
+        const name = fitLine(text, width - 2);
         output += `${dot} ${name}
 `;
       }
       if (hasMoreBelow) {
-        const moreCount = tickets.length - (this.viewportStart + ticketsToShow);
+        const moreCount = this.tickets.length - (this.viewportStart + ticketsToShow);
         output += `  ... ${moreCount} more below
 `;
       }
@@ -1083,7 +1096,9 @@ var PlainDisplay = class {
   static {
     __name(this, "PlainDisplay");
   }
-  startWave(waveNum, _totalWaves, tickets, progress, _remaining) {
+  startRun(_tickets) {
+  }
+  startWave(waveNum, _totalWaves, tickets, progress) {
     const pct = progress && progress.total > 0 ? ` (${progress.completed}/${progress.total} done)` : "";
     console.log(
       `
@@ -1092,6 +1107,8 @@ Wave ${waveNum}${pct}: ` + tickets.map((t) => ticketLabel(t)).join(", ")
   }
   setTicketStatus(_num, _status, _feature) {
   }
+  setBlocked(_num, _feature, _blockedBy) {
+  }
   log(message) {
     console.log(message);
   }
@@ -1301,6 +1318,37 @@ function findReadyTickets(tickets) {
   });
 }
 __name(findReadyTickets, "findReadyTickets");
+function findBlockedTickets(tickets, failedKeys) {
+  const byKey = new Map(
+    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);
+      if (visited.has(key)) continue;
+      visited.add(key);
+      const blocker = byKey.get(key);
+      if (!blocker || blocker.status === "done") continue;
+      if (failedKeys.has(key) || blocker.status !== "ready-for-agent") {
+        found.add(key);
+        continue;
+      }
+      collectDead(blocker, visited, found);
+    }
+  }
+  __name(collectDead, "collectDead");
+  const blocked = /* @__PURE__ */ new Map();
+  for (const t of tickets) {
+    const key = ticketKey(t.feature, t.num);
+    if (t.status !== "ready-for-agent") continue;
+    if (failedKeys.has(key)) continue;
+    const found = /* @__PURE__ */ new Set();
+    collectDead(t, /* @__PURE__ */ new Set([key]), found);
+    if (found.size > 0) blocked.set(key, [...found]);
+  }
+  return blocked;
+}
+__name(findBlockedTickets, "findBlockedTickets");
 var COMPLETED_RE = /^\s*[-*+]?\s*\[x\]\s+(.+)$/i;
 var TOOL_USE_RE = /^\[[\w.]+\]/;
 var CHECKBOX_RE = /^(\s*[-*+] )\[( |x|X)\]( .*)$/;
@@ -1837,7 +1885,7 @@ function spawnAgent(opts) {
     detached: true
   });
   if (proc.pid !== void 0) runningAgents.add(proc.pid);
-  proc.stdout.pipe(logStream);
+  proc.stdout.pipe(logStream, { end: false });
   const piFormatter = isPi ? createPiStreamFormatter() : null;
   const completedItems = [];
   const seenItems = /* @__PURE__ */ new Set();
@@ -1886,7 +1934,7 @@ function spawnAgent(opts) {
       }
     }
   });
-  proc.stderr.pipe(logStream);
+  proc.stderr.pipe(logStream, { end: false });
   const rlErr = createInterface({ input: proc.stderr });
   rlErr.on("line", (line) => {
     if (isClaude && !TOOL_USE_RE.test(line)) return;
@@ -2480,6 +2528,29 @@ function renderFinishSummary(tickets, totalCompleted, failedKeys) {
   return lines.join("\n");
 }
 __name(renderFinishSummary, "renderFinishSummary");
+function sessionTickets(tickets) {
+  return [...tickets].filter((t) => t.status === "ready-for-agent").sort((a, b) => a.feature.localeCompare(b.feature) || a.num - b.num);
+}
+__name(sessionTickets, "sessionTickets");
+function toRef(t) {
+  return { num: t.num, filename: t.filename, feature: t.feature };
+}
+__name(toRef, "toRef");
+function reportBlocked(d, tickets, failedKeys) {
+  const byKey = new Map(
+    tickets.map((t) => [ticketKey(t.feature, t.num), t])
+  );
+  for (const [key, dead] of findBlockedTickets(
+    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)));
+    d.setBlocked(ticket.num, ticket.feature, labels);
+  }
+}
+__name(reportBlocked, "reportBlocked");
 function runProgress(tickets) {
   return {
     completed: tickets.filter((t) => t.status === "done").length,
@@ -2500,7 +2571,9 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
   let totalCompleted = 0;
   let waveNum = 0;
   const failedKeys = /* @__PURE__ */ new Set();
+  const session = sessionTickets(tickets);
   while (true) {
+    if (waveNum > 0) reportBlocked(d, tickets, failedKeys);
     const ready = findReadyTickets(tickets).filter(
       (t) => !failedKeys.has(
         ticketKey(t.feature, t.num)
@@ -2508,12 +2581,10 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
     );
     if (ready.length === 0) break;
     waveNum++;
-    const readyKeys = new Set(
-      ready.map((t) => ticketKey(t.feature, t.num))
-    );
-    const remaining2 = tickets.filter(
-      (t) => t.status === "ready-for-agent" && !readyKeys.has(ticketKey(t.feature, t.num))
-    );
+    if (waveNum === 1) {
+      d.startRun(session.map(toRef));
+      reportBlocked(d, tickets, failedKeys);
+    }
     d.startWave(
       waveNum,
       totalWaves,
@@ -2522,12 +2593,7 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
         filename: t.filename,
         feature: t.feature
       })),
-      runProgress(tickets),
-      remaining2.map((t) => ({
-        num: t.num,
-        filename: t.filename,
-        feature: t.feature
-      }))
+      runProgress(session)
     );
     const results = await runPool(
       ready,
@@ -2624,10 +2690,10 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
       );
     }
     if (waveCompleted === 0) {
-      const remaining3 = findReadyTickets(tickets).filter((t) => !failedKeys.has(
+      const remaining2 = findReadyTickets(tickets).filter((t) => !failedKeys.has(
         ticketKey(t.feature, t.num)
       ));
-      if (remaining3.length === 0) {
+      if (remaining2.length === 0) {
         d.log(
           "\nNo tickets completed this wave and no ready tickets remain. Stopping."
         );
@@ -2635,10 +2701,11 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, te
       }
       d.log(
         `
-No tickets completed this wave. ${remaining3.length} ready ticket${remaining3.length === 1 ? "" : "s"} remain; continuing.`
+No tickets completed this wave. ${remaining2.length} ready ticket${remaining2.length === 1 ? "" : "s"} remain; continuing.`
       );
     }
   }
+  if (waveNum > 0) reportBlocked(d, tickets, failedKeys);
   const remaining = tickets.filter(
     (t) => t.status === "ready-for-agent"
   );
@@ -2731,7 +2798,9 @@ async function runWavesIsolated(opts) {
   let totalCompleted = 0;
   let waveNum = 0;
   const failedKeys = /* @__PURE__ */ new Set();
+  const session = sessionTickets(opts.tickets);
   while (true) {
+    if (waveNum > 0) reportBlocked(d, opts.tickets, failedKeys);
     const ready = findReadyTickets(opts.tickets).filter(
       (t) => !failedKeys.has(
         ticketKey(t.feature, t.num)
@@ -2739,12 +2808,10 @@ async function runWavesIsolated(opts) {
     );
     if (ready.length === 0) break;
     waveNum++;
-    const readyKeys = new Set(
-      ready.map((t) => ticketKey(t.feature, t.num))
-    );
-    const remaining2 = opts.tickets.filter(
-      (t) => t.status === "ready-for-agent" && !readyKeys.has(ticketKey(t.feature, t.num))
-    );
+    if (waveNum === 1) {
+      d.startRun(session.map(toRef));
+      reportBlocked(d, opts.tickets, failedKeys);
+    }
     d.startWave(
       waveNum,
       totalWaves,
@@ -2753,12 +2820,7 @@ async function runWavesIsolated(opts) {
         filename: t.filename,
         feature: t.feature
       })),
-      runProgress(opts.tickets),
-      remaining2.map((t) => ({
-        num: t.num,
-        filename: t.filename,
-        feature: t.feature
-      }))
+      runProgress(session)
     );
     const settled = await runPool(
       ready,
@@ -3020,6 +3082,11 @@ async function runWavesIsolated(opts) {
             failedKeys.add(
               ticketKey(ticket.feature, ticket.num)
             );
+            d.setTicketStatus(
+              ticket.num,
+              "failed",
+              ticket.feature
+            );
             d.log(
               `  ${ticket.filename}: merge failed, staying ready-for-agent`
             );
@@ -3067,12 +3134,12 @@ Merge stopped at ${mergeResult.stoppedAt.branch}`
       }
     }
     if (waveCompleted === 0) {
-      const remaining3 = findReadyTickets(
+      const remaining2 = findReadyTickets(
         opts.tickets
       ).filter((t) => !failedKeys.has(
         ticketKey(t.feature, t.num)
       ));
-      if (remaining3.length === 0) {
+      if (remaining2.length === 0) {
         d.log(
           "\nNo tickets completed this wave and no ready tickets remain. Stopping."
         );
@@ -3080,10 +3147,11 @@ Merge stopped at ${mergeResult.stoppedAt.branch}`
       }
       d.log(
         `
-No tickets completed this wave. ${remaining3.length} ready ticket${remaining3.length === 1 ? "" : "s"} remain; continuing.`
+No tickets completed this wave. ${remaining2.length} ready ticket${remaining2.length === 1 ? "" : "s"} remain; continuing.`
       );
     }
   }
+  if (waveNum > 0) reportBlocked(d, opts.tickets, failedKeys);
   const remaining = opts.tickets.filter(
     (t) => t.status === "ready-for-agent"
   );