merge-steward 0.18.0 → 0.19.0

package/dist/watch/App.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState } from "react";
-import { Box, Text, useApp, useInput } from "ink";
+import { Box, Text, useApp, useInput, useStdout } from "ink";
 import { fetchGatewayHealth, fetchSnapshot, triggerReconcile } from "./api.js";
 import { buildDashboard, matchRepoRef, repoSelector, stepRepo } from "./dashboard-model.js";
 import { HelpBar } from "./HelpBar.js";
@@ -10,6 +10,7 @@ import { StatusBar } from "./StatusBar.js";
 const REFRESH_INTERVAL_MS = 1_500;
 export function App({ gatewayBaseUrl, repos, initialRepoRef, initialPrNumber }) {
     const { exit } = useApp();
+    const { stdout } = useStdout();
     const [repoStates, setRepoStates] = useState(() => repos.map((repo) => ({
         ...repo,
         serviceState: "offline",
@@ -27,6 +28,7 @@ export function App({ gatewayBaseUrl, repos, initialRepoRef, initialPrNumber })
     const [view, setView] = useState(initialRepoRef || initialPrNumber !== undefined ? "detail" : "list");
     const [flashMessage, setFlashMessage] = useState(null);
     const [pendingInitialPrNumber, setPendingInitialPrNumber] = useState(initialPrNumber ?? null);
+    const [detailScrollOffset, setDetailScrollOffset] = useState(0);
     const model = useMemo(() => buildDashboard(repoStates), [repoStates]);
     useEffect(() => {
         setSelectedRepoId((current) => repoSelector(model.repos, current));
@@ -150,6 +152,9 @@ export function App({ gatewayBaseUrl, repos, initialRepoRef, initialPrNumber })
             setFlashMessage(error instanceof Error ? error.message : String(error));
         }
     }
+    const rows = Math.max(8, stdout?.rows ?? 24);
+    const chromeRows = 1 /* status */ + 1 /* body marginTop */ + (flashMessage ? 2 : 0) + 2 /* help bar + its marginTop */;
+    const bodyRows = Math.max(2, rows - chromeRows);
     useInput((input, key) => {
         if (input === "q") {
             exit();
@@ -159,22 +164,58 @@ export function App({ gatewayBaseUrl, repos, initialRepoRef, initialPrNumber })
             void runReconcile(selectedRepoId);
             return;
         }
-        if (input === "j" || key.downArrow) {
+        if (view === "list") {
+            if (input === "j" || key.downArrow || input === "]") {
+                setSelectedRepoId((current) => stepRepo(model.repos, current, 1));
+                return;
+            }
+            if (input === "k" || key.upArrow || input === "[") {
+                setSelectedRepoId((current) => stepRepo(model.repos, current, -1));
+                return;
+            }
+            if (key.return)
+                setView("detail");
+            return;
+        }
+        // detail view
+        if (input === "]") {
             setSelectedRepoId((current) => stepRepo(model.repos, current, 1));
+            setDetailScrollOffset(0);
             return;
         }
-        if (input === "k" || key.upArrow) {
+        if (input === "[") {
             setSelectedRepoId((current) => stepRepo(model.repos, current, -1));
+            setDetailScrollOffset(0);
             return;
         }
-        if (view === "list") {
-            if (key.return)
-                setView("detail");
+        if (input === "j" || key.downArrow) {
+            setDetailScrollOffset((offset) => offset + 1);
+            return;
+        }
+        if (input === "k" || key.upArrow) {
+            setDetailScrollOffset((offset) => Math.max(0, offset - 1));
+            return;
+        }
+        if (key.pageDown || input === " ") {
+            setDetailScrollOffset((offset) => offset + Math.max(1, bodyRows - 2));
+            return;
+        }
+        if (key.pageUp) {
+            setDetailScrollOffset((offset) => Math.max(0, offset - Math.max(1, bodyRows - 2)));
+            return;
+        }
+        if (input === "g") {
+            setDetailScrollOffset(0);
+            return;
+        }
+        if (input === "G") {
+            setDetailScrollOffset(Number.MAX_SAFE_INTEGER);
             return;
         }
         if (key.escape || key.backspace || key.delete) {
             setView("list");
+            setDetailScrollOffset(0);
         }
     });
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(StatusBar, { connected: model.repos.some((repo) => !repo.offlineMessage), lastSnapshotReceivedAt: lastSnapshotReceivedAt, gatewayError: gatewayError }), view === "detail" ? (_jsx(ProjectDetailView, { model: model, selectedRepoId: selectedRepoId })) : (_jsx(OverviewView, { model: model, selectedRepoId: selectedRepoId, showCursor: true })), flashMessage ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: flashMessage }) })) : null, _jsx(HelpBar, { view: view })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(StatusBar, { connected: model.repos.some((repo) => !repo.offlineMessage), lastSnapshotReceivedAt: lastSnapshotReceivedAt, gatewayError: gatewayError }), view === "detail" ? (_jsx(ProjectDetailView, { model: model, selectedRepoId: selectedRepoId, bodyRows: bodyRows, scrollOffset: detailScrollOffset })) : (_jsx(OverviewView, { model: model, selectedRepoId: selectedRepoId, showCursor: true, bodyRows: bodyRows })), flashMessage ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: flashMessage }) })) : null, _jsx(HelpBar, { view: view })] }));
 }

package/dist/watch/HelpBar.js

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Box, Text } from "ink";
 export function HelpBar({ view }) {
     const text = view === "list"
-        ? "↑↓ switch repo  enter detail  r reconcile  q quit"
-        : "↑↓ switch repo  esc back  r reconcile  q quit";
+        ? "↑↓ repo  enter detail  r reconcile  q quit"
+        : "[ ] repo  ↑↓ scroll  g/G top/end  esc back  r reconcile  q quit";
     return (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: text }) }));
 }

package/dist/watch/OverviewView.d.ts

@@ -3,6 +3,7 @@ interface ListViewProps {
     model: DashboardModel;
     selectedRepoId: string | null;
     showCursor: boolean;
+    bodyRows: number;
 }
 export declare function RepoRow({ repo, selected, showCursor, width, }: {
     repo: DashboardRepo;
@@ -14,5 +15,5 @@ export declare function pickVisibleWindow(total: number, selectedIndex: number,
     start: number;
     end: number;
 };
-export declare function OverviewView({ model, selectedRepoId, showCursor }: ListViewProps): React.JSX.Element;
+export declare function OverviewView({ model, selectedRepoId, showCursor, bodyRows }: ListViewProps): React.JSX.Element;
 export {};

package/dist/watch/OverviewView.js

@@ -45,21 +45,36 @@ export function pickVisibleWindow(total, selectedIndex, availableRows) {
     }
     return { start, end };
 }
-export function OverviewView({ model, selectedRepoId, showCursor }) {
+export function OverviewView({ model, selectedRepoId, showCursor, bodyRows }) {
     const { stdout } = useStdout();
-    const rows = Math.max(3, stdout?.rows ?? 24);
     const width = Math.max(40, stdout?.columns ?? 80);
-    const availableRows = Math.max(1, rows - 3);
+    const total = model.repos.length;
     const selectedIndex = Math.max(0, model.repos.findIndex((repo) => repo.repoId === selectedRepoId));
-    const quietReserve = model.repos.length > availableRows && model.quietCount > 0 ? 1 : 0;
-    const windowRows = Math.max(1, availableRows - quietReserve);
-    const { start, end } = pickVisibleWindow(model.repos.length, selectedIndex, windowRows);
+    let { start, end } = pickVisibleWindow(total, selectedIndex, Math.max(1, bodyRows));
+    let needTop = start > 0;
+    let needBottom = end < total;
+    if (needTop || needBottom) {
+        const reserve = (needTop ? 1 : 0) + (needBottom ? 1 : 0);
+        const windowRows = Math.max(1, bodyRows - reserve);
+        ({ start, end } = pickVisibleWindow(total, selectedIndex, windowRows));
+        needTop = start > 0;
+        needBottom = end < total;
+    }
     const visible = model.repos.slice(start, end);
-    const hiddenQuiet = model.repos
-        .filter((repo, index) => !repo.hasActivity && repo.offlineMessage === null && (index < start || index >= end))
-        .length;
-    if (visible.length === 0) {
+    const above = start;
+    const below = total - end;
+    if (total === 0 || bodyRows <= 0) {
         return _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: " " }) });
     }
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [visible.map((repo) => (_jsx(RepoRow, { repo: repo, selected: repo.repoId === selectedRepoId, showCursor: showCursor, width: width - 2 }, repo.repoId))), hiddenQuiet > 0 ? (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { dimColor: true, children: `+${hiddenQuiet} quiet` }) })) : null] }));
+    const children = [];
+    if (needTop) {
+        children.push(_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { dimColor: true, children: `\u2191${above} more above` }) }, "above"));
+    }
+    for (const repo of visible) {
+        children.push(_jsx(RepoRow, { repo: repo, selected: repo.repoId === selectedRepoId, showCursor: showCursor, width: width - 2 }, repo.repoId));
+    }
+    if (needBottom) {
+        children.push(_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { dimColor: true, children: `\u2193${below} more below` }) }, "below"));
+    }
+    return (_jsx(Box, { flexDirection: "column", marginTop: 1, children: children.slice(0, Math.max(1, bodyRows)) }));
 }

package/dist/watch/ProjectDetailView.d.ts

@@ -1,7 +1,20 @@
-import { type DashboardModel } from "./dashboard-model.ts";
+import { type DashboardModel, type DashboardPrEntry, type DashboardRepo } from "./dashboard-model.ts";
 interface ProjectDetailViewProps {
     model: DashboardModel;
     selectedRepoId: string | null;
+    bodyRows: number;
+    scrollOffset: number;
 }
-export declare function ProjectDetailView({ model, selectedRepoId }: ProjectDetailViewProps): React.JSX.Element;
+type ContentLine = {
+    kind: "blank";
+} | {
+    kind: "entry-header";
+    entry: DashboardPrEntry;
+} | {
+    kind: "summary-line";
+    text: string;
+};
+export declare function buildContentLines(repo: DashboardRepo, width: number): ContentLine[];
+export declare function clampScrollOffset(requested: number, totalLines: number, scrollArea: number): number;
+export declare function ProjectDetailView({ model, selectedRepoId, bodyRows, scrollOffset }: ProjectDetailViewProps): React.JSX.Element;
 export {};

package/dist/watch/ProjectDetailView.js

@@ -5,28 +5,58 @@ import { clipSummary } from "./dashboard-model.js";
 const PR_ID_WIDTH = 7;
 const PR_PHRASE_WIDTH = 20;
 const SUMMARY_INDENT = 9;
-function PrEntryRow({ entry, width, includeSummary, }) {
+function truncate(value, maxWidth) {
+    if (value.length <= maxWidth)
+        return value;
+    if (maxWidth <= 1)
+        return value.slice(0, maxWidth);
+    return `${value.slice(0, Math.max(0, maxWidth - 1))}\u2026`;
+}
+export function buildContentLines(repo, width) {
+    const lines = [];
+    repo.entries.forEach((entry, index) => {
+        if (index > 0)
+            lines.push({ kind: "blank" });
+        lines.push({ kind: "entry-header", entry });
+        if (entry.summary) {
+            const summaryText = clipSummary(entry.summary, {
+                maxLines: 3,
+                width: Math.max(20, width - SUMMARY_INDENT),
+            });
+            if (summaryText) {
+                summaryText.split("\n").forEach((line) => lines.push({ kind: "summary-line", text: line }));
+            }
+        }
+    });
+    return lines;
+}
+function EntryHeaderRow({ entry, width }) {
     const idText = `#${entry.prNumber}`.padEnd(PR_ID_WIDTH, " ");
     const paddedPhrase = entry.phrase.padEnd(PR_PHRASE_WIDTH, " ");
-    const summaryText = includeSummary
-        ? clipSummary(entry.summary, { maxLines: 3, width: Math.max(20, width - SUMMARY_INDENT) })
-        : "";
     const titleSpace = Math.max(0, width - (PR_ID_WIDTH + 3 + PR_PHRASE_WIDTH + 1));
     const title = entry.title && entry.title !== entry.phrase && titleSpace >= 8
         ? truncate(entry.title, titleSpace)
         : "";
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: entry.color, children: idText }), _jsx(Text, { color: entry.color, children: entry.glyph }), _jsx(Text, { children: `  ${paddedPhrase}` }), title ? _jsx(Text, { dimColor: true, children: `  ${title}` }) : null] }), summaryText ? (_jsxs(Box, { children: [_jsx(Text, { children: " ".repeat(SUMMARY_INDENT) }), _jsx(Text, { dimColor: true, children: summaryText })] })) : null] }));
+    return (_jsxs(Box, { children: [_jsx(Text, { color: entry.color, children: idText }), _jsx(Text, { color: entry.color, children: entry.glyph }), _jsx(Text, { children: `  ${paddedPhrase}` }), title ? _jsx(Text, { dimColor: true, children: `  ${title}` }) : null] }));
 }
-function truncate(value, maxWidth) {
-    if (value.length <= maxWidth)
-        return value;
-    if (maxWidth <= 1)
-        return value.slice(0, maxWidth);
-    return `${value.slice(0, Math.max(0, maxWidth - 1))}\u2026`;
+function renderLine(line, key, width) {
+    if (line.kind === "blank")
+        return _jsx(Box, { children: _jsx(Text, { children: " " }) }, key);
+    if (line.kind === "summary-line") {
+        return (_jsxs(Box, { children: [_jsx(Text, { children: " ".repeat(SUMMARY_INDENT) }), _jsx(Text, { dimColor: true, children: line.text })] }, key));
+    }
+    return _jsx(EntryHeaderRow, { entry: line.entry, width: width }, key);
 }
-export function ProjectDetailView({ model, selectedRepoId }) {
+export function clampScrollOffset(requested, totalLines, scrollArea) {
+    if (scrollArea <= 0 || totalLines <= scrollArea)
+        return 0;
+    // When scrolled at all, a one-row top indicator eats into the viewport, so the
+    // largest useful offset lets (scrollArea - 1) rows of content fill the remainder.
+    const maxOffset = Math.max(0, totalLines - Math.max(1, scrollArea - 1));
+    return Math.max(0, Math.min(requested, maxOffset));
+}
+export function ProjectDetailView({ model, selectedRepoId, bodyRows, scrollOffset }) {
     const { stdout } = useStdout();
-    const rows = Math.max(3, stdout?.rows ?? 24);
     const width = Math.max(40, stdout?.columns ?? 80);
     const repo = selectedRepoId
         ? model.repos.find((candidate) => candidate.repoId === selectedRepoId) ?? model.repos[0] ?? null
@@ -34,42 +64,32 @@ export function ProjectDetailView({ model, selectedRepoId }) {
     if (!repo) {
         return _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: " " }) });
     }
-    const availableRows = Math.max(1, rows - 3);
-    const afterRepoRow = Math.max(0, availableRows - 2);
-    const entries = repo.entries;
-    const planned = [];
-    let used = 0;
-    const maxSummaryLines = 3;
-    for (const entry of entries) {
-        if (used >= afterRepoRow)
-            break;
-        if (used + 1 > afterRepoRow)
-            break;
-        planned.push({ entry, includeSummary: false });
-        used += 1;
+    const repoHeaderRows = 1;
+    const separatorRows = bodyRows >= 3 ? 1 : 0;
+    const scrollArea = Math.max(0, bodyRows - repoHeaderRows - separatorRows);
+    const contentWidth = Math.max(20, width - 2);
+    const contentLines = buildContentLines(repo, contentWidth);
+    const offset = clampScrollOffset(scrollOffset, contentLines.length, scrollArea);
+    const children = [];
+    const couldHaveAbove = offset > 0;
+    const reserveTop = couldHaveAbove && scrollArea > 0 ? 1 : 0;
+    let remaining = scrollArea - reserveTop;
+    let tentativeEnd = Math.min(contentLines.length, offset + remaining);
+    const belowCount = contentLines.length - tentativeEnd;
+    const reserveBottom = belowCount > 0 && remaining > 0 ? 1 : 0;
+    if (reserveBottom) {
+        remaining = Math.max(0, remaining - 1);
+        tentativeEnd = Math.min(contentLines.length, offset + remaining);
     }
-    if (afterRepoRow - used >= 2) {
-        for (let i = 0; i < planned.length; i += 1) {
-            const item = planned[i];
-            if (!item.entry.summary)
-                continue;
-            const summaryText = clipSummary(item.entry.summary, {
-                maxLines: maxSummaryLines,
-                width: Math.max(20, width - SUMMARY_INDENT),
-            });
-            if (!summaryText)
-                continue;
-            const summaryLines = summaryText.split("\n").length;
-            const isLast = i === planned.length - 1;
-            const extra = summaryLines + (isLast ? 0 : 1);
-            if (used + extra > afterRepoRow)
-                break;
-            item.includeSummary = true;
-            used += extra;
-        }
+    if (reserveTop) {
+        children.push(_jsx(Box, { children: _jsx(Text, { dimColor: true, children: `  \u2191${offset} more above` }) }, "above"));
+    }
+    for (let i = offset; i < tentativeEnd; i += 1) {
+        children.push(renderLine(contentLines[i], i, contentWidth));
+    }
+    if (reserveBottom) {
+        const hidden = contentLines.length - tentativeEnd;
+        children.push(_jsx(Box, { children: _jsx(Text, { dimColor: true, children: `  \u2193${hidden} more below` }) }, "below"));
     }
-    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(RepoRow, { repo: repo, selected: false, showCursor: false, width: width - 2 }), planned.length > 0 ? _jsx(Box, { children: _jsx(Text, { children: " " }) }) : null, planned.map(({ entry, includeSummary }, index) => {
-                const isLast = index === planned.length - 1;
-                return (_jsxs(Box, { flexDirection: "column", children: [_jsx(PrEntryRow, { entry: entry, width: width, includeSummary: includeSummary }), includeSummary && !isLast ? _jsx(Box, { children: _jsx(Text, { children: " " }) }) : null] }, entry.prNumber));
-            })] }));
+    return (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(RepoRow, { repo: repo, selected: false, showCursor: false, width: width - 2 }), separatorRows > 0 ? _jsx(Box, { children: _jsx(Text, { children: " " }) }) : null, children] }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-steward",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "Serial merge queue for GitHub — rebase, CI-gate, and merge PRs one at a time",
   "type": "module",
   "repository": {