santree 0.5.6 → 0.6.1

package/dist/commands/dashboard.js

@@ -1,8 +1,7 @@
 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";
-import { exec, execSync, spawn } from "child_process";
+import { exec, spawn } from "child_process";
 import { promisify } from "util";
 import { createRequire } from "module";
 import * as fs from "fs";
@@ -11,13 +10,17 @@ const require = createRequire(import.meta.url);
 const { version } = require("../../package.json");
 import { findMainRepoRoot, createWorktree, getDefaultBranch, getBaseBranch, hasInitScript, getInitScriptPath, removeWorktree, getDiffTool, getWorktreeStatus, stageFile, unstageFile, stageAll, unstageAll, discardFile, } from "../lib/git.js";
 import { run, spawnAsync } from "../lib/exec.js";
-import { resolveAgentBinary } from "../lib/ai.js";
+import { resolveAgentBinary, fillCommitMessage } from "../lib/ai.js";
 import { getInstalledClaudeVersion } from "../lib/version.js";
-import { extractTicketId } from "../lib/git.js";
+import { extractTicketId, getStagedDiffContent } from "../lib/git.js";
 import { getMultiplexer } from "../lib/multiplexer/index.js";
+import { shellEscape } from "../lib/multiplexer/types.js";
+import SquirrelLoader from "../lib/squirrel-loader.js";
 import { getPRTemplate } from "../lib/github.js";
 import { renderPrompt, renderDiff, renderTicket } from "../lib/prompts.js";
 import { getIssueTracker } from "../lib/trackers/index.js";
+import { openUrl } from "../lib/open-url.js";
+import { parseUnifiedDiff } from "../lib/diff-parse.js";
 import * as os from "os";
 import { initialState, reducer } from "../lib/dashboard/types.js";
 import { loadDashboardData, loadReviewsData } from "../lib/dashboard/data.js";
@@ -26,7 +29,7 @@ import { detectTerminalTheme, getThemeForMode, } from "../lib/dashboard/theme.js
 import DetailPanel, { buildIssueActions } from "../lib/dashboard/DetailPanel.js";
 import ReviewList from "../lib/dashboard/ReviewList.js";
 import ReviewDetailPanel, { buildReviewActions } from "../lib/dashboard/ReviewDetailPanel.js";
-import { CommitOverlay, PrCreateOverlay } from "../lib/dashboard/Overlays.js";
+import { CommitOverlay, PrCreateOverlay, HelpOverlay } from "../lib/dashboard/Overlays.js";
 import { MultilineTextArea } from "../lib/dashboard/MultilineTextArea.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";
@@ -134,6 +137,45 @@ function runPipedDiff(cwd, gitArgs, tool, themeMode) {
         });
     });
 }
+/**
+ * Pipe an in-memory unified diff string through the configured pager. Used by
+ * the reviews-tab PR diff path, which already has per-file content from
+ * `gh pr diff` parsed into a map — no `git diff` to spawn here.
+ */
+function runPagerOnString(input, tool, themeMode) {
+    return new Promise((resolve, reject) => {
+        const pagerArgs = tool === "delta" ? [themeMode === "light" ? "--light" : "--dark"] : [];
+        const pagerEnv = tool === "delta"
+            ? {
+                ...process.env,
+                GIT_CONFIG_PARAMETERS: "'delta.hyperlinks=false' 'delta.line-numbers=false'",
+            }
+            : process.env;
+        const pager = spawn(tool, pagerArgs, {
+            stdio: ["pipe", "pipe", "pipe"],
+            env: pagerEnv,
+        });
+        let out = "";
+        let err = "";
+        pager.stdout.on("data", (d) => {
+            out += d.toString();
+        });
+        pager.stderr.on("data", (d) => {
+            err += d.toString();
+        });
+        pager.on("error", reject);
+        pager.on("close", (code) => {
+            if (code !== 0 && !out) {
+                reject(new Error(err || `${tool} exited with code ${code}`));
+            }
+            else {
+                resolve(splitCombinedSgr(out));
+            }
+        });
+        pager.stdin.write(input);
+        pager.stdin.end();
+    });
+}
 function parseNameStatus(raw) {
     const files = [];
     for (const line of raw.split("\n")) {
@@ -259,7 +301,7 @@ function CommandBar({ showWorkspace, mode = "default", }) {
     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: "\u2423" }), _jsx(Text, { dimColor: true, children: " stage" }), dot, _jsx(Key, { k: "a" }), _jsx(Text, { dimColor: true, children: " all" }), dot, _jsx(Key, { k: "d" }), _jsx(Text, { dimColor: true, children: " discard" }), dot, _jsx(Key, { k: "e" }), _jsx(Text, { dimColor: true, children: " edit" }), 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" })] }));
+    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: "?" }), _jsx(Text, { dimColor: true, children: " help" }), dot, _jsx(Key, { k: "q" }), _jsx(Text, { dimColor: true, children: " quit" })] }));
 }
 // ── Component ─────────────────────────────────────────────────────────
 export default function Dashboard() {
@@ -346,14 +388,23 @@ export default function Dashboard() {
         }
         repoRootRef.current = repoRoot;
         try {
-            // Re-detect terminal theme alongside data fetch so light↔dark switches
-            // propagate within one refresh cycle (≤30s).
+            // Re-detect terminal theme alongside data fetch so light↔dark
+            // switches propagate within one refresh cycle (≤30s). Skip the
+            // OSC 11 query when a text-input overlay is active — the
+            // terminal's response would otherwise leak into the user's
+            // commit/PR/context message via Ink's stdin handler.
+            const overlay = stateRef.current.overlay;
+            const inTextInput = overlay === "context-input" ||
+                (overlay === "pr-create" && stateRef.current.prCreatePhase === "review") ||
+                (overlay === "commit" && stateRef.current.commitPhase === "awaiting-message");
+            const themeP = inTextInput ? Promise.resolve(null) : detectTerminalTheme();
             const [data, reviewData, themeMode] = await Promise.all([
                 loadDashboardData(repoRoot),
                 loadReviewsData(repoRoot),
-                detectTerminalTheme(),
+                themeP,
             ]);
-            setTheme(getThemeForMode(themeMode));
+            if (themeMode !== null)
+                setTheme(getThemeForMode(themeMode));
             // Workspace file presence — only meaningful when the editor consumes
             // `.code-workspace` files. Cheap directory read; recomputed each cycle
             // in case the user adds/removes one.
@@ -644,6 +695,29 @@ export default function Dashboard() {
             process.stdout.write("\x1b[?1002h\x1b[?1006h");
         };
     }, [state.overlay, state.prCreatePhase, state.commitPhase]);
+    // ── Diff overlay: load file list when opened (gh pr diff path) ────
+    // Reviews-tab PRs without a local worktree shell out to `gh pr diff <n>`,
+    // parse the unified blob into per-file records, and stash the per-file
+    // content for the content-loader effect below to read synchronously.
+    useEffect(() => {
+        if (state.overlay !== "diff" || state.diffPRNumber == null)
+            return;
+        const prNumber = state.diffPRNumber;
+        void (async () => {
+            try {
+                const { stdout } = await execAsync(`gh pr diff ${prNumber}`, {
+                    maxBuffer: 32 * 1024 * 1024,
+                });
+                const { files, contentByPath } = parseUnifiedDiff(stdout);
+                const ordered = flattenTreeFiles(files);
+                dispatch({ type: "DIFF_PR_LOADED", files: ordered, contentByPath });
+            }
+            catch (err) {
+                const msg = err instanceof Error ? err.message : String(err);
+                dispatch({ type: "DIFF_FILES_ERROR", error: msg });
+            }
+        })();
+    }, [state.overlay, state.diffPRNumber]);
     // ── Diff overlay: load file list when opened ──────────────────────
     // Resolves merge-base against the configured base branch so upstream-only
     // changes (commits on master we haven't pulled) are excluded — same semantics
@@ -702,6 +776,44 @@ export default function Dashboard() {
             }
         })();
     }, [state.overlay, state.diffWorktreePath, state.diffBaseBranch, state.diffRefreshTick]);
+    // ── Diff overlay: select content for current file (gh pr diff path) ─
+    // Per-file slices were parsed up front by the file-list effect above —
+    // just pull the right entry out of the map. When SANTREE_DIFF_TOOL is set,
+    // pipe the slice through the pager so reviews-tab diffs get the same
+    // syntax highlighting as worktree diffs.
+    useEffect(() => {
+        if (state.overlay !== "diff" || state.diffPRNumber == null)
+            return;
+        const file = state.diffFiles[state.diffFileIndex];
+        if (!file) {
+            dispatch({ type: "DIFF_CONTENT_LOADED", content: "" });
+            return;
+        }
+        const raw = state.diffPRContentByPath[file.path] ?? "";
+        const tool = getDiffTool();
+        if (!tool || !raw) {
+            dispatch({ type: "DIFF_CONTENT_LOADED", content: raw });
+            return;
+        }
+        dispatch({ type: "DIFF_CONTENT_LOADING" });
+        void (async () => {
+            try {
+                const content = await runPagerOnString(raw, tool, theme.mode);
+                dispatch({ type: "DIFF_CONTENT_LOADED", content });
+            }
+            catch (err) {
+                const msg = err instanceof Error ? err.message : String(err);
+                dispatch({ type: "DIFF_CONTENT_LOADED", content: `Error rendering diff: ${msg}` });
+            }
+        })();
+    }, [
+        state.overlay,
+        state.diffPRNumber,
+        state.diffFileIndex,
+        state.diffFiles,
+        state.diffPRContentByPath,
+        theme.mode,
+    ]);
     // ── Diff overlay: load content for selected file ──────────────────
     // If SANTREE_DIFF_TOOL is set, pipe `git diff` output through the tool so
     // the user's preferred renderer (delta, diff-so-fancy, etc.) handles
@@ -765,7 +877,15 @@ export default function Dashboard() {
         const windowName = di.issue.identifier;
         const sessionId = di.worktree?.sessionId;
         const bin = resolveAgentBinary();
-        const resumeCmd = sessionId && bin ? `${bin} --resume ${sessionId}` : null;
+        // `claude --resume` is cwd-scoped — it only finds the session under
+        // the encoded path of the current cwd. Project conventions (direnv,
+        // shell init) sometimes leave the tmux window in a subdir, so we
+        // prepend `cd <sessionCwd>` (resolved by `findClaudeSessionCwd`)
+        // to guarantee the resume runs from where the session was created.
+        const sessionCwd = di.worktree?.sessionCwd ?? di.worktree?.path;
+        const resumeCmd = sessionId && bin && sessionCwd
+            ? `cd ${shellEscape(sessionCwd)} && ${bin} --resume ${sessionId}`
+            : null;
         const contextArg = contextFile ? ` --context-file "${contextFile}"` : "";
         const workCmd = mode === "plan" ? `st worktree work --plan${contextArg}` : `st worktree work${contextArg}`;
         const cmd = resumeCmd ?? workCmd;
@@ -1024,13 +1144,12 @@ export default function Dashboard() {
     // ── Commit flow ──────────────────────────────────────────────────
     const handleStageAll = useCallback(async () => {
         const wtPath = stateRef.current.commitWorktreePath;
-        const ticketId = stateRef.current.commitTicketId;
         if (!wtPath)
             return;
         try {
             await execAsync("git add -A", { cwd: wtPath });
-            dispatch({ type: "COMMIT_MESSAGE", message: `[${ticketId}] ` });
-            dispatch({ type: "COMMIT_PHASE", phase: "awaiting-message" });
+            // After staging, ask whether to draft with AI or write manually.
+            dispatch({ type: "COMMIT_PHASE", phase: "choose-mode" });
         }
         catch (e) {
             dispatch({
@@ -1039,6 +1158,46 @@ export default function Dashboard() {
             });
         }
     }, []);
+    const handleFillCommit = useCallback(async () => {
+        const s = stateRef.current;
+        const wtPath = s.commitWorktreePath;
+        const branch = s.commitBranch;
+        const ticketId = s.commitTicketId;
+        if (!wtPath || !branch)
+            return;
+        dispatch({ type: "COMMIT_PHASE", phase: "filling" });
+        const diffContent = getStagedDiffContent(wtPath);
+        const fallbackPrefix = ticketId ? `[${ticketId}] ` : "";
+        if (!diffContent.trim()) {
+            dispatch({ type: "COMMIT_MESSAGE", message: fallbackPrefix });
+            dispatch({ type: "COMMIT_PHASE", phase: "awaiting-message" });
+            return;
+        }
+        // Pull ticket context so the AI message is grounded in the requested
+        // change rather than just the literal diff.
+        let ticketContent;
+        const mainRoot = repoRootRef.current;
+        if (ticketId && mainRoot) {
+            try {
+                const tracker = getIssueTracker(mainRoot);
+                const result = await tracker.getIssue(ticketId, mainRoot);
+                if (result.ok) {
+                    ticketContent = renderTicket(result.value, tracker.displayName);
+                }
+            }
+            catch {
+                // non-fatal — the prompt works with diff alone
+            }
+        }
+        const drafted = await fillCommitMessage({
+            branch,
+            ticketId,
+            ticketContent,
+            diffContent,
+        });
+        dispatch({ type: "COMMIT_MESSAGE", message: drafted ?? fallbackPrefix });
+        dispatch({ type: "COMMIT_PHASE", phase: "awaiting-message" });
+    }, []);
     const handleCommitSubmit = useCallback(async (value) => {
         const s = stateRef.current;
         if (!s.commitWorktreePath || !s.commitBranch)
@@ -1048,9 +1207,10 @@ export default function Dashboard() {
             dispatch({ type: "COMMIT_ERROR", error: "Empty commit message" });
             return;
         }
-        const msg = trimmed.includes(`[${s.commitTicketId}]`)
-            ? trimmed
-            : `[${s.commitTicketId}] ${trimmed}`;
+        // Auto-prefix with `[TICKET]` only when there's a real ticket
+        // AND the user hasn't already typed it.
+        const tid = s.commitTicketId;
+        const msg = tid && !trimmed.includes(`[${tid}]`) ? `[${tid}] ${trimmed}` : trimmed;
         dispatch({ type: "COMMIT_PHASE", phase: "committing" });
         try {
             await execAsync(`git commit -m "${msg.replace(/"/g, '\\"')}"`, {
@@ -1263,8 +1423,25 @@ export default function Dashboard() {
         if (state.actionMessage && input !== "q") {
             dispatch({ type: "SET_ACTION_MESSAGE", message: null });
         }
+        // Help overlay — toggleable from anywhere except text-input
+        // overlays. ? opens, ? again or Esc closes.
+        if (state.overlay === "help") {
+            if (input === "?" || key.escape) {
+                dispatch({ type: "SET_OVERLAY", overlay: null });
+            }
+            return;
+        }
+        if (input === "?" && state.overlay === null) {
+            dispatch({ type: "SET_OVERLAY", overlay: "help" });
+            return;
+        }
         // Commit overlay
         if (state.overlay === "commit") {
+            // awaiting-message is owned by MultilineTextArea (Ctrl+D submit,
+            // Ctrl+G cancel) — escape there is handled inside the component,
+            // so we don't intercept any keys at this phase.
+            if (state.commitPhase === "awaiting-message")
+                return;
             if (key.escape) {
                 dispatch({ type: "COMMIT_CANCEL" });
                 return;
@@ -1280,8 +1457,20 @@ export default function Dashboard() {
                 }
                 return;
             }
-            // awaiting-message is handled by TextInput, not useInput
-            // All other phases: swallow input
+            if (state.commitPhase === "choose-mode") {
+                if (input === "f") {
+                    handleFillCommit();
+                    return;
+                }
+                if (input === "m") {
+                    const tid = state.commitTicketId;
+                    dispatch({ type: "COMMIT_MESSAGE", message: tid ? `[${tid}] ` : "" });
+                    dispatch({ type: "COMMIT_PHASE", phase: "awaiting-message" });
+                    return;
+                }
+                return;
+            }
+            // committing / pushing / done / error: swallow
             return;
         }
         // PR create overlay
@@ -1681,15 +1870,55 @@ export default function Dashboard() {
             const ri = state.flatReviews[state.reviewSelectedIndex];
             if (!ri)
                 return;
-            // Open PR in browser
+            // Open linked ticket in browser (only when one is associated).
+            // Aligns with the issues tab: `[o]` always opens the ticket; `[p]`
+            // opens the PR. The previous behavior — `[o]` opens the PR — is
+            // the only intentional muscle-memory break in this redesign.
             if (input === "o") {
-                if (ri.pr.url) {
-                    const openCmd = process.platform === "darwin" ? "open" : "xdg-open";
-                    execSync(`${openCmd} "${ri.pr.url}"`, { stdio: "ignore" });
+                if (!ri.ticket?.url) {
+                    dispatch({ type: "SET_ACTION_MESSAGE", message: "No linked ticket" });
+                    return;
+                }
+                if (openUrl(ri.ticket.url)) {
+                    dispatch({ type: "SET_ACTION_MESSAGE", message: "Opened ticket in browser" });
+                }
+                return;
+            }
+            // Open PR in browser
+            if (input === "p") {
+                if (!ri.pr.url)
+                    return;
+                if (openUrl(ri.pr.url)) {
                     dispatch({ type: "SET_ACTION_MESSAGE", message: "Opened PR in browser" });
                 }
                 return;
             }
+            // View diff (inline overlay).
+            //   - With a local worktree: reuse the issues-tab path (git diff
+            //     against merge-base, full XY/staging support).
+            //   - Without a worktree: parse `gh pr diff <n>` once, render the
+            //     same DiffOverlay in read-only mode.
+            if (input === "v") {
+                const ticketLabel = ri.ticket?.identifier ?? `#${ri.pr.number}`;
+                if (ri.worktree) {
+                    const baseBranch = getBaseBranch(ri.worktree.branch);
+                    dispatch({
+                        type: "DIFF_OPEN",
+                        ticketId: ticketLabel,
+                        worktreePath: ri.worktree.path,
+                        baseBranch,
+                    });
+                }
+                else {
+                    dispatch({
+                        type: "DIFF_OPEN_PR",
+                        label: ticketLabel,
+                        prNumber: ri.pr.number,
+                        baseBranch: ri.baseBranch ?? "main",
+                    });
+                }
+                return;
+            }
             // Create worktree from PR branch (checkout for local testing)
             if (input === "w") {
                 if (ri.worktree) {
@@ -1898,7 +2127,10 @@ export default function Dashboard() {
                 const windowName = di.issue.identifier;
                 const sessionId = di.worktree.sessionId;
                 const bin = resolveAgentBinary();
-                const resumeCmd = sessionId && bin ? `${bin} --resume ${sessionId}` : null;
+                const sessionCwd = di.worktree.sessionCwd ?? di.worktree.path;
+                const resumeCmd = sessionId && bin
+                    ? `cd ${shellEscape(sessionCwd)} && ${bin} --resume ${sessionId}`
+                    : null;
                 const worktreePath = di.worktree.path;
                 void (async () => {
                     const selected = await mux.selectWindow(windowName);
@@ -1931,9 +2163,9 @@ export default function Dashboard() {
                 dispatch({ type: "SET_ACTION_MESSAGE", message: "No issue URL available" });
                 return;
             }
-            const openCmd = process.platform === "darwin" ? "open" : "xdg-open";
-            execSync(`${openCmd} "${di.issue.url}"`, { stdio: "ignore" });
-            dispatch({ type: "SET_ACTION_MESSAGE", message: "Opened in browser" });
+            if (openUrl(di.issue.url)) {
+                dispatch({ type: "SET_ACTION_MESSAGE", message: "Opened in browser" });
+            }
             return;
         }
         // Open PR
@@ -1942,9 +2174,9 @@ export default function Dashboard() {
                 dispatch({ type: "SET_ACTION_MESSAGE", message: "No PR to open" });
                 return;
             }
-            const openCmd = process.platform === "darwin" ? "open" : "xdg-open";
-            execSync(`${openCmd} "${di.pr.url}"`, { stdio: "ignore" });
-            dispatch({ type: "SET_ACTION_MESSAGE", message: "Opened PR in browser" });
+            if (openUrl(di.pr.url)) {
+                dispatch({ type: "SET_ACTION_MESSAGE", message: "Opened PR in browser" });
+            }
             return;
         }
         // Create PR
@@ -2025,7 +2257,9 @@ export default function Dashboard() {
             }
             dispatch({
                 type: "COMMIT_START",
-                ticketId: di.issue.identifier,
+                // Main-row commits don't carry a ticket prefix — only real
+                // tracker tickets do.
+                ticketId: di.issue.state.type === "main" ? null : di.issue.identifier,
                 worktreePath: di.worktree.path,
                 branch: di.worktree.branch,
                 gitStatus: di.worktree.gitStatus,
@@ -2094,14 +2328,14 @@ export default function Dashboard() {
     });
     // ── Render ─────────────────────────────────────────────────────────
     if (state.loading) {
-        return (_jsx(Box, { width: columns, height: rows, flexDirection: "column", children: _jsxs(Box, { justifyContent: "center", alignItems: "center", flexGrow: 1, children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { children: " Loading dashboard..." })] }) }));
+        return (_jsx(Box, { width: columns, height: rows, flexDirection: "column", children: _jsx(Box, { justifyContent: "center", alignItems: "center", flexGrow: 1, children: _jsx(SquirrelLoader, { text: "Loading dashboard..." }) }) }));
     }
     if (state.error) {
         return (_jsx(Box, { width: columns, height: rows, flexDirection: "column", children: _jsxs(Box, { justifyContent: "center", alignItems: "center", flexGrow: 1, flexDirection: "column", children: [_jsxs(Text, { color: "red", bold: true, children: ["Error: ", state.error] }), _jsx(Text, { dimColor: true, children: "Press R to retry or q to quit" })] }) }));
     }
     const selectedIssue = state.flatIssues[state.selectedIndex] ?? null;
     const selectedReview = state.flatReviews[state.reviewSelectedIndex] ?? null;
-    return (_jsxs(Box, { width: columns, height: rows, flexDirection: "column", children: [_jsxs(Box, { paddingX: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "santree" }), _jsxs(Text, { dimColor: true, children: ["  ", "v", version] }), updateAvailable && latestVersion ? (_jsxs(Text, { color: "yellow", children: ["  ⬆ v", latestVersion, " available — `santree update`"] })) : null, CLAUDE_VERSION ? (_jsxs(Text, { dimColor: true, children: ["  ·  claude ", CLAUDE_VERSION] })) : null, claudeUpdateAvailable && latestClaudeVersion ? (_jsxs(Text, { color: "yellow", children: ["  ⬆ ", latestClaudeVersion] })) : null, state.refreshing ? _jsx(Text, { dimColor: true, children: "  ·  refreshing…" }) : null, state.actionMessage ? (_jsxs(Text, { color: "yellow", children: ["  ·  ", state.actionMessage] })) : null] }), _jsxs(Box, { paddingX: 1, children: [_jsx(Tab, { active: state.activeTab === "issues", label: `1 Issues (${state.flatIssues.length})`, mode: theme.mode }), _jsx(Text, { children: " " }), _jsx(Tab, { active: state.activeTab === "reviews", label: `2 Reviews (${state.flatReviews.length})`, mode: theme.mode })] }), _jsxs(Box, { flexGrow: 1, borderStyle: "round", borderColor: "cyan", flexDirection: "column", children: [state.overlay === "mode-select" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 3, paddingY: 1, children: [_jsx(Text, { bold: true, children: "Select mode:" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: "p" }), "  Plan"] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: "i" }), "  Implement"] }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "ESC to cancel" })] }) })) : state.overlay === "context-input" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", paddingX: 2, width: Math.min(columns - 8, 100), children: [_jsxs(Text, { bold: true, color: "cyan", children: ["Extra context for ", state.contextInputMode] }), _jsx(Text, { dimColor: true, children: "Optional \u2014 appended to the prompt before launching Claude" }), _jsx(Text, { children: " " }), _jsx(MultilineTextArea, { value: state.contextInputValue, onChange: (v) => dispatch({ type: "CONTEXT_INPUT_CHANGE", value: v }), onSubmit: () => {
+    return (_jsxs(Box, { width: columns, height: rows, flexDirection: "column", children: [_jsxs(Box, { paddingX: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "santree" }), _jsxs(Text, { dimColor: true, children: ["  ", "v", version] }), updateAvailable && latestVersion ? (_jsxs(Text, { color: "yellow", children: ["  ⬆ v", latestVersion, " available — `santree update`"] })) : null, CLAUDE_VERSION ? (_jsxs(Text, { dimColor: true, children: ["  ·  claude ", CLAUDE_VERSION] })) : null, claudeUpdateAvailable && latestClaudeVersion ? (_jsxs(Text, { color: "yellow", children: ["  ⬆ ", latestClaudeVersion] })) : null, state.refreshing ? _jsx(Text, { dimColor: true, children: "  ·  refreshing…" }) : null, state.actionMessage ? (_jsxs(Text, { color: "yellow", children: ["  ·  ", state.actionMessage] })) : null] }), _jsxs(Box, { paddingX: 1, children: [_jsx(Tab, { active: state.activeTab === "issues", label: `1 Issues (${state.flatIssues.length})`, mode: theme.mode }), _jsx(Text, { children: " " }), _jsx(Tab, { active: state.activeTab === "reviews", label: `2 Reviews (${state.flatReviews.length})`, mode: theme.mode })] }), _jsxs(Box, { flexGrow: 1, borderStyle: "round", borderColor: "cyan", flexDirection: "column", children: [state.overlay === "help" ? (_jsx(HelpOverlay, { width: innerWidth, height: contentHeight })) : state.overlay === "mode-select" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 3, paddingY: 1, children: [_jsx(Text, { bold: true, children: "Select mode:" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: "p" }), "  Plan"] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: "i" }), "  Implement"] }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "ESC to cancel" })] }) })) : state.overlay === "context-input" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", paddingX: 2, width: Math.min(columns - 8, 100), children: [_jsxs(Text, { bold: true, color: "cyan", children: ["Extra context for ", state.contextInputMode] }), _jsx(Text, { dimColor: true, children: "Optional \u2014 appended to the prompt before launching Claude" }), _jsx(Text, { children: " " }), _jsx(MultilineTextArea, { value: state.contextInputValue, onChange: (v) => dispatch({ type: "CONTEXT_INPUT_CHANGE", value: v }), onSubmit: () => {
                                         const mode = state.contextInputMode;
                                         const ctx = state.contextInputValue;
                                         dispatch({ type: "CONTEXT_INPUT_DONE" });

package/dist/commands/doctor.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Box, Text } from "ink";
-import Spinner from "ink-spinner";
 import { useEffect, useState } from "react";
+import SquirrelLoader from "../lib/squirrel-loader.js";
 import { exec, execSync } from "child_process";
 import { promisify } from "util";
 import { createRequire } from "module";
@@ -608,7 +608,7 @@ export default function Doctor() {
         runChecks();
     }, []);
     if (loading) {
-        return (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { children: " Checking system requirements..." })] }));
+        return (_jsx(Box, { paddingY: 1, children: _jsx(SquirrelLoader, { text: "Checking system requirements..." }) }));
     }
     const requiredMissing = tools.filter((t) => t.required && (!t.installed || t.hint));
     const optionalMissing = tools.filter((t) => !t.required && !t.installed);

package/dist/commands/helpers/squirrel.d.ts

@@ -0,0 +1,2 @@
+export declare const description = "Render the spinning squirrel until you Ctrl+C (debug helper)";
+export default function Squirrel(): import("react/jsx-runtime").JSX.Element;

package/dist/commands/helpers/squirrel.js

@@ -0,0 +1,12 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Box, useApp, useInput } from "ink";
+import SquirrelLoader from "../../lib/squirrel-loader.js";
+export const description = "Render the spinning squirrel until you Ctrl+C (debug helper)";
+export default function Squirrel() {
+    const { exit } = useApp();
+    useInput((_, key) => {
+        if (key.escape)
+            exit();
+    });
+    return (_jsx(Box, { flexDirection: "column", alignItems: "center", paddingY: 1, children: _jsx(SquirrelLoader, { text: "Press Esc or Ctrl+C to exit" }) }));
+}

package/dist/commands/worktree/commit.d.ts

@@ -1,2 +1,10 @@
+import { z } from "zod";
 export declare const description = "Stage and commit changes";
-export default function Commit(): import("react/jsx-runtime").JSX.Element;
+export declare const options: z.ZodObject<{
+    fill: z.ZodOptional<z.ZodBoolean>;
+}, z.core.$strip>;
+type Props = {
+    options: z.infer<typeof options>;
+};
+export default function Commit({ options }: Props): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/commands/worktree/commit.js

@@ -3,12 +3,19 @@ import { useEffect, useState } from "react";
 import { Text, Box, useInput, useApp } from "ink";
 import TextInput from "ink-text-input";
 import Spinner from "ink-spinner";
+import { z } from "zod";
 import { exec } from "child_process";
 import { promisify } from "util";
-import { findRepoRoot, getCurrentBranch, extractTicketId, getGitStatus, getStagedDiffStat, hasStagedChanges, hasUnstagedChanges, } from "../../lib/git.js";
+import { findRepoRoot, findMainRepoRoot, getCurrentBranch, extractTicketId, getGitStatus, getStagedDiffStat, getStagedDiffContent, hasStagedChanges, hasUnstagedChanges, } from "../../lib/git.js";
+import { fillCommitMessage } from "../../lib/ai.js";
+import { getIssueTracker } from "../../lib/trackers/index.js";
+import { renderTicket } from "../../lib/prompts.js";
 export const description = "Stage and commit changes";
+export const options = z.object({
+    fill: z.boolean().optional().describe("Use AI to draft a short commit message"),
+});
 const execAsync = promisify(exec);
-export default function Commit() {
+export default function Commit({ options }) {
     const { exit } = useApp();
     const [status, setStatus] = useState("loading");
     const [message, setMessage] = useState("");
@@ -25,10 +32,9 @@ export default function Commit() {
                 stageAndContinue();
             }
             else if (input === "n" || input === "N" || key.escape) {
-                if (hasStagedChanges()) {
-                    setStatus("awaiting-message");
-                    const prefix = ticketId ? `[${ticketId}] ` : "";
-                    setCommitInput(prefix);
+                if (hasStagedChanges() && repoRoot && branch) {
+                    // Respect --fill even when the user declines to stage more.
+                    void openMessagePhase({ repoRoot, branch, ticketId });
                 }
                 else {
                     setStatus("no-changes");
@@ -39,19 +45,59 @@ export default function Commit() {
         }
     });
     async function stageAndContinue() {
+        if (!repoRoot || !branch)
+            return;
         try {
-            await execAsync("git add -A", { cwd: repoRoot ?? undefined });
+            await execAsync("git add -A", { cwd: repoRoot });
             setGitStatus(getGitStatus());
             setDiffStat(getStagedDiffStat());
-            setStatus("awaiting-message");
-            const prefix = ticketId ? `[${ticketId}] ` : "";
-            setCommitInput(prefix);
+            await openMessagePhase({ repoRoot, branch, ticketId });
         }
         catch (e) {
             setStatus("error");
             setMessage(`Failed to stage changes: ${e}`);
         }
     }
+    // Routes to either the AI-fill phase or straight to the bare input.
+    // Takes context as args so callers in init() (where state isn't yet
+    // propagated from the just-fired setStates) can hand in fresh values.
+    async function openMessagePhase(ctx) {
+        const prefix = ctx.ticketId ? `[${ctx.ticketId}] ` : "";
+        if (options.fill) {
+            setStatus("filling");
+            setMessage("Drafting commit message with Claude...");
+            const drafted = await draftWithAI(ctx);
+            // Whether Claude succeeds or not, fall through to the input —
+            // the user can edit or type from scratch.
+            setCommitInput(drafted ?? prefix);
+            setStatus("awaiting-message");
+            return;
+        }
+        setCommitInput(prefix);
+        setStatus("awaiting-message");
+    }
+    async function draftWithAI(ctx) {
+        const diffContent = getStagedDiffContent(ctx.repoRoot);
+        if (!diffContent.trim())
+            return null;
+        // Pull ticket context if we can — the prompt uses it to ground the
+        // summary in the requested change rather than the literal diff.
+        let ticketContent;
+        const mainRoot = findMainRepoRoot();
+        if (ctx.ticketId && mainRoot) {
+            const tracker = getIssueTracker(mainRoot);
+            const result = await tracker.getIssue(ctx.ticketId, mainRoot);
+            if (result.ok) {
+                ticketContent = renderTicket(result.value, tracker.displayName);
+            }
+        }
+        return fillCommitMessage({
+            branch: ctx.branch,
+            ticketId: ctx.ticketId,
+            ticketContent,
+            diffContent,
+        });
+    }
     async function handleCommitSubmit(value) {
         const trimmed = value.trim();
         if (!trimmed) {
@@ -128,9 +174,7 @@ export default function Commit() {
             }
             else if (staged) {
                 setDiffStat(getStagedDiffStat());
-                setStatus("awaiting-message");
-                const prefix = ticket ? `[${ticket}] ` : "";
-                setCommitInput(prefix);
+                await openMessagePhase({ repoRoot: root, branch: currentBranch, ticketId: ticket });
             }
             else {
                 setStatus("no-changes");
@@ -140,7 +184,7 @@ export default function Commit() {
         }
         init();
     }, []);
-    const isLoading = status === "loading" || status === "committing" || status === "pushing";
+    const isLoading = status === "loading" || status === "filling" || status === "committing" || status === "pushing";
     return (_jsxs(Box, { flexDirection: "column", padding: 1, width: "100%", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "\uD83D\uDCBE Commit" }) }), _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: status === "error" ? "red" : status === "done" ? "green" : "blue", paddingX: 1, width: "100%", children: [branch && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "branch:" }), _jsx(Text, { color: "cyan", bold: true, children: branch })] })), ticketId && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "ticket:" }), _jsx(Text, { color: "blue", bold: true, children: ticketId })] }))] }), gitStatus && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { bold: true, dimColor: true, children: "Changes:" }), _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, width: "100%", children: [gitStatus
                                 .split("\n")
                                 .slice(0, 10)