patchrelay 0.35.11 → 0.35.12

package/dist/cli/index.js

@@ -1,7 +1,6 @@
 import { loadConfig } from "../config.js";
 import { getBuildInfo } from "../build-info.js";
 import { assertKnownFlags, hasHelpFlag, parseArgs, resolveCommand } from "./args.js";
-import { handleFeedCommand } from "./commands/feed.js";
 import { handleIssueCommand, } from "./commands/issues.js";
 import { handleLinearCommand } from "./commands/linear.js";
 import { handleRepoCommand } from "./commands/repo.js";
@@ -19,7 +18,6 @@ function getCommandConfigProfile(command) {
         case "service":
             return "doctor";
         case "linear":
-        case "feed":
         case "dashboard":
             return "operator_cli";
         case "repo":
@@ -133,9 +131,6 @@ function validateFlags(command, commandArgs, parsed) {
             }
             assertKnownFlags(parsed, "service", []);
             return;
-        case "feed":
-            assertKnownFlags(parsed, command, ["follow", "limit", "issue", "repo", "kind", "stage", "status", "workflow", "json"]);
-            return;
         case "dashboard":
             assertKnownFlags(parsed, command, ["issue"]);
             return;
@@ -323,21 +318,6 @@ export async function runCli(argv, options) {
             writeOutput(stderr, `${command} has been removed. Use \`patchrelay linear ...\` and \`patchrelay repo ...\` instead.\n`);
             return 1;
         }
-        if (command === "feed") {
-            const operatorData = parsed.flags.get("follow") === true
-                ? await ensureFeedFollowDataAccess(data, config)
-                : await ensureFeedListDataAccess(data, config);
-            if (!data) {
-                data = operatorData;
-                ownsData = true;
-            }
-            return await handleFeedCommand({
-                parsed,
-                json,
-                stdout,
-                data: operatorData,
-            });
-        }
         if (command === "dashboard") {
             const { handleWatchCommand } = await import("./commands/watch.js");
             return await handleWatchCommand({ config, parsed });
@@ -362,10 +342,6 @@ async function createCliDataAccess(config) {
     const { CliDataAccess } = await import("./data.js");
     return new CliDataAccess(config);
 }
-async function createCliOperatorDataAccess(config) {
-    const { CliOperatorApiClient } = await import("./operator-client.js");
-    return new CliOperatorApiClient(config);
-}
 async function ensureIssueDataAccess(data, config) {
     if (data) {
         if (isIssueDataAccess(data)) {
@@ -378,27 +354,3 @@ async function ensureIssueDataAccess(data, config) {
 function isIssueDataAccess(data) {
     return !!data && typeof data === "object" && "inspect" in data && typeof data.inspect === "function";
 }
-async function ensureFeedListDataAccess(data, config) {
-    if (data) {
-        if (hasFeedListDataAccess(data)) {
-            return data;
-        }
-        throw new Error("The feed command requires listOperatorFeed() data access.");
-    }
-    return await createCliOperatorDataAccess(config);
-}
-async function ensureFeedFollowDataAccess(data, config) {
-    if (data) {
-        if (hasFeedFollowDataAccess(data)) {
-            return data;
-        }
-        throw new Error("The feed --follow command requires followOperatorFeed() data access.");
-    }
-    return await createCliOperatorDataAccess(config);
-}
-function hasFeedListDataAccess(data) {
-    return !!data && typeof data === "object" && "listOperatorFeed" in data && typeof data.listOperatorFeed === "function";
-}
-function hasFeedFollowDataAccess(data) {
-    return !!data && typeof data === "object" && "followOperatorFeed" in data && typeof data.followOperatorFeed === "function";
-}

package/dist/cli/operator-client.js

@@ -29,88 +29,6 @@ export class CliOperatorApiClient {
     async disconnectLinearWorkspace(workspace) {
         return await this.requestJson(`/api/linear/workspaces/${encodeURIComponent(workspace)}`, undefined, { method: "DELETE" });
     }
-    async listOperatorFeed(options) {
-        return await this.requestJson("/api/feed", {
-            ...(options?.limit && options.limit > 0 ? { limit: String(options.limit) } : {}),
-            ...(options?.issueKey ? { issue: options.issueKey } : {}),
-            ...(options?.projectId ? { project: options.projectId } : {}),
-            ...(options?.kind ? { kind: options.kind } : {}),
-            ...(options?.stage ? { stage: options.stage } : {}),
-            ...(options?.status ? { status: options.status } : {}),
-            ...(options?.workflowId ? { workflow: options.workflowId } : {}),
-        });
-    }
-    async followOperatorFeed(onEvent, options) {
-        const url = new URL("/api/feed", this.getOperatorBaseUrl());
-        url.searchParams.set("follow", "1");
-        if (options?.limit && options.limit > 0) {
-            url.searchParams.set("limit", String(options.limit));
-        }
-        if (options?.issueKey) {
-            url.searchParams.set("issue", options.issueKey);
-        }
-        if (options?.projectId) {
-            url.searchParams.set("project", options.projectId);
-        }
-        if (options?.kind) {
-            url.searchParams.set("kind", options.kind);
-        }
-        if (options?.stage) {
-            url.searchParams.set("stage", options.stage);
-        }
-        if (options?.status) {
-            url.searchParams.set("status", options.status);
-        }
-        if (options?.workflowId) {
-            url.searchParams.set("workflow", options.workflowId);
-        }
-        const response = await fetch(url, {
-            method: "GET",
-            headers: {
-                accept: "text/event-stream",
-                ...(this.config.operatorApi.bearerToken ? { authorization: `Bearer ${this.config.operatorApi.bearerToken}` } : {}),
-            },
-        });
-        if (!response.ok || !response.body) {
-            const body = await response.text().catch(() => "");
-            const message = this.readErrorMessage(body);
-            throw new Error(message ?? `Request failed: ${response.status}`);
-        }
-        const reader = response.body.getReader();
-        const decoder = new TextDecoder();
-        let buffer = "";
-        let dataLines = [];
-        while (true) {
-            const { done, value } = await reader.read();
-            if (done) {
-                break;
-            }
-            buffer += decoder.decode(value, { stream: true });
-            let newlineIndex = buffer.indexOf("\n");
-            while (newlineIndex !== -1) {
-                const rawLine = buffer.slice(0, newlineIndex);
-                buffer = buffer.slice(newlineIndex + 1);
-                const line = rawLine.endsWith("\r") ? rawLine.slice(0, -1) : rawLine;
-                if (!line) {
-                    if (dataLines.length > 0) {
-                        const parsed = JSON.parse(dataLines.join("\n"));
-                        onEvent(parsed);
-                        dataLines = [];
-                    }
-                    newlineIndex = buffer.indexOf("\n");
-                    continue;
-                }
-                if (line.startsWith(":")) {
-                    newlineIndex = buffer.indexOf("\n");
-                    continue;
-                }
-                if (line.startsWith("data:")) {
-                    dataLines.push(line.slice(5).trimStart());
-                }
-                newlineIndex = buffer.indexOf("\n");
-            }
-        }
-    }
     getOperatorBaseUrl() {
         const host = this.normalizeLocalHost(this.config.server.bind);
         return `http://${host}:${this.config.server.port}/`;

package/dist/cli/watch/App.js

@@ -4,10 +4,8 @@ import { Box, Text, useApp, useInput } from "ink";
 import { watchReducer, initialWatchState, filterIssues } from "./watch-state.js";
 import { useWatchStream } from "./use-watch-stream.js";
 import { useDetailStream } from "./use-detail-stream.js";
-import { useFeedStream } from "./use-feed-stream.js";
 import { IssueListView } from "./IssueListView.js";
 import { IssueDetailView } from "./IssueDetailView.js";
-import { FeedView } from "./FeedView.js";
 async function postPrompt(baseUrl, issueKey, text, bearerToken) {
     const headers = { "content-type": "application/json" };
     if (bearerToken)
@@ -71,7 +69,6 @@ export function App({ baseUrl, bearerToken, initialIssueKey }) {
     const [frozen, setFrozen] = useState(false);
     useWatchStream({ baseUrl, bearerToken, dispatch, active: !frozen });
     useDetailStream({ baseUrl, bearerToken, issueKey: state.activeDetailKey, dispatch, active: !frozen });
-    useFeedStream({ baseUrl, bearerToken, active: state.view === "feed" && !frozen, dispatch });
     const [promptMode, setPromptMode] = useState(false);
     const [promptBuffer, setPromptBuffer] = useState("");
     const handleRetry = useCallback(() => {
@@ -154,9 +151,6 @@ export function App({ baseUrl, bearerToken, initialIssueKey }) {
             else if (key.tab) {
                 dispatch({ type: "cycle-filter" });
             }
-            else if (input === "F" || input === "f") {
-                dispatch({ type: "enter-feed" });
-            }
         }
         else if (state.view === "detail") {
             if (key.escape || key.backspace || key.delete) {
@@ -193,11 +187,6 @@ export function App({ baseUrl, bearerToken, initialIssueKey }) {
                 dispatch({ type: "detail-navigate", direction: "prev", filtered });
             }
         }
-        else if (state.view === "feed") {
-            if (key.escape || key.backspace || key.delete) {
-                dispatch({ type: "exit-feed" });
-            }
-        }
     });
-    return (_jsx(Box, { flexDirection: "column", children: state.view === "list" ? (_jsx(IssueListView, { issues: filtered, allIssues: state.issues, selectedIndex: state.selectedIndex, connected: state.connected, lastServerMessageAt: state.lastServerMessageAt, filter: state.filter, totalCount: state.issues.length, frozen: frozen })) : state.view === "detail" ? (_jsxs(Box, { flexDirection: "column", children: [state.activeDetailKey && (_jsxs(Box, { children: [_jsx(Text, { dimColor: true, children: "Issues" }), _jsx(Text, { dimColor: true, children: " \u203A " }), _jsx(Text, { bold: true, children: state.activeDetailKey }), _jsx(Text, { dimColor: true, children: " \u203A " }), _jsx(Text, { dimColor: true, children: state.detailTab === "timeline" ? "Timeline" : "History" })] })), _jsx(IssueDetailView, { issue: state.issues.find((i) => i.issueKey === state.activeDetailKey), timeline: state.timeline, follow: state.follow, activeRunStartedAt: state.activeRunStartedAt, activeRunId: state.activeRunId, tokenUsage: state.tokenUsage, diffSummary: state.diffSummary, plan: state.plan, issueContext: state.issueContext, detailTab: state.detailTab, rawRuns: state.rawRuns, rawFeedEvents: state.rawFeedEvents, connected: state.connected, lastServerMessageAt: state.lastServerMessageAt }), promptMode && (_jsxs(Box, { children: [_jsx(Text, { color: "yellow", children: "prompt> " }), _jsx(Text, { children: promptBuffer }), _jsx(Text, { dimColor: true, children: "_" })] })), promptStatus && !promptMode && (_jsx(Text, { dimColor: true, children: promptStatus }))] })) : (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { dimColor: true, children: "Issues" }), _jsx(Text, { dimColor: true, children: " \u203A " }), _jsx(Text, { bold: true, children: "Operator Feed" })] }), _jsx(FeedView, { events: state.feedEvents, connected: state.connected, lastServerMessageAt: state.lastServerMessageAt })] })) }));
+    return (_jsx(Box, { flexDirection: "column", children: state.view === "list" ? (_jsx(IssueListView, { issues: filtered, allIssues: state.issues, selectedIndex: state.selectedIndex, connected: state.connected, lastServerMessageAt: state.lastServerMessageAt, filter: state.filter, totalCount: state.issues.length, frozen: frozen })) : state.view === "detail" ? (_jsxs(Box, { flexDirection: "column", children: [state.activeDetailKey && (_jsxs(Box, { children: [_jsx(Text, { dimColor: true, children: "Issues" }), _jsx(Text, { dimColor: true, children: " \u203A " }), _jsx(Text, { bold: true, children: state.activeDetailKey }), _jsx(Text, { dimColor: true, children: " \u203A " }), _jsx(Text, { dimColor: true, children: state.detailTab === "timeline" ? "Timeline" : "History" })] })), _jsx(IssueDetailView, { issue: state.issues.find((i) => i.issueKey === state.activeDetailKey), timeline: state.timeline, follow: state.follow, activeRunStartedAt: state.activeRunStartedAt, activeRunId: state.activeRunId, tokenUsage: state.tokenUsage, diffSummary: state.diffSummary, plan: state.plan, issueContext: state.issueContext, detailTab: state.detailTab, rawRuns: state.rawRuns, rawFeedEvents: state.rawFeedEvents, connected: state.connected, lastServerMessageAt: state.lastServerMessageAt }), promptMode && (_jsxs(Box, { children: [_jsx(Text, { color: "yellow", children: "prompt> " }), _jsx(Text, { children: promptBuffer }), _jsx(Text, { dimColor: true, children: "_" })] })), promptStatus && !promptMode && (_jsx(Text, { dimColor: true, children: promptStatus }))] })) : null }));
 }

package/dist/cli/watch/HelpBar.js

@@ -9,10 +9,10 @@ export function HelpBar({ view, follow, detailTab }) {
             .join("  ");
     }
     else if (view === "feed") {
-        text = "";
+        text = "Legacy feed view  Esc: back";
     }
     else {
-        text = "F: feed  Tab: filter";
+        text = "Enter: detail  Tab: filter";
     }
     return (_jsx(Box, { children: _jsx(Text, { dimColor: true, children: text }) }));
 }

package/dist/cli/watch/IssueDetailView.js

@@ -7,9 +7,6 @@ import { buildStateHistory } from "./history-builder.js";
 import { HelpBar } from "./HelpBar.js";
 import { planStepSymbol, planStepColor } from "./plan-helpers.js";
 import { progressBar } from "./format-utils.js";
-import { FactoryStateGraph } from "./FactoryStateGraph.js";
-import { QueueObservationView } from "./QueueObservationView.js";
-import { buildPatchRelayQueueObservations, buildPatchRelayStateGraph } from "./state-visualization.js";
 import { FreshnessBadge } from "./FreshnessBadge.js";
 function formatTokens(n) {
     if (n >= 1_000_000)
@@ -46,46 +43,74 @@ function formatCheckState(checkState) {
             return null;
     }
 }
-const STATE_DISPLAY = {
-    blocked: { label: "blocked", color: "yellow" },
-    ready: { label: "ready", color: "blueBright" },
-    delegated: { label: "delegated", color: "cyan" },
-    implementing: { label: "implementing", color: "cyan" },
-    pr_open: { label: "PR open", color: "cyan" },
-    changes_requested: { label: "review changes", color: "yellow" },
-    repairing_ci: { label: "repairing CI", color: "yellow" },
-    awaiting_queue: { label: "queued for merge", color: "cyan" },
-    repairing_queue: { label: "repairing queue", color: "yellow" },
-    done: { label: "merged", color: "green" },
+const SESSION_DISPLAY = {
+    idle: { label: "idle", color: "blueBright" },
+    running: { label: "running", color: "cyan" },
+    waiting_input: { label: "needs input", color: "yellow" },
+    done: { label: "done", color: "green" },
     failed: { label: "failed", color: "red" },
-    escalated: { label: "escalated", color: "red" },
-    awaiting_input: { label: "awaiting input", color: "yellow" },
+};
+const STAGE_DISPLAY = {
+    blocked: "blocked",
+    ready: "ready",
+    delegated: "delegated",
+    implementing: "implementing",
+    pr_open: "PR open",
+    changes_requested: "review changes",
+    repairing_ci: "repairing CI",
+    awaiting_queue: "waiting downstream",
+    repairing_queue: "repairing queue",
+    done: "merged",
+    failed: "failed",
+    escalated: "escalated",
+    awaiting_input: "needs input",
 };
 function effectiveState(issue) {
+    if (issue.sessionState === "done")
+        return "done";
+    if (issue.sessionState === "failed")
+        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";
     return issue.factoryState;
 }
+function sessionDisplay(issue) {
+    const state = issue.sessionState ?? "unknown";
+    return SESSION_DISPLAY[state] ?? { label: state, color: "white" };
+}
+function stageDisplay(issue) {
+    const state = effectiveState(issue);
+    return STAGE_DISPLAY[state] ?? issue.factoryState;
+}
 function blockerText(issue, issueContext) {
+    const rereviewNeeded = issue.prReviewState === "changes_requested"
+        && (issue.prCheckStatus === "passed" || issue.prCheckStatus === "success")
+        && !issue.activeRunType;
+    if (issue.sessionState === "waiting_input")
+        return issue.waitingReason ?? "Waiting for input";
+    if (issue.waitingReason && !issue.activeRunType)
+        return issue.waitingReason;
     if (issue.blockedByCount > 0)
         return `Waiting on ${issue.blockedByKeys.join(", ")}`;
-    if (issue.factoryState === "repairing_queue")
+    if (effectiveState(issue) === "repairing_queue")
         return "Merge queue conflict, repairing branch";
-    if (issue.factoryState === "repairing_ci") {
+    if (effectiveState(issue) === "repairing_ci") {
         const check = issueContext?.latestFailureCheckName ?? issue.latestFailureCheckName ?? "CI";
         return `Repairing ${check}`;
     }
-    if (issue.factoryState === "awaiting_queue")
-        return "Waiting for merge queue";
     if (issue.prCheckStatus === "failed" || issue.prCheckStatus === "failure") {
         const check = issueContext?.latestFailureCheckName ?? issue.latestFailureCheckName ?? "checks";
         return `${check} failed`;
     }
+    if (rereviewNeeded)
+        return "Awaiting re-review after requested changes";
     if (issue.prReviewState === "changes_requested")
         return "Review changes requested";
-    if (issue.prNumber !== undefined && !issue.prReviewState && issue.factoryState !== "done")
+    if (issue.prNumber !== undefined && !issue.prReviewState && effectiveState(issue) !== "done")
         return "Awaiting review";
     return null;
 }
@@ -102,7 +127,7 @@ function ElapsedTime({ startedAt }) {
 }
 export function IssueDetailView({ issue, timeline, follow, activeRunStartedAt, activeRunId, tokenUsage, diffSummary, plan, issueContext, detailTab, rawRuns, rawFeedEvents, connected, lastServerMessageAt, }) {
     if (!issue) {
-        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "red", children: "Issue not found." }), _jsx(HelpBar, { view: "detail", follow: follow, detailTab: detailTab })] }));
+        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: "Loading issue\u2026" }), _jsx(HelpBar, { view: "detail", follow: follow, detailTab: detailTab })] }));
     }
     const key = issue.issueKey ?? issue.projectId;
     const meta = [];
@@ -112,19 +137,25 @@ export function IssueDetailView({ issue, timeline, follow, activeRunStartedAt, a
         meta.push(`${diffSummary.filesChanged}f +${diffSummary.linesAdded} -${diffSummary.linesRemoved}`);
     if (issueContext?.runCount)
         meta.push(`${issueContext.runCount} runs`);
-    const state = STATE_DISPLAY[effectiveState(issue)] ?? { label: issue.factoryState, color: "white" };
+    const session = sessionDisplay(issue);
+    const stage = stageDisplay(issue);
     const blocker = blockerText(issue, issueContext);
     const history = useMemo(() => buildStateHistory(rawRuns, rawFeedEvents, issue.factoryState, activeRunId), [rawRuns, rawFeedEvents, issue.factoryState, activeRunId]);
-    const graph = useMemo(() => buildPatchRelayStateGraph(history, issue.factoryState), [history, issue.factoryState]);
-    const queueObservations = useMemo(() => buildPatchRelayQueueObservations(issue, rawFeedEvents), [issue, rawFeedEvents]);
     // Build compact facts for the header
     const facts = [];
+    const rereviewNeeded = issue.prReviewState === "changes_requested"
+        && (issue.prCheckStatus === "passed" || issue.prCheckStatus === "success")
+        && !issue.activeRunType;
     if (issue.prNumber !== undefined)
         facts.push(`PR #${issue.prNumber}`);
     if (issue.prReviewState === "approved")
         facts.push("approved");
+    else if (rereviewNeeded)
+        facts.push("re-review needed");
     else if (issue.prReviewState === "changes_requested")
         facts.push("changes requested");
+    if (issue.waitingReason && issue.sessionState === "waiting_input")
+        facts.push(issue.waitingReason);
     if (issue.prCheckStatus === "passed" || issue.prCheckStatus === "success")
         facts.push("checks passed");
     else if (issue.prCheckStatus === "failed" || issue.prCheckStatus === "failure") {
@@ -134,5 +165,5 @@ export function IssueDetailView({ issue, timeline, follow, activeRunStartedAt, a
     else if (issue.prChecksSummary?.total) {
         facts.push(`checks ${issue.prChecksSummary.completed}/${issue.prChecksSummary.total}`);
     }
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { gap: 2, children: [_jsx(Text, { bold: true, children: key }), _jsx(Text, { color: state.color, children: state.label }), facts.length > 0 && _jsx(Text, { dimColor: true, children: facts.join(" \u00b7 ") }), activeRunStartedAt && _jsx(ElapsedTime, { startedAt: activeRunStartedAt }), meta.length > 0 && _jsx(Text, { dimColor: true, children: meta.join("  ") }), follow && _jsx(Text, { color: "yellow", children: "follow" }), _jsx(FreshnessBadge, { connected: connected, lastServerMessageAt: lastServerMessageAt })] }), issue.title && _jsx(Text, { children: issue.title }), blocker && _jsx(Text, { color: "yellow", children: blocker }), issueContext?.latestFailureSummary && (_jsxs(Text, { color: issueContext.latestFailureSource === "queue_eviction" ? "yellow" : "red", children: ["Latest failure: ", issueContext.latestFailureSummary, issueContext.latestFailureHeadSha ? ` @ ${issueContext.latestFailureHeadSha.slice(0, 8)}` : ""] })), detailTab === "timeline" ? (_jsxs(_Fragment, { children: [plan && plan.length > 0 && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "Plan" }), _jsx(Text, { children: progressBar(plan.filter((s) => s.status === "completed").length, plan.length, 16) }), _jsxs(Text, { dimColor: true, children: [plan.filter((s) => s.status === "completed").length, "/", plan.length] })] }), plan.map((entry, i) => (_jsxs(Box, { gap: 1, children: [_jsxs(Text, { color: planStepColor(entry.status), children: ["[", planStepSymbol(entry.status), "]"] }), _jsx(Text, { children: entry.step })] }, `plan-${i}`)))] })), _jsx(Box, { marginTop: 1, flexDirection: "column", children: _jsx(Timeline, { entries: timeline, follow: follow }) })] })) : (_jsxs(_Fragment, { children: [_jsx(FactoryStateGraph, { main: graph.main, prLoops: graph.prLoops, queueLoop: graph.queueLoop, exits: graph.exits }), _jsx(QueueObservationView, { observations: queueObservations }), _jsx(Box, { marginTop: 1, children: _jsx(StateHistoryView, { history: history, plan: plan, activeRunId: activeRunId }) })] })), _jsx(Box, { marginTop: 1, children: _jsx(HelpBar, { view: "detail", follow: follow, detailTab: detailTab }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { gap: 2, children: [_jsx(Text, { bold: true, children: key }), _jsx(Text, { color: session.color, children: session.label }), _jsx(Text, { dimColor: true, children: `  debug stage ${stage}` }), facts.length > 0 && _jsx(Text, { dimColor: true, children: facts.join(" \u00b7 ") }), activeRunStartedAt && _jsx(ElapsedTime, { startedAt: activeRunStartedAt }), meta.length > 0 && _jsx(Text, { dimColor: true, children: meta.join("  ") }), follow && _jsx(Text, { color: "yellow", children: "follow" }), _jsx(FreshnessBadge, { connected: connected, lastServerMessageAt: lastServerMessageAt })] }), issue.title && _jsx(Text, { children: issue.title }), blocker && _jsx(Text, { color: "yellow", children: blocker }), issue.statusNote && issue.statusNote !== blocker && (_jsx(Text, { dimColor: true, wrap: "wrap", children: issue.statusNote })), issueContext?.latestFailureSummary && (_jsxs(Text, { color: issueContext.latestFailureSource === "queue_eviction" ? "yellow" : "red", children: ["Latest failure: ", issueContext.latestFailureSummary, issueContext.latestFailureHeadSha ? ` @ ${issueContext.latestFailureHeadSha.slice(0, 8)}` : ""] })), detailTab === "timeline" ? (_jsxs(_Fragment, { children: [plan && plan.length > 0 && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "Plan" }), _jsx(Text, { children: progressBar(plan.filter((s) => s.status === "completed").length, plan.length, 16) }), _jsxs(Text, { dimColor: true, children: [plan.filter((s) => s.status === "completed").length, "/", plan.length] })] }), plan.map((entry, i) => (_jsxs(Box, { gap: 1, children: [_jsxs(Text, { color: planStepColor(entry.status), children: ["[", planStepSymbol(entry.status), "]"] }), _jsx(Text, { children: entry.step })] }, `plan-${i}`)))] })), _jsx(Box, { marginTop: 1, flexDirection: "column", children: _jsx(Timeline, { entries: timeline, follow: follow }) })] })) : (_jsxs(_Fragment, { children: [_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: "PatchRelay activity history." }), _jsx(Text, { dimColor: true, children: "Runs, waits, and wake-ups are shown here in PatchRelay order." })] }), _jsx(Box, { marginTop: 1, children: _jsx(StateHistoryView, { history: history, plan: plan, activeRunId: activeRunId }) })] })), _jsx(Box, { marginTop: 1, children: _jsx(HelpBar, { view: "detail", follow: follow, detailTab: detailTab }) })] }));
 }

package/dist/cli/watch/IssueRow.js

@@ -3,48 +3,85 @@ import { Box, Text } from "ink";
 import { summarizeIssueStatusNote } from "./issue-status-note.js";
 import { relativeTime, truncate } from "./format-utils.js";
 // ─── State display ──────────────────────────────────────────────
-const TERMINAL_STATES = new Set(["done", "failed", "escalated", "awaiting_input"]);
+const TERMINAL_STATES = new Set(["done", "failed", "escalated"]);
 function effectiveState(issue) {
+    if (issue.sessionState === "done")
+        return "done";
+    if (issue.sessionState === "failed")
+        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";
     return issue.factoryState;
 }
-function stateDisplay(issue) {
+function sessionDisplay(issue) {
+    switch (issue.sessionState) {
+        case "running":
+            return { label: "running", color: "cyan" };
+        case "idle":
+            return { label: "idle", color: "blueBright" };
+        case "waiting_input":
+            return { label: "needs input", color: "yellow" };
+        case "done":
+            return { label: "done", color: "green" };
+        case "failed":
+            return { label: "failed", color: "red" };
+        default:
+            return { label: "unknown", color: "white" };
+    }
+}
+function stageLabel(issue) {
     const state = effectiveState(issue);
     switch (state) {
-        case "blocked": return { label: "blocked", color: "yellow" };
-        case "ready": return { label: "ready", color: "blueBright" };
-        case "delegated": return { label: "delegated", color: "cyan" };
-        case "implementing": return { label: "implementing", color: "cyan" };
-        case "pr_open": return { label: "PR open", color: "cyan" };
-        case "changes_requested": return { label: "review changes", color: "yellow" };
-        case "repairing_ci": return { label: "repairing CI", color: "yellow" };
-        case "awaiting_queue": return { label: "queued for merge", color: "cyan" };
-        case "repairing_queue": return { label: "repairing queue", color: "yellow" };
-        case "done": return { label: "merged", color: "green" };
-        case "failed": return { label: "failed", color: "red" };
-        case "escalated": return { label: "escalated", color: "red" };
-        case "awaiting_input": return { label: "awaiting input", color: "yellow" };
-        default: return { label: state, color: "white" };
+        case "blocked": return "blocked";
+        case "ready": return "ready";
+        case "delegated": return "delegated";
+        case "implementing": return "implementing";
+        case "pr_open": return "PR open";
+        case "changes_requested": return "review changes";
+        case "repairing_ci": return "repairing CI";
+        case "awaiting_queue": return "waiting downstream";
+        case "repairing_queue": return "repairing queue";
+        case "done": return "merged";
+        case "failed": return "failed";
+        case "escalated": return "escalated";
+        case "awaiting_input": return "needs input";
+        default: return state;
     }
 }
 // ─── Context facts (what matters right now) ─────────────────────
-function buildFacts(issue) {
+function buildFacts(issue, selected) {
     const facts = [];
+    const rereviewNeeded = issue.prReviewState === "changes_requested"
+        && (issue.prCheckStatus === "passed" || issue.prCheckStatus === "success")
+        && !issue.activeRunType;
     // PR number
     if (issue.prNumber !== undefined) {
         facts.push({ text: `PR #${issue.prNumber}` });
     }
+    if (!issue.sessionState) {
+        facts.push({ text: `stage ${stageLabel(issue)}` });
+    }
+    else if (selected) {
+        facts.push({ text: `internal stage ${stageLabel(issue)}` });
+    }
+    if (issue.waitingReason && issue.sessionState === "waiting_input") {
+        facts.push({ text: issue.waitingReason, color: "yellow" });
+    }
     // Review state — only show when it matters (not yet approved, or changes requested)
     if (issue.prReviewState === "approved") {
         facts.push({ text: "approved", color: "green" });
     }
+    else if (rereviewNeeded) {
+        facts.push({ text: "re-review needed", color: "yellow" });
+    }
     else if (issue.prReviewState === "changes_requested") {
         facts.push({ text: "changes requested", color: "yellow" });
     }
-    else if (issue.prNumber !== undefined && !issue.prReviewState && !TERMINAL_STATES.has(issue.factoryState)) {
+    else if (issue.prNumber !== undefined && !issue.prReviewState && !TERMINAL_STATES.has(effectiveState(issue))) {
         facts.push({ text: "awaiting review", color: "yellow" });
     }
     // Check status — compact
@@ -74,20 +111,27 @@ function buildFacts(issue) {
 }
 // ─── What's blocking progress ───────────────────────────────────
 function blockerText(issue) {
+    const rereviewNeeded = issue.prReviewState === "changes_requested"
+        && (issue.prCheckStatus === "passed" || issue.prCheckStatus === "success")
+        && !issue.activeRunType;
+    if (issue.sessionState === "waiting_input")
+        return issue.waitingReason ?? "Waiting for input";
+    if (issue.waitingReason && !issue.activeRunType)
+        return issue.waitingReason;
     if (issue.blockedByCount > 0)
         return `Waiting on ${issue.blockedByKeys.join(", ")}`;
-    if (issue.factoryState === "repairing_queue")
+    if (effectiveState(issue) === "repairing_queue")
         return "Merge queue conflict, repairing branch";
-    if (issue.factoryState === "repairing_ci") {
+    if (effectiveState(issue) === "repairing_ci") {
         const check = issue.latestFailureCheckName ?? "CI";
         return `Repairing ${check}`;
     }
-    if (issue.factoryState === "awaiting_queue")
-        return "Waiting for merge queue";
     if (issue.prCheckStatus === "failed" || issue.prCheckStatus === "failure") {
         const check = issue.latestFailureCheckName ?? "checks";
         return `${check} failed`;
     }
+    if (rereviewNeeded)
+        return "Awaiting re-review after requested changes";
     if (issue.prReviewState === "changes_requested")
         return "Review changes requested";
     return null;
@@ -98,13 +142,13 @@ export function IssueRow({ issue, selected, titleWidth }) {
     const tw = titleWidth ?? 60;
     const title = issue.title ? truncate(issue.title, tw) : "";
     const detail = selected ? summarizeIssueStatusNote(issue.statusNote) : undefined;
-    const state = stateDisplay(issue);
-    const facts = buildFacts(issue);
+    const session = sessionDisplay(issue);
+    const facts = buildFacts(issue, selected);
     const blocker = selected ? blockerText(issue) : null;
-    const isTerminal = TERMINAL_STATES.has(issue.factoryState);
+    const isTerminal = TERMINAL_STATES.has(effectiveState(issue));
     // Terminal issues: compact single line
     if (isTerminal && !selected) {
-        return (_jsxs(Box, { children: [_jsx(Text, { dimColor: true, children: " " }), _jsx(Text, { dimColor: true, children: ` ${key}` }), _jsx(Text, { dimColor: true, children: `  ${relativeTime(issue.updatedAt).padStart(4)}` }), _jsx(Text, { children: `  ` }), _jsx(Text, { color: state.color, children: state.label })] }));
+        return (_jsxs(Box, { children: [_jsx(Text, { dimColor: true, children: " " }), _jsx(Text, { dimColor: true, children: ` ${key}` }), _jsx(Text, { dimColor: true, children: `  ${relativeTime(issue.updatedAt).padStart(4)}` }), _jsx(Text, { children: `  ` }), _jsx(Text, { color: session.color, children: session.label })] }));
     }
-    return (_jsxs(Box, { flexDirection: "column", marginBottom: detail ? 1 : 0, children: [_jsxs(Box, { children: [_jsx(Text, { color: selected ? "blueBright" : "gray", children: selected ? "\u25b8" : " " }), _jsx(Text, { bold: true, children: ` ${key}` }), _jsx(Text, { dimColor: true, children: `  ${relativeTime(issue.updatedAt).padStart(4)}` }), _jsx(Text, { children: `  ` }), _jsx(Text, { color: state.color, children: state.label }), facts.length > 0 && (_jsx(Text, { dimColor: true, children: ` \u00b7 ` })), facts.map((fact, i) => (_jsxs(Text, { children: [i > 0 ? _jsx(Text, { dimColor: true, children: ` \u00b7 ` }) : null, _jsx(Text, { color: fact.color ?? "white", dimColor: !fact.color, children: fact.text })] }, i)))] }), title ? (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { dimColor: true, children: title }) })) : null, blocker ? (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { color: "yellow", children: blocker }) })) : null, detail ? (_jsx(Box, { paddingLeft: 4, children: _jsx(Text, { dimColor: true, wrap: "wrap", children: detail }) })) : null] }));
+    return (_jsxs(Box, { flexDirection: "column", marginBottom: detail ? 1 : 0, children: [_jsxs(Box, { children: [_jsx(Text, { color: selected ? "blueBright" : "gray", children: selected ? "\u25b8" : " " }), _jsx(Text, { bold: true, children: ` ${key}` }), _jsx(Text, { dimColor: true, children: `  ${relativeTime(issue.updatedAt).padStart(4)}` }), _jsx(Text, { children: `  ` }), _jsx(Text, { color: session.color, children: session.label }), facts.length > 0 && (_jsx(Text, { dimColor: true, children: ` \u00b7 ` })), facts.map((fact, i) => (_jsxs(Text, { children: [i > 0 ? _jsx(Text, { dimColor: true, children: ` \u00b7 ` }) : null, _jsx(Text, { color: fact.color ?? "white", dimColor: !fact.color, children: fact.text })] }, i)))] }), title ? (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { dimColor: true, children: title }) })) : null, blocker ? (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { color: "yellow", children: blocker }) })) : null, detail ? (_jsx(Box, { paddingLeft: 4, children: _jsx(Text, { dimColor: true, wrap: "wrap", children: detail }) })) : null, selected && issue.factoryState && issue.sessionState ? (_jsx(Box, { paddingLeft: 4, children: _jsx(Text, { dimColor: true, children: `Debug stage: ${stageLabel(issue)}` }) })) : null] }));
 }

package/dist/cli/watch/StatusBar.js

@@ -9,8 +9,11 @@ const FILTER_LABELS = {
 };
 export function StatusBar({ issues, totalCount, filter, connected, lastServerMessageAt, allIssues, frozen, }) {
     const showing = filter === "all" ? `${totalCount} issues` : `${issues.length}/${totalCount} issues`;
-    const agg = computeAggregates(allIssues);
-    const withPr = allIssues.filter((i) => i.prNumber !== undefined).length;
-    const awaitingInput = allIssues.filter((i) => i.factoryState === "awaiting_input").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: "|" }), agg.active > 0 && _jsxs(Text, { color: "cyan", children: [agg.active, " active"] }), 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"] }), awaitingInput > 0 && _jsxs(Text, { color: "yellow", children: [awaitingInput, " awaiting 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 })] }));
+    const aggregateSource = filter === "all" ? allIssues : issues;
+    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 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 })] }));
 }