santree 0.2.14 → 0.3.0

package/dist/commands/dashboard.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, 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";
@@ -371,16 +371,19 @@ export default function Dashboard() {
     // ── Mouse tracking pause ─────────────────────────────────────────
     // The MultilineTextArea captures ESC for cancel. With SGR mouse tracking on,
     // every click emits `\x1b[<btn;col;rowM` — Ink reads the leading ESC and fires
-    // key.escape, dismissing the overlay. Disable mouse tracking while the
-    // context-input overlay is mounted; restore on unmount.
+    // key.escape, dismissing the overlay. Disable tracking while any overlay
+    // phase mounts a MultilineTextArea (context-input editing OR pr-create
+    // review); restore when that phase ends.
     useEffect(() => {
-        if (state.overlay !== "context-input")
+        const needsMouseOff = (state.overlay === "context-input" && state.contextInputPhase === "editing") ||
+            (state.overlay === "pr-create" && state.prCreatePhase === "review");
+        if (!needsMouseOff)
             return;
         process.stdout.write("\x1b[?1002l\x1b[?1006l");
         return () => {
             process.stdout.write("\x1b[?1002h\x1b[?1006h");
         };
-    }, [state.overlay]);
+    }, [state.overlay, state.contextInputPhase, state.prCreatePhase]);
     // ── Actions ───────────────────────────────────────────────────────
     const launchWorkInTmux = useCallback((di, mode, worktreePath, contextFile) => {
         const windowName = di.issue.identifier;
@@ -890,6 +893,9 @@ export default function Dashboard() {
         }
         // PR create overlay
         if (state.overlay === "pr-create") {
+            // Review phase — MultilineTextArea owns the keyboard
+            if (state.prCreatePhase === "review")
+                return;
             if (key.escape) {
                 dispatch({ type: "PR_CREATE_CANCEL" });
                 return;
@@ -904,21 +910,17 @@ export default function Dashboard() {
                     return;
                 }
             }
-            if (state.prCreatePhase === "review") {
+            if (state.prCreatePhase === "confirm") {
                 if (input === "y" || key.return) {
                     confirmPrCreate();
                     return;
                 }
-                if (input === "w") {
-                    openPrInWeb();
-                    return;
-                }
-                if (key.shift && key.downArrow) {
-                    dispatch({ type: "SCROLL_DETAIL", offset: state.detailScrollOffset + 3 });
+                if (input === "e") {
+                    dispatch({ type: "PR_CREATE_EDIT" });
                     return;
                 }
-                if (key.shift && key.upArrow) {
-                    dispatch({ type: "SCROLL_DETAIL", offset: Math.max(0, state.detailScrollOffset - 3) });
+                if (input === "w") {
+                    openPrInWeb();
                     return;
                 }
             }
@@ -1001,9 +1003,29 @@ export default function Dashboard() {
             }
             return;
         }
-        // Context-input overlay — MultilineTextArea owns its own useInput;
-        // outer useInput is disabled for this overlay via isActive below.
+        // Context-input overlay.
+        // Editing phase: MultilineTextArea owns useInput (outer is disabled
+        // via isActive below).
+        // Review phase: outer handles y/n/e/ESC.
         if (state.overlay === "context-input") {
+            if (state.contextInputPhase === "review") {
+                if (input === "y" || key.return) {
+                    const mode = state.contextInputMode;
+                    const ctx = state.contextInputValue;
+                    dispatch({ type: "CONTEXT_INPUT_DONE" });
+                    if (mode)
+                        doWork(mode, ctx);
+                    return;
+                }
+                if (input === "n" || input === "e") {
+                    dispatch({ type: "CONTEXT_INPUT_EDIT" });
+                    return;
+                }
+                if (key.escape) {
+                    dispatch({ type: "CONTEXT_INPUT_DONE" });
+                    return;
+                }
+            }
             return;
         }
         // Confirm delete overlay
@@ -1475,7 +1497,8 @@ export default function Dashboard() {
             return;
         }
     }, {
-        isActive: state.overlay !== "context-input" &&
+        isActive: (state.overlay !== "context-input" || state.contextInputPhase === "review") &&
+            (state.overlay !== "pr-create" || state.prCreatePhase !== "review") &&
             (state.overlay !== "commit" || state.commitPhase !== "awaiting-message"),
     });
     // ── Render ─────────────────────────────────────────────────────────
@@ -1487,13 +1510,10 @@ export default function Dashboard() {
     }
     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, { children: [_jsx(Text, { bold: true, color: "cyan", children: "Santree Dashboard" }), _jsxs(Text, { dimColor: true, children: ["  ", "v", version] }), CLAUDE_VERSION ? (_jsxs(Text, { dimColor: true, children: ["  ", "claude ", CLAUDE_VERSION] })) : null, _jsx(Text, { dimColor: true, children: state.refreshing ? "  refreshing..." : "" }), state.actionMessage && (_jsxs(Text, { color: "yellow", children: ["  ", state.actionMessage] }))] }), _jsxs(Box, { children: [_jsxs(Text, { bold: state.activeTab === "issues", color: state.activeTab === "issues" ? "cyan" : undefined, dimColor: state.activeTab !== "issues", children: [state.activeTab === "issues" ? "\u25b8 " : "  ", "1 Issues (", state.flatIssues.length, ")"] }), _jsx(Text, { children: "   " }), _jsxs(Text, { bold: state.activeTab === "reviews", color: state.activeTab === "reviews" ? "cyan" : undefined, dimColor: state.activeTab !== "reviews", children: [state.activeTab === "reviews" ? "\u25b8 " : "  ", "2 Reviews (", state.flatReviews.length, ")"] })] }), 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, 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" });
-                                if (mode)
-                                    doWork(mode, ctx);
-                            }, onCancel: () => dispatch({ type: "CONTEXT_INPUT_DONE" }), width: Math.min(columns - 8, 100), height: 10, placeholder: "Type or paste extra context\u2026" }), _jsx(Text, { children: " " }), _jsxs(Text, { dimColor: true, children: [_jsx(Text, { color: "cyan", bold: true, children: "Ctrl+D" }), " ", "launch", "   ", _jsx(Text, { color: "cyan", bold: true, children: "Enter" }), " ", "newline", "   ", _jsx(Text, { color: "cyan", bold: true, children: "ESC" }), " ", "cancel"] })] }) })) : state.overlay === "base-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 base branch:" }), _jsx(Text, { children: " " }), state.baseSelectOptions.map((branch, idx) => {
+    return (_jsxs(Box, { width: columns, height: rows, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, color: "cyan", children: "Santree Dashboard" }), _jsxs(Text, { dimColor: true, children: ["  ", "v", version] }), CLAUDE_VERSION ? (_jsxs(Text, { dimColor: true, children: ["  ", "claude ", CLAUDE_VERSION] })) : null, _jsx(Text, { dimColor: true, children: state.refreshing ? "  refreshing..." : "" }), state.actionMessage && (_jsxs(Text, { color: "yellow", children: ["  ", state.actionMessage] }))] }), _jsxs(Box, { children: [_jsxs(Text, { bold: state.activeTab === "issues", color: state.activeTab === "issues" ? "cyan" : undefined, dimColor: state.activeTab !== "issues", children: [state.activeTab === "issues" ? "\u25b8 " : "  ", "1 Issues (", state.flatIssues.length, ")"] }), _jsx(Text, { children: "   " }), _jsxs(Text, { bold: state.activeTab === "reviews", color: state.activeTab === "reviews" ? "cyan" : undefined, dimColor: state.activeTab !== "reviews", children: [state.activeTab === "reviews" ? "\u25b8 " : "  ", "2 Reviews (", state.flatReviews.length, ")"] })] }), 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: " " }), state.contextInputPhase === "editing" ? (_jsxs(_Fragment, { children: [_jsx(MultilineTextArea, { value: state.contextInputValue, onChange: (v) => dispatch({ type: "CONTEXT_INPUT_CHANGE", value: v }), onSubmit: () => dispatch({ type: "CONTEXT_INPUT_REVIEW" }), onCancel: () => dispatch({ type: "CONTEXT_INPUT_DONE" }), width: Math.min(columns - 8, 100), height: 10, placeholder: "Type or paste extra context\u2026" }), _jsx(Text, { children: " " }), _jsxs(Text, { dimColor: true, children: [_jsx(Text, { color: "cyan", bold: true, children: "Enter" }), " newline  ", _jsx(Text, { color: "cyan", bold: true, children: "\u2191\u2193\u2190\u2192" }), " move  ", _jsx(Text, { color: "cyan", bold: true, children: "Ctrl+V" }), " paste image  ", _jsx(Text, { color: "cyan", bold: true, children: "Ctrl+D" }), " continue  ", _jsx(Text, { color: "cyan", bold: true, children: "ESC" }), " cancel"] })] })) : (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 1, minHeight: 6, children: [(state.contextInputValue || "(no extra context)")
+                                            .split("\n")
+                                            .slice(0, 12)
+                                            .map((line, i) => (_jsx(Text, { children: line || " " }, i))), state.contextInputValue.split("\n").length > 12 && (_jsxs(Text, { dimColor: true, children: ["\u2026+", state.contextInputValue.split("\n").length - 12, " more lines"] }))] }), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: "Anything else to add?" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "green", bold: true, children: "y" }), " / ", _jsx(Text, { color: "green", bold: true, children: "Enter" }), "  launch   ", _jsx(Text, { color: "yellow", bold: true, children: "n" }), " / ", _jsx(Text, { color: "yellow", bold: true, children: "e" }), "  keep editing   ", _jsx(Text, { color: "red", bold: true, children: "ESC" }), "  cancel"] })] }))] }) })) : state.overlay === "base-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 base branch:" }), _jsx(Text, { children: " " }), state.baseSelectOptions.map((branch, idx) => {
                             const selected = idx === state.baseSelectIndex;
                             const defaultBranch = getDefaultBranch();
                             const label = branch === defaultBranch ? `${branch} (default)` : branch;
@@ -1501,5 +1521,5 @@ export default function Dashboard() {
                         }), _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 === "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 })) : 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, creatingForTicket: state.creatingForTicket, deletingForTicket: state.deletingForTicket })) }), _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, scrollOffset: state.detailScrollOffset })) : (_jsx(DetailPanel, { issue: selectedIssue, scrollOffset: state.detailScrollOffset, height: contentHeight, width: rightWidth, creatingForTicket: state.creatingForTicket, creationLogs: state.creationLogs })) })] }))] }));
+                                    .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 })) })] }))] }));
 }

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

@@ -2,7 +2,7 @@ import { z } from "zod";
 export declare const description = "Launch Claude to work on current ticket";
 export declare const options: z.ZodObject<{
     plan: z.ZodOptional<z.ZodBoolean>;
-    "context-file": z.ZodOptional<z.ZodString>;
+    contextFile: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 type Props = {
     options: z.infer<typeof options>;

package/dist/commands/worktree/work.js

@@ -10,7 +10,7 @@ import { getSessionId, setSessionId } from "../../lib/git.js";
 export const description = "Launch Claude to work on current ticket";
 export const options = z.object({
     plan: z.boolean().optional().describe("Only create implementation plan"),
-    "context-file": z
+    contextFile: z
         .string()
         .optional()
         .describe("Path to a file whose contents are appended to the prompt as extra context"),
@@ -28,7 +28,7 @@ export default function Work({ options }) {
     const [error, setError] = useState(null);
     const [mode] = useState(options.plan ? "plan" : "implement");
     const [aiContext, setAiContext] = useState(null);
-    const contextFilePath = options["context-file"];
+    const contextFilePath = options.contextFile;
     useEffect(() => {
         async function init() {
             // Small delay to allow spinner to render

package/dist/lib/dashboard/MultilineTextArea.js

@@ -1,48 +1,189 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from "react";
 import { Box, Text, useInput } from "ink";
+import { spawnSync } from "node:child_process";
+import { openSync, readSync, closeSync, statSync, unlinkSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+const PNG_MAGIC = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
+// macOS clipboard → PNG. Returns the written file path on success, or null if
+// the clipboard holds no image, the platform isn't macOS, or the write produced
+// a file that isn't actually a PNG. The coercion to «class PNGf» errors when
+// the clipboard holds only text — verified against real clipboards.
+function pasteClipboardImageToTmp() {
+    if (process.platform !== "darwin")
+        return null;
+    const filePath = join(tmpdir(), `santree-paste-${Date.now()}.png`);
+    const script = `try
+set pngData to the clipboard as «class PNGf»
+set theFile to POSIX file "${filePath}"
+set fileRef to open for access theFile with write permission
+set eof fileRef to 0
+write pngData to fileRef
+close access fileRef
+return "ok"
+on error
+return "no-image"
+end try`;
+    try {
+        const result = spawnSync("osascript", ["-e", script], {
+            encoding: "utf-8",
+            timeout: 3000,
+        });
+        if (result.status !== 0 || result.stdout.trim() !== "ok")
+            return null;
+        // Defense in depth: verify the file is non-empty and starts with the PNG
+        // magic header. Guards against an osascript quirk writing a stub.
+        if (statSync(filePath).size === 0) {
+            try {
+                unlinkSync(filePath);
+            }
+            catch { }
+            return null;
+        }
+        const fd = openSync(filePath, "r");
+        const header = Buffer.alloc(8);
+        readSync(fd, header, 0, 8, 0);
+        closeSync(fd);
+        if (!header.equals(PNG_MAGIC)) {
+            try {
+                unlinkSync(filePath);
+            }
+            catch { }
+            return null;
+        }
+        return filePath;
+    }
+    catch {
+        // osascript unavailable or fs error — silent no-op
+    }
+    return null;
+}
+function offsetToRowCol(value, offset) {
+    const lines = value.split("\n");
+    let idx = 0;
+    for (let r = 0; r < lines.length; r++) {
+        const len = lines[r].length;
+        if (offset <= idx + len) {
+            return [r, offset - idx];
+        }
+        idx += len + 1;
+    }
+    const last = lines.length - 1;
+    return [last, lines[last].length];
+}
+function rowColToOffset(value, row, col) {
+    const lines = value.split("\n");
+    const clampedRow = Math.max(0, Math.min(row, lines.length - 1));
+    let idx = 0;
+    for (let r = 0; r < clampedRow; r++) {
+        idx += lines[r].length + 1;
+    }
+    const clampedCol = Math.max(0, Math.min(col, lines[clampedRow].length));
+    return idx + clampedCol;
+}
 export function MultilineTextArea({ value, onChange, onSubmit, onCancel, placeholder, width, height = 6, focus = true, }) {
+    const [cursor, setCursor] = useState(value.length);
+    // Keep cursor within bounds if value shrinks externally
+    useEffect(() => {
+        if (cursor > value.length)
+            setCursor(value.length);
+    }, [value, cursor]);
+    const insertAt = (pos, text) => {
+        onChange(value.slice(0, pos) + text + value.slice(pos));
+        setCursor(pos + text.length);
+    };
+    const deleteBefore = (pos) => {
+        if (pos === 0)
+            return;
+        onChange(value.slice(0, pos - 1) + value.slice(pos));
+        setCursor(pos - 1);
+    };
     useInput((input, key) => {
         // Ctrl+D submits
         if (key.ctrl && input === "d") {
             onSubmit();
             return;
         }
-        // ESC cancels. Parent disables SGR mouse tracking while this overlay is
-        // mounted so clicks can no longer masquerade as ESC.
+        // Ctrl+V — try to paste clipboard image as a temp file reference.
+        // Regular Cmd+V text paste is handled by the terminal and arrives as
+        // normal input below.
+        if (key.ctrl && input === "v") {
+            const imagePath = pasteClipboardImageToTmp();
+            if (imagePath) {
+                insertAt(cursor, `![pasted image](${imagePath})`);
+            }
+            return;
+        }
+        // ESC cancels (parent disables SGR mouse tracking while mounted
+        // so clicks don't masquerade as ESC)
         if (key.escape) {
             onCancel();
             return;
         }
         if (key.backspace || key.delete) {
-            onChange(value.slice(0, -1));
+            deleteBefore(cursor);
+            return;
+        }
+        // Arrow navigation — column is remembered via col-from-current-pos
+        if (key.upArrow || key.downArrow || key.leftArrow || key.rightArrow) {
+            const lines = value.split("\n");
+            const [row, col] = offsetToRowCol(value, cursor);
+            if (key.upArrow) {
+                if (row === 0)
+                    setCursor(0);
+                else
+                    setCursor(rowColToOffset(value, row - 1, col));
+            }
+            else if (key.downArrow) {
+                if (row === lines.length - 1)
+                    setCursor(value.length);
+                else
+                    setCursor(rowColToOffset(value, row + 1, col));
+            }
+            else if (key.leftArrow) {
+                setCursor(Math.max(0, cursor - 1));
+            }
+            else if (key.rightArrow) {
+                setCursor(Math.min(value.length, cursor + 1));
+            }
             return;
         }
-        // Swallow navigation keys — this is an append-only text area.
-        if (key.upArrow || key.downArrow || key.leftArrow || key.rightArrow || key.tab)
+        if (key.tab)
             return;
-        // Enter inserts a newline. MUST run before the meta/ctrl swallow below so
-        // Option+Enter and Ctrl+Enter also insert newlines. When Ink delivers a
-        // paste as one chunk, `input` may carry embedded content alongside the
-        // \r — normalize and append the whole thing instead of dropping it.
+        // Enter inserts a newline at cursor. MUST run before meta/ctrl swallow
+        // so Option+Enter / Ctrl+Enter also insert. When a paste carries content
+        // alongside \r, append the whole normalized chunk.
         if (key.return) {
             const chunk = input ? input.replace(/\r\n?/g, "\n") : "\n";
-            onChange(value + chunk);
+            insertAt(cursor, chunk);
             return;
         }
-        // Swallow remaining modifier combos.
+        // Swallow remaining modifier combos
         if (key.ctrl || key.meta)
             return;
         if (!input)
             return;
-        // Pasted content may embed \r or \r\n — normalize to \n.
         const normalized = input.replace(/\r\n?/g, "\n");
-        onChange(value + normalized);
+        insertAt(cursor, normalized);
     }, { isActive: focus });
+    const [cursorRow, cursorCol] = offsetToRowCol(value, cursor);
     const lines = value.length === 0 ? [""] : value.split("\n");
-    const visibleLines = lines.slice(Math.max(0, lines.length - height));
+    // Scroll viewport so the cursor row is always visible
+    let scrollStart = 0;
+    if (cursorRow >= height)
+        scrollStart = cursorRow - height + 1;
+    const visibleLines = lines.slice(scrollStart, scrollStart + height);
     const isEmpty = value.length === 0;
-    return (_jsx(Box, { flexDirection: "column", width: width, borderStyle: "round", borderColor: "cyan", paddingX: 1, minHeight: height + 2, children: isEmpty && placeholder ? (_jsxs(Box, { minHeight: 1, children: [_jsx(Text, { color: "cyan", children: "\u2588" }), _jsx(Text, { dimColor: true, children: placeholder })] })) : (visibleLines.map((line, i) => {
-            const isLast = i === visibleLines.length - 1;
-            return (_jsxs(Box, { minHeight: 1, children: [_jsx(Text, { children: line }), isLast && focus ? _jsx(Text, { color: "cyan", children: "\u2588" }) : null] }, i));
+    return (_jsx(Box, { flexDirection: "column", width: width, borderStyle: "round", borderColor: "cyan", paddingX: 1, minHeight: height + 2, children: isEmpty && placeholder ? (_jsxs(Box, { minHeight: 1, children: [_jsx(Text, { inverse: true, children: " " }), _jsx(Text, { dimColor: true, children: placeholder })] })) : (visibleLines.map((line, i) => {
+            const absoluteRow = scrollStart + i;
+            const isCursorRow = focus && absoluteRow === cursorRow;
+            if (!isCursorRow) {
+                return (_jsx(Box, { minHeight: 1, children: _jsx(Text, { children: line }) }, i));
+            }
+            const before = line.slice(0, cursorCol);
+            const atCursor = cursorCol < line.length ? line[cursorCol] : " ";
+            const after = cursorCol < line.length ? line.slice(cursorCol + 1) : "";
+            return (_jsxs(Box, { minHeight: 1, children: [_jsx(Text, { children: before }), _jsx(Text, { inverse: true, children: atCursor }), _jsx(Text, { children: after })] }, i));
         })) }));
 }

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

@@ -22,7 +22,7 @@ interface PrCreateOverlayProps {
     url: string | null;
     body: string | null;
     title: string | null;
-    scrollOffset: number;
+    dispatch: React.Dispatch<DashboardAction>;
 }
-export declare function PrCreateOverlay({ width, height, branch, ticketId, phase, error, url, body, title, scrollOffset, }: PrCreateOverlayProps): import("react/jsx-runtime").JSX.Element;
+export declare function PrCreateOverlay({ width, height, branch, ticketId, phase, error, url, body, title, dispatch, }: PrCreateOverlayProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/lib/dashboard/Overlays.js

@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { Box, Text } from "ink";
 import Spinner from "ink-spinner";
 import TextInput from "ink-text-input";
+import { MultilineTextArea } from "./MultilineTextArea.js";
 export function CommitOverlay({ width, height, branch, ticketId, gitStatus, phase, message, error, dispatch, onSubmit, }) {
     return (_jsxs(Box, { flexDirection: "column", width: width, height: height, children: [_jsx(Text, { bold: true, color: "cyan", children: "Commit & Push" }), _jsx(Text, { dimColor: true, children: "─".repeat(Math.min(width, 50)) }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "branch: " }), _jsx(Text, { children: branch })] }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "ticket: " }), _jsx(Text, { children: ticketId })] }), _jsx(Text, { children: " " }), gitStatus ? (_jsxs(_Fragment, { children: [_jsx(Text, { dimColor: true, children: "Changes:" }), gitStatus
                         .split("\n")
@@ -20,9 +21,9 @@ export function CommitOverlay({ width, height, branch, ticketId, gitStatus, phas
                         return (_jsxs(Text, { color: color, children: [" ", line] }, i));
                     }), gitStatus.split("\n").length > 8 && (_jsxs(Text, { dimColor: true, children: [" +", gitStatus.split("\n").length - 8, " more"] }))] })) : null, _jsx(Text, { children: " " }), phase === "confirm-stage" && (_jsxs(Text, { children: ["Stage all changes?", " ", _jsx(Text, { color: "cyan", bold: true, children: "y" }), "/", _jsx(Text, { color: "cyan", bold: true, children: "n" })] })), phase === "awaiting-message" && (_jsxs(Box, { children: [_jsx(Text, { children: "Message: " }), _jsx(TextInput, { value: message, onChange: (v) => dispatch({ type: "COMMIT_MESSAGE", message: v }), onSubmit: onSubmit })] })), phase === "committing" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Committing..."] })), phase === "pushing" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Pushing..."] })), phase === "done" && (_jsx(Text, { color: "green", bold: true, children: "Committed and pushed!" })), phase === "error" && _jsx(Text, { color: "red", children: error }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "ESC to cancel" })] }));
 }
-export function PrCreateOverlay({ width, height, branch, ticketId, phase, error, url, body, title, scrollOffset, }) {
-    return (_jsxs(Box, { flexDirection: "column", width: width, height: height, children: [_jsx(Text, { bold: true, color: "cyan", children: "Create Pull Request" }), _jsx(Text, { dimColor: true, children: "─".repeat(Math.min(width, 50)) }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "branch: " }), _jsx(Text, { children: branch })] }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "ticket: " }), _jsx(Text, { children: ticketId })] }), _jsx(Text, { children: " " }), phase === "choose-mode" && (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: "How do you want to create this PR?" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [" ", _jsx(Text, { color: "cyan", bold: true, children: "f" }), " ", "Fill \u2014 use AI to fill the PR template"] }), _jsxs(Text, { children: [" ", _jsx(Text, { color: "cyan", bold: true, children: "w" }), " ", "Web \u2014 open in browser to edit manually"] })] })), phase === "pushing" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Pushing branch..."] })), phase === "filling" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Filling PR template with AI..."] })), phase === "review" && (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: "Review PR" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "title: " }), _jsx(Text, { children: title })] }), _jsx(Text, { children: " " }), body
-                        ?.split("\n")
-                        .slice(scrollOffset, scrollOffset + height - 11)
-                        .map((line, i) => (_jsx(Text, { wrap: "truncate", children: line }, i))), _jsx(Text, { children: " " }), _jsxs(Text, { dimColor: true, children: [_jsx(Text, { color: "cyan", bold: true, children: "y" }), "/Enter create", " ", _jsx(Text, { color: "cyan", bold: true, children: "w" }), " ", "open in browser ESC cancel Shift+arrows scroll"] })] })), phase === "creating" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Creating PR..."] })), phase === "done" && (_jsxs(_Fragment, { children: [_jsx(Text, { color: "green", bold: true, children: "PR created!" }), url ? _jsx(Text, { dimColor: true, children: url }) : null] })), phase === "error" && (_jsxs(_Fragment, { children: [_jsx(Text, { color: "red", children: error }), _jsx(Text, { children: " " }), _jsxs(Text, { dimColor: true, children: [_jsx(Text, { color: "cyan", bold: true, children: "w" }), " ", "open in browser ESC cancel"] })] })), phase !== "review" && phase !== "error" && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "ESC to cancel" })] }))] }));
+export function PrCreateOverlay({ width, height, branch, ticketId, phase, error, url, body, title, dispatch, }) {
+    return (_jsxs(Box, { flexDirection: "column", width: width, height: height, children: [_jsx(Text, { bold: true, color: "cyan", children: "Create Pull Request" }), _jsx(Text, { dimColor: true, children: "─".repeat(Math.min(width, 50)) }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "branch: " }), _jsx(Text, { children: branch })] }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "ticket: " }), _jsx(Text, { children: ticketId })] }), _jsx(Text, { children: " " }), phase === "choose-mode" && (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: "How do you want to create this PR?" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [" ", _jsx(Text, { color: "cyan", bold: true, children: "f" }), " ", "Fill \u2014 use AI to fill the PR template"] }), _jsxs(Text, { children: [" ", _jsx(Text, { color: "cyan", bold: true, children: "w" }), " ", "Web \u2014 open in browser to edit manually"] })] })), phase === "pushing" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Pushing branch..."] })), phase === "filling" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Filling PR template with AI..."] })), phase === "review" && (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: "Edit PR description" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "title: " }), _jsx(Text, { children: title })] }), _jsx(Text, { children: " " }), _jsx(MultilineTextArea, { value: body ?? "", onChange: (v) => dispatch({ type: "PR_CREATE_BODY_CHANGE", body: v }), onSubmit: () => dispatch({ type: "PR_CREATE_CONFIRM" }), onCancel: () => dispatch({ type: "PR_CREATE_CANCEL" }), width: width, height: Math.max(6, height - 10), placeholder: "(empty PR body)" }), _jsx(Text, { children: " " }), _jsxs(Text, { dimColor: true, children: [_jsx(Text, { color: "cyan", bold: true, children: "Enter" }), " newline  ", _jsx(Text, { color: "cyan", bold: true, children: "\u2191\u2193\u2190\u2192" }), " move  ", _jsx(Text, { color: "cyan", bold: true, children: "Ctrl+V" }), " paste image  ", _jsx(Text, { color: "cyan", bold: true, children: "Ctrl+D" }), " continue  ", _jsx(Text, { color: "cyan", bold: true, children: "ESC" }), " cancel"] })] })), phase === "confirm" && (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: "Create this PR?" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "title: " }), _jsx(Text, { children: title })] }), _jsx(Text, { children: " " }), _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 1, children: [(body ?? "")
+                                .split("\n")
+                                .slice(0, Math.max(4, height - 12))
+                                .map((line, i) => (_jsx(Text, { wrap: "truncate", children: line || " " }, i))), (body ?? "").split("\n").length > Math.max(4, height - 12) && (_jsxs(Text, { dimColor: true, children: ["\u2026+", (body ?? "").split("\n").length - Math.max(4, height - 12), " more lines"] }))] }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "green", bold: true, children: "y" }), " / ", _jsx(Text, { color: "green", bold: true, children: "Enter" }), "  create   ", _jsx(Text, { color: "yellow", bold: true, children: "e" }), "  keep editing   ", _jsx(Text, { color: "cyan", bold: true, children: "w" }), "  open in browser   ", _jsx(Text, { color: "red", bold: true, children: "ESC" }), "  cancel"] })] })), phase === "creating" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Creating PR..."] })), phase === "done" && (_jsxs(_Fragment, { children: [_jsx(Text, { color: "green", bold: true, children: "PR created!" }), url ? _jsx(Text, { dimColor: true, children: url }) : null] })), phase === "error" && (_jsxs(_Fragment, { children: [_jsx(Text, { color: "red", children: error }), _jsx(Text, { children: " " }), _jsxs(Text, { dimColor: true, children: [_jsx(Text, { color: "cyan", bold: true, children: "w" }), " ", "open in browser ESC cancel"] })] })), phase !== "review" && phase !== "confirm" && phase !== "error" && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "ESC to cancel" })] }))] }));
 }

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

@@ -60,7 +60,7 @@ export interface EnrichedReviewPR {
 export type DashboardTab = "issues" | "reviews";
 export type ActionOverlay = "mode-select" | "context-input" | "base-select" | "confirm-delete" | "confirm-setup" | "commit" | "pr-create" | null;
 export type CommitPhase = "idle" | "confirm-stage" | "awaiting-message" | "committing" | "pushing" | "done" | "error";
-export type PrCreatePhase = "idle" | "choose-mode" | "pushing" | "filling" | "review" | "creating" | "done" | "error";
+export type PrCreatePhase = "idle" | "choose-mode" | "pushing" | "filling" | "review" | "confirm" | "creating" | "done" | "error";
 export interface DashboardState {
     activeTab: DashboardTab;
     groups: ProjectGroup[];
@@ -102,6 +102,7 @@ export interface DashboardState {
     baseSelectChosen: string | null;
     contextInputValue: string;
     contextInputMode: "plan" | "implement" | null;
+    contextInputPhase: "editing" | "review";
 }
 export type DashboardAction = {
     type: "SET_DATA";
@@ -181,6 +182,13 @@ export type DashboardAction = {
     type: "PR_CREATE_REVIEW";
     body: string;
     title: string;
+} | {
+    type: "PR_CREATE_BODY_CHANGE";
+    body: string;
+} | {
+    type: "PR_CREATE_CONFIRM";
+} | {
+    type: "PR_CREATE_EDIT";
 } | {
     type: "PR_CREATE_DONE";
     url: string;
@@ -223,6 +231,10 @@ export type DashboardAction = {
 } | {
     type: "CONTEXT_INPUT_CHANGE";
     value: string;
+} | {
+    type: "CONTEXT_INPUT_REVIEW";
+} | {
+    type: "CONTEXT_INPUT_EDIT";
 } | {
     type: "CONTEXT_INPUT_DONE";
 };

package/dist/lib/dashboard/types.js

@@ -40,6 +40,7 @@ export const initialState = {
     baseSelectChosen: null,
     contextInputValue: "",
     contextInputMode: null,
+    contextInputPhase: "editing",
 };
 export function reducer(state, action) {
     switch (action.type) {
@@ -165,6 +166,12 @@ export function reducer(state, action) {
                 prCreateTitle: action.title,
                 detailScrollOffset: 0,
             };
+        case "PR_CREATE_BODY_CHANGE":
+            return { ...state, prCreateBody: action.body };
+        case "PR_CREATE_CONFIRM":
+            return { ...state, prCreatePhase: "confirm" };
+        case "PR_CREATE_EDIT":
+            return { ...state, prCreatePhase: "review" };
         case "PR_CREATE_DONE":
             return {
                 ...state,
@@ -250,15 +257,21 @@ export function reducer(state, action) {
                 overlay: "context-input",
                 contextInputMode: action.mode,
                 contextInputValue: "",
+                contextInputPhase: "editing",
             };
         case "CONTEXT_INPUT_CHANGE":
             return { ...state, contextInputValue: action.value };
+        case "CONTEXT_INPUT_REVIEW":
+            return { ...state, contextInputPhase: "review" };
+        case "CONTEXT_INPUT_EDIT":
+            return { ...state, contextInputPhase: "editing" };
         case "CONTEXT_INPUT_DONE":
             return {
                 ...state,
                 overlay: null,
                 contextInputMode: null,
                 contextInputValue: "",
+                contextInputPhase: "editing",
             };
         default:
             return state;

package/package.json

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