santree 0.2.8 → 0.2.9

package/dist/commands/dashboard.js

@@ -35,6 +35,15 @@ function slugify(title) {
         .slice(0, 40);
 }
 // ── Scroll helpers ────────────────────────────────────────────────────
+function countWithChildren(di) {
+    let count = 1;
+    if (di.children) {
+        for (const child of di.children) {
+            count += countWithChildren(child);
+        }
+    }
+    return count;
+}
 function getRowIndexForFlatIndex(groups, flatIndex) {
     let row = 1; // skip column header row
     let issuesSeen = 0;
@@ -42,11 +51,14 @@ function getRowIndexForFlatIndex(groups, flatIndex) {
         row++; // project header
         for (const sg of g.statusGroups) {
             row++; // status header
-            for (let i = 0; i < sg.issues.length; i++) {
-                if (issuesSeen === flatIndex)
-                    return row;
-                row++;
-                issuesSeen++;
+            for (const di of sg.issues) {
+                const total = countWithChildren(di);
+                if (flatIndex >= issuesSeen && flatIndex < issuesSeen + total) {
+                    // The target is within this issue or its children
+                    return row + (flatIndex - issuesSeen);
+                }
+                row += total;
+                issuesSeen += total;
             }
         }
     }
@@ -65,11 +77,13 @@ function getFlatIndexForListRow(groups, listRow) {
             if (row === listRow)
                 return null; // status header row
             row++;
-            for (let i = 0; i < sg.issues.length; i++) {
-                if (row === listRow)
-                    return issuesSeen;
-                row++;
-                issuesSeen++;
+            for (const di of sg.issues) {
+                const total = countWithChildren(di);
+                if (listRow >= row && listRow < row + total) {
+                    return issuesSeen + (listRow - row);
+                }
+                row += total;
+                issuesSeen += total;
             }
         }
     }
@@ -359,7 +373,7 @@ export default function Dashboard() {
             exit();
         }
     }, [exit, refresh]);
-    const createAndLaunch = useCallback(async (mode, runSetup) => {
+    const createAndLaunch = useCallback(async (mode, runSetup, base) => {
         const di = stateRef.current.flatIssues[stateRef.current.selectedIndex];
         if (!di)
             return;
@@ -373,24 +387,32 @@ export default function Dashboard() {
         dispatch({ type: "CREATION_START", ticketId });
         const slug = slugify(di.issue.title);
         const branchName = `feature/${ticketId}-${slug}`;
-        const base = getDefaultBranch();
+        const defaultBranch = getDefaultBranch();
+        const baseBranch = base ?? defaultBranch;
+        const isDefaultBase = baseBranch === defaultBranch;
         // 1. Pull latest (async to avoid blocking the event loop)
         dispatch({ type: "CREATION_LOG", logs: `Fetching origin...\n` });
         try {
             await execAsync("git fetch origin", { cwd: repoRoot });
-            dispatch({ type: "CREATION_LOG", logs: `Checking out ${base}...\n` });
-            await execAsync(`git checkout ${base}`, { cwd: repoRoot });
-            dispatch({ type: "CREATION_LOG", logs: `Pulling ${base}...\n` });
-            await execAsync(`git pull origin ${base}`, { cwd: repoRoot });
-            dispatch({ type: "CREATION_LOG", logs: `Pulled latest ${base}\n` });
+            if (isDefaultBase) {
+                // Only checkout + pull for default branch (can't checkout a branch with an active worktree)
+                dispatch({ type: "CREATION_LOG", logs: `Checking out ${baseBranch}...\n` });
+                await execAsync(`git checkout ${baseBranch}`, { cwd: repoRoot });
+                dispatch({ type: "CREATION_LOG", logs: `Pulling ${baseBranch}...\n` });
+                await execAsync(`git pull origin ${baseBranch}`, { cwd: repoRoot });
+            }
+            dispatch({ type: "CREATION_LOG", logs: `Pulled latest ${baseBranch}\n` });
         }
         catch (e) {
             const msg = e instanceof Error ? e.message : "Failed to pull latest";
             dispatch({ type: "CREATION_LOG", logs: `Warning: ${msg}\n` });
         }
         // 2. Create worktree
-        dispatch({ type: "CREATION_LOG", logs: `Creating worktree ${branchName}...\n` });
-        const result = await createWorktree(branchName, base, repoRoot);
+        dispatch({
+            type: "CREATION_LOG",
+            logs: `Creating worktree ${branchName} from ${baseBranch}...\n`,
+        });
+        const result = await createWorktree(branchName, baseBranch, repoRoot);
         if (!result.success || !result.path) {
             dispatch({ type: "CREATION_ERROR", error: result.error ?? "Unknown error" });
             dispatch({
@@ -446,6 +468,16 @@ export default function Dashboard() {
         dispatch({ type: "CREATION_DONE" });
         launchAfterCreation(mode, result.path, ticketId);
     }, [launchAfterCreation]);
+    const proceedAfterBaseSelect = useCallback((mode, base) => {
+        const repoRoot = repoRootRef.current;
+        if (!repoRoot)
+            return;
+        if (hasInitScript(repoRoot)) {
+            dispatch({ type: "SETUP_CONFIRM_SHOW", mode });
+            return;
+        }
+        createAndLaunch(mode, false, base);
+    }, [createAndLaunch]);
     const doWork = useCallback((mode) => {
         const di = state.flatIssues[state.selectedIndex];
         if (!di)
@@ -467,15 +499,25 @@ export default function Dashboard() {
             }
         }
         else {
-            // No worktree — ask about setup if init script exists
-            if (hasInitScript(repoRoot)) {
+            // No worktree — collect possible base branches
+            const defaultBranch = getDefaultBranch();
+            const baseOptions = [defaultBranch];
+            for (const fi of state.flatIssues) {
+                if (fi.worktree && !baseOptions.includes(fi.worktree.branch)) {
+                    baseOptions.push(fi.worktree.branch);
+                }
+            }
+            if (baseOptions.length > 1) {
+                // Store mode in setupMode so we can retrieve it after base selection
                 dispatch({ type: "SETUP_CONFIRM_SHOW", mode });
+                // Immediately replace overlay with base-select (setupMode is preserved)
+                dispatch({ type: "BASE_SELECT_SHOW", options: baseOptions });
                 return;
             }
-            // No init script — create directly
-            createAndLaunch(mode, false);
+            // Only default branch available — skip base select
+            proceedAfterBaseSelect(mode);
         }
-    }, [state.flatIssues, state.selectedIndex, exit, launchWorkInTmux, createAndLaunch]);
+    }, [state.flatIssues, state.selectedIndex, exit, launchWorkInTmux, proceedAfterBaseSelect]);
     // ── Commit flow ──────────────────────────────────────────────────
     const handleStageAll = useCallback(async () => {
         const wtPath = stateRef.current.commitWorktreePath;
@@ -769,17 +811,48 @@ export default function Dashboard() {
             }
             return;
         }
+        // Base select overlay
+        if (state.overlay === "base-select") {
+            const opts = state.baseSelectOptions;
+            if (input === "j" || key.downArrow) {
+                const next = Math.min(state.baseSelectIndex + 1, opts.length - 1);
+                dispatch({ type: "BASE_SELECT_MOVE", index: next });
+                return;
+            }
+            if (input === "k" || key.upArrow) {
+                const prev = Math.max(state.baseSelectIndex - 1, 0);
+                dispatch({ type: "BASE_SELECT_MOVE", index: prev });
+                return;
+            }
+            if (key.return) {
+                const chosen = opts[state.baseSelectIndex];
+                if (chosen) {
+                    dispatch({ type: "BASE_SELECT_CONFIRM", chosen });
+                    const mode = state.setupMode;
+                    if (mode) {
+                        proceedAfterBaseSelect(mode, chosen);
+                    }
+                }
+                return;
+            }
+            if (key.escape) {
+                dispatch({ type: "BASE_SELECT_DONE" });
+                return;
+            }
+            return;
+        }
         // Confirm setup overlay
         if (state.overlay === "confirm-setup") {
             const mode = state.setupMode;
+            const base = state.baseSelectChosen ?? undefined;
             if (input === "y" && mode) {
                 dispatch({ type: "SETUP_CONFIRM_DONE" });
-                createAndLaunch(mode, true);
+                createAndLaunch(mode, true, base);
                 return;
             }
             if (input === "n" && mode) {
                 dispatch({ type: "SETUP_CONFIRM_DONE" });
-                createAndLaunch(mode, false);
+                createAndLaunch(mode, false, base);
                 return;
             }
             if (key.escape) {
@@ -1073,5 +1146,10 @@ export default function Dashboard() {
         return (_jsx(Box, { width: columns, height: rows, flexDirection: "column", children: _jsxs(Box, { justifyContent: "center", alignItems: "center", flexGrow: 1, flexDirection: "column", children: [_jsx(Text, { color: "yellow", children: "No active issues assigned to you" }), _jsx(Text, { dimColor: true, children: "Press R to refresh or q to quit" })] }) }));
     }
     const selectedIssue = state.flatIssues[state.selectedIndex] ?? 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] }), _jsxs(Text, { dimColor: true, children: [" ", "(", state.flatIssues.length, " issues)", state.refreshing ? " refreshing..." : ""] }), state.actionMessage && (_jsxs(Text, { color: "yellow", children: ["  ", state.actionMessage] }))] }), 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 === "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: _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.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 })) })] }))] }));
+    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] }), _jsxs(Text, { dimColor: true, children: [" ", "(", state.flatIssues.length, " issues)", state.refreshing ? " refreshing..." : ""] }), state.actionMessage && (_jsxs(Text, { color: "yellow", children: ["  ", state.actionMessage] }))] }), 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 === "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;
+                            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 === "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: _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.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 })) })] }))] }));
 }

package/dist/lib/dashboard/IssueList.js

@@ -79,13 +79,26 @@ function buildRows(groups, flatIssues) {
     // Build a map from issue identifier to flat index
     const indexMap = new Map();
     flatIssues.forEach((di, i) => indexMap.set(di.issue.identifier, i));
+    function pushIssueWithChildren(di, depth) {
+        rows.push({
+            kind: "issue",
+            issue: di,
+            flatIndex: indexMap.get(di.issue.identifier) ?? -1,
+            depth,
+        });
+        if (di.children) {
+            for (const child of di.children) {
+                pushIssueWithChildren(child, depth + 1);
+            }
+        }
+    }
     for (const group of groups) {
         const totalIssues = group.statusGroups.reduce((sum, sg) => sum + sg.issues.length, 0);
         rows.push({ kind: "header", name: group.name, count: totalIssues });
         for (const sg of group.statusGroups) {
             rows.push({ kind: "status-header", name: sg.name, type: sg.type, count: sg.issues.length });
             for (const di of sg.issues) {
-                rows.push({ kind: "issue", issue: di, flatIndex: indexMap.get(di.issue.identifier) ?? -1 });
+                pushIssueWithChildren(di, 0);
             }
         }
     }
@@ -115,7 +128,7 @@ export default function IssueList({ groups, flatIssues, selectedIndex, scrollOff
                     if (row.kind === "status-header") {
                         return (_jsx(Box, { children: _jsxs(Text, { color: stateColor(row.type, row.name), dimColor: true, children: ["   ", row.name, " (", row.count, ")"] }) }, `sh-${i}`));
                     }
-                    const { issue, flatIndex } = row;
+                    const { issue, flatIndex, depth } = row;
                     const selected = flatIndex === selectedIndex;
                     const di = issue;
                     const sc = stateColor(di.issue.state.type, di.issue.state.name);
@@ -126,10 +139,12 @@ export default function IssueList({ groups, flatIssues, selectedIndex, scrollOff
                     const pr = prIndicator(di.pr);
                     const prio = priorityIndicator(di.issue.priority);
                     const cursor = selected ? ">" : " ";
-                    const title = di.issue.title.length > titleMaxWidth
-                        ? di.issue.title.slice(0, titleMaxWidth - 1) + "…"
+                    const nestPrefix = depth > 0 ? "  ".repeat(depth - 1) + "└ " : "";
+                    const adjustedTitleWidth = Math.max(titleMaxWidth - nestPrefix.length, 5);
+                    const title = di.issue.title.length > adjustedTitleWidth
+                        ? di.issue.title.slice(0, adjustedTitleWidth - 1) + "…"
                         : di.issue.title;
                     const bg = selected ? "#1e3a5f" : undefined;
-                    return (_jsxs(Box, { width: width, children: [_jsxs(Text, { backgroundColor: bg, color: selected ? "cyan" : undefined, bold: selected, children: [cursor, " "] }), _jsx(Text, { backgroundColor: bg, color: sc, children: "\u25CF" }), _jsxs(Text, { backgroundColor: bg, color: prio.color, children: [" ", prio.text] }), _jsx(Text, { backgroundColor: bg, color: selected ? "cyan" : undefined, bold: selected, children: di.issue.identifier.padEnd(10) }), _jsx(Text, { backgroundColor: bg, color: selected ? "white" : undefined, bold: selected, children: title.padEnd(titleMaxWidth) }), _jsx(Text, { backgroundColor: bg, color: selected ? (sess.color === "gray" ? "gray" : sess.color) : sess.color, children: sess.text.padStart(sessionColWidth) }), _jsx(Text, { backgroundColor: bg, children: " " }), _jsx(Text, { backgroundColor: bg, color: selected ? (pr.color === "gray" ? "gray" : pr.color) : pr.color, children: pr.text.padStart(prColWidth) }), _jsx(Text, { backgroundColor: bg, children: " " }), _jsx(Text, { backgroundColor: bg, color: selected ? (ci.color === "gray" ? "gray" : ci.color) : ci.color, children: ci.text.padStart(checksColWidth) })] }, di.issue.identifier));
+                    return (_jsxs(Box, { width: width, children: [_jsxs(Text, { backgroundColor: bg, color: selected ? "cyan" : undefined, bold: selected, children: [cursor, " "] }), _jsx(Text, { backgroundColor: bg, color: sc, children: "\u25CF" }), _jsxs(Text, { backgroundColor: bg, color: prio.color, children: [" ", prio.text] }), _jsxs(Text, { backgroundColor: bg, color: selected ? "cyan" : undefined, bold: selected, children: [nestPrefix, di.issue.identifier.padEnd(10)] }), _jsx(Text, { backgroundColor: bg, color: selected ? "white" : undefined, bold: selected, children: title.padEnd(adjustedTitleWidth) }), _jsx(Text, { backgroundColor: bg, color: selected ? (sess.color === "gray" ? "gray" : sess.color) : sess.color, children: sess.text.padStart(sessionColWidth) }), _jsx(Text, { backgroundColor: bg, children: " " }), _jsx(Text, { backgroundColor: bg, color: selected ? (pr.color === "gray" ? "gray" : pr.color) : pr.color, children: pr.text.padStart(prColWidth) }), _jsx(Text, { backgroundColor: bg, children: " " }), _jsx(Text, { backgroundColor: bg, color: selected ? (ci.color === "gray" ? "gray" : ci.color) : ci.color, children: ci.text.padStart(checksColWidth) })] }, di.issue.identifier));
                 }) }), _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" }), "   ", _jsx(Text, { color: "cyan", bold: true, children: "Shift + \u2191\u2193" }), _jsx(Text, { color: "white", children: " Scroll detail" }), "   ", _jsx(Text, { color: "cyan", bold: true, children: "E" }), _jsx(Text, { color: "white", children: " Workspace" }), "   ", _jsx(Text, { color: "cyan", bold: true, children: "R" }), _jsx(Text, { color: "white", children: " Refresh" }), "   ", _jsx(Text, { color: "cyan", bold: true, children: "q" }), _jsx(Text, { color: "white", children: " Quit" })] })] })] }));
 }

package/dist/lib/dashboard/data.js

@@ -129,9 +129,37 @@ export async function loadDashboardData(repoRoot) {
             reviews: reviewsInfo,
         };
     }));
-    // Group by project
+    // ── Compute parent-child relationships ──────────────────────────
+    // Build a map from worktree branch → DashboardIssue
+    const allIssues = [...enriched, ...orphans];
+    const branchToIssue = new Map();
+    for (const di of allIssues) {
+        if (di.worktree)
+            branchToIssue.set(di.worktree.branch, di);
+    }
+    // For each issue with a worktree, check if its base_branch matches another issue's branch
+    const childTicketIds = new Set();
+    for (const di of allIssues) {
+        if (!di.worktree)
+            continue;
+        const ticketId = di.issue.identifier;
+        const baseBranch = metadata[ticketId]?.base_branch;
+        if (!baseBranch)
+            continue; // no custom base = branched from default, not a child
+        const parent = branchToIssue.get(baseBranch);
+        if (!parent || parent === di)
+            continue;
+        di.parentTicketId = parent.issue.identifier;
+        if (!parent.children)
+            parent.children = [];
+        parent.children.push(di);
+        childTicketIds.add(ticketId);
+    }
+    // Group by project (excluding children — they'll appear nested under parents)
     const groupMap = new Map();
     for (const di of enriched) {
+        if (childTicketIds.has(di.issue.identifier))
+            continue;
         const key = di.issue.projectName ?? "No Project";
         const list = groupMap.get(key) ?? [];
         list.push(di);
@@ -169,8 +197,9 @@ export async function loadDashboardData(repoRoot) {
             statusGroups,
         };
     });
-    // Append orphaned worktrees as a separate group at the bottom
-    if (orphans.length > 0) {
+    // Append orphaned worktrees as a separate group at the bottom (excluding children)
+    const topLevelOrphans = orphans.filter((di) => !childTicketIds.has(di.issue.identifier));
+    if (topLevelOrphans.length > 0) {
         groups.push({
             name: "Orphaned Worktrees",
             id: null,
@@ -178,11 +207,21 @@ export async function loadDashboardData(repoRoot) {
                 {
                     name: "Orphaned",
                     type: "orphaned",
-                    issues: orphans,
+                    issues: topLevelOrphans,
                 },
             ],
         });
     }
-    const flatIssues = groups.flatMap((g) => g.statusGroups.flatMap((sg) => sg.issues));
+    // Flatten with children inserted right after their parent
+    function flattenWithChildren(di) {
+        const result = [di];
+        if (di.children) {
+            for (const child of di.children) {
+                result.push(...flattenWithChildren(child));
+            }
+        }
+        return result;
+    }
+    const flatIssues = groups.flatMap((g) => g.statusGroups.flatMap((sg) => sg.issues.flatMap(flattenWithChildren)));
     return { groups, flatIssues };
 }

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

@@ -30,6 +30,8 @@ export interface DashboardIssue {
     pr: PRInfo | null;
     checks: PRCheck[] | null;
     reviews: PRReview[] | null;
+    parentTicketId?: string;
+    children?: DashboardIssue[];
 }
 export interface StatusGroup {
     name: string;
@@ -41,7 +43,7 @@ export interface ProjectGroup {
     id: string | null;
     statusGroups: StatusGroup[];
 }
-export type ActionOverlay = "mode-select" | "confirm-delete" | "confirm-setup" | "commit" | "pr-create" | null;
+export type ActionOverlay = "mode-select" | "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 interface DashboardState {
@@ -75,6 +77,9 @@ export interface DashboardState {
     prCreateBody: string | null;
     prCreateTitle: string | null;
     setupMode: "plan" | "implement" | null;
+    baseSelectOptions: string[];
+    baseSelectIndex: number;
+    baseSelectChosen: string | null;
 }
 export type DashboardAction = {
     type: "SET_DATA";
@@ -164,6 +169,17 @@ export type DashboardAction = {
     mode: "plan" | "implement";
 } | {
     type: "SETUP_CONFIRM_DONE";
+} | {
+    type: "BASE_SELECT_SHOW";
+    options: string[];
+} | {
+    type: "BASE_SELECT_MOVE";
+    index: number;
+} | {
+    type: "BASE_SELECT_CONFIRM";
+    chosen: string;
+} | {
+    type: "BASE_SELECT_DONE";
 };
 export declare const initialState: DashboardState;
 export declare function reducer(state: DashboardState, action: DashboardAction): DashboardState;

package/dist/lib/dashboard/types.js

@@ -30,6 +30,9 @@ export const initialState = {
     prCreateBody: null,
     prCreateTitle: null,
     setupMode: null,
+    baseSelectOptions: [],
+    baseSelectIndex: 0,
+    baseSelectChosen: null,
 };
 export function reducer(state, action) {
     switch (action.type) {
@@ -81,9 +84,21 @@ export function reducer(state, action) {
         case "CREATION_LOG":
             return { ...state, creationLogs: state.creationLogs + action.logs };
         case "CREATION_DONE":
-            return { ...state, creatingForTicket: null, creationLogs: "", creationError: null };
+            return {
+                ...state,
+                creatingForTicket: null,
+                creationLogs: "",
+                creationError: null,
+                baseSelectChosen: null,
+            };
         case "CREATION_ERROR":
-            return { ...state, creationError: action.error, creatingForTicket: null, creationLogs: "" };
+            return {
+                ...state,
+                creationError: action.error,
+                creatingForTicket: null,
+                creationLogs: "",
+                baseSelectChosen: null,
+            };
         case "DELETE_START":
             return { ...state, deletingForTicket: action.ticketId };
         case "DELETE_DONE":
@@ -176,6 +191,29 @@ export function reducer(state, action) {
                 overlay: null,
                 setupMode: null,
             };
+        case "BASE_SELECT_SHOW":
+            return {
+                ...state,
+                overlay: "base-select",
+                baseSelectOptions: action.options,
+                baseSelectIndex: 0,
+                baseSelectChosen: null,
+            };
+        case "BASE_SELECT_MOVE":
+            return { ...state, baseSelectIndex: action.index };
+        case "BASE_SELECT_CONFIRM":
+            return {
+                ...state,
+                overlay: null,
+                baseSelectChosen: action.chosen,
+            };
+        case "BASE_SELECT_DONE":
+            return {
+                ...state,
+                overlay: null,
+                baseSelectOptions: [],
+                baseSelectIndex: 0,
+            };
         default:
             return state;
     }

package/package.json

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