patchrelay 0.32.0 → 0.32.1

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
   "service": "patchrelay",
-  "version": "0.32.0",
-  "commit": "21ba6968b0ff",
-  "builtAt": "2026-04-01T11:53:53.815Z"
+  "version": "0.32.1",
+  "commit": "c48953273955",
+  "builtAt": "2026-04-01T21:29:18.620Z"
 }

package/dist/cli/commands/watch.js

@@ -24,7 +24,13 @@ export async function handleWatchCommand(params) {
     const issueKey = typeof params.parsed.flags.get("issue") === "string"
         ? String(params.parsed.flags.get("issue"))
         : undefined;
-    const instance = render(createElement(App, { baseUrl, bearerToken, initialIssueKey: issueKey }), { stdout: process.stderr, stdin: process.stdin, patchConsole: false });
-    await instance.waitUntilExit();
-    return 0;
+    process.stderr.write("\u001b[?1049h\u001b[2J\u001b[H");
+    try {
+        const instance = render(createElement(App, { baseUrl, bearerToken, initialIssueKey: issueKey }), { stdout: process.stderr, stdin: process.stdin, patchConsole: false });
+        await instance.waitUntilExit();
+        return 0;
+    }
+    finally {
+        process.stderr.write("\u001b[?1049l");
+    }
 }

package/dist/cli/watch/App.js

@@ -68,9 +68,10 @@ export function App({ baseUrl, bearerToken, initialIssueKey }) {
         ...(initialIssueKey ? { view: "detail", activeDetailKey: initialIssueKey } : {}),
     });
     const filtered = useMemo(() => filterIssues(state.issues, state.filter), [state.issues, state.filter]);
-    useWatchStream({ baseUrl, bearerToken, dispatch });
-    useDetailStream({ baseUrl, bearerToken, issueKey: state.activeDetailKey, dispatch });
-    useFeedStream({ baseUrl, bearerToken, active: state.view === "feed", dispatch });
+    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(() => {
@@ -133,6 +134,10 @@ export function App({ baseUrl, bearerToken, initialIssueKey }) {
             exit();
             return;
         }
+        if (input === "x") {
+            setFrozen((value) => !value);
+            return;
+        }
         if (state.view === "list") {
             if (input === "j" || key.downArrow) {
                 dispatch({ type: "select", index: state.selectedIndex + 1 });
@@ -197,5 +202,5 @@ export function App({ baseUrl, bearerToken, initialIssueKey }) {
             }
         }
     });
-    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 })) : 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, timelineMode: state.timelineMode, 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, timelineMode: state.timelineMode, 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 })] })) }));
 }

package/dist/cli/watch/HelpBar.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Box, Text } from "ink";
 const HELP_TEXT = {
-    list: "j/k: navigate  Enter: detail  F: feed  Tab: filter  q: quit",
+    list: "j/k: navigate  Enter: detail  F: feed  Tab: filter  x: freeze  q: quit",
     detail: "",
     feed: "Esc: list  q: quit",
 };
@@ -10,7 +10,7 @@ export function HelpBar({ view, follow, detailTab, timelineMode }) {
     if (view === "detail") {
         const tabHint = detailTab === "history" ? "t: timeline" : "h: history";
         const timelineHint = detailTab === "timeline" ? `v: ${timelineMode === "verbose" ? "compact" : "verbose"}` : undefined;
-        text = [tabHint, timelineHint, "j/k: prev/next", "Esc: list", `f: follow ${follow ? "on" : "off"}`, "p: prompt", "s: stop", "r: retry", "q: quit"]
+        text = [tabHint, timelineHint, "j/k: prev/next", "Esc: list", `f: follow ${follow ? "on" : "off"}`, "x: freeze", "p: prompt", "s: stop", "r: retry", "q: quit"]
             .filter(Boolean)
             .join("  ");
     }

package/dist/cli/watch/IssueDetailView.js

@@ -18,6 +18,92 @@ function formatTokens(n) {
         return `${(n / 1_000).toFixed(1)}k`;
     return String(n);
 }
+function formatReviewState(reviewState) {
+    switch (reviewState) {
+        case "approved":
+            return "approved";
+        case "changes_requested":
+            return "changes requested";
+        case "commented":
+            return "commented";
+        default:
+            return reviewState ? reviewState.replaceAll("_", " ") : null;
+    }
+}
+function formatCheckState(checkState) {
+    switch (checkState) {
+        case "passed":
+        case "success":
+            return "checks passed";
+        case "failed":
+        case "failure":
+            return "checks failed";
+        case "pending":
+        case "in_progress":
+        case "queued":
+            return "checks pending";
+        default:
+            return null;
+    }
+}
+function buildPrStatusSummary(issue, issueContext) {
+    if (issue.prNumber === undefined)
+        return [];
+    const summary = [`PR #${issue.prNumber}`];
+    const checkState = formatCheckState(issue.prCheckStatus);
+    const reviewState = formatReviewState(issue.prReviewState);
+    const failedCheck = issueContext?.latestFailureCheckName ?? issue.latestFailureCheckName;
+    if (checkState === "checks failed" && failedCheck) {
+        summary.push(`${failedCheck} failed`);
+    }
+    else if (checkState) {
+        summary.push(checkState);
+    }
+    if (reviewState) {
+        summary.push(`review ${reviewState}`);
+    }
+    else if (issue.factoryState === "pr_open" || issue.factoryState === "repairing_ci" || issue.factoryState === "awaiting_queue") {
+        summary.push("review pending");
+    }
+    if (issue.factoryState === "awaiting_queue") {
+        summary.push("queued for merge");
+    }
+    else if (issue.factoryState === "repairing_queue") {
+        summary.push("merge queue repair needed");
+    }
+    else if (issue.factoryState === "done") {
+        summary.push("merged");
+    }
+    else if (issue.prCheckStatus === "failed" || issue.prReviewState === undefined || issue.prReviewState === "changes_requested") {
+        summary.push("not mergeable");
+    }
+    return summary;
+}
+function resolvePrimaryBlocker(issue, issueContext) {
+    if (issue.blockedByCount > 0) {
+        return {
+            text: `Waiting on blockers: ${issue.blockedByKeys.join(", ")}`,
+            color: "yellow",
+        };
+    }
+    if (issue.prCheckStatus === "failed") {
+        const failedCheck = issueContext?.latestFailureCheckName ?? issue.latestFailureCheckName;
+        return {
+            text: failedCheck ? `Blocked by failed check: ${failedCheck}` : "Blocked by failed PR checks",
+            color: "red",
+        };
+    }
+    if (issue.prReviewState === "changes_requested") {
+        return { text: "Blocked by requested review changes", color: "yellow" };
+    }
+    if (issue.prNumber !== undefined && !issue.prReviewState && issue.factoryState !== "done") {
+        return { text: "Blocked pending review approval", color: "yellow" };
+    }
+    if (issue.factoryState === "awaiting_queue") {
+        return { text: "Waiting in merge queue", color: "yellow" };
+    }
+    return null;
+}
 function ElapsedTime({ startedAt }) {
     const [, tick] = useReducer((c) => c + 1, 0);
     useEffect(() => {
@@ -44,5 +130,7 @@ export function IssueDetailView({ issue, timeline, follow, activeRunStartedAt, a
     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]);
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { gap: 2, children: [_jsx(Text, { bold: true, children: key }), _jsx(Text, { color: "cyan", children: issue.factoryState }), issue.blockedByCount > 0 && _jsxs(Text, { color: "yellow", children: ["blocked by ", issue.blockedByKeys.join(", ")] }), issue.readyForExecution && !issue.activeRunType && issue.blockedByCount === 0 && _jsx(Text, { color: "blueBright", children: "ready" }), issue.activeRunType && _jsx(Text, { color: "yellow", children: issue.activeRunType }), issue.prNumber !== undefined && _jsxs(Text, { dimColor: true, children: ["#", issue.prNumber] }), activeRunStartedAt && _jsx(ElapsedTime, { startedAt: activeRunStartedAt }), meta.length > 0 && _jsx(Text, { dimColor: true, children: meta.join("  ") }), detailTab === "timeline" && _jsx(Text, { dimColor: true, children: timelineMode }), follow && _jsx(Text, { color: "yellow", children: "follow" }), _jsx(FreshnessBadge, { connected: connected, lastServerMessageAt: lastServerMessageAt })] }), issue.title && _jsx(Text, { children: issue.title }), issueContext?.latestFailureSummary && (_jsx(Box, { marginTop: 1, children: _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, mode: timelineMode }) })] })) : (_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, timelineMode: timelineMode }) })] }));
+    const prStatusSummary = useMemo(() => buildPrStatusSummary(issue, issueContext), [issue, issueContext]);
+    const primaryBlocker = useMemo(() => resolvePrimaryBlocker(issue, issueContext), [issue, issueContext]);
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { gap: 2, children: [_jsx(Text, { bold: true, children: key }), _jsx(Text, { color: "cyan", children: issue.factoryState }), issue.blockedByCount > 0 && _jsxs(Text, { color: "yellow", children: ["blocked by ", issue.blockedByKeys.join(", ")] }), issue.readyForExecution && !issue.activeRunType && issue.blockedByCount === 0 && _jsx(Text, { color: "blueBright", children: "ready" }), issue.activeRunType && _jsx(Text, { color: "yellow", children: issue.activeRunType }), issue.prNumber !== undefined && _jsxs(Text, { dimColor: true, children: ["#", issue.prNumber] }), activeRunStartedAt && _jsx(ElapsedTime, { startedAt: activeRunStartedAt }), meta.length > 0 && _jsx(Text, { dimColor: true, children: meta.join("  ") }), detailTab === "timeline" && _jsx(Text, { dimColor: true, children: timelineMode }), follow && _jsx(Text, { color: "yellow", children: "follow" }), _jsx(FreshnessBadge, { connected: connected, lastServerMessageAt: lastServerMessageAt })] }), issue.title && _jsx(Text, { children: issue.title }), prStatusSummary.length > 0 && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: prStatusSummary.join("  |  ") }) })), primaryBlocker && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: primaryBlocker.color, children: ["Blocked by: ", primaryBlocker.text] }) })), issueContext?.latestFailureSummary && (_jsx(Box, { marginTop: 1, children: _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, mode: timelineMode }) })] })) : (_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, timelineMode: timelineMode }) })] }));
 }

package/dist/cli/watch/IssueListView.js

@@ -7,7 +7,7 @@ import { HelpBar } from "./HelpBar.js";
 // selector(2) + key(10) + status(13) + pr(7) + ago(4) + gaps = ~36
 const FIXED_COLS = 40;
 const CHROME_ROWS = 4;
-export function IssueListView({ issues, allIssues, selectedIndex, connected, lastServerMessageAt, filter, totalCount, }) {
+export function IssueListView({ issues, allIssues, selectedIndex, connected, lastServerMessageAt, filter, totalCount, frozen, }) {
     const { stdout } = useStdout();
     const cols = stdout?.columns ?? 80;
     const rows = stdout?.rows ?? 24;
@@ -15,7 +15,12 @@ export function IssueListView({ issues, allIssues, selectedIndex, connected, las
     const maxVisible = Math.max(1, rows - CHROME_ROWS);
     // Periodic refresh for elapsed times
     const [, tick] = useReducer((c) => c + 1, 0);
-    useEffect(() => { const id = setInterval(tick, 5000); return () => clearInterval(id); }, []);
+    useEffect(() => {
+        if (frozen)
+            return;
+        const id = setInterval(tick, 5000);
+        return () => clearInterval(id);
+    }, [frozen]);
     let startIndex = 0;
     if (issues.length > maxVisible) {
         startIndex = Math.max(0, Math.min(selectedIndex - Math.floor(maxVisible / 2), issues.length - maxVisible));
@@ -23,5 +28,5 @@ export function IssueListView({ issues, allIssues, selectedIndex, connected, las
     const visible = issues.slice(startIndex, startIndex + maxVisible);
     const hiddenAbove = startIndex;
     const hiddenBelow = Math.max(0, issues.length - startIndex - maxVisible);
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(StatusBar, { issues: issues, totalCount: totalCount, filter: filter, connected: connected, lastServerMessageAt: lastServerMessageAt, allIssues: allIssues }), _jsx(Box, { marginTop: 1, flexDirection: "column", children: issues.length === 0 ? (_jsx(Text, { dimColor: true, children: "No issues match the current filter." })) : (_jsxs(_Fragment, { children: [hiddenAbove > 0 && _jsxs(Text, { dimColor: true, children: ["  ", hiddenAbove, " more above"] }), visible.map((issue, i) => (_jsx(IssueRow, { issue: issue, selected: startIndex + i === selectedIndex, titleWidth: titleWidth }, issue.issueKey ?? `${issue.projectId}-${startIndex + i}`))), hiddenBelow > 0 && _jsxs(Text, { dimColor: true, children: ["  ", hiddenBelow, " more below"] })] })) }), _jsx(Box, { marginTop: 1, children: _jsx(HelpBar, { view: "list" }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(StatusBar, { issues: issues, totalCount: totalCount, filter: filter, connected: connected, lastServerMessageAt: lastServerMessageAt, allIssues: allIssues, frozen: frozen ?? false }), _jsx(Box, { marginTop: 1, flexDirection: "column", children: issues.length === 0 ? (_jsx(Text, { dimColor: true, children: "No issues match the current filter." })) : (_jsxs(_Fragment, { children: [hiddenAbove > 0 && _jsxs(Text, { dimColor: true, children: ["  ", hiddenAbove, " more above"] }), visible.map((issue, i) => (_jsx(IssueRow, { issue: issue, selected: startIndex + i === selectedIndex, titleWidth: titleWidth }, issue.issueKey ?? `${issue.projectId}-${startIndex + i}`))), hiddenBelow > 0 && _jsxs(Text, { dimColor: true, children: ["  ", hiddenBelow, " more below"] })] })) }), _jsx(Box, { marginTop: 1, children: _jsx(HelpBar, { view: "list" }) })] }));
 }

package/dist/cli/watch/IssueRow.js

@@ -44,12 +44,65 @@ function formatPr(issue) {
     if (!issue.prNumber)
         return "";
     const parts = [`#${issue.prNumber}`];
-    if (issue.prReviewState === "approved")
-        parts.push("\u2713");
-    else if (issue.prReviewState === "changes_requested")
-        parts.push("\u2717");
+    const review = formatReviewState(issue.prReviewState);
+    const checks = formatCheckState(issue.prCheckStatus);
+    const merge = formatMergeState(issue);
+    if (review)
+        parts.push(review);
+    if (checks)
+        parts.push(checks);
+    if (merge)
+        parts.push(merge);
     return parts.join("");
 }
+function formatReviewState(reviewState) {
+    switch (reviewState) {
+        case "approved":
+            return "rev:+";
+        case "changes_requested":
+            return "rev:x";
+        case "commented":
+            return "rev:c";
+        case "dismissed":
+            return "rev:-";
+        default:
+            return null;
+    }
+}
+function formatCheckState(checkState) {
+    switch (checkState) {
+        case "passed":
+        case "success":
+            return "ci:+";
+        case "failed":
+        case "failure":
+            return "ci:x";
+        case "pending":
+        case "in_progress":
+        case "queued":
+            return "ci:…";
+        default:
+            return null;
+    }
+}
+function formatMergeState(issue) {
+    if (!issue.prNumber)
+        return null;
+    switch (issue.factoryState) {
+        case "awaiting_queue":
+            return "queue";
+        case "repairing_queue":
+            return "mq-fix";
+        case "done":
+            return "merged";
+        case "pr_open":
+            if (issue.prReviewState === "approved" && issue.prCheckStatus === "passed")
+                return "ready";
+            return "open";
+        default:
+            return null;
+    }
+}
 function relativeTime(iso) {
     const ms = Date.now() - new Date(iso).getTime();
     if (ms < 0)
@@ -97,5 +150,5 @@ export function IssueRow({ issue, selected, titleWidth }) {
     const tw = titleWidth ?? 30;
     const title = issue.title ? truncate(issue.title, tw) : "";
     const detail = selected ? summarizeIssueStatusNote(issue.statusNote) : undefined;
-    return (_jsxs(Box, { flexDirection: "column", marginBottom: detail ? 1 : 0, children: [_jsxs(Box, { children: [_jsx(Text, { color: selected ? "blueBright" : "white", bold: selected, children: selected ? "\u25b8" : " " }), _jsx(Text, { bold: true, children: ` ${key.padEnd(9)}` }), _jsx(Text, { color: stateColor(issue.blockedByCount > 0 && !issue.activeRunType ? "blocked" : issue.readyForExecution && !issue.activeRunType ? "ready" : issue.factoryState), children: ` ${status.padEnd(12)}` }), _jsx(Text, { dimColor: true, children: ` ${pr.padEnd(6)}` }), _jsx(Text, { dimColor: true, children: ` ${ago.padStart(3)}` }), title ? _jsx(Text, { dimColor: true, children: ` ${title}` }) : 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" : "white", bold: selected, children: selected ? "\u25b8" : " " }), _jsx(Text, { bold: true, children: ` ${key.padEnd(9)}` }), _jsx(Text, { color: stateColor(issue.blockedByCount > 0 && !issue.activeRunType ? "blocked" : issue.readyForExecution && !issue.activeRunType ? "ready" : issue.factoryState), children: ` ${status.padEnd(12)}` }), _jsx(Text, { dimColor: true, children: ` ${pr.padEnd(26)}` }), _jsx(Text, { dimColor: true, children: ` ${ago.padStart(3)}` }), title ? _jsx(Text, { dimColor: true, children: ` ${title}` }) : null] }), detail ? (_jsx(Box, { paddingLeft: 4, children: _jsx(Text, { dimColor: true, wrap: "wrap", children: detail }) })) : null] }));
 }

package/dist/cli/watch/StatusBar.js

@@ -7,10 +7,10 @@ const FILTER_LABELS = {
     "active": "active",
     "non-done": "in progress",
 };
-export function StatusBar({ issues, totalCount, filter, connected, lastServerMessageAt, allIssues, }) {
+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"] })] }), _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: "|" }), 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 })] }));
 }

package/dist/cli/watch/use-detail-stream.js

@@ -3,7 +3,9 @@ export function useDetailStream(options) {
     const optionsRef = useRef(options);
     optionsRef.current = options;
     useEffect(() => {
-        const { issueKey } = optionsRef.current;
+        const { issueKey, active } = optionsRef.current;
+        if (active === false)
+            return;
         if (!issueKey)
             return;
         const abortController = new AbortController();
@@ -19,7 +21,7 @@ export function useDetailStream(options) {
         return () => {
             abortController.abort();
         };
-    }, [options.issueKey]);
+    }, [options.issueKey, options.active]);
 }
 // ─── Rehydration ──────────────────────────────────────────────────
 async function rehydrate(baseUrl, issueKey, headers, signal, dispatch) {

package/dist/cli/watch/use-watch-stream.js

@@ -3,6 +3,8 @@ export function useWatchStream(options) {
     const optionsRef = useRef(options);
     optionsRef.current = options;
     useEffect(() => {
+        if (options.active === false)
+            return;
         let abortController = new AbortController();
         let reconnectTimeout;
         let attempt = 0;
@@ -110,7 +112,7 @@ export function useWatchStream(options) {
             }
             clearInterval(snapshotInterval);
         };
-    }, []);
+    }, [options.active]);
 }
 function processEvent(dispatch, eventType, data) {
     try {

package/dist/db/linear-installation-store.js

@@ -122,6 +122,27 @@ export class LinearInstallationStore {
             .all();
         return rows.map((row) => mapProjectInstallation(row));
     }
+    repairProjectInstallations(projectIds) {
+        const repairs = [];
+        for (const projectId of projectIds) {
+            const existing = this.getProjectInstallation(projectId);
+            const existingInstallation = existing ? this.getLinearInstallation(existing.installationId) : undefined;
+            if (existing && existingInstallation) {
+                continue;
+            }
+            const installationId = this.resolveRepairInstallationId(projectId);
+            if (installationId === undefined) {
+                continue;
+            }
+            this.linkProjectInstallation(projectId, installationId);
+            repairs.push({
+                projectId,
+                installationId,
+                reason: existing ? "dangling" : "missing",
+            });
+        }
+        return repairs;
+    }
     unlinkProjectInstallation(projectId) {
         this.connection.prepare("DELETE FROM project_installations WHERE project_id = ?").run(projectId);
     }
@@ -136,12 +157,55 @@ export class LinearInstallationStore {
             .prepare(`
         SELECT li.*
         FROM linear_installations li
-        INNER JOIN project_installations pi ON pi.installation_id = li.id
-        WHERE pi.project_id = ?
+        WHERE li.id = COALESCE(
+          (
+            SELECT pi.installation_id
+            FROM project_installations pi
+            WHERE pi.project_id = ?
+            LIMIT 1
+          ),
+          (
+            SELECT rl.installation_id
+            FROM repository_links rl
+            WHERE rl.github_repo = ?
+            LIMIT 1
+          ),
+          (
+            SELECT li_single.id
+            FROM linear_installations li_single
+            WHERE (SELECT COUNT(*) FROM linear_installations) = 1
+            ORDER BY li_single.updated_at DESC, li_single.id DESC
+            LIMIT 1
+          )
+        )
         `)
-            .get(projectId);
+            .get(projectId, projectId);
         return row ? mapLinearInstallation(row) : undefined;
     }
+    resolveRepairInstallationId(projectId) {
+        const repoLink = this.connection
+            .prepare(`
+        SELECT rl.installation_id AS installation_id
+        FROM repository_links rl
+        INNER JOIN linear_installations li ON li.id = rl.installation_id
+        WHERE rl.github_repo = ?
+        LIMIT 1
+        `)
+            .get(projectId);
+        if (repoLink) {
+            return Number(repoLink.installation_id);
+        }
+        const singleInstallation = this.connection
+            .prepare(`
+        SELECT li.id AS installation_id
+        FROM linear_installations li
+        WHERE (SELECT COUNT(*) FROM linear_installations) = 1
+        ORDER BY li.updated_at DESC, li.id DESC
+        LIMIT 1
+        `)
+            .get();
+        return singleInstallation ? Number(singleInstallation.installation_id) : undefined;
+    }
     createOAuthState(params) {
         const now = isoNow();
         const result = this.connection

package/dist/db/migrations.js

@@ -12,6 +12,8 @@ CREATE TABLE IF NOT EXISTS issues (
   pending_run_type TEXT,
   pending_run_context_json TEXT,
   branch_name TEXT,
+  branch_owner TEXT NOT NULL DEFAULT 'patchrelay',
+  branch_ownership_changed_at TEXT,
   worktree_path TEXT,
   thread_id TEXT,
   active_run_id INTEGER,
@@ -180,6 +182,9 @@ export function runPatchRelayMigrations(connection) {
     connection.prepare("UPDATE webhook_events SET processing_status = 'processed' WHERE processing_status = 'pending' AND payload_json IS NULL").run();
     // Add pending_merge_prep column for merge queue stewardship
     addColumnIfMissing(connection, "issues", "pending_merge_prep", "INTEGER NOT NULL DEFAULT 0");
+    // Explicit PR branch ownership hand-off between PatchRelay and MergeSteward
+    addColumnIfMissing(connection, "issues", "branch_owner", "TEXT NOT NULL DEFAULT 'patchrelay'");
+    addColumnIfMissing(connection, "issues", "branch_ownership_changed_at", "TEXT");
     // Add merge_prep_attempts for retry budget / escalation
     addColumnIfMissing(connection, "issues", "merge_prep_attempts", "INTEGER NOT NULL DEFAULT 0");
     // Add review_fix_attempts counter

package/dist/db.js

@@ -341,6 +341,13 @@ export class PatchRelayDatabase {
         const row = this.connection.prepare("SELECT * FROM issues WHERE pr_number = ?").get(prNumber);
         return row ? mapIssueRow(row) : undefined;
     }
+    setBranchOwner(projectId, linearIssueId, owner) {
+        this.connection.prepare(`
+      UPDATE issues
+      SET branch_owner = ?, branch_ownership_changed_at = ?, updated_at = ?
+      WHERE project_id = ? AND linear_issue_id = ?
+    `).run(owner, isoNow(), isoNow(), projectId, linearIssueId);
+    }
     replaceIssueDependencies(params) {
         const now = isoNow();
         this.connection
@@ -641,6 +648,10 @@ function mapIssueRow(row) {
         ...(row.pending_run_type !== null && row.pending_run_type !== undefined ? { pendingRunType: String(row.pending_run_type) } : {}),
         ...(row.pending_run_context_json !== null && row.pending_run_context_json !== undefined ? { pendingRunContextJson: String(row.pending_run_context_json) } : {}),
         ...(row.branch_name !== null ? { branchName: String(row.branch_name) } : {}),
+        ...(row.branch_owner !== null && row.branch_owner !== undefined ? { branchOwner: String(row.branch_owner) } : { branchOwner: "patchrelay" }),
+        ...(row.branch_ownership_changed_at !== null && row.branch_ownership_changed_at !== undefined
+            ? { branchOwnershipChangedAt: String(row.branch_ownership_changed_at) }
+            : {}),
         ...(row.worktree_path !== null ? { worktreePath: String(row.worktree_path) } : {}),
         ...(row.thread_id !== null ? { threadId: String(row.thread_id) } : {}),
         ...(row.active_run_id !== null ? { activeRunId: Number(row.active_run_id) } : {}),

package/dist/github-webhook-handler.js

@@ -146,6 +146,9 @@ export class GitHubWebhookHandler {
                     linearIssueId: issue.linearIssueId,
                     factoryState: newState,
                 });
+                if (newState === "awaiting_queue") {
+                    this.db.setBranchOwner(issue.projectId, issue.linearIssueId, "merge_steward");
+                }
                 this.logger.info({ issueKey: issue.issueKey, from: afterMetadata.factoryState, to: newState, trigger: event.triggerEvent }, "Factory state transition from GitHub event");
                 const transitionedIssue = this.db.getIssue(issue.projectId, issue.linearIssueId) ?? issue;
                 void this.emitLinearActivity(transitionedIssue, newState, event);
@@ -318,6 +321,7 @@ export class GitHubWebhookHandler {
                     lastQueueSignalAt: new Date().toISOString(),
                     lastQueueIncidentJson: JSON.stringify(queueRepairContext),
                 });
+                this.db.setBranchOwner(issue.projectId, issue.linearIssueId, "patchrelay");
                 this.enqueueIssue(issue.projectId, issue.linearIssueId);
                 this.logger.info({ issueKey: issue.issueKey, checkName: event.checkName }, "Queue eviction detected, enqueued queue repair");
                 this.feed?.publish({
@@ -367,6 +371,7 @@ export class GitHubWebhookHandler {
                     lastGitHubFailureAt: new Date().toISOString(),
                     lastQueueIncidentJson: null,
                 });
+                this.db.setBranchOwner(issue.projectId, issue.linearIssueId, "patchrelay");
                 this.enqueueIssue(issue.projectId, issue.linearIssueId);
                 this.logger.info({ issueKey: issue.issueKey, checkName: failureContext.checkName ?? event.checkName }, "Enqueued CI repair run");
                 this.feed?.publish({
@@ -391,6 +396,7 @@ export class GitHubWebhookHandler {
                     reviewerName: event.reviewerName,
                 }),
             });
+            this.db.setBranchOwner(issue.projectId, issue.linearIssueId, "patchrelay");
             this.enqueueIssue(issue.projectId, issue.linearIssueId);
             this.logger.info({ issueKey: issue.issueKey, reviewerName: event.reviewerName }, "Enqueued review fix run");
         }

package/dist/linear-client.js

@@ -370,9 +370,9 @@ export class DatabaseBackedLinearClientProvider {
         this.logger = logger;
     }
     async forProject(projectId) {
-        const link = this.db.linearInstallations.getProjectInstallation(projectId);
-        if (link) {
-            return await this.forInstallationId(link.installationId);
+        const installation = this.db.linearInstallations.getLinearInstallationForProject(projectId);
+        if (installation) {
+            return await this.forInstallationId(installation.id);
         }
         return undefined;
     }

package/dist/run-orchestrator.js

@@ -61,11 +61,11 @@ function buildRunPrompt(issue, runType, repoPath, context) {
             const snapshot = context?.ciSnapshot && typeof context.ciSnapshot === "object"
                 ? context.ciSnapshot
                 : undefined;
-            lines.push("## CI Repair", "", "A full CI iteration has settled failed on your PR. Diagnose the whole snapshot, fix the root cause and directly related fallout, then push to the same PR branch.", snapshot?.gateCheckName ? `Gate check: ${String(snapshot.gateCheckName)}` : "", snapshot?.gateCheckStatus ? `Gate status: ${String(snapshot.gateCheckStatus)}` : "", snapshot?.settledAt ? `Settled at: ${String(snapshot.settledAt)}` : "", context?.failureHeadSha ? `Failing head SHA: ${String(context.failureHeadSha)}` : "", context?.checkName ? `Failed check: ${String(context.checkName)}` : "", context?.jobName && context?.jobName !== context?.checkName ? `Failed job: ${String(context.jobName)}` : "", context?.stepName ? `Failed step: ${String(context.stepName)}` : "", context?.summary ? `Failure summary: ${String(context.summary)}` : "", Array.isArray(snapshot?.failedChecks) && snapshot.failedChecks.length > 0
-                ? `All failed checks in settled snapshot:\n${snapshot.failedChecks.map((entry) => `- ${String(entry.name ?? "unknown")}${entry.summary ? `: ${String(entry.summary)}` : ""}`).join("\n")}`
+            lines.push("## CI Repair", "", "A full CI iteration has settled failed on your PR. Start from the specific failing check/job/step below on the latest remote PR branch tip, fix that concrete failure first, then push to the same PR branch.", snapshot?.gateCheckName ? `Gate check: ${String(snapshot.gateCheckName)}` : "", snapshot?.gateCheckStatus ? `Gate status: ${String(snapshot.gateCheckStatus)}` : "", snapshot?.settledAt ? `Settled at: ${String(snapshot.settledAt)}` : "", context?.failureHeadSha ? `Failing head SHA: ${String(context.failureHeadSha)}` : "", context?.checkName ? `Failed check: ${String(context.checkName)}` : "", context?.jobName && context?.jobName !== context?.checkName ? `Failed job: ${String(context.jobName)}` : "", context?.stepName ? `Failed step: ${String(context.stepName)}` : "", context?.summary ? `Failure summary: ${String(context.summary)}` : "", Array.isArray(snapshot?.failedChecks) && snapshot.failedChecks.length > 0
+                ? `Other failed checks in the settled snapshot (context only; ignore unless the logs show the same root cause):\n${snapshot.failedChecks.map((entry) => `- ${String(entry.name ?? "unknown")}${entry.summary ? `: ${String(entry.summary)}` : ""}`).join("\n")}`
                 : "", context?.checkUrl ? `Check URL: ${String(context.checkUrl)}` : "", Array.isArray(context?.annotations) && context.annotations.length > 0
                 ? `Annotations:\n${context.annotations.map((entry) => `- ${String(entry)}`).join("\n")}`
-                : "", "", "Read the latest CI logs, consider the broader PR context, fix the likely root cause and any directly related fallout in one pass, run verification, commit and push.", "Do not open a new PR. Keep working on the existing branch until CI goes green or the situation is clearly stuck.", "Do not change test expectations unless the test is genuinely wrong.", "");
+                : "", "", "Fetch the latest remote branch state first. If the branch moved since this failure, restart from the new tip instead of pushing older work.", "Read the latest logs for the named failing check, fix that root cause, and only broaden scope when the logs show direct fallout from the same issue.", "Do not change workflows, dependency installation, or unrelated tests unless the failing logs clearly point there.", "Run focused verification for the named failure, then commit and push.", "Do not open a new PR. Keep working on the existing branch until CI goes green or the situation is clearly stuck.", "Do not change test expectations unless the test is genuinely wrong.", "");
             break;
         }
         case "review_fix":
@@ -188,6 +188,7 @@ export class RunOrchestrator {
                     }
                     : {}),
             });
+            this.db.setBranchOwner(item.projectId, item.issueId, "patchrelay");
             return created;
         });
         if (!run)
@@ -293,8 +294,9 @@ export class RunOrchestrator {
      * Risks mitigated:
      * - Dirty worktree from interrupted run → stash before, pop after
      * - Conflicts → abort rebase, throw so the run fails with a clear reason
-     * - Already up-to-date → no-op, no force-push needed
-     * - Force-push invalidates reviews → only push if rebase actually moved commits
+     * - Already up-to-date → no-op
+     * - Keep publishing explicit: the orchestrator updates the local worktree
+     *   only; the agent/run owns any later branch push.
      */
     async freshenWorktree(worktreePath, project, issue) {
         const gitBin = this.config.runner.gitBin;
@@ -331,14 +333,7 @@ export class RunOrchestrator {
             this.logger.warn({ issueKey: issue.issueKey, baseBranch }, "Pre-run freshen: rebase conflict, agent will resolve");
             return;
         }
-        // Push the rebased branch (force-with-lease to protect against concurrent pushes)
-        const pushResult = await execCommand(gitBin, ["-C", worktreePath, "push", "--force-with-lease"], { timeoutMs: 60_000 });
-        if (pushResult.exitCode !== 0) {
-            this.logger.warn({ issueKey: issue.issueKey, stderr: pushResult.stderr?.slice(0, 300) }, "Pre-run rebase push failed, proceeding anyway");
-        }
-        else {
-            this.logger.info({ issueKey: issue.issueKey, baseBranch }, "Pre-run freshen: rebased and pushed onto latest base");
-        }
+        this.logger.info({ issueKey: issue.issueKey, baseBranch }, "Pre-run freshen: rebased locally onto latest base");
         // Restore stashed changes
         if (didStash)
             await execCommand(gitBin, ["-C", worktreePath, "stash", "pop"], { timeoutMs: 10_000 });
@@ -470,6 +465,9 @@ export class RunOrchestrator {
                     }
                     : {}),
             });
+            if (postRunState === "awaiting_queue") {
+                this.db.setBranchOwner(run.projectId, run.linearIssueId, "merge_steward");
+            }
         });
         // If we advanced to awaiting_queue, enqueue for merge prep
         if (postRunState === "awaiting_queue") {
@@ -570,7 +568,7 @@ export class RunOrchestrator {
             }
             // Review approved + checks not failed — advance to awaiting_queue
             if (issue.prReviewState === "approved" && issue.prCheckStatus !== "failed") {
-                if (issue.factoryState !== "awaiting_queue") {
+                if (issue.factoryState !== "awaiting_queue" || issue.branchOwner !== "merge_steward") {
                     this.advanceIdleIssue(issue, "awaiting_queue", { clearFailureProvenance: true });
                 }
                 continue;
@@ -688,6 +686,10 @@ export class RunOrchestrator {
                 }
                 : {}),
         });
+        const branchOwner = this.resolveBranchOwnerForStateTransition(newState, options?.pendingRunType);
+        if (branchOwner) {
+            this.db.setBranchOwner(issue.projectId, issue.linearIssueId, branchOwner);
+        }
         this.feed?.publish({
             level: "info",
             kind: "stage",
@@ -697,7 +699,7 @@ export class RunOrchestrator {
             status: "reconciled",
             summary: `Reconciliation: ${issue.factoryState} \u2192 ${newState}`,
         });
-        if (newState === "awaiting_queue") {
+        if (newState === "awaiting_queue" && issue.factoryState !== "awaiting_queue") {
             this.requestMergeQueueAdmission(issue, issue.projectId);
         }
         if (options?.pendingRunType) {
@@ -920,6 +922,9 @@ export class RunOrchestrator {
                         }
                         : {}),
                 });
+                if (postRunState === "awaiting_queue") {
+                    this.db.setBranchOwner(run.projectId, run.linearIssueId, "merge_steward");
+                }
             });
             if (postRunState) {
                 this.feed?.publish({
@@ -987,8 +992,21 @@ export class RunOrchestrator {
                 activeRunId: null,
                 factoryState: nextState,
             });
+            const branchOwner = this.resolveBranchOwnerForStateTransition(nextState);
+            if (branchOwner) {
+                this.db.setBranchOwner(run.projectId, run.linearIssueId, branchOwner);
+            }
         });
     }
+    resolveBranchOwnerForStateTransition(newState, pendingRunType) {
+        if (pendingRunType)
+            return "patchrelay";
+        if (newState === "awaiting_queue")
+            return "merge_steward";
+        if (newState === "repairing_ci" || newState === "repairing_queue")
+            return "patchrelay";
+        return undefined;
+    }
     async verifyReactiveRunAdvancedBranch(run, issue) {
         if (run.runType !== "ci_repair" && run.runType !== "queue_repair") {
             return undefined;

package/dist/service.js

@@ -85,6 +85,10 @@ export class PatchRelayService {
         });
     }
     async start() {
+        const repairedInstallations = this.db.linearInstallations.repairProjectInstallations(this.config.projects.map((project) => project.id));
+        for (const repair of repairedInstallations) {
+            this.logger.info({ projectId: repair.projectId, installationId: repair.installationId, reason: repair.reason }, "Repaired Linear project installation link");
+        }
         // Verify Linear connectivity for all configured projects before starting.
         // Auth errors do not prevent startup (the OAuth callback must be reachable
         // for `patchrelay linear connect`), but the service reports NOT READY until at

package/dist/webhook-handler.js

@@ -1,5 +1,6 @@
 import { buildAgentSessionPlanForIssue, } from "./agent-session-plan.js";
 import { buildAgentSessionExternalUrls } from "./agent-session-presentation.js";
+import { TERMINAL_STATES } from "./factory-state.js";
 import { buildAlreadyRunningThought, buildDelegationThought, buildPromptDeliveredThought, buildStopConfirmationActivity, } from "./linear-session-reporting.js";
 import { resolveProject, triggerEventAllowed, trustedActorAllowed } from "./project-resolution.js";
 import { normalizeWebhook } from "./webhooks.js";
@@ -161,8 +162,9 @@ export class WebhookHandler {
         const hydratedIssue = await this.syncIssueDependencies(project.id, normalizedIssue);
         const unresolvedBlockers = this.db.countUnresolvedBlockers(project.id, normalizedIssue.id);
         const pendingRunContextJson = mergePendingImplementationContext(existingIssue?.pendingRunContextJson, normalized);
+        const terminalForAutomation = isTerminalDelegationState(existingIssue, hydratedIssue);
         let pendingRunType;
-        if (delegated && triggerAllowed && unresolvedBlockers === 0 && !activeRun && !existingIssue?.pendingRunType) {
+        if (delegated && triggerAllowed && unresolvedBlockers === 0 && !activeRun && !existingIssue?.pendingRunType && !terminalForAutomation) {
             pendingRunType = "implementation";
         }
         const clearPendingImplementation = unresolvedBlockers > 0 && existingIssue?.pendingRunType === "implementation" && !activeRun;
@@ -537,6 +539,18 @@ export class WebhookHandler {
         return undefined;
     }
 }
+function isResolvedLinearState(stateType, stateName) {
+    return stateType === "completed" || stateName?.trim().toLowerCase() === "done";
+}
+function isTerminalDelegationState(existingIssue, hydratedIssue) {
+    if (existingIssue?.prState === "merged") {
+        return true;
+    }
+    if (existingIssue?.factoryState && TERMINAL_STATES.has(existingIssue.factoryState)) {
+        return true;
+    }
+    return isResolvedLinearState(hydratedIssue.stateType, hydratedIssue.stateName);
+}
 function hasCompleteIssueContext(issue) {
     return Boolean(issue.stateName && issue.delegateId && issue.teamId && issue.teamKey);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchrelay",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -33,8 +33,8 @@
     "prepack": "npm run build",
     "start": "node dist/index.js serve",
     "doctor": "node dist/index.js doctor",
-    "restart": "node dist/index.js restart-service",
-    "deploy": "npm run build && npm install -g . && node dist/index.js restart-service",
+    "restart": "node dist/index.js service restart",
+    "deploy": "npm run build && npm install -g . && node dist/index.js service restart",
     "lint": "eslint .",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "check": "npm run typecheck",