merge-steward 0.16.2 → 0.16.3

package/dist/watch/OverviewView.d.ts

@@ -10,5 +10,9 @@ 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 }: ListViewProps): React.JSX.Element;
 export {};

package/dist/watch/OverviewView.js

@@ -24,25 +24,42 @@ export function RepoRow({ repo, selected, showCursor, width, }) {
         : 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 };
+}
 export function OverviewView({ model, selectedRepoId, showCursor }) {
     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 selectedIndex = model.repos.findIndex((repo) => repo.repoId === selectedRepoId);
-    const selected = selectedIndex >= 0 ? model.repos[selectedIndex] : model.repos[0];
-    const others = model.repos.filter((repo) => repo !== selected);
-    const ordered = [];
-    if (selected)
-        ordered.push(selected);
-    ordered.push(...others);
-    const quietLine = model.quietCount > 0 ? 1 : 0;
-    const maxRepoLines = Math.max(1, availableRows - quietLine);
-    const visible = ordered.slice(0, maxRepoLines);
-    const hiddenActive = ordered.length - visible.length;
-    const quietFooter = model.quietCount + hiddenActive;
+    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);
+    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) {
         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 === selected, showCursor: showCursor, width: width - 2 }, repo.repoId))), quietFooter > 0 ? (_jsx(Box, { paddingLeft: 2, children: _jsx(Text, { dimColor: true, children: `+${quietFooter} quiet` }) })) : null] }));
+    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] }));
 }

package/dist/watch/dashboard-model.js

@@ -197,22 +197,25 @@ export function buildDashboard(repos, opts = {}) {
             offlineMessage: null,
         };
     });
-    const active = mapped.filter((repo) => repo.hasActivity || repo.offlineMessage);
-    active.sort((left, right) => {
+    mapped.sort((left, right) => {
         if (left.offlineMessage !== null && right.offlineMessage === null)
             return 1;
         if (right.offlineMessage !== null && left.offlineMessage === null)
             return -1;
-        const leftHasActive = left.entries.some((entry) => entry.kind === "running" || entry.kind === "queued");
-        const rightHasActive = right.entries.some((entry) => entry.kind === "running" || entry.kind === "queued");
-        if (leftHasActive !== rightHasActive)
-            return leftHasActive ? -1 : 1;
+        const leftVisible = left.hasActivity || left.offlineMessage !== null;
+        const rightVisible = right.hasActivity || right.offlineMessage !== null;
+        if (leftVisible !== rightVisible)
+            return leftVisible ? -1 : 1;
+        const leftActive = left.entries.some((entry) => entry.kind === "running" || entry.kind === "queued");
+        const rightActive = right.entries.some((entry) => entry.kind === "running" || entry.kind === "queued");
+        if (leftActive !== rightActive)
+            return leftActive ? -1 : 1;
         if (left.latestActivityAt !== right.latestActivityAt)
             return right.latestActivityAt - left.latestActivityAt;
         return left.repoFullName.localeCompare(right.repoFullName);
     });
-    const quietCount = mapped.length - active.length;
-    return { repos: active, quietCount };
+    const quietCount = mapped.filter((repo) => !repo.hasActivity && repo.offlineMessage === null).length;
+    return { repos: mapped, quietCount };
 }
 export function clipSummary(summary, opts = {}) {
     if (!summary)

package/package.json

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