patchrelay 0.35.12 → 0.35.14

package/dist/cli/watch/IssueRow.js

@@ -2,8 +2,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from "ink";
 import { summarizeIssueStatusNote } from "./issue-status-note.js";
 import { relativeTime, truncate } from "./format-utils.js";
+import { hasDisplayPrBlocker, isRereviewNeeded, prChecksFact } from "./pr-status.js";
 // ─── State display ──────────────────────────────────────────────
 const TERMINAL_STATES = new Set(["done", "failed", "escalated"]);
+function needsOperatorIntervention(issue) {
+    return issue.sessionState === "failed" || issue.factoryState === "failed" || issue.factoryState === "escalated";
+}
 function effectiveState(issue) {
     if (issue.sessionState === "done")
         return "done";
@@ -11,13 +15,16 @@ function effectiveState(issue) {
         return "failed";
     if (issue.blockedByCount > 0 && !issue.activeRunType)
         return "blocked";
-    if (issue.readyForExecution && !issue.activeRunType)
-        return "ready";
     if (issue.sessionState === "waiting_input")
         return "awaiting_input";
+    if (issue.readyForExecution && !issue.activeRunType && !hasDisplayPrBlocker(issue))
+        return "ready";
     return issue.factoryState;
 }
 function sessionDisplay(issue) {
+    if (needsOperatorIntervention(issue)) {
+        return { label: "needs help", color: "red" };
+    }
     switch (issue.sessionState) {
         case "running":
             return { label: "running", color: "cyan" };
@@ -55,9 +62,7 @@ function stageLabel(issue) {
 // ─── Context facts (what matters right now) ─────────────────────
 function buildFacts(issue, selected) {
     const facts = [];
-    const rereviewNeeded = issue.prReviewState === "changes_requested"
-        && (issue.prCheckStatus === "passed" || issue.prCheckStatus === "success")
-        && !issue.activeRunType;
+    const rereviewNeeded = isRereviewNeeded(issue);
     // PR number
     if (issue.prNumber !== undefined) {
         facts.push({ text: `PR #${issue.prNumber}` });
@@ -71,6 +76,9 @@ function buildFacts(issue, selected) {
     if (issue.waitingReason && issue.sessionState === "waiting_input") {
         facts.push({ text: issue.waitingReason, color: "yellow" });
     }
+    if (needsOperatorIntervention(issue)) {
+        facts.push({ text: "operator action needed", color: "red" });
+    }
     // Review state — only show when it matters (not yet approved, or changes requested)
     if (issue.prReviewState === "approved") {
         facts.push({ text: "approved", color: "green" });
@@ -85,23 +93,9 @@ function buildFacts(issue, selected) {
         facts.push({ text: "awaiting review", color: "yellow" });
     }
     // Check status — compact
-    if (issue.prCheckStatus === "passed" || issue.prCheckStatus === "success") {
-        facts.push({ text: "checks passed", color: "green" });
-    }
-    else if (issue.prCheckStatus === "failed" || issue.prCheckStatus === "failure") {
-        const failedNames = issue.prChecksSummary?.failedNames ?? [];
-        const checkInfo = issue.latestFailureCheckName
-            ?? (failedNames.length > 0 ? failedNames.slice(0, 2).join(", ") : "checks");
-        facts.push({ text: `${checkInfo} failed`, color: "red" });
-    }
-    else if (issue.prCheckStatus === "pending" || issue.prCheckStatus === "in_progress") {
-        const summary = issue.prChecksSummary;
-        if (summary && summary.total > 0) {
-            facts.push({ text: `checks ${summary.completed}/${summary.total}`, color: "yellow" });
-        }
-        else {
-            facts.push({ text: "checks running", color: "yellow" });
-        }
+    const checksFact = prChecksFact(issue);
+    if (checksFact) {
+        facts.push(checksFact);
     }
     // Blocker
     if (issue.blockedByCount > 0) {
@@ -111,11 +105,11 @@ function buildFacts(issue, selected) {
 }
 // ─── What's blocking progress ───────────────────────────────────
 function blockerText(issue) {
-    const rereviewNeeded = issue.prReviewState === "changes_requested"
-        && (issue.prCheckStatus === "passed" || issue.prCheckStatus === "success")
-        && !issue.activeRunType;
+    const rereviewNeeded = isRereviewNeeded(issue);
     if (issue.sessionState === "waiting_input")
         return issue.waitingReason ?? "Waiting for input";
+    if (needsOperatorIntervention(issue))
+        return issue.statusNote ?? issue.waitingReason ?? "Needs operator intervention";
     if (issue.waitingReason && !issue.activeRunType)
         return issue.waitingReason;
     if (issue.blockedByCount > 0)
@@ -126,9 +120,12 @@ function blockerText(issue) {
         const check = issue.latestFailureCheckName ?? "CI";
         return `Repairing ${check}`;
     }
-    if (issue.prCheckStatus === "failed" || issue.prCheckStatus === "failure") {
-        const check = issue.latestFailureCheckName ?? "checks";
-        return `${check} failed`;
+    const checksFact = prChecksFact(issue);
+    if (checksFact?.color === "red") {
+        return checksFact.text;
+    }
+    if (checksFact?.color === "yellow" && checksFact.text.startsWith("checks ")) {
+        return `${checksFact.text} still running`;
     }
     if (rereviewNeeded)
         return "Awaiting re-review after requested changes";

package/dist/cli/watch/StatusBar.js

@@ -13,7 +13,8 @@ export function StatusBar({ issues, totalCount, filter, connected, lastServerMes
     const agg = computeAggregates(aggregateSource);
     const withPr = aggregateSource.filter((i) => i.prNumber !== undefined).length;
     const waitingInput = aggregateSource.filter((i) => i.sessionState === "waiting_input" || i.factoryState === "awaiting_input").length;
+    const intervention = aggregateSource.filter((i) => i.sessionState === "failed" || i.factoryState === "failed" || i.factoryState === "escalated").length;
     const running = aggregateSource.filter((i) => i.sessionState === "running").length;
     const idle = aggregateSource.filter((i) => i.sessionState === "idle").length;
-    return (_jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { bold: true, children: showing }), _jsxs(Text, { dimColor: true, children: ["[", FILTER_LABELS[filter], "]"] }), _jsx(Text, { dimColor: true, children: "|" }), running > 0 && _jsxs(Text, { color: "cyan", children: [running, " running"] }), idle > 0 && _jsxs(Text, { color: "blueBright", children: [idle, " idle"] }), agg.ready > 0 && _jsxs(Text, { color: "blueBright", children: [agg.ready, " ready"] }), agg.blocked > 0 && _jsxs(Text, { color: "yellow", children: [agg.blocked, " blocked"] }), withPr > 0 && _jsxs(Text, { dimColor: true, children: [withPr, " PRs"] }), waitingInput > 0 && _jsxs(Text, { color: "yellow", children: [waitingInput, " needs input"] }), agg.done > 0 && _jsxs(Text, { color: "green", children: [agg.done, " done"] }), agg.failed > 0 && _jsxs(Text, { color: "red", children: [agg.failed, " failed"] }), frozen && _jsx(Text, { color: "magenta", children: "frozen" })] }), _jsx(FreshnessBadge, { connected: connected, lastServerMessageAt: lastServerMessageAt })] }));
+    return (_jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { bold: true, children: showing }), _jsxs(Text, { dimColor: true, children: ["[", FILTER_LABELS[filter], "]"] }), _jsx(Text, { dimColor: true, children: "|" }), running > 0 && _jsxs(Text, { color: "cyan", children: [running, " running"] }), idle > 0 && _jsxs(Text, { color: "blueBright", children: [idle, " idle"] }), agg.ready > 0 && _jsxs(Text, { color: "blueBright", children: [agg.ready, " ready"] }), agg.blocked > 0 && _jsxs(Text, { color: "yellow", children: [agg.blocked, " blocked"] }), withPr > 0 && _jsxs(Text, { dimColor: true, children: [withPr, " PRs"] }), waitingInput > 0 && _jsxs(Text, { color: "yellow", children: [waitingInput, " needs input"] }), intervention > 0 && _jsxs(Text, { color: "red", children: [intervention, " needs help"] }), agg.done > 0 && _jsxs(Text, { color: "green", children: [agg.done, " done"] }), agg.failed > 0 && _jsxs(Text, { color: "red", children: [agg.failed, " failed"] }), frozen && _jsx(Text, { color: "magenta", children: "frozen" })] }), _jsx(FreshnessBadge, { connected: connected, lastServerMessageAt: lastServerMessageAt })] }));
 }