patchrelay 0.33.0 → 0.35.0

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
   "service": "patchrelay",
-  "version": "0.33.0",
-  "commit": "90189d83b85f",
-  "builtAt": "2026-04-02T00:44:41.741Z"
+  "version": "0.35.0",
+  "commit": "e1a5b7d3b9e0",
+  "builtAt": "2026-04-02T21:55:42.542Z"
 }

package/dist/cli/watch/App.js

@@ -186,9 +186,6 @@ export function App({ baseUrl, bearerToken, initialIssueKey }) {
             else if (input === "t") {
                 dispatch({ type: "switch-detail-tab", tab: "timeline" });
             }
-            else if (input === "v") {
-                dispatch({ type: "toggle-timeline-mode" });
-            }
             else if (input === "j" || key.downArrow) {
                 dispatch({ type: "detail-navigate", direction: "next", filtered });
             }
@@ -202,5 +199,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, 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 })] })) }));
+    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 })] })) }));
 }

package/dist/cli/watch/HelpBar.js

@@ -1,21 +1,18 @@
 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  x: freeze  q: quit",
-    detail: "",
-    feed: "Esc: list  q: quit",
-};
-export function HelpBar({ view, follow, detailTab, timelineMode }) {
+export function HelpBar({ view, follow, detailTab }) {
     let text;
     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"}`, "x: freeze", "p: prompt", "s: stop", "r: retry", "q: quit"]
+        text = [tabHint, `f: follow ${follow ? "on" : "off"}`, "p: prompt", "s: stop", "r: retry"]
             .filter(Boolean)
             .join("  ");
     }
+    else if (view === "feed") {
+        text = "";
+    }
     else {
-        text = HELP_TEXT[view];
+        text = "F: feed  Tab: filter";
     }
     return (_jsx(Box, { children: _jsx(Text, { dimColor: true, children: text }) }));
 }

package/dist/cli/watch/IssueDetailView.js

@@ -46,82 +46,47 @@ function formatCheckState(checkState) {
             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 (issue.prChecksSummary?.total) {
-        if (issue.prChecksSummary.failed > 0) {
-            summary.push(`${issue.prChecksSummary.failed}/${issue.prChecksSummary.total} checks failing`);
-        }
-        else if (issue.prChecksSummary.pending > 0) {
-            summary.push(`${issue.prChecksSummary.completed}/${issue.prChecksSummary.total} checks settled`);
-        }
-        else {
-            summary.push(`${issue.prChecksSummary.passed}/${issue.prChecksSummary.total} checks passed`);
-        }
-    }
-    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;
+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" },
+    failed: { label: "failed", color: "red" },
+    escalated: { label: "escalated", color: "red" },
+    awaiting_input: { label: "awaiting input", color: "yellow" },
+};
+function effectiveState(issue) {
+    if (issue.blockedByCount > 0 && !issue.activeRunType)
+        return "blocked";
+    if (issue.readyForExecution && !issue.activeRunType)
+        return "ready";
+    return issue.factoryState;
 }
-function resolvePrimaryBlocker(issue, issueContext) {
-    if (issue.blockedByCount > 0) {
-        return {
-            text: `Waiting on blockers: ${issue.blockedByKeys.join(", ")}`,
-            color: "yellow",
-        };
-    }
+function blockerText(issue, issueContext) {
+    if (issue.blockedByCount > 0)
+        return `Waiting on ${issue.blockedByKeys.join(", ")}`;
+    if (issue.factoryState === "repairing_queue")
+        return "Merge queue conflict, repairing branch";
+    if (issue.factoryState === "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 failedChecks = issue.prChecksSummary?.failedNames ?? [];
-        const failedCheck = issueContext?.latestFailureCheckName
-            ?? issue.latestFailureCheckName
-            ?? (failedChecks.length > 0 ? failedChecks.slice(0, 2).join(", ") : undefined);
-        return {
-            text: failedCheck ? `Blocked by failed check: ${failedCheck}` : "Blocked by failed PR checks",
-            color: "red",
-        };
-    }
-    if (issue.prCheckStatus === "pending" || issue.prCheckStatus === "in_progress" || issue.prCheckStatus === "queued") {
-        return { text: "Waiting for PR checks to finish", color: "yellow" };
-    }
-    if (issue.prReviewState === "changes_requested") {
-        return { text: "Blocked by requested review changes", color: "yellow" };
-    }
-    if (issue.factoryState === "repairing_queue") {
-        return { text: "Blocked by merge queue refresh failure", color: "yellow" };
-    }
-    if (issue.factoryState === "awaiting_queue") {
-        return { text: "Waiting in merge queue", color: "yellow" };
-    }
-    if (issue.prNumber !== undefined && !issue.prReviewState && issue.factoryState !== "done") {
-        return { text: "Blocked pending review approval", color: "yellow" };
+        const check = issueContext?.latestFailureCheckName ?? issue.latestFailureCheckName ?? "checks";
+        return `${check} failed`;
     }
+    if (issue.prReviewState === "changes_requested")
+        return "Review changes requested";
+    if (issue.prNumber !== undefined && !issue.prReviewState && issue.factoryState !== "done")
+        return "Awaiting review";
     return null;
 }
 function ElapsedTime({ startedAt }) {
@@ -135,9 +100,9 @@ function ElapsedTime({ startedAt }) {
     const seconds = elapsed % 60;
     return _jsxs(Text, { dimColor: true, children: [minutes, "m ", String(seconds).padStart(2, "0"), "s"] });
 }
-export function IssueDetailView({ issue, timeline, follow, activeRunStartedAt, activeRunId, tokenUsage, diffSummary, plan, issueContext, detailTab, timelineMode, rawRuns, rawFeedEvents, connected, lastServerMessageAt, }) {
+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, timelineMode: timelineMode })] }));
+        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "red", children: "Issue not found." }), _jsx(HelpBar, { view: "detail", follow: follow, detailTab: detailTab })] }));
     }
     const key = issue.issueKey ?? issue.projectId;
     const meta = [];
@@ -147,10 +112,27 @@ 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 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]);
-    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 }) })] }));
+    // Build compact facts for the header
+    const facts = [];
+    if (issue.prNumber !== undefined)
+        facts.push(`PR #${issue.prNumber}`);
+    if (issue.prReviewState === "approved")
+        facts.push("approved");
+    else if (issue.prReviewState === "changes_requested")
+        facts.push("changes requested");
+    if (issue.prCheckStatus === "passed" || issue.prCheckStatus === "success")
+        facts.push("checks passed");
+    else if (issue.prCheckStatus === "failed" || issue.prCheckStatus === "failure") {
+        const check = issueContext?.latestFailureCheckName ?? issue.latestFailureCheckName ?? "checks";
+        facts.push(`${check} failed`);
+    }
+    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 }) })] }));
 }

package/dist/cli/watch/IssueRow.js

@@ -1,260 +1,110 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from "ink";
 import { summarizeIssueStatusNote } from "./issue-status-note.js";
-import { progressBar, relativeTime, truncate } from "./format-utils.js";
-const STATE_COLORS = {
-    blocked: "yellow",
-    ready: "blueBright",
-    delegated: "cyan",
-    implementing: "cyan",
-    pr_open: "cyan",
-    changes_requested: "yellow",
-    repairing_ci: "cyan",
-    awaiting_queue: "cyan",
-    repairing_queue: "cyan",
-    done: "green",
-    failed: "red",
-    escalated: "red",
-    awaiting_input: "yellow",
-};
-const STATE_SHORT = {
-    blocked: "blocked",
-    ready: "ready",
-    delegated: "delegated",
-    implementing: "implementing",
-    pr_open: "pr open",
-    changes_requested: "review changes",
-    repairing_ci: "repairing checks",
-    awaiting_queue: "queued for merge",
-    repairing_queue: "repairing merge queue",
-    done: "done",
-    failed: "failed",
-    escalated: "escalated",
-    awaiting_input: "awaiting input",
-};
-const STATUS_SHORT = {
-    running: "\u25b8",
-    completed: "\u2713",
-    failed: "\u2717",
-    released: "\u2013",
-};
-function stateColor(state) {
-    return STATE_COLORS[state] ?? "white";
-}
+import { relativeTime, truncate } from "./format-utils.js";
+// ─── State display ──────────────────────────────────────────────
 const TERMINAL_STATES = new Set(["done", "failed", "escalated", "awaiting_input"]);
-function formatStatus(issue) {
-    const effectiveState = issue.blockedByCount > 0 && !issue.activeRunType
-        ? "blocked"
-        : issue.readyForExecution && !issue.activeRunType
-            ? "ready"
-            : issue.factoryState;
-    const state = STATE_SHORT[effectiveState] ?? effectiveState;
-    // Terminal states: just the label, no run symbol
-    if (TERMINAL_STATES.has(issue.factoryState))
-        return state;
-    // Active/in-progress: show run status symbol
-    const status = issue.activeRunType ? "running" : issue.latestRunStatus;
-    const statusSym = status ? (STATUS_SHORT[status] ?? "") : "";
-    if (statusSym)
-        return `${state} ${statusSym}`;
-    return state;
-}
-function buildStatusChips(issue) {
-    const effectiveState = issue.blockedByCount > 0 && !issue.activeRunType
-        ? "blocked"
-        : issue.readyForExecution && !issue.activeRunType
-            ? "ready"
-            : issue.factoryState;
-    const chips = [{
-            text: `${stateIcon(effectiveState)} ${STATE_SHORT[effectiveState] ?? effectiveState}`,
-            color: stateColor(effectiveState),
-        }];
-    if (issue.prNumber !== undefined) {
-        chips.push({ text: `PR #${issue.prNumber}`, color: "cyan" });
-    }
-    const reviewChip = buildReviewChip(issue.prReviewState);
-    if (reviewChip)
-        chips.push(reviewChip);
-    const checkChip = buildCheckChip(issue.prCheckStatus);
-    if (checkChip)
-        chips.push(checkChip);
-    const checksProgressChip = buildChecksProgressChip(issue);
-    if (checksProgressChip)
-        chips.push(checksProgressChip);
-    const mergeChip = buildMergeChip(issue);
-    if (mergeChip)
-        chips.push(mergeChip);
-    if (issue.blockedByCount > 0) {
-        chips.push({
-            text: `blocked by ${issue.blockedByKeys.join(", ")}`,
-            color: "yellow",
-        });
-    }
-    return chips;
+function effectiveState(issue) {
+    if (issue.blockedByCount > 0 && !issue.activeRunType)
+        return "blocked";
+    if (issue.readyForExecution && !issue.activeRunType)
+        return "ready";
+    return issue.factoryState;
 }
-function stateIcon(state) {
+function stateDisplay(issue) {
+    const state = effectiveState(issue);
     switch (state) {
-        case "implementing":
-        case "repairing_ci":
-        case "repairing_queue":
-            return "\u25b8";
-        case "awaiting_queue":
-            return "\u25a4";
-        case "done":
-            return "\u2713";
-        case "failed":
-        case "escalated":
-            return "\u2717";
-        case "blocked":
-            return "!";
-        case "ready":
-            return "+";
-        default:
-            return "\u2022";
+        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" };
     }
 }
-function buildReviewChip(reviewState) {
-    switch (reviewState) {
-        case "approved":
-            return { text: "\u2713 review approved", color: "green" };
-        case "changes_requested":
-            return { text: "\u2717 changes requested", color: "yellow" };
-        case "commented":
-            return { text: "\u2022 review commented", color: "yellow" };
-        case "dismissed":
-            return { text: "\u2013 review dismissed", color: "yellow" };
-        default:
-            return null;
+// ─── Context facts (what matters right now) ─────────────────────
+function buildFacts(issue) {
+    const facts = [];
+    // PR number
+    if (issue.prNumber !== undefined) {
+        facts.push({ text: `PR #${issue.prNumber}` });
     }
-}
-function buildCheckChip(checkState) {
-    switch (checkState) {
-        case "passed":
-        case "success":
-            return { text: "\u2713 checks passed", color: "green" };
-        case "failed":
-        case "failure":
-            return { text: "\u2717 checks failed", color: "red" };
-        case "pending":
-        case "in_progress":
-        case "queued":
-            return { text: "\u25cf checks running", color: "yellow" };
-        default:
-            return null;
+    // Review state — only show when it matters (not yet approved, or changes requested)
+    if (issue.prReviewState === "approved") {
+        facts.push({ text: "approved", color: "green" });
     }
-}
-function buildChecksProgressChip(issue) {
-    const summary = issue.prChecksSummary;
-    if (!summary || summary.total <= 0)
-        return null;
-    const text = summary.failed > 0
-        ? `checks ${summary.failed}/${summary.total} failed`
-        : summary.pending > 0
-            ? `checks ${summary.completed}/${summary.total} settled`
-            : `checks ${summary.passed}/${summary.total} passed`;
-    const color = summary.failed > 0 ? "red" : summary.pending > 0 ? "yellow" : "green";
-    return { text, color };
-}
-function buildMergeChip(issue) {
-    if (issue.prNumber === undefined)
-        return null;
-    switch (issue.factoryState) {
-        case "awaiting_queue":
-            return { text: "\u25a4 queued for merge", color: "cyan" };
-        case "repairing_queue":
-            return { text: "! merge queue repair", color: "yellow" };
-        case "done":
-            return { text: "\u2713 merged", color: "green" };
-        case "pr_open":
-            if (issue.prReviewState === "approved" && issue.prCheckStatus === "passed") {
-                return { text: "\u2713 merge ready", color: "green" };
-            }
-            return { text: "\u2022 PR open", color: "cyan" };
-        default:
-            return null;
+    else if (issue.prReviewState === "changes_requested") {
+        facts.push({ text: "changes requested", color: "yellow" });
     }
-}
-function buildPrimaryBlocker(issue) {
-    if (issue.blockedByCount > 0) {
-        return {
-            text: `Waiting on ${issue.blockedByKeys.join(", ")}`,
-            color: "yellow",
-        };
+    else if (issue.prNumber !== undefined && !issue.prReviewState && !TERMINAL_STATES.has(issue.factoryState)) {
+        facts.push({ text: "awaiting review", color: "yellow" });
     }
-    if (issue.prCheckStatus === "failed" || issue.prCheckStatus === "failure") {
-        const failedChecks = issue.prChecksSummary?.failedNames ?? [];
-        const failedCheck = issue.latestFailureCheckName
-            ?? (failedChecks.length > 0 ? failedChecks.slice(0, 2).join(", ") : undefined)
-            ?? "PR checks";
-        return {
-            text: `${failedCheck} failed`,
-            color: "red",
-        };
+    // Check status — compact
+    if (issue.prCheckStatus === "passed" || issue.prCheckStatus === "success") {
+        facts.push({ text: "checks passed", color: "green" });
     }
-    if (issue.prCheckStatus === "pending" || issue.prCheckStatus === "in_progress" || issue.prCheckStatus === "queued") {
-        return {
-            text: "Waiting for PR checks to finish",
-            color: "yellow",
-        };
+    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" });
     }
-    if (issue.prReviewState === "changes_requested") {
-        return {
-            text: "Review changes requested",
-            color: "yellow",
-        };
+    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" });
+        }
     }
-    if (issue.factoryState === "repairing_queue") {
-        return {
-            text: "Merge queue reported a branch refresh failure",
-            color: "yellow",
-        };
+    // Blocker
+    if (issue.blockedByCount > 0) {
+        facts.push({ text: `waiting on ${issue.blockedByKeys.join(", ")}`, color: "yellow" });
     }
-    if (issue.factoryState === "awaiting_queue") {
-        return {
-            text: "Waiting for merge queue turn",
-            color: "yellow",
-        };
+    return facts;
+}
+// ─── What's blocking progress ───────────────────────────────────
+function blockerText(issue) {
+    if (issue.blockedByCount > 0)
+        return `Waiting on ${issue.blockedByKeys.join(", ")}`;
+    if (issue.factoryState === "repairing_queue")
+        return "Merge queue conflict, repairing branch";
+    if (issue.factoryState === "repairing_ci") {
+        const check = issue.latestFailureCheckName ?? "CI";
+        return `Repairing ${check}`;
     }
-    if (issue.prNumber !== undefined && !issue.prReviewState && issue.factoryState !== "done") {
-        return {
-            text: "Waiting for review approval",
-            color: "yellow",
-        };
+    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 (issue.prReviewState === "changes_requested")
+        return "Review changes requested";
     return null;
 }
-function buildPipelineProgress(issue) {
-    switch (issue.factoryState) {
-        case "delegated":
-            return { current: 1, total: 4, label: "delegated" };
-        case "implementing":
-            return { current: 1, total: 4, label: "implementing" };
-        case "pr_open":
-        case "changes_requested":
-        case "repairing_ci":
-            return { current: 2, total: 4, label: "pr checks" };
-        case "awaiting_queue":
-        case "repairing_queue":
-            return { current: 3, total: 4, label: "merge queue" };
-        case "done":
-            return { current: 4, total: 4, label: "merged" };
-        case "failed":
-        case "escalated":
-        case "awaiting_input":
-            return { current: 4, total: 4, label: "stopped" };
-        default:
-            return { current: 1, total: 4, label: "queued" };
-    }
-}
+// ─── Render ─────────────────────────────────────────────────────
 export function IssueRow({ issue, selected, titleWidth }) {
     const key = issue.issueKey ?? issue.projectId;
-    const ago = relativeTime(issue.updatedAt);
-    const tw = titleWidth ?? 40;
+    const tw = titleWidth ?? 60;
     const title = issue.title ? truncate(issue.title, tw) : "";
     const detail = selected ? summarizeIssueStatusNote(issue.statusNote) : undefined;
-    const status = formatStatus(issue);
-    const chips = buildStatusChips(issue);
-    const blocker = buildPrimaryBlocker(issue);
-    const pipeline = buildPipelineProgress(issue);
-    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}` }), _jsx(Text, { dimColor: true, children: `  ${ago}` }), _jsx(Text, { dimColor: true, children: `  ${status}` })] }), _jsx(Box, { paddingLeft: 2, flexWrap: "wrap", children: title ? _jsx(Text, { children: title }) : null }), _jsx(Box, { paddingLeft: 2, flexWrap: "wrap", children: chips.map((chip, index) => (_jsx(Box, { marginRight: 1, children: _jsxs(Text, { color: chip.color, children: ["[", chip.text, "]"] }) }, `${key}-chip-${index}`))) }), _jsxs(Box, { paddingLeft: 2, gap: 1, children: [_jsx(Text, { dimColor: true, children: progressBar(pipeline.current, pipeline.total, 8) }), _jsx(Text, { dimColor: true, children: pipeline.label }), blocker ? (_jsxs(_Fragment, { children: [_jsx(Text, { dimColor: true, children: "|" }), _jsx(Text, { color: blocker.color, children: blocker.text })] })) : null] }), detail ? (_jsx(Box, { paddingLeft: 4, children: _jsx(Text, { dimColor: true, wrap: "wrap", children: detail }) })) : null] }));
+    const state = stateDisplay(issue);
+    const facts = buildFacts(issue);
+    const blocker = selected ? blockerText(issue) : null;
+    const isTerminal = TERMINAL_STATES.has(issue.factoryState);
+    // 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, { 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] }));
 }

package/dist/cli/watch/ItemLine.js

@@ -24,19 +24,37 @@ function itemPrefix(item) {
         return "$ ";
     return "";
 }
+function formatItemDuration(ms) {
+    if (ms === undefined || ms === null)
+        return "";
+    const seconds = Math.floor(ms / 1000);
+    if (seconds < 1)
+        return "";
+    if (seconds < 60)
+        return `  ${seconds}s`;
+    const minutes = Math.floor(seconds / 60);
+    return `  ${minutes}m`;
+}
 function itemText(item) {
     switch (item.type) {
         case "agentMessage":
         case "plan":
         case "reasoning":
             return summarizeText(item);
-        case "commandExecution":
-            return cleanCommand(item.command ?? "?");
+        case "commandExecution": {
+            const cmd = cleanCommand(item.command ?? "?");
+            const exit = item.exitCode !== undefined && item.exitCode !== null && item.exitCode !== 0
+                ? `  exit ${item.exitCode}` : "";
+            const dur = formatItemDuration(item.durationMs);
+            return `${cmd}${exit}${dur}`;
+        }
         case "fileChange":
             return summarizeFileChange(item);
         case "mcpToolCall":
-        case "dynamicToolCall":
-            return summarizeToolCall(item);
+        case "dynamicToolCall": {
+            const dur = formatItemDuration(item.durationMs);
+            return `${summarizeToolCall(item)}${dur}`;
+        }
         case "userMessage":
             return `you: ${summarizeText(item)}`;
         default:

package/dist/cli/watch/Timeline.js

@@ -4,16 +4,14 @@ import { Box, Static, Text, useStdout } from "ink";
 import { buildTimelineRows } from "./timeline-presentation.js";
 import { TimelineRow } from "./TimelineRow.js";
 const ACTIVE_TAIL = 8;
-export function Timeline({ entries, follow, mode }) {
+export function Timeline({ entries, follow }) {
     const { stdout } = useStdout();
     const rows = stdout?.rows ?? 24;
     const maxActive = Math.max(ACTIVE_TAIL, rows - 12);
-    const displayRows = useMemo(() => buildTimelineRows(entries, mode), [entries, mode]);
-    // Split: finalized entries go to Static (terminal scrollback), active entries re-render
+    const displayRows = useMemo(() => buildTimelineRows(entries), [entries]);
     const splitIndex = useMemo(() => {
         if (!follow)
-            return 0; // follow OFF: everything in active area (re-renders)
-        // Find the boundary: keep the last maxActive entries in the active area
+            return 0;
         return Math.max(0, displayRows.length - maxActive);
     }, [displayRows.length, follow, maxActive]);
     const finalized = displayRows.slice(0, splitIndex);
@@ -21,5 +19,5 @@ export function Timeline({ entries, follow, mode }) {
     if (displayRows.length === 0) {
         return _jsx(Text, { dimColor: true, children: "No timeline events yet." });
     }
-    return (_jsxs(Box, { flexDirection: "column", children: [finalized.length > 0 && (_jsx(Static, { items: finalized, children: (entry) => _jsx(TimelineRow, { entry: entry, mode: mode }, entry.id) })), active.map((entry) => (_jsx(TimelineRow, { entry: entry, mode: mode }, entry.id)))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [finalized.length > 0 && (_jsx(Static, { items: finalized, children: (entry) => _jsx(TimelineRow, { entry: entry }, entry.id) })), active.map((entry) => (_jsx(TimelineRow, { entry: entry }, entry.id)))] }));
 }

package/dist/cli/watch/TimelineRow.js

@@ -1,9 +1,6 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from "ink";
 import { ItemLine } from "./ItemLine.js";
-function formatTime(iso) {
-    return new Date(iso).toLocaleTimeString("en-GB", { hour12: false, hour: "2-digit", minute: "2-digit", second: "2-digit" });
-}
 function formatDuration(startedAt, endedAt) {
     const ms = new Date(endedAt).getTime() - new Date(startedAt).getTime();
     const seconds = Math.floor(ms / 1000);
@@ -21,7 +18,7 @@ const RUN_LABELS = {
     review_fix: "review fix",
     queue_repair: "merge fix",
 };
-function runStatusColor(status) {
+function runDotColor(status) {
     if (status === "completed")
         return "green";
     if (status === "failed")
@@ -32,13 +29,6 @@ function runStatusColor(status) {
         return "yellow";
     return "white";
 }
-function runStatusLabel(status) {
-    if (status === "running")
-        return "running";
-    if (status === "released")
-        return "released";
-    return status;
-}
 function detailColor(detail) {
     if (detail.tone === "command")
         return "white";
@@ -51,54 +41,35 @@ function detailPrefix(detail) {
         return "$ ";
     return "";
 }
-function verboseItemLabel(type) {
-    switch (type) {
-        case "agentMessage":
-            return "message";
-        case "commandExecution":
-            return "command";
-        case "fileChange":
-            return "files";
-        case "mcpToolCall":
-        case "dynamicToolCall":
-            return "tool";
-        case "userMessage":
-            return "you";
-        case "plan":
-            return "plan";
-        case "reasoning":
-            return "reasoning";
-        default:
-            return type;
-    }
-}
 function FeedRow({ entry }) {
     const label = entry.feed.status ?? entry.feed.feedKind;
-    const repeatSuffix = entry.repeatCount && entry.repeatCount > 1 ? ` ×${entry.repeatCount}` : "";
-    return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsxs(Text, { dimColor: true, children: [formatTime(entry.at), " "] }), _jsx(Text, { color: "cyan", bold: true, children: label.padEnd(12) })] }), _jsx(Box, { paddingLeft: 6, children: _jsxs(Text, { wrap: "wrap", children: [entry.feed.summary, repeatSuffix] }) })] }));
+    const repeatSuffix = entry.repeatCount && entry.repeatCount > 1 ? ` \u00d7${entry.repeatCount}` : "";
+    return (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: "cyan", children: "\u25cf" }), _jsx(Text, { color: "cyan", children: ` ${label}` }), _jsx(Text, { dimColor: true, children: `  ${entry.feed.summary}${repeatSuffix}` })] }));
 }
-function RunRow({ entry, mode, }) {
+function RunRow({ entry, }) {
     const run = entry.run;
-    const color = runStatusColor(run.status);
+    const dotColor = runDotColor(run.status);
     const duration = run.endedAt ? formatDuration(run.startedAt, run.endedAt) : undefined;
-    const showVerboseItems = mode === "verbose" && entry.items.length > 0;
-    return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsxs(Text, { dimColor: true, children: [formatTime(entry.at), " "] }), _jsx(Text, { bold: true, color: "yellow", children: (RUN_LABELS[run.runType] ?? run.runType).padEnd(12) }), _jsxs(Text, { bold: true, color: color, children: [" ", runStatusLabel(run.status)] }), duration ? _jsx(Text, { dimColor: true, children: ` ${duration}` }) : null] }), entry.details.length > 0 && _jsx(Text, { children: " " }), entry.details.map((detail, index) => (_jsx(Box, { paddingLeft: 6, marginBottom: index === entry.details.length - 1 ? 0 : 1, children: _jsxs(Text, { wrap: "wrap", ...(detailColor(detail) ? { color: detailColor(detail) } : {}), bold: detail.tone === "message", children: [detailPrefix(detail), detail.text] }) }, `${entry.id}-detail-${index}`))), showVerboseItems && _jsx(Text, { children: " " }), showVerboseItems && entry.items.map((itemEntry, index) => (_jsxs(Box, { flexDirection: "column", paddingLeft: 6, marginBottom: index === entry.items.length - 1 ? 0 : 1, children: [_jsxs(Box, { marginBottom: 1, children: [_jsxs(Text, { dimColor: true, children: [formatTime(itemEntry.at), " "] }), _jsx(Text, { dimColor: true, children: verboseItemLabel(itemEntry.item.type) })] }), _jsx(Box, { paddingLeft: 2, children: _jsx(ItemLine, { item: itemEntry.item }) })] }, `${entry.id}-item-${index}`)))] }));
+    const showItems = entry.items.length > 0;
+    const showDetails = !showItems && entry.details.length > 0;
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Box, { children: [_jsx(Text, { color: dotColor, children: "\u25cf" }), _jsx(Text, { bold: true, color: "yellow", children: ` ${RUN_LABELS[run.runType] ?? run.runType}` }), _jsx(Text, { bold: true, color: dotColor, children: `  ${run.status}` }), duration ? _jsx(Text, { dimColor: true, children: `  ${duration}` }) : null] }), showItems && entry.items.map((itemEntry, index) => (_jsx(Box, { paddingLeft: 2, children: _jsx(ItemLine, { item: itemEntry.item }) }, `${entry.id}-item-${index}`))), showDetails && entry.details.map((detail, index) => (_jsx(Box, { paddingLeft: 2, children: _jsxs(Text, { wrap: "wrap", ...(detailColor(detail) ? { color: detailColor(detail) } : { dimColor: true }), bold: detail.tone === "message", children: [detailPrefix(detail), detail.text] }) }, `${entry.id}-detail-${index}`)))] }));
 }
-function ItemRow({ entry, mode, }) {
-    return (_jsxs(Box, { flexDirection: "column", paddingLeft: 6, marginBottom: mode === "verbose" ? 1 : 0, children: [_jsxs(Box, { marginBottom: 1, children: [_jsxs(Text, { dimColor: true, children: [formatTime(entry.at), " "] }), _jsx(Text, { dimColor: true, children: entry.item.type })] }), _jsx(Box, { paddingLeft: 2, children: _jsx(ItemLine, { item: entry.item }) })] }));
+function ItemRow({ entry, }) {
+    return (_jsx(Box, { paddingLeft: 2, children: _jsx(ItemLine, { item: entry.item }) }));
 }
 function CIChecksRow({ entry }) {
     const ci = entry.ciChecks;
-    return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsxs(Text, { dimColor: true, children: [formatTime(entry.at), " "] }), _jsx(Text, { color: CHECK_COLORS[ci.overall] ?? "white", bold: true, children: "checks".padEnd(12) })] }), _jsx(Box, { paddingLeft: 6, gap: 2, flexWrap: "wrap", children: ci.checks.map((check, i) => (_jsxs(Text, { children: [_jsx(Text, { color: CHECK_COLORS[check.status] ?? "white", children: CHECK_SYMBOLS[check.status] ?? " " }), _jsx(Text, { dimColor: true, children: check.name })] }, `c-${i}`))) })] }));
+    const dotColor = CHECK_COLORS[ci.overall] ?? "white";
+    return (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: dotColor, children: "\u25cf" }), _jsx(Text, { color: dotColor, bold: true, children: ` checks` }), _jsx(Text, { children: `  ` }), ci.checks.map((check, i) => (_jsxs(Text, { children: [i > 0 ? _jsx(Text, { children: `  ` }) : null, _jsx(Text, { color: CHECK_COLORS[check.status] ?? "white", children: CHECK_SYMBOLS[check.status] ?? " " }), _jsx(Text, { dimColor: true, children: ` ${check.name}` })] }, `c-${i}`)))] }));
 }
-export function TimelineRow({ entry, mode }) {
+export function TimelineRow({ entry }) {
     switch (entry.kind) {
         case "feed":
             return _jsx(FeedRow, { entry: entry });
         case "run":
-            return _jsx(RunRow, { entry: entry, mode: mode });
+            return _jsx(RunRow, { entry: entry });
         case "item":
-            return _jsx(ItemRow, { entry: entry, mode: mode });
+            return _jsx(ItemRow, { entry: entry });
         case "ci-checks":
             return _jsx(CIChecksRow, { entry: entry });
     }

package/dist/cli/watch/timeline-builder.js

@@ -8,7 +8,7 @@ export function buildTimelineFromRehydration(runs, feedEvents, liveThread, activ
             at: run.startedAt,
             kind: "run-start",
             runId: run.id,
-            run: { runType: run.runType, status: run.status, startedAt: run.startedAt, endedAt: run.endedAt },
+            run: { runType: run.runType, status: run.status, startedAt: run.startedAt, endedAt: run.endedAt, threadId: run.threadId },
         });
         if (run.endedAt) {
             entries.push({
@@ -16,7 +16,7 @@ export function buildTimelineFromRehydration(runs, feedEvents, liveThread, activ
                 at: run.endedAt,
                 kind: "run-end",
                 runId: run.id,
-                run: { runType: run.runType, status: run.status, startedAt: run.startedAt, endedAt: run.endedAt },
+                run: { runType: run.runType, status: run.status, startedAt: run.startedAt, endedAt: run.endedAt, threadId: run.threadId },
             });
         }
         // Items from completed run event history, with report fallback

package/dist/cli/watch/timeline-presentation.js

@@ -1,103 +1,5 @@
-export function buildTimelineRows(entries, mode) {
-    const rows = mode === "compact" ? buildCompactTimelineRows(entries) : buildVerboseTimelineRows(entries);
-    return collapseRepeatedFeedRows(rows);
-}
-function buildVerboseTimelineRows(entries) {
-    const rows = [];
-    const runs = new Map();
-    for (const entry of entries) {
-        if (entry.kind === "run-start" && entry.runId !== undefined) {
-            const existing = runs.get(entry.runId);
-            if (!existing) {
-                const run = { ...entry.run };
-                runs.set(entry.runId, {
-                    id: `run-${entry.runId}`,
-                    at: run.startedAt,
-                    run,
-                    items: [],
-                    endedAt: run.endedAt,
-                });
-            }
-            continue;
-        }
-        if (entry.kind === "run-end" && entry.runId !== undefined) {
-            const existing = runs.get(entry.runId);
-            if (existing) {
-                existing.run = { ...entry.run };
-                existing.endedAt = entry.run?.endedAt;
-            }
-            else {
-                const run = { ...entry.run };
-                runs.set(entry.runId, {
-                    id: `run-${entry.runId}`,
-                    at: run.startedAt,
-                    run,
-                    items: [],
-                    endedAt: run.endedAt,
-                });
-            }
-            continue;
-        }
-        if (entry.kind === "item" && entry.runId !== undefined && runs.has(entry.runId)) {
-            runs.get(entry.runId).items.push(entry.item);
-            continue;
-        }
-        switch (entry.kind) {
-            case "feed":
-                if (shouldHideFeed(entry.feed)) {
-                    break;
-                }
-                rows.push({
-                    id: entry.id,
-                    kind: "feed",
-                    at: entry.at,
-                    finalized: true,
-                    feed: entry.feed,
-                });
-                break;
-            case "ci-checks":
-                rows.push({
-                    id: entry.id,
-                    kind: "ci-checks",
-                    at: entry.at,
-                    finalized: true,
-                    ciChecks: entry.ciChecks,
-                });
-                break;
-            case "item":
-                rows.push({
-                    id: entry.id,
-                    kind: "item",
-                    at: entry.at,
-                    finalized: entry.item?.status !== "inProgress",
-                    item: entry.item,
-                });
-                break;
-        }
-    }
-    for (const [runId, run] of runs) {
-        rows.push({
-            id: run.id,
-            kind: "run",
-            at: run.at,
-            finalized: run.items.every((item) => item.status !== "inProgress") && run.run.status !== "running",
-            run: { ...run.run, ...(run.endedAt ? { endedAt: run.endedAt } : {}) },
-            details: [],
-            items: summarizeVerboseItems(entries
-                .filter((entry) => entry.kind === "item" && entry.runId === runId)
-                .map((entry) => ({ at: entry.at, item: entry.item }))),
-        });
-    }
-    rows.sort((left, right) => {
-        const cmp = left.at.localeCompare(right.at);
-        if (cmp !== 0)
-            return cmp;
-        const kindCmp = rowKindOrder(left.kind) - rowKindOrder(right.kind);
-        if (kindCmp !== 0)
-            return kindCmp;
-        return left.id.localeCompare(right.id);
-    });
-    return rows;
+export function buildTimelineRows(entries) {
+    return collapseRepeatedFeedRows(buildCompactTimelineRows(entries));
 }
 function buildCompactTimelineRows(entries) {
     const rows = [];
@@ -181,7 +83,7 @@ function buildCompactTimelineRows(entries) {
             finalized: status !== "running",
             run: { ...run.run, status, ...(run.endedAt ? { endedAt: run.endedAt } : {}) },
             details: summarizeRunDetails(run.items),
-            items: [],
+            items: run.items.map((item) => ({ at: run.at, item })),
         });
     }
     rows.sort((left, right) => {
@@ -335,39 +237,6 @@ function rowKindOrder(kind) {
             return 3;
     }
 }
-function summarizeVerboseItems(items) {
-    const directTypes = new Set(["userMessage", "commandExecution", "fileChange", "plan"]);
-    const kept = items.filter((entry) => directTypes.has(entry.item.type));
-    const latestAgentMessage = findLatestVerboseItem(items, (entry) => entry.item.type === "agentMessage" && Boolean(entry.item.text?.trim()));
-    if (latestAgentMessage) {
-        kept.push(latestAgentMessage);
-    }
-    else {
-        const latestReasoning = findLatestVerboseItem(items, (entry) => entry.item.type === "reasoning" && Boolean(entry.item.text?.trim()));
-        if (latestReasoning) {
-            kept.push(latestReasoning);
-        }
-    }
-    const deduped = new Map();
-    for (const entry of kept) {
-        deduped.set(entry.item.id, entry);
-    }
-    return Array.from(deduped.values()).sort((left, right) => {
-        const cmp = left.at.localeCompare(right.at);
-        if (cmp !== 0)
-            return cmp;
-        return left.item.id.localeCompare(right.item.id);
-    });
-}
-function findLatestVerboseItem(items, predicate) {
-    for (let i = items.length - 1; i >= 0; i -= 1) {
-        const item = items[i];
-        if (predicate(item)) {
-            return item;
-        }
-    }
-    return undefined;
-}
 function collapseRepeatedFeedRows(rows) {
     const collapsed = [];
     for (const row of rows) {

package/dist/cli/watch/watch-state.js

@@ -8,7 +8,6 @@ function capArray(arr, max) {
 }
 const DETAIL_INITIAL = {
     detailTab: "timeline",
-    timelineMode: "compact",
     timeline: [],
     rawRuns: [],
     rawFeedEvents: [],
@@ -140,8 +139,8 @@ export function watchReducer(state, action) {
             return { ...state, feedEvents: capArray([...state.feedEvents, action.event], MAX_FEED_EVENTS) };
         case "switch-detail-tab":
             return { ...state, detailTab: action.tab };
-        case "toggle-timeline-mode":
-            return { ...state, timelineMode: state.timelineMode === "compact" ? "verbose" : "compact" };
+        default:
+            return state;
     }
 }
 // ─── Feed Event → Issue List + Timeline ───────────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchrelay",
-  "version": "0.33.0",
+  "version": "0.35.0",
   "license": "MIT",
   "type": "module",
   "repository": {