nightralph 0.0.52 → 0.0.53

package/dist/meta.json

@@ -105,7 +105,7 @@
       "format": "esm"
     },
     "src/display.ts": {
-      "bytes": 14240,
+      "bytes": 15265,
       "imports": [
         {
           "path": "<runtime>",
@@ -142,7 +142,7 @@
       "format": "esm"
     },
     "src/orchestrator.ts": {
-      "bytes": 78213,
+      "bytes": 81131,
       "imports": [
         {
           "path": "node:child_process",
@@ -320,7 +320,7 @@
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 206097
+      "bytes": 212042
     },
     "dist/index.js": {
       "imports": [
@@ -488,7 +488,7 @@
           "bytesInOutput": 4816
         },
         "src/orchestrator.ts": {
-          "bytesInOutput": 55078
+          "bytesInOutput": 57013
         },
         "src/worktree.ts": {
           "bytesInOutput": 4235
@@ -500,7 +500,7 @@
           "bytesInOutput": 4995
         },
         "src/display.ts": {
-          "bytesInOutput": 9023
+          "bytesInOutput": 9578
         },
         "src/testcmd.ts": {
           "bytesInOutput": 1914
@@ -509,7 +509,7 @@
           "bytesInOutput": 2785
         }
       },
-      "bytes": 96640
+      "bytes": 99130
     }
   }
 }

package/dist/orchestrator.js

@@ -41,7 +41,8 @@ import {
   updateWorktreeFromBase
 } from "./merge.js";
 import {
-  createDisplay
+  createDisplay,
+  ticketLabel
 } from "./display.js";
 import { runTestCmd } from "./testcmd.js";
 function formatErrorMessage(error) {
@@ -165,6 +166,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");
 const COMPLETED_RE = /^\s*[-*+]?\s*\[x\]\s+(.+)$/i;
 const TOOL_USE_RE = /^\[[\w.]+\]/;
 const CHECKBOX_RE = /^(\s*[-*+] )\[( |x|X)\]( .*)$/;
@@ -701,7 +733,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();
@@ -750,7 +782,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;
@@ -1344,6 +1376,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,
@@ -1364,7 +1419,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)
@@ -1372,12 +1429,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,
@@ -1386,12 +1441,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,
@@ -1488,10 +1538,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."
         );
@@ -1499,10 +1549,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"
   );
@@ -1595,7 +1646,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)
@@ -1603,12 +1656,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,
@@ -1617,12 +1668,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,
@@ -1884,6 +1930,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`
             );
@@ -1931,12 +1982,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."
         );
@@ -1944,10 +1995,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"
   );
@@ -1975,6 +2027,7 @@ export {
   dryRun,
   dryRunIsolated,
   escalateEffort,
+  findBlockedTickets,
   findReadyTickets,
   formatErrorMessage,
   formatStreamLine,