merge-steward 0.22.2 → 0.22.4

package/README.md

@@ -34,7 +34,7 @@ The skill wraps `merge-steward pr status --wait` and `review-quill pr status --w
 Prerequisites: Node.js 24+, `gh` CLI in `PATH`, `git`.
 
 ```bash
-npm install -g merge-steward
+pnpm add -g merge-steward
 merge-steward init https://queue.example.com
 merge-steward attach owner/repo --base-branch main
 merge-steward doctor --repo repo

package/dist/watch/App.js

@@ -7,6 +7,7 @@ import { HelpBar } from "./HelpBar.js";
 import { OverviewView } from "./OverviewView.js";
 import { ProjectDetailView } from "./ProjectDetailView.js";
 import { StatusBar } from "./StatusBar.js";
+import { computeDashboardLayout } from "./compact-layout.js";
 const REFRESH_INTERVAL_MS = 1_500;
 export function App({ gatewayBaseUrl, repos, initialRepoRef, initialPrNumber }) {
     const { exit } = useApp();
@@ -152,9 +153,7 @@ 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);
+    const layout = computeDashboardLayout(stdout?.rows ?? 24, Boolean(flashMessage));
     useInput((input, key) => {
         if (input === "q") {
             exit();
@@ -197,11 +196,11 @@ export function App({ gatewayBaseUrl, repos, initialRepoRef, initialPrNumber })
             return;
         }
         if (key.pageDown || input === " ") {
-            setDetailScrollOffset((offset) => offset + Math.max(1, bodyRows - 2));
+            setDetailScrollOffset((offset) => offset + Math.max(1, layout.bodyRows - 2));
             return;
         }
         if (key.pageUp) {
-            setDetailScrollOffset((offset) => Math.max(0, offset - Math.max(1, bodyRows - 2)));
+            setDetailScrollOffset((offset) => Math.max(0, offset - Math.max(1, layout.bodyRows - 2)));
             return;
         }
         if (input === "g") {
@@ -217,5 +216,5 @@ export function App({ gatewayBaseUrl, repos, initialRepoRef, initialPrNumber })
             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, 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 })] }));
+    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: layout.bodyRows, topMarginRows: layout.bodyTopMarginRows, scrollOffset: detailScrollOffset })) : (_jsx(OverviewView, { model: model, selectedRepoId: selectedRepoId, showCursor: true, bodyRows: layout.bodyRows, topMarginRows: layout.bodyTopMarginRows })), flashMessage && layout.showFlashMessage ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: flashMessage }) })) : null, layout.showHelp ? _jsx(HelpBar, { view: view }) : null] }));
 }

package/dist/watch/OverviewView.d.ts

@@ -4,6 +4,7 @@ interface ListViewProps {
     selectedRepoId: string | null;
     showCursor: boolean;
     bodyRows: number;
+    topMarginRows?: number | undefined;
 }
 export declare function RepoRow({ repo, selected, showCursor, width }: {
     repo: DashboardRepo;
@@ -11,9 +12,5 @@ export declare function RepoRow({ repo, selected, showCursor, width }: {
     showCursor: boolean;
     width: number;
 }): React.JSX.Element;
-export declare function pickVisibleWindow(total: number, selectedIndex: number, availableRows: number): {
-    start: number;
-    end: number;
-};
-export declare function OverviewView({ model, selectedRepoId, showCursor, bodyRows }: ListViewProps): React.JSX.Element;
+export declare function OverviewView({ model, selectedRepoId, showCursor, bodyRows, topMarginRows }: ListViewProps): React.JSX.Element;
 export {};

package/dist/watch/OverviewView.js

@@ -1,81 +1,49 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text, useStdout } from "ink";
 import { formatRepoTokenText } from "./format.js";
+import { formatRepoTokensText, pickVisibleParts, } from "./compact-layout.js";
 function RepoTokens({ tokens, width }) {
-    if (tokens.length === 0 || width < 6)
+    const text = formatRepoTokensText(tokens, width);
+    if (!text)
         return null;
-    const parts = [];
-    let used = 0;
-    for (const token of tokens) {
-        const text = formatRepoTokenText(token);
-        const separatorWidth = parts.length === 0 ? 0 : 2;
-        if (used + separatorWidth + text.length > width)
-            break;
-        used += separatorWidth + text.length;
-        parts.push({ token, text });
-    }
-    return (_jsx(Text, { children: parts.map((part, index) => (_jsx(Text, { color: part.token.color, children: index === 0 ? part.text : `  ${part.text}` }, `${part.token.prNumber}-${index}`))) }));
+    let offset = 0;
+    const parts = text.split("  ").map((part) => {
+        const token = tokens.find((candidate) => formatRepoTokenText(candidate) === part);
+        const item = { text: part, token, offset };
+        offset += part.length + 2;
+        return item;
+    });
+    return (_jsx(Text, { children: parts.map((part, index) => (_jsx(Text, { ...(part.token ? { color: part.token.color } : {}), children: index === 0 ? part.text : `  ${part.text}` }, `${part.text}-${part.offset}`))) }));
 }
 export function RepoRow({ repo, selected, showCursor, width, }) {
-    const cursorChar = showCursor && selected ? ">" : " ";
     const repoLabelWidth = Math.min(28, Math.max(12, Math.floor(width * 0.35)));
     const tokenWidth = Math.max(6, width - repoLabelWidth - 3);
     const repoLabel = repo.repoFullName.length > repoLabelWidth
         ? repo.repoFullName.slice(0, repoLabelWidth)
         : repo.repoFullName.padEnd(repoLabelWidth, " ");
-    return (_jsxs(Box, { children: [_jsx(Text, { color: selected ? "cyan" : "gray", children: cursorChar }), _jsx(Text, { bold: selected, children: ` ${repoLabel}  ` }), repo.offlineMessage ? (_jsx(Text, { color: "red", children: repo.offlineMessage })) : (_jsx(RepoTokens, { tokens: repo.tokens, width: tokenWidth }))] }));
-}
-export function pickVisibleWindow(total, selectedIndex, availableRows) {
-    if (total === 0)
-        return { start: 0, end: 0 };
-    if (total <= availableRows)
-        return { start: 0, end: total };
-    const clamped = Math.max(0, Math.min(selectedIndex, total - 1));
-    let start = clamped;
-    let end = clamped + 1;
-    while (end - start < availableRows) {
-        if (start > 0 && (end === total || clamped - start <= end - 1 - clamped)) {
-            start -= 1;
-        }
-        else if (end < total) {
-            end += 1;
-        }
-        else {
-            break;
-        }
-    }
-    return { start, end };
+    return (_jsxs(Box, { children: [_jsx(Text, { color: selected ? "cyan" : "gray", children: showCursor && selected ? ">" : " " }), _jsx(Text, { bold: selected, children: ` ${repoLabel}  ` }), repo.offlineMessage ? (_jsx(Text, { color: "red", children: repo.offlineMessage })) : (_jsx(RepoTokens, { tokens: repo.tokens, width: tokenWidth }))] }));
 }
-export function OverviewView({ model, selectedRepoId, showCursor, bodyRows }) {
+export function OverviewView({ model, selectedRepoId, showCursor, bodyRows, topMarginRows = 1, }) {
     const { stdout } = useStdout();
     const width = Math.max(40, stdout?.columns ?? 80);
     const total = model.repos.length;
     const selectedIndex = Math.max(0, model.repos.findIndex((repo) => repo.repoId === selectedRepoId));
-    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 { start, end, showAbove, showBelow } = pickVisibleParts(total, selectedIndex, bodyRows);
     const visible = model.repos.slice(start, end);
     const above = start;
     const below = total - end;
     if (total === 0 || bodyRows <= 0) {
-        return _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: " " }) });
+        return _jsx(Box, { marginTop: topMarginRows, children: _jsx(Text, { dimColor: true, children: " " }) });
     }
     const children = [];
-    if (needTop) {
+    if (showAbove) {
         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) {
+    if (showBelow) {
         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)) }));
+    return (_jsx(Box, { flexDirection: "column", marginTop: topMarginRows, children: children }));
 }

package/dist/watch/ProjectDetailView.d.ts

@@ -3,6 +3,7 @@ interface ProjectDetailViewProps {
     model: DashboardModel;
     selectedRepoId: string | null;
     bodyRows: number;
+    topMarginRows?: number | undefined;
     scrollOffset: number;
 }
 type ContentLine = {
@@ -16,5 +17,5 @@ type ContentLine = {
 };
 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 declare function ProjectDetailView({ model, selectedRepoId, bodyRows, topMarginRows, scrollOffset }: ProjectDetailViewProps): React.JSX.Element;
 export {};

package/dist/watch/ProjectDetailView.js

@@ -58,14 +58,14 @@ export function clampScrollOffset(requested, totalLines, scrollArea) {
     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 }) {
+export function ProjectDetailView({ model, selectedRepoId, bodyRows, topMarginRows = 1, scrollOffset, }) {
     const { stdout } = useStdout();
     const width = Math.max(40, stdout?.columns ?? 80);
     const repo = selectedRepoId
         ? model.repos.find((candidate) => candidate.repoId === selectedRepoId) ?? model.repos[0] ?? null
         : model.repos[0] ?? null;
     if (!repo) {
-        return _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: " " }) });
+        return _jsx(Box, { marginTop: topMarginRows, children: _jsx(Text, { dimColor: true, children: " " }) });
     }
     const repoHeaderRows = 1;
     const separatorRows = bodyRows >= 3 ? 1 : 0;
@@ -94,5 +94,5 @@ export function ProjectDetailView({ model, selectedRepoId, bodyRows, scrollOffse
         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 }), separatorRows > 0 ? _jsx(Box, { children: _jsx(Text, { children: " " }) }) : null, children] }));
+    return (_jsxs(Box, { flexDirection: "column", marginTop: topMarginRows, children: [_jsx(RepoRow, { repo: repo, selected: false, showCursor: false, width: width - 2 }), separatorRows > 0 ? _jsx(Box, { children: _jsx(Text, { children: " " }) }) : null, children] }));
 }

package/dist/watch/compact-layout.d.ts

@@ -0,0 +1,32 @@
+import type { DashboardModel, DashboardRepo, DashboardToken } from "./dashboard-model.ts";
+export declare function computeDashboardLayout(totalRows: number, hasFlashMessage: boolean): {
+    bodyRows: number;
+    bodyTopMarginRows: number;
+    showFlashMessage: boolean;
+    showHelp: boolean;
+};
+export declare function pickVisibleWindow(total: number, selectedIndex: number, availableRows: number): {
+    start: number;
+    end: number;
+};
+export declare function pickVisibleParts(total: number, selectedIndex: number, rowBudget: number): {
+    start: number;
+    end: number;
+    showAbove: boolean;
+    showBelow: boolean;
+};
+export declare function formatRepoTokensText(tokens: DashboardToken[], width: number): string | null;
+export declare function formatRepoRowText({ repo, selected, showCursor, width }: {
+    repo: DashboardRepo;
+    selected: boolean;
+    showCursor: boolean;
+    width: number;
+}): string;
+export declare function renderOverviewLines({ model, selectedRepoId, showCursor, bodyRows, topMarginRows, width }: {
+    model: DashboardModel;
+    selectedRepoId: string | null;
+    showCursor: boolean;
+    bodyRows: number;
+    topMarginRows?: number | undefined;
+    width: number;
+}): string[];

package/dist/watch/compact-layout.js

@@ -0,0 +1,111 @@
+import { formatRepoTokenText } from "./format.js";
+export function computeDashboardLayout(totalRows, hasFlashMessage) {
+    const rows = Math.max(1, totalRows);
+    const bodyTopMarginRows = rows >= 5 ? 1 : 0;
+    const showFlashMessage = hasFlashMessage && rows >= 6;
+    const showHelp = rows >= 8;
+    const chromeRows = 1
+        + bodyTopMarginRows
+        + (showFlashMessage ? 2 : 0)
+        + (showHelp ? 2 : 0);
+    return {
+        bodyRows: Math.max(1, rows - chromeRows),
+        bodyTopMarginRows,
+        showFlashMessage,
+        showHelp,
+    };
+}
+export function pickVisibleWindow(total, selectedIndex, availableRows) {
+    if (total === 0)
+        return { start: 0, end: 0 };
+    if (total <= availableRows)
+        return { start: 0, end: total };
+    const clamped = Math.max(0, Math.min(selectedIndex, total - 1));
+    let start = clamped;
+    let end = clamped + 1;
+    while (end - start < availableRows) {
+        if (start > 0 && (end === total || clamped - start <= end - 1 - clamped)) {
+            start -= 1;
+        }
+        else if (end < total) {
+            end += 1;
+        }
+        else {
+            break;
+        }
+    }
+    return { start, end };
+}
+export function pickVisibleParts(total, selectedIndex, rowBudget) {
+    if (total === 0 || rowBudget <= 0) {
+        return { start: 0, end: 0, showAbove: false, showBelow: false };
+    }
+    let { start, end } = pickVisibleWindow(total, selectedIndex, Math.max(1, rowBudget));
+    let hiddenAbove = start > 0;
+    let hiddenBelow = end < total;
+    if (rowBudget >= 3 && (hiddenAbove || hiddenBelow)) {
+        const indicatorRows = (hiddenAbove ? 1 : 0) + (hiddenBelow ? 1 : 0);
+        ({ start, end } = pickVisibleWindow(total, selectedIndex, Math.max(1, rowBudget - indicatorRows)));
+        hiddenAbove = start > 0;
+        hiddenBelow = end < total;
+    }
+    const usedRows = end - start;
+    let remaining = Math.max(0, rowBudget - usedRows);
+    const showAbove = hiddenAbove && remaining > 0;
+    if (showAbove)
+        remaining -= 1;
+    const showBelow = hiddenBelow && remaining > 0;
+    return { start, end, showAbove, showBelow };
+}
+export function formatRepoTokensText(tokens, width) {
+    if (tokens.length === 0 || width < 6)
+        return null;
+    const parts = [];
+    let used = 0;
+    for (const token of tokens) {
+        const text = formatRepoTokenText(token);
+        const separatorWidth = parts.length === 0 ? 0 : 2;
+        if (used + separatorWidth + text.length > width)
+            break;
+        used += separatorWidth + text.length;
+        parts.push(text);
+    }
+    return parts.join("  ");
+}
+export function formatRepoRowText({ repo, selected, showCursor, width, }) {
+    const cursorChar = showCursor && selected ? ">" : " ";
+    const repoLabelWidth = Math.min(28, Math.max(12, Math.floor(width * 0.35)));
+    const tokenWidth = Math.max(6, width - repoLabelWidth - 3);
+    const repoLabel = repo.repoFullName.length > repoLabelWidth
+        ? repo.repoFullName.slice(0, repoLabelWidth)
+        : repo.repoFullName.padEnd(repoLabelWidth, " ");
+    return `${cursorChar} ${repoLabel}  ${repo.offlineMessage ?? formatRepoTokensText(repo.tokens, tokenWidth) ?? ""}`;
+}
+export function renderOverviewLines({ model, selectedRepoId, showCursor, bodyRows, topMarginRows = 1, width, }) {
+    const total = model.repos.length;
+    const selectedIndex = Math.max(0, model.repos.findIndex((repo) => repo.repoId === selectedRepoId));
+    const lines = Array.from({ length: topMarginRows }, () => "");
+    if (total === 0 || bodyRows <= 0) {
+        lines.push(" ");
+        return lines;
+    }
+    const { start, end, showAbove, showBelow } = pickVisibleParts(total, selectedIndex, bodyRows);
+    const visible = model.repos.slice(start, end);
+    const above = start;
+    const below = total - end;
+    if (showAbove) {
+        lines.push(`  \u2191${above} more above`);
+    }
+    for (const repo of visible) {
+        lines.push(formatRepoRowText({
+            repo,
+            selected: repo.repoId === selectedRepoId,
+            showCursor,
+            width: width - 2,
+        }));
+    }
+    if (showBelow) {
+        lines.push(`  \u2193${below} more below`);
+    }
+    return lines;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-steward",
-  "version": "0.22.2",
+  "version": "0.22.4",
   "description": "Serial merge queue for GitHub — rebase, CI-gate, and merge PRs one at a time",
   "type": "module",
   "repository": {
@@ -34,16 +34,6 @@
   "bin": {
     "merge-steward": "dist/index.js"
   },
-  "scripts": {
-    "dev": "node --watch --experimental-transform-types src/index.ts",
-    "prepack": "pnpm build",
-    "build": "rm -rf dist && tsgo -p tsconfig.json && chmod +x dist/index.js",
-    "start": "node dist/index.js serve",
-    "typecheck": "tsgo -p tsconfig.json --noEmit",
-    "test": "node --experimental-transform-types --test 'test/**/*.test.ts'",
-    "test:scenarios": "node --experimental-transform-types --test 'test/scenarios/*.test.ts'",
-    "test:property": "node --experimental-transform-types --test 'test/property/*.test.ts'"
-  },
   "dependencies": {
     "fastify": "^5.8.5",
     "fastify-raw-body": "^5.0.0",
@@ -59,5 +49,14 @@
     "fast-check": "^4.7.0",
     "isomorphic-git": "^1.37.6",
     "memfs": "^4.57.2"
+  },
+  "scripts": {
+    "dev": "node --watch --experimental-transform-types src/index.ts",
+    "build": "rm -rf dist && tsgo -p tsconfig.json && chmod +x dist/index.js",
+    "start": "node dist/index.js serve",
+    "typecheck": "tsgo -p tsconfig.json --noEmit",
+    "test": "node --experimental-transform-types --test 'test/**/*.test.ts'",
+    "test:scenarios": "node --experimental-transform-types --test 'test/scenarios/*.test.ts'",
+    "test:property": "node --experimental-transform-types --test 'test/property/*.test.ts'"
   }
-}
+}