santree 0.5.0 → 0.5.1

package/dist/commands/dashboard.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useReducer, useCallback, useRef, useState } from "react";
 import { Text, Box, useInput, useStdout, useApp } from "ink";
 import Spinner from "ink-spinner";
@@ -28,7 +28,7 @@ import ReviewList from "../lib/dashboard/ReviewList.js";
 import ReviewDetailPanel, { buildReviewActions } from "../lib/dashboard/ReviewDetailPanel.js";
 import { CommitOverlay, PrCreateOverlay } from "../lib/dashboard/Overlays.js";
 import { MultilineTextArea } from "../lib/dashboard/MultilineTextArea.js";
-import DiffOverlay, { flattenTreeFiles, computeDiffLayout } from "../lib/dashboard/DiffOverlay.js";
+import DiffOverlay, { flattenTreeFiles, computeDiffLayout, clampDiffLeftWidth, DIFF_DIVIDER_WIDTH, } from "../lib/dashboard/DiffOverlay.js";
 import { CURRENT_VERSION, CLAUDE_CODE_PACKAGE, getLatestVersion, getCachedLatestVersion, getLatestVersionFor, getCachedLatestVersionFor, isUpdateAvailable, } from "../lib/version.js";
 export const description = "Interactive dashboard of your Linear issues";
 const execAsync = promisify(exec);
@@ -193,11 +193,15 @@ function Tab({ active, label, mode }) {
  * Single-line global keymap shown at the bottom-left of the dashboard. The
  * `E workspace` hint only appears when the action is meaningful
  * (`SANTREE_EDITOR` is `code`/`cursor` and a `.code-workspace` file exists in
- * the repo root).
+ * the repo root). When the diff overlay is active, the keymap switches to
+ * diff-specific bindings since the global ones don't apply.
  */
-function CommandBar({ showWorkspace }) {
+function CommandBar({ showWorkspace, mode = "default", }) {
     const dot = _jsx(Text, { dimColor: true, children: "  ·  " });
     const Key = ({ k }) => (_jsx(Text, { color: "cyan", bold: true, children: k }));
+    if (mode === "diff") {
+        return (_jsxs(Text, { children: [_jsx(Key, { k: "j/k" }), _jsx(Text, { dimColor: true, children: " file" }), dot, _jsx(Key, { k: "\u21E7\u2191\u2193" }), _jsx(Text, { dimColor: true, children: " scroll" }), dot, _jsx(Key, { k: "g/G" }), _jsx(Text, { dimColor: true, children: " top/bot" }), dot, _jsx(Key, { k: "q" }), _jsx(Text, { dimColor: true, children: " close" })] }));
+    }
     return (_jsxs(Text, { children: [_jsx(Key, { k: "j/k" }), _jsx(Text, { dimColor: true, children: " nav" }), dot, _jsx(Key, { k: "\u21E7\u2191\u2193" }), _jsx(Text, { dimColor: true, children: " scroll" }), dot, _jsx(Key, { k: "1/2" }), _jsx(Text, { dimColor: true, children: " tabs" }), showWorkspace ? (_jsxs(_Fragment, { children: [dot, _jsx(Key, { k: "E" }), _jsx(Text, { dimColor: true, children: " workspace" })] })) : null, dot, _jsx(Key, { k: "R" }), _jsx(Text, { dimColor: true, children: " refresh" }), dot, _jsx(Key, { k: "q" }), _jsx(Text, { dimColor: true, children: " quit" })] }));
 }
 // ── Component ─────────────────────────────────────────────────────────
@@ -218,7 +222,7 @@ export default function Dashboard() {
     const repoRootRef = useRef(null);
     const stateRef = useRef(state);
     stateRef.current = state;
-    const draggingRef = useRef(false);
+    const draggingRef = useRef(null);
     const [termSize, setTermSize] = useState({
         columns: stdout?.columns ?? 80,
         rows: stdout?.rows ?? 24,
@@ -264,6 +268,13 @@ export default function Dashboard() {
     const leftWidthRef = useRef(leftWidth);
     leftWidthRef.current = leftWidth;
     const rightWidth = innerWidth - leftWidth - separatorWidth;
+    // Diff overlay's left pane width — null means "use the default formula"
+    // (computed inside computeDiffLayout). Becomes a number once the user drags
+    // the divider, and persists across overlay open/close while the dashboard
+    // session is alive.
+    const [diffLeftWidth, setDiffLeftWidth] = useState(null);
+    const diffLeftWidthRef = useRef(diffLeftWidth);
+    diffLeftWidthRef.current = diffLeftWidth;
     // Header (1) + tab strip (1) + 2 borders + command bar (1, inside box) = 5 rows
     const contentHeight = Math.max(3, rows - 5);
     const LIST_FOOTER_HEIGHT = 0;
@@ -333,11 +344,20 @@ export default function Dashboard() {
             const sepW = 3;
             // Release — stop dragging
             if (isRelease && draggingRef.current) {
-                draggingRef.current = false;
+                draggingRef.current = null;
                 return;
             }
             // Drag — resize if actively dragging
             if (isDrag && draggingRef.current) {
+                if (draggingRef.current === "diff") {
+                    // DiffOverlay starts at abs col 2 with width=innerWidth; its
+                    // 1-col divider sits at relative col (leftWidth+1) → abs col
+                    // (leftWidth+2). Setting newLeft = col - 2 keeps it under the
+                    // cursor; clampDiffLeftWidth enforces pane minimums.
+                    const innerW = Math.max(40, cols - 2);
+                    setDiffLeftWidth(clampDiffLeftWidth(col - 2, innerW));
+                    return;
+                }
                 // col is 1-based; outer border consumes col 1, so left pane spans cols 2..(lw+1).
                 // Setting newLeft = col - 1 keeps the divider at the user's cursor.
                 const newLeft = Math.max(minW, Math.min(col - 1, cols - 2 - sepW - minW));
@@ -361,12 +381,15 @@ export default function Dashboard() {
                         files: s.diffFiles,
                         fileIndex: s.diffFileIndex,
                         fileScrollOffset: s.diffFileScrollOffset,
+                        leftWidthOverride: diffLeftWidthRef.current ?? undefined,
                     });
                     // Body's first line is at absolute row 6 (title + tab + top border + overlay title + rule)
                     const bodyRow = row - 6;
                     if (bodyRow < 0 || bodyRow >= layout.bodyHeight)
                         return;
-                    if (col <= layout.leftWidth) {
+                    // DiffOverlay starts at abs col 2; left pane occupies abs cols
+                    // 2..(leftWidth+1).
+                    if (col <= layout.leftWidth + 1) {
                         const maxIdx = s.diffFiles.length - 1;
                         if (maxIdx < 0)
                             return;
@@ -414,7 +437,7 @@ export default function Dashboard() {
             }
             if (!isPress)
                 return;
-            // Diff overlay click: select file row in left pane
+            // Diff overlay click: drag divider, or select file row in left pane
             {
                 const s = stateRef.current;
                 if (s.overlay === "diff") {
@@ -427,8 +450,17 @@ export default function Dashboard() {
                         files: s.diffFiles,
                         fileIndex: s.diffFileIndex,
                         fileScrollOffset: s.diffFileScrollOffset,
+                        leftWidthOverride: diffLeftWidthRef.current ?? undefined,
                     });
-                    if (col > layout.leftWidth)
+                    // Divider sits at abs col leftWidth+2 (DiffOverlay starts at
+                    // abs col 2; divider at relative col leftWidth+1). Allow ±1
+                    // tolerance — a 1-col target is hard to hit precisely.
+                    const diffDivAbsCol = layout.leftWidth + 2;
+                    if (col >= diffDivAbsCol - 1 && col <= diffDivAbsCol - 1 + DIFF_DIVIDER_WIDTH + 1) {
+                        draggingRef.current = "diff";
+                        return;
+                    }
+                    if (col > layout.leftWidth + 1)
                         return;
                     const bodyRow = row - 6;
                     if (bodyRow < 0 || bodyRow >= layout.bodyHeight)
@@ -447,7 +479,7 @@ export default function Dashboard() {
             const divStart = lw + 2;
             const divEnd = lw + 1 + sepW;
             if (col >= divStart && col <= divEnd) {
-                draggingRef.current = true;
+                draggingRef.current = "main";
                 return;
             }
             // Left-click press: select item in left pane (cols 2..lw+1)
@@ -1292,6 +1324,7 @@ export default function Dashboard() {
                 files: state.diffFiles,
                 fileIndex: state.diffFileIndex,
                 fileScrollOffset: state.diffFileScrollOffset,
+                leftWidthOverride: diffLeftWidth ?? undefined,
             });
             const totalLines = state.diffContent ? state.diffContent.split("\n").length : 0;
             const maxScroll = Math.max(0, totalLines - layout.bodyHeight);
@@ -1851,17 +1884,22 @@ export default function Dashboard() {
                                     const defaultBranch = getDefaultBranch();
                                     const label = branch === defaultBranch ? `${branch} (default)` : branch;
                                     return (_jsx(Text, { children: _jsxs(Text, { color: selected ? "cyan" : undefined, bold: selected, children: [selected ? "> " : "  ", label] }) }, branch));
-                                }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "j/k to navigate, Enter to select, ESC to cancel" })] }) })) : state.overlay === "confirm-delete" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "red", paddingX: 3, paddingY: 1, children: [_jsx(Text, { bold: true, color: "red", children: "Remove worktree?" }), _jsx(Text, { children: " " }), _jsx(Text, { children: selectedIssue?.worktree?.branch ?? "" }), selectedIssue?.worktree?.dirty && (_jsx(Text, { color: "yellow", children: "Warning: worktree has uncommitted changes" })), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "red", bold: true, children: "y" }), "  Confirm"] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: "n" }), "  Cancel"] })] }) })) : state.overlay === "diff" ? (_jsx(DiffOverlay, { width: innerWidth, height: contentHeight, ticketId: state.diffTicketId ?? "", baseBranch: state.diffBaseBranch ?? "", files: state.diffFiles, fileIndex: state.diffFileIndex, fileScrollOffset: state.diffFileScrollOffset, content: state.diffContent, contentScrollOffset: state.diffContentScrollOffset, loadingFiles: state.diffLoadingFiles, loadingContent: state.diffLoadingContent, error: state.diffError, selectionBg: theme.selectionBg })) : state.overlay === "confirm-setup" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 3, paddingY: 1, children: [_jsx(Text, { bold: true, children: "Run setup script?" }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: ".santree/init.sh" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "green", bold: true, children: "y" }), "  Run setup"] }), _jsxs(Text, { children: [_jsx(Text, { color: "yellow", bold: true, children: "n" }), "  Skip"] })] }) })) : (_jsxs(Box, { flexGrow: 1, children: [_jsx(Box, { width: leftWidth, children: state.activeTab === "reviews" ? (_jsx(ReviewList, { flatReviews: state.flatReviews, selectedIndex: state.reviewSelectedIndex, scrollOffset: state.reviewListScrollOffset, height: contentHeight, width: leftWidth, selectionBg: theme.selectionBg })) : state.flatIssues.length === 0 ? (_jsx(Box, { width: leftWidth, height: contentHeight, justifyContent: "center", alignItems: "center", children: _jsx(Text, { color: "yellow", children: "No active issues" }) })) : (_jsx(IssueList, { groups: state.groups, flatIssues: state.flatIssues, selectedIndex: state.selectedIndex, scrollOffset: state.listScrollOffset, height: contentHeight, width: leftWidth, selectionBg: theme.selectionBg })) }), _jsx(Box, { flexDirection: "column", width: 3, children: Array.from({ length: contentHeight }).map((_, i) => (_jsx(Text, { dimColor: true, children: " │ " }, i))) }), _jsx(Box, { width: rightWidth, children: state.activeTab === "reviews" && state.creatingForTicket ? (_jsxs(Box, { flexDirection: "column", width: rightWidth, height: contentHeight, children: [_jsxs(Text, { color: "yellow", bold: true, children: ["Setting up worktree for ", state.creatingForTicket, "..."] }), state.creationLogs
+                                }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "j/k to navigate, Enter to select, ESC to cancel" })] }) })) : state.overlay === "confirm-delete" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "red", paddingX: 3, paddingY: 1, children: [_jsx(Text, { bold: true, color: "red", children: "Remove worktree?" }), _jsx(Text, { children: " " }), _jsx(Text, { children: selectedIssue?.worktree?.branch ?? "" }), selectedIssue?.worktree?.dirty && (_jsx(Text, { color: "yellow", children: "Warning: worktree has uncommitted changes" })), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "red", bold: true, children: "y" }), "  Confirm"] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: "n" }), "  Cancel"] })] }) })) : state.overlay === "diff" ? (_jsx(DiffOverlay, { width: innerWidth, height: contentHeight, ticketId: state.diffTicketId ?? "", baseBranch: state.diffBaseBranch ?? "", files: state.diffFiles, fileIndex: state.diffFileIndex, fileScrollOffset: state.diffFileScrollOffset, content: state.diffContent, contentScrollOffset: state.diffContentScrollOffset, loadingFiles: state.diffLoadingFiles, loadingContent: state.diffLoadingContent, error: state.diffError, selectionBg: theme.selectionBg, leftWidthOverride: diffLeftWidth ?? undefined })) : state.overlay === "confirm-setup" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 3, paddingY: 1, children: [_jsx(Text, { bold: true, children: "Run setup script?" }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: ".santree/init.sh" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "green", bold: true, children: "y" }), "  Run setup"] }), _jsxs(Text, { children: [_jsx(Text, { color: "yellow", bold: true, children: "n" }), "  Skip"] })] }) })) : (_jsxs(Box, { flexGrow: 1, children: [_jsx(Box, { width: leftWidth, children: state.activeTab === "reviews" ? (_jsx(ReviewList, { flatReviews: state.flatReviews, selectedIndex: state.reviewSelectedIndex, scrollOffset: state.reviewListScrollOffset, height: contentHeight, width: leftWidth, selectionBg: theme.selectionBg })) : state.flatIssues.length === 0 ? (_jsx(Box, { width: leftWidth, height: contentHeight, justifyContent: "center", alignItems: "center", children: _jsx(Text, { color: "yellow", children: "No active issues" }) })) : (_jsx(IssueList, { groups: state.groups, flatIssues: state.flatIssues, selectedIndex: state.selectedIndex, scrollOffset: state.listScrollOffset, height: contentHeight, width: leftWidth, selectionBg: theme.selectionBg })) }), _jsx(Box, { flexDirection: "column", width: 3, children: Array.from({ length: contentHeight }).map((_, i) => (_jsx(Text, { dimColor: true, children: " │ " }, i))) }), _jsx(Box, { width: rightWidth, children: state.activeTab === "reviews" && state.creatingForTicket ? (_jsxs(Box, { flexDirection: "column", width: rightWidth, height: contentHeight, children: [_jsxs(Text, { color: "yellow", bold: true, children: ["Setting up worktree for ", state.creatingForTicket, "..."] }), state.creationLogs
                                             .split("\n")
                                             .slice(-(contentHeight - 1))
-                                            .map((line, i) => (_jsx(Box, { children: _jsx(Text, { dimColor: true, children: line }) }, i)))] })) : state.activeTab === "reviews" ? (_jsx(ReviewDetailPanel, { item: selectedReview, scrollOffset: state.reviewDetailScrollOffset, height: contentHeight, width: rightWidth })) : state.overlay === "commit" ? (_jsx(CommitOverlay, { width: rightWidth, height: contentHeight, branch: state.commitBranch, ticketId: state.commitTicketId, gitStatus: state.commitGitStatus, phase: state.commitPhase, message: state.commitMessage, error: state.commitError, dispatch: dispatch, onSubmit: handleCommitSubmit })) : state.overlay === "pr-create" ? (_jsx(PrCreateOverlay, { width: rightWidth, height: contentHeight, branch: state.prCreateBranch, ticketId: state.prCreateTicketId, phase: state.prCreatePhase, error: state.prCreateError, url: state.prCreateUrl, body: state.prCreateBody, title: state.prCreateTitle, dispatch: dispatch })) : (_jsx(DetailPanel, { issue: selectedIssue, scrollOffset: state.detailScrollOffset, height: contentHeight, width: rightWidth, creatingForTicket: state.creatingForTicket, creationLogs: state.creationLogs })) })] })), _jsxs(Box, { children: [_jsx(Box, { width: leftWidth + separatorWidth, paddingX: 1, children: _jsx(CommandBar, { showWorkspace: hasWorkspaceFile }) }), _jsx(Box, { width: rightWidth, children: _jsx(ActionRow, { activeTab: state.activeTab, selectedIssue: selectedIssue, selectedReview: selectedReview }) })] })] })] }));
+                                            .map((line, i) => (_jsx(Box, { children: _jsx(Text, { dimColor: true, children: line }) }, i)))] })) : state.activeTab === "reviews" ? (_jsx(ReviewDetailPanel, { item: selectedReview, scrollOffset: state.reviewDetailScrollOffset, height: contentHeight, width: rightWidth })) : state.overlay === "commit" ? (_jsx(CommitOverlay, { width: rightWidth, height: contentHeight, branch: state.commitBranch, ticketId: state.commitTicketId, gitStatus: state.commitGitStatus, phase: state.commitPhase, message: state.commitMessage, error: state.commitError, dispatch: dispatch, onSubmit: handleCommitSubmit })) : state.overlay === "pr-create" ? (_jsx(PrCreateOverlay, { width: rightWidth, height: contentHeight, branch: state.prCreateBranch, ticketId: state.prCreateTicketId, phase: state.prCreatePhase, error: state.prCreateError, url: state.prCreateUrl, body: state.prCreateBody, title: state.prCreateTitle, dispatch: dispatch })) : (_jsx(DetailPanel, { issue: selectedIssue, scrollOffset: state.detailScrollOffset, height: contentHeight, width: rightWidth, creatingForTicket: state.creatingForTicket, creationLogs: state.creationLogs })) })] })), _jsxs(Box, { children: [_jsx(Box, { width: leftWidth + separatorWidth, paddingX: 1, children: _jsx(CommandBar, { showWorkspace: hasWorkspaceFile, mode: state.overlay === "diff" ? "diff" : "default" }) }), _jsx(Box, { width: rightWidth, children: _jsx(ActionRow, { activeTab: state.activeTab, selectedIssue: selectedIssue, selectedReview: selectedReview, overlay: state.overlay }) })] })] })] }));
 }
 /**
  * Renders the per-issue action key hints (Resume / Editor / View diff / …)
  * lifted out of the detail panels so they sit on the same row as the global
  * command bar. Empty when nothing is selected.
  */
-function ActionRow({ activeTab, selectedIssue, selectedReview, }) {
+function ActionRow({ activeTab, selectedIssue, selectedReview, overlay, }) {
+    // During the diff overlay, none of the per-issue actions apply (View diff
+    // is what got us here, Commit/PR/etc. need the detail panel context). Keep
+    // the row blank so the diff-specific CommandBar reads cleanly.
+    if (overlay === "diff")
+        return _jsx(Text, { children: " " });
     const items = activeTab === "reviews"
         ? selectedReview
             ? buildReviewActions(selectedReview)

package/dist/lib/dashboard/DiffOverlay.d.ts

@@ -14,6 +14,11 @@ interface Props {
     error: string | null;
     /** Theme-adapted selection background. Falls back to dark navy. */
     selectionBg?: string;
+    /**
+     * User-set left pane width (from divider drag). Falls back to the default
+     * formula when undefined. Always clamped against pane minimums.
+     */
+    leftWidthOverride?: number;
 }
 interface RenderedRow {
     prefix: string;
@@ -39,12 +44,18 @@ export interface DiffLayout {
  * Shared between DiffOverlay (rendering) and the dashboard mouse handler
  * (mapping click coords back to file indices).
  */
+export declare const DIFF_LEFT_MIN = 20;
+export declare const DIFF_RIGHT_MIN = 20;
+export declare const DIFF_DIVIDER_WIDTH = 1;
+export declare function defaultDiffLeftWidth(width: number): number;
+export declare function clampDiffLeftWidth(leftWidth: number, width: number): number;
 export declare function computeDiffLayout(opts: {
     width: number;
     height: number;
     files: DiffFile[];
     fileIndex: number;
     fileScrollOffset: number;
+    leftWidthOverride?: number;
 }): DiffLayout;
-export default function DiffOverlay({ width, height, ticketId, baseBranch, files, fileIndex, fileScrollOffset, content, contentScrollOffset, loadingFiles, loadingContent, error, selectionBg, }: Props): import("react/jsx-runtime").JSX.Element;
+export default function DiffOverlay({ width, height, ticketId, baseBranch, files, fileIndex, fileScrollOffset, content, contentScrollOffset, loadingFiles, loadingContent, error, selectionBg, leftWidthOverride, }: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/lib/dashboard/DiffOverlay.js

@@ -112,12 +112,24 @@ export function flattenTreeFiles(files) {
  * Shared between DiffOverlay (rendering) and the dashboard mouse handler
  * (mapping click coords back to file indices).
  */
+export const DIFF_LEFT_MIN = 20;
+export const DIFF_RIGHT_MIN = 20;
+export const DIFF_DIVIDER_WIDTH = 1;
+export function defaultDiffLeftWidth(width) {
+    return Math.min(48, Math.max(24, Math.floor(width * 0.32)));
+}
+export function clampDiffLeftWidth(leftWidth, width) {
+    const max = Math.max(DIFF_LEFT_MIN, width - DIFF_DIVIDER_WIDTH - DIFF_RIGHT_MIN);
+    return Math.max(DIFF_LEFT_MIN, Math.min(leftWidth, max));
+}
 export function computeDiffLayout(opts) {
     const headerHeight = 2;
-    const footerHeight = 1;
-    const bodyHeight = Math.max(3, opts.height - headerHeight - footerHeight);
-    const leftWidth = Math.min(48, Math.max(24, Math.floor(opts.width * 0.32)));
-    const rightWidth = Math.max(20, opts.width - leftWidth - 1);
+    // Keymap footer lives in the dashboard's global CommandBar — don't reserve
+    // a row here or we'd render two stacked keymap rows.
+    const bodyHeight = Math.max(3, opts.height - headerHeight);
+    const requestedLeft = opts.leftWidthOverride ?? defaultDiffLeftWidth(opts.width);
+    const leftWidth = clampDiffLeftWidth(requestedLeft, opts.width);
+    const rightWidth = Math.max(DIFF_RIGHT_MIN, opts.width - leftWidth - DIFF_DIVIDER_WIDTH);
     const rows = [];
     const tree = buildTree(opts.files);
     renderTree(tree, 0, rows, { value: 0 });
@@ -194,8 +206,15 @@ function truncateVisible(s, max) {
     return out + "…";
 }
 // ── Component ─────────────────────────────────────────────────────────
-export default function DiffOverlay({ width, height, ticketId, baseBranch, files, fileIndex, fileScrollOffset, content, contentScrollOffset, loadingFiles, loadingContent, error, selectionBg = "#1e3a5f", }) {
-    const layout = computeDiffLayout({ width, height, files, fileIndex, fileScrollOffset });
+export default function DiffOverlay({ width, height, ticketId, baseBranch, files, fileIndex, fileScrollOffset, content, contentScrollOffset, loadingFiles, loadingContent, error, selectionBg = "#1e3a5f", leftWidthOverride, }) {
+    const layout = computeDiffLayout({
+        width,
+        height,
+        files,
+        fileIndex,
+        fileScrollOffset,
+        leftWidthOverride,
+    });
     const { bodyHeight, leftWidth, rightWidth, rows, effectiveScroll, selectedRowIdx } = layout;
     const visibleRows = rows.slice(effectiveScroll, effectiveScroll + bodyHeight);
     // Right pane: split content into lines and slice for scroll. If the content
@@ -239,5 +258,5 @@ export default function DiffOverlay({ width, height, ticketId, baseBranch, files
                             // so usable column count is rightWidth - 1.
                             const cell = truncateVisible(line.text || " ", Math.max(1, rightWidth - 1));
                             return (_jsx(Text, { color: line.color, bold: line.bold, dimColor: line.dim, children: cell }, i));
-                        })) })] }), _jsx(Box, { flexShrink: 0, width: width, children: _jsx(Text, { dimColor: true, wrap: "truncate", children: "j/k file \u2022 J/K scroll \u2022 g/G top/bot \u2022 click select \u2022 wheel scroll \u2022 q close" }) })] }));
+                        })) })] })] }));
 }

package/dist/lib/dashboard/ReviewList.js

@@ -9,20 +9,20 @@ function checksIndicator(checks) {
         return { text: "\u2713", color: "green" };
     return { text: "\u25cf", color: "yellow" };
 }
-const FOOTER_HEIGHT = 2;
 const HEADER_ROWS = 1;
 export function getReviewListRowCount(flatReviews) {
     return HEADER_ROWS + flatReviews.length;
 }
 export default function ReviewList({ flatReviews, selectedIndex, scrollOffset, height, width, selectionBg = "#1e3a5f", }) {
-    const listHeight = height - FOOTER_HEIGHT;
+    // Keymap footer lives in the dashboard's global CommandBar \u2014 use the full
+    // pane height for the list so we don't render two stacked keymap rows.
+    const listHeight = height;
     const numColWidth = 6;
     const authorColWidth = 12;
     const changesColWidth = 10;
     const checksColWidth = 2;
     const fixedWidth = 2 + numColWidth + 1 + authorColWidth + 1 + changesColWidth + 1 + checksColWidth;
     const titleMaxWidth = Math.max(width - fixedWidth, 10);
-    const footerRule = "\u2500".repeat(width);
     const totalRows = HEADER_ROWS + flatReviews.length;
     const visibleStart = scrollOffset;
     const visibleEnd = Math.min(visibleStart + listHeight, totalRows);
@@ -49,5 +49,5 @@ export default function ReviewList({ flatReviews, selectedIndex, scrollOffset, h
         const bg = selected ? selectionBg : undefined;
         rows.push(_jsxs(Box, { width: width, children: [_jsxs(Text, { backgroundColor: bg, bold: selected, children: [cursor, " "] }), _jsx(Text, { backgroundColor: bg, color: pr.isDraft ? "gray" : "green", children: num.padEnd(numColWidth) }), _jsx(Text, { backgroundColor: bg, children: " " }), _jsx(Text, { backgroundColor: bg, bold: selected, children: title.padEnd(titleMaxWidth) }), _jsx(Text, { backgroundColor: bg, dimColor: true, children: author.padStart(authorColWidth) }), _jsx(Text, { backgroundColor: bg, children: " " }), _jsxs(Text, { backgroundColor: bg, children: [_jsx(Text, { color: "green", children: `+${item.additions}` }), _jsx(Text, { dimColor: true, children: "/" }), _jsx(Text, { color: "red", children: `-${item.deletions}` }), "".padStart(Math.max(0, changesColWidth - changes.length))] }), _jsx(Text, { backgroundColor: bg, children: " " }), _jsx(Text, { backgroundColor: bg, color: selected ? (ci.color === "gray" ? "gray" : ci.color) : ci.color, children: ci.text.padStart(checksColWidth) })] }, `${pr.number}`));
     }
-    return (_jsxs(Box, { flexDirection: "column", width: width, height: height, children: [_jsx(Box, { flexDirection: "column", height: listHeight, children: rows }), _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: footerRule }), _jsxs(Text, { children: ["  ", _jsx(Text, { color: "cyan", bold: true, children: "j/k" }), _jsx(Text, { color: "white", children: " Navigate" }), "   ", _jsxs(Text, { color: "cyan", bold: true, children: ["Shift + ", "\u2191\u2193"] }), _jsx(Text, { color: "white", children: " Scroll detail" }), "   ", _jsx(Text, { color: "cyan", bold: true, children: "o" }), _jsx(Text, { color: "white", children: " Open PR" }), "   ", _jsx(Text, { color: "cyan", bold: true, children: "Tab" }), _jsx(Text, { color: "white", children: " Issues" }), "   ", _jsx(Text, { color: "cyan", bold: true, children: "q" }), _jsx(Text, { color: "white", children: " Quit" })] })] })] }));
+    return (_jsx(Box, { flexDirection: "column", width: width, height: height, children: _jsx(Box, { flexDirection: "column", height: listHeight, children: rows }) }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "santree",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"description": "Git worktree manager",
 	"license": "MIT",
 	"author": "Santiago Toscanini",