mintree 0.3.2 → 0.4.1

package/dist/commands/dashboard.js

@@ -10,7 +10,7 @@ import { resolveClaudeBinary } from "../lib/claude.js";
 import { tryExec } from "../lib/exec.js";
 import { getLatestVersion, isNewerVersion } from "../lib/version.js";
 import { ALLOWED_TYPES } from "../lib/branch.js";
-import { runCreate, runCreateDetached } from "../lib/worktreeCreate.js";
+import { runCreate, runCreateDetached, } from "../lib/worktreeCreate.js";
 import { runRemove, runRemoveByPath } from "../lib/worktreeRemove.js";
 import { buildCreateMarkers, emitMarkers } from "../lib/markers.js";
 import { readMetadata } from "../lib/metadata.js";
@@ -19,6 +19,20 @@ import { loadDashboard } from "../lib/dashboard.js";
 const require = createRequire(import.meta.url);
 const { version: mintreeVersion } = require("../../package.json");
 export const description = "Interactive dashboard listing open issues assigned to you with worktree + session state";
+function isOrphan(d) {
+    return d.orphan === true;
+}
+function tabIssues(issues, tab) {
+    return issues.filter((d) => (tab === "issues" ? !isOrphan(d) : isOrphan(d)));
+}
+function currentSelected(s) {
+    const displayed = tabIssues(s.issues, s.activeTab);
+    const selectedIndex = s.activeTab === "issues" ? s.issuesIndex : s.worktreesIndex;
+    return { displayed, selectedIndex };
+}
+function withSelectedIndex(s, next) {
+    return s.activeTab === "issues" ? { ...s, issuesIndex: next } : { ...s, worktreesIndex: next };
+}
 // xterm/iTerm/etc switch to the alternate screen buffer with these escape
 // codes. Using the buffer means the dashboard owns the whole window for its
 // lifetime, and the previous shell content reappears unchanged the moment
@@ -152,8 +166,10 @@ function useTerminalSize() {
     }, [stdout]);
     return size;
 }
-function HeaderRow({ repoName, claudeVersion, issueCount, updateAvailable, }) {
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, color: "green", children: "mintree" }), _jsx(Text, { dimColor: true, children: `  v${mintreeVersion}` }), updateAvailable && _jsx(Text, { color: "yellow", children: " (*)" }), claudeVersion && _jsx(Text, { dimColor: true, children: `   ·   claude ${claudeVersion}` }), repoName && _jsx(Text, { dimColor: true, children: `   ·   ${repoName}` })] }), _jsx(Box, { children: _jsx(Text, { bold: true, backgroundColor: "cyan", color: "black", children: ` Issues (${issueCount}) ` }) })] }));
+function HeaderRow({ repoName, claudeVersion, issueCount, worktreeCount, activeTab, updateAvailable, }) {
+    const issuesLabel = ` Issues (${issueCount}) `;
+    const worktreesLabel = ` Worktrees (${worktreeCount}) `;
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, color: "green", children: "mintree" }), _jsx(Text, { dimColor: true, children: `  v${mintreeVersion}` }), updateAvailable && _jsx(Text, { color: "yellow", children: " (*)" }), claudeVersion && _jsx(Text, { dimColor: true, children: `   ·   claude ${claudeVersion}` }), repoName && _jsx(Text, { dimColor: true, children: `   ·   ${repoName}` })] }), _jsxs(Box, { children: [activeTab === "issues" ? (_jsx(Text, { bold: true, backgroundColor: "cyan", color: "black", children: issuesLabel })) : (_jsx(Text, { dimColor: true, children: issuesLabel })), _jsx(Text, { children: " " }), activeTab === "worktrees" ? (_jsx(Text, { bold: true, backgroundColor: "cyan", color: "black", children: worktreesLabel })) : (_jsx(Text, { dimColor: true, children: worktreesLabel })), _jsx(Text, { dimColor: true, children: "   ← / → switch tab" })] })] }));
 }
 function FooterRow({ phase, overlayKind, latestVersion, listWidth, }) {
     if (phase === "error") {
@@ -186,7 +202,14 @@ function CreateOverlayView({ overlay, onDescChange, onPromptChange, }) {
     const dirPreview = isNewBranch
         ? `${overlay.issue.issue.id}-${overlay.desc}`
         : `${overlay.issue.issue.id}-${detachedDesc}`;
-    return (_jsxs(Box, { flexGrow: 1, flexDirection: "column", paddingX: 1, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, color: "cyan", children: "Create worktree" }), _jsx(Text, { dimColor: true, children: ` for ${overlay.issue.issue.id}` })] }), _jsx(Box, { marginTop: 0, children: _jsx(Text, { children: overlay.issue.issue.title }) }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { bold: overlay.field === "branchMode", children: overlay.field === "branchMode" ? "▸ Branch:" : "  Branch:" }) }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "<  " }), _jsx(Text, { color: overlay.field === "branchMode" ? "cyan" : undefined, bold: overlay.field === "branchMode", children: isNewBranch ? "new" : `current (${overlay.currentBranch ?? "?"})` }), _jsx(Text, { dimColor: true, children: "  >" })] }), overlay.field === "branchMode" && _jsx(Text, { dimColor: true, children: "   (use ← / → to toggle)" })] }), isNewBranch && (_jsxs(_Fragment, { children: [_jsxs(Box, { marginTop: 0, children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { bold: overlay.field === "type", children: overlay.field === "type" ? "▸ Type:" : "  Type:" }) }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "<  " }), _jsx(Text, { color: overlay.field === "type" ? "cyan" : undefined, bold: overlay.field === "type", children: overlay.type }), _jsx(Text, { dimColor: true, children: "  >" })] }), overlay.field === "type" && _jsx(Text, { dimColor: true, children: "   (use ← / → to cycle)" })] }), _jsxs(Box, { marginTop: 0, children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { bold: overlay.field === "desc", children: overlay.field === "desc" ? "▸ Description:" : "  Description:" }) }), _jsx(Box, { children: overlay.field === "desc" ? (_jsx(TextInput, { value: overlay.desc, onChange: onDescChange, placeholder: "kebab-case" })) : (_jsx(Text, { children: overlay.desc || "(empty)" })) })] })] })), _jsxs(Box, { marginTop: 0, children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { bold: overlay.field === "prompt", children: overlay.field === "prompt" ? "▸ Prompt:" : "  Prompt:" }) }), _jsx(Box, { children: overlay.field === "prompt" ? (_jsx(TextInput, { value: overlay.prompt, onChange: onPromptChange, placeholder: "(empty = no initial message)" })) : (_jsx(Text, { dimColor: true, children: overlay.prompt || "(empty — Claude starts with no message)" })) })] })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { dimColor: true, children: " Checkout:" }) }), _jsx(Text, { color: "green", children: branchPreview })] }), _jsxs(Box, { children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { dimColor: true, children: " Worktree:" }) }), _jsxs(Text, { dimColor: true, children: [".mintree/worktrees/", dirPreview] })] }), _jsxs(Box, { children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { dimColor: true, children: " Mode:" }) }), _jsx(Text, { dimColor: true, children: "--work (Claude launches in the new worktree)" })] })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [isNewBranch ? (_jsxs(Text, { dimColor: true, children: ["Suggestion is a kebab of the title (capped at ", SUGGESTED_DESC_MAX_WORDS, " words). Edit it to match your repo's branch conventions."] })) : (_jsxs(Text, { dimColor: true, children: ["Detached HEAD at the tip of ", overlay.currentBranch ?? "the current branch", ". No new branch is created \u2014 commit on a new one with `git switch -c` when ready."] })), isNewBranch && overlay.conventionDoc && (_jsx(Text, { dimColor: true, children: `This repo has \`${overlay.conventionDoc}\` — review it before creating.` }))] }), overlay.error && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "red", bold: true, children: ["\u2717 ", overlay.error] }) })), overlay.pending && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", overlay.pending] })] }))] }));
+    return (_jsxs(Box, { flexGrow: 1, flexDirection: "column", paddingX: 1, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, color: "cyan", children: "Create worktree" }), _jsx(Text, { dimColor: true, children: ` for ${overlay.issue.issue.id}` })] }), _jsx(Box, { marginTop: 0, children: _jsx(Text, { children: overlay.issue.issue.title }) }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { bold: overlay.field === "branchMode", children: overlay.field === "branchMode" ? "▸ Branch:" : "  Branch:" }) }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "<  " }), _jsx(Text, { color: overlay.field === "branchMode" ? "cyan" : undefined, bold: overlay.field === "branchMode", children: isNewBranch ? "new" : `current (${overlay.currentBranch ?? "?"})` }), _jsx(Text, { dimColor: true, children: "  >" })] }), overlay.field === "branchMode" && _jsx(Text, { dimColor: true, children: "   (use ← / → to toggle)" })] }), isNewBranch && (_jsxs(_Fragment, { children: [_jsxs(Box, { marginTop: 0, children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { bold: overlay.field === "type", children: overlay.field === "type" ? "▸ Type:" : "  Type:" }) }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "<  " }), _jsx(Text, { color: overlay.field === "type" ? "cyan" : undefined, bold: overlay.field === "type", children: overlay.type }), _jsx(Text, { dimColor: true, children: "  >" })] }), overlay.field === "type" && _jsx(Text, { dimColor: true, children: "   (use ← / → to cycle)" })] }), _jsxs(Box, { marginTop: 0, children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { bold: overlay.field === "desc", children: overlay.field === "desc" ? "▸ Description:" : "  Description:" }) }), _jsx(Box, { children: overlay.field === "desc" ? (_jsx(TextInput, { value: overlay.desc, onChange: onDescChange, placeholder: "kebab-case" })) : (_jsx(Text, { children: overlay.desc || "(empty)" })) })] })] })), _jsxs(Box, { marginTop: 0, children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { bold: overlay.field === "prompt", children: overlay.field === "prompt" ? "▸ Prompt:" : "  Prompt:" }) }), _jsx(Box, { children: overlay.field === "prompt" ? (_jsx(TextInput, { value: overlay.prompt, onChange: onPromptChange, placeholder: "(empty = no initial message)" })) : (_jsx(Text, { dimColor: true, children: overlay.prompt || "(empty — Claude starts with no message)" })) })] })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { dimColor: true, children: " Checkout:" }) }), _jsx(Text, { color: "green", children: branchPreview })] }), _jsxs(Box, { children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { dimColor: true, children: " Worktree:" }) }), _jsxs(Text, { dimColor: true, children: [".mintree/worktrees/", dirPreview] })] }), _jsxs(Box, { children: [_jsx(Box, { width: labelWidth, children: _jsx(Text, { dimColor: true, children: " Mode:" }) }), _jsx(Text, { dimColor: true, children: "--work (Claude launches in the new worktree)" })] })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [isNewBranch ? (_jsxs(Text, { dimColor: true, children: ["Suggestion is a kebab of the title (capped at ", SUGGESTED_DESC_MAX_WORDS, " words). Edit it to match your repo's branch conventions."] })) : (_jsxs(Text, { dimColor: true, children: ["Detached HEAD at the tip of ", overlay.currentBranch ?? "the current branch", ". No new branch is created \u2014 commit on a new one with `git switch -c` when ready."] })), isNewBranch && overlay.conventionDoc && (_jsx(Text, { dimColor: true, children: `This repo has \`${overlay.conventionDoc}\` — review it before creating.` }))] }), overlay.error && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "red", bold: true, children: ["\u2717 ", overlay.error] }) })), overlay.steps.length > 0 && (_jsx(Box, { marginTop: 1, flexDirection: "column", children: overlay.steps.map((step, i) => (_jsxs(Box, { children: [_jsx(CreateStepIcon, { kind: step.kind }), _jsx(Text, { children: " " }), _jsx(Text, { children: step.label }), step.detail && _jsxs(Text, { dimColor: true, children: [" (", step.detail, ")"] })] }, i))) })), overlay.pending && (_jsxs(Box, { marginTop: overlay.steps.length > 0 ? 0 : 1, children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", overlay.pending] })] }))] }));
+}
+function CreateStepIcon({ kind }) {
+    if (kind === "ok")
+        return _jsx(Text, { color: "green", children: "\u2713" });
+    if (kind === "warn")
+        return _jsx(Text, { color: "yellow", children: "!" });
+    return _jsx(Text, { color: "cyan", children: "\u25CB" });
 }
 function IssueListRow({ d, selected, identifierWidth, rowWidth, }) {
     // Display the issue id raw (e.g. "FE-123", "100"). The `#` prefix is a
@@ -639,18 +662,32 @@ export default function Dashboard() {
             return;
         }
         setState((prev) => {
-            const previousIndex = prev.phase === "ready" ? prev.selectedIndex : 0;
-            const previousOverlay = prev.phase === "ready" ? prev.overlay : null;
-            const previousToast = prev.phase === "ready" ? prev.toast : null;
-            const previousScroll = prev.phase === "ready" ? prev.detailScrollOffset : 0;
-            const clamped = Math.min(previousIndex, Math.max(0, issues.length - 1));
-            // Preserve scroll only when the selected issue stayed put — clamping
-            // to a different row means the user is now reading something else.
-            const detailScrollOffset = clamped === previousIndex ? previousScroll : 0;
+            const prevReady = prev.phase === "ready" ? prev : null;
+            const activeTab = prevReady?.activeTab ?? "issues";
+            const previousIssuesIndex = prevReady?.issuesIndex ?? 0;
+            const previousWorktreesIndex = prevReady?.worktreesIndex ?? 0;
+            const previousOverlay = prevReady?.overlay ?? null;
+            const previousToast = prevReady?.toast ?? null;
+            const previousScroll = prevReady?.detailScrollOffset ?? 0;
+            const issuesList = tabIssues(issues, "issues");
+            const worktreesList = tabIssues(issues, "worktrees");
+            const issuesIndex = Math.min(previousIssuesIndex, Math.max(0, issuesList.length - 1));
+            const worktreesIndex = Math.min(previousWorktreesIndex, Math.max(0, worktreesList.length - 1));
+            // Preserve scroll only when the active tab's selected issue still
+            // resolves to the same row — clamping or list churn means the user
+            // is now reading something else.
+            const prevDisplayed = prevReady ? tabIssues(prevReady.issues, activeTab) : [];
+            const nextDisplayed = activeTab === "issues" ? issuesList : worktreesList;
+            const prevSelectedId = prevDisplayed[activeTab === "issues" ? previousIssuesIndex : previousWorktreesIndex]?.issue
+                .id ?? null;
+            const nextSelectedId = nextDisplayed[activeTab === "issues" ? issuesIndex : worktreesIndex]?.issue.id ?? null;
+            const detailScrollOffset = prevSelectedId !== null && prevSelectedId === nextSelectedId ? previousScroll : 0;
             return {
                 phase: "ready",
                 issues,
-                selectedIndex: clamped,
+                activeTab,
+                issuesIndex,
+                worktreesIndex,
                 detailScrollOffset,
                 refreshing: false,
                 overlay: previousOverlay,
@@ -707,10 +744,11 @@ export default function Dashboard() {
                     if (prev.overlay)
                         return prev; // overlay pauses scroll routing
                     if (inLeftPane) {
-                        const next = Math.max(0, Math.min(prev.issues.length - 1, prev.selectedIndex + delta));
-                        if (next === prev.selectedIndex)
+                        const { displayed, selectedIndex } = currentSelected(prev);
+                        const next = Math.max(0, Math.min(displayed.length - 1, selectedIndex + delta));
+                        if (next === selectedIndex)
                             return prev;
-                        return { ...prev, selectedIndex: next, detailScrollOffset: 0 };
+                        return { ...withSelectedIndex(prev, next), detailScrollOffset: 0 };
                     }
                     const next = Math.max(0, prev.detailScrollOffset + delta);
                     if (next === prev.detailScrollOffset)
@@ -781,20 +819,23 @@ export default function Dashboard() {
         }
         if (state.phase !== "ready")
             return;
+        if (key.leftArrow || key.rightArrow) {
+            // Two tabs only — either arrow toggles. Per-tab indices are
+            // preserved, so the user returns to the row they left.
+            const next = state.activeTab === "issues" ? "worktrees" : "issues";
+            setState({ ...state, activeTab: next, detailScrollOffset: 0 });
+            return;
+        }
         if (key.upArrow || input === "k") {
-            setState({
-                ...state,
-                selectedIndex: Math.max(0, state.selectedIndex - 1),
-                detailScrollOffset: 0,
-            });
+            const { selectedIndex } = currentSelected(state);
+            const nextIndex = Math.max(0, selectedIndex - 1);
+            setState({ ...withSelectedIndex(state, nextIndex), detailScrollOffset: 0 });
             return;
         }
         if (key.downArrow || input === "j") {
-            setState({
-                ...state,
-                selectedIndex: Math.min(state.issues.length - 1, state.selectedIndex + 1),
-                detailScrollOffset: 0,
-            });
+            const { displayed, selectedIndex } = currentSelected(state);
+            const nextIndex = Math.min(Math.max(0, displayed.length - 1), selectedIndex + 1);
+            setState({ ...withSelectedIndex(state, nextIndex), detailScrollOffset: 0 });
             return;
         }
         if (key.pageUp) {
@@ -817,7 +858,8 @@ export default function Dashboard() {
             return;
         }
         if (input === "o") {
-            const issue = state.issues[state.selectedIndex];
+            const { displayed, selectedIndex } = currentSelected(state);
+            const issue = displayed[selectedIndex];
             // Orphan rows carry an empty URL — nothing to open. Skip silently
             // rather than asking the OS to open an empty string.
             if (issue && issue.issue.url)
@@ -825,7 +867,8 @@ export default function Dashboard() {
             return;
         }
         if (input === "w") {
-            const issue = state.issues[state.selectedIndex];
+            const { displayed, selectedIndex } = currentSelected(state);
+            const issue = displayed[selectedIndex];
             if (!issue)
                 return;
             if (issue.worktree) {
@@ -836,7 +879,8 @@ export default function Dashboard() {
             return;
         }
         if (key.return) {
-            const issue = state.issues[state.selectedIndex];
+            const { displayed, selectedIndex } = currentSelected(state);
+            const issue = displayed[selectedIndex];
             if (!issue)
                 return;
             if (issue.worktree) {
@@ -852,7 +896,8 @@ export default function Dashboard() {
             return;
         }
         if (input === "d") {
-            const issue = state.issues[state.selectedIndex];
+            const { displayed, selectedIndex } = currentSelected(state);
+            const issue = displayed[selectedIndex];
             if (!issue || !issue.worktree)
                 return;
             setState({
@@ -888,6 +933,7 @@ export default function Dashboard() {
                 error: null,
                 conventionDoc: root ? findBranchConventionDoc(root) : null,
                 pending: null,
+                steps: [],
             },
             toast: null,
         });
@@ -985,22 +1031,37 @@ export default function Dashboard() {
             });
             return;
         }
-        // Surface the spinner BEFORE the heavy sync work. runCreate /
-        // runCreateDetached both block the event loop (execSync: git fetch +
-        // worktree add + optional .mintree/init.sh — easily several seconds on
-        // slow remotes or a repo with a real init script). Without yielding
-        // here, Ink wouldn't get to paint the spinner before execSync blocks
-        // the event loop, leaving the user staring at a frozen overlay.
-        //
-        // A single setImmediate isn't enough: React 19 commits the state on
-        // the next microtask, then Ink schedules its stdout write on a later
-        // macrotask. A ~32ms setTimeout (two frames at 60fps) covers both
-        // phases reliably without being perceptible.
+        // Enter the live-setup view: clear input chrome, reset the step log,
+        // show a starting spinner. The actual progress updates come through
+        // the runCreate/runCreateDetached callbacks below.
         setState({
             ...state,
-            overlay: { ...overlay, error: null, pending: "Creating worktree..." },
+            overlay: { ...overlay, error: null, pending: "Starting...", steps: [] },
         });
         await new Promise((resolve) => setTimeout(resolve, 32));
+        // Progress callbacks invoked from inside runCreate/runCreateDetached.
+        // Use functional setState so we don't clobber concurrent updates and
+        // don't rely on the stale closure of `state`.
+        const onStep = (step) => {
+            setState((prev) => {
+                if (prev.phase !== "ready" || prev.overlay?.kind !== "create")
+                    return prev;
+                return {
+                    ...prev,
+                    overlay: { ...prev.overlay, steps: [...prev.overlay.steps, step] },
+                };
+            });
+        };
+        const onPending = (label) => {
+            setState((prev) => {
+                if (prev.phase !== "ready" || prev.overlay?.kind !== "create")
+                    return prev;
+                return {
+                    ...prev,
+                    overlay: { ...prev.overlay, pending: label },
+                };
+            });
+        };
         const prompt = overlay.prompt.trim();
         const issueId = overlay.issue.issue.id;
         let result;
@@ -1009,29 +1070,35 @@ export default function Dashboard() {
             // from the issue title (kebabized), not user input — keeping the
             // "current branch" flow as low-friction as possible.
             const descKebab = kebabize(overlay.issue.issue.title) || `issue-${issueId}`;
-            result = runCreateDetached({
+            result = await runCreateDetached({
                 issueId,
                 descKebab,
                 work: true,
+                progress: { onStep, onPending },
                 ...(prompt.length > 0 ? { prompt } : {}),
             });
         }
         else {
             const desc = overlay.desc.trim();
             const branch = `${overlay.type}/${issueId}-${desc}`;
-            result = runCreate(branch, {
+            result = await runCreate(branch, {
                 work: true,
+                progress: { onStep, onPending },
                 ...(prompt.length > 0 ? { prompt } : {}),
             });
         }
         if (!result.ok) {
-            setState({
-                ...state,
-                overlay: {
-                    ...overlay,
-                    pending: null,
-                    error: result.message + (result.hint ? ` — ${result.hint}` : ""),
-                },
+            setState((prev) => {
+                if (prev.phase !== "ready" || prev.overlay?.kind !== "create")
+                    return prev;
+                return {
+                    ...prev,
+                    overlay: {
+                        ...prev.overlay,
+                        pending: null,
+                        error: result.ok ? null : result.message + (result.hint ? ` — ${result.hint}` : ""),
+                    },
+                };
             });
             return;
         }
@@ -1039,9 +1106,15 @@ export default function Dashboard() {
         // to In Progress on its project. Errors from the GraphQL call don't
         // block the worktree hand-off; we swallow them and let `mintree doctor`
         // surface persistent issues (missing `project` scope, etc.).
-        setState({
-            ...state,
-            overlay: { ...overlay, error: null, pending: "Updating issue status..." },
+        // Functional update preserves the accumulated `steps` list from the
+        // progress callbacks; using the stale `overlay` closure would wipe it.
+        setState((prev) => {
+            if (prev.phase !== "ready" || prev.overlay?.kind !== "create")
+                return prev;
+            return {
+                ...prev,
+                overlay: { ...prev.overlay, error: null, pending: "Updating issue status..." },
+            };
         });
         const repoRoot = findMainRepoRoot();
         if (repoRoot) {
@@ -1094,8 +1167,11 @@ export default function Dashboard() {
     if (state.phase === "error") {
         return (_jsxs(Box, { width: columns, height: rows, flexDirection: "column", borderStyle: "round", borderColor: "red", paddingX: 1, children: [_jsxs(Text, { color: "red", bold: true, children: ["\u2717 ", state.message] }), state.hint && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "yellow", children: ["\u21B3 ", state.hint] }) })), _jsx(Box, { marginTop: 1, children: _jsx(FooterRow, { phase: "error" }) })] }));
     }
-    const { issues, selectedIndex, refreshing, overlay, toast } = state;
-    const selected = issues[selectedIndex] ?? null;
+    const { issues, refreshing, overlay, toast, activeTab } = state;
+    const { displayed, selectedIndex } = currentSelected(state);
+    const selected = displayed[selectedIndex] ?? null;
+    const issuesTabCount = issues.reduce((n, d) => (isOrphan(d) ? n : n + 1), 0);
+    const worktreesTabCount = issues.length - issuesTabCount;
     const onOverlayDescChange = (next) => {
         if (state.phase !== "ready" || !state.overlay)
             return;
@@ -1122,7 +1198,7 @@ export default function Dashboard() {
     const listWidthPct = 0.5;
     const listWidth = Math.max(32, Math.floor(columns * listWidthPct));
     const detailWidth = columns - listWidth - 2; // border slack
-    const identifierWidth = Math.max(3, ...issues.map((d) => d.issue.id.length));
+    const identifierWidth = Math.max(3, ...displayed.map((d) => d.issue.id.length));
     // Reserve rows: header (2), top borders (1), footer (3).
     const listVisibleRows = Math.max(3, rows - 9);
     // Detail pane content height inside the bordered box. Header eats 2 rows,
@@ -1136,8 +1212,14 @@ export default function Dashboard() {
     // Grouped list: build the project/status header rows interleaved with
     // issue rows, then split into a sticky header region (the selected issue's
     // project + Status, pinned to the top) and a windowed scrollable body.
-    const listRows = buildListRows(issues);
+    // The Worktrees tab renders flat — the tab title already labels the group,
+    // so the per-project headers would just be visual noise.
+    const listRows = activeTab === "issues"
+        ? buildListRows(displayed)
+        : displayed.map((d, index) => ({ kind: "issue", d, index }));
     const listView = windowListRows(listRows, selectedIndex, listVisibleRows);
     const listContentWidth = Math.max(8, listWidth - 4);
-    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, children: [_jsx(Box, { paddingX: 1, paddingTop: 0, flexDirection: "column", children: _jsx(HeaderRow, { repoName: repoName, claudeVersion: claudeVersion, issueCount: issues.length, updateAvailable: latestVersion !== null }) }), overlay ? (_jsx(Box, { flexGrow: 1, flexDirection: "column", borderStyle: "round", borderColor: overlay.kind === "remove" ? "yellow" : "cyan", children: overlay.kind === "create" ? (_jsx(CreateOverlayView, { overlay: overlay, onDescChange: onOverlayDescChange, onPromptChange: onOverlayPromptChange })) : (_jsx(RemoveOverlayView, { overlay: overlay })) })) : (_jsxs(Box, { flexGrow: 1, flexDirection: "row", children: [_jsx(Box, { width: listWidth, flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, children: issues.length === 0 ? (_jsx(Text, { dimColor: true, children: "No open issues assigned to you in this repo." })) : (_jsxs(_Fragment, { children: [listView.sticky.map((row, i) => (_jsx(ListRowView, { row: row, selectedIndex: selectedIndex, identifierWidth: identifierWidth, width: listContentWidth }, `sticky-${i}`))), listView.issuesAbove > 0 && (_jsxs(Text, { dimColor: true, children: ["\u2191 ", listView.issuesAbove, " more above"] })), listView.body.map((row, i) => (_jsx(ListRowView, { row: row, selectedIndex: selectedIndex, identifierWidth: identifierWidth, width: listContentWidth }, `body-${i}`))), listView.issuesBelow > 0 && (_jsxs(Text, { dimColor: true, children: ["\u2193 ", listView.issuesBelow, " more below"] }))] })) }), _jsx(Box, { width: detailWidth, flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, children: _jsx(DetailPane, { d: selected, contentWidth: detailWidth - 4, contentHeight: detailContentHeight, scrollOffset: state.detailScrollOffset }) })] })), _jsxs(Box, { paddingX: 1, flexDirection: "column", children: [toast && (_jsx(Box, { children: _jsxs(Text, { color: toast.kind === "success" ? "green" : toast.kind === "error" ? "red" : "cyan", children: [toast.kind === "success" ? "✓ " : toast.kind === "error" ? "✗ " : "· ", toast.text] }) })), refreshing && (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { dimColor: true, children: " refreshing" })] })), _jsx(FooterRow, { phase: "ready", overlayKind: overlay?.kind, latestVersion: latestVersion, listWidth: listWidth })] })] }));
+    return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, children: [_jsx(Box, { paddingX: 1, paddingTop: 0, flexDirection: "column", children: _jsx(HeaderRow, { repoName: repoName, claudeVersion: claudeVersion, issueCount: issuesTabCount, worktreeCount: worktreesTabCount, activeTab: activeTab, updateAvailable: latestVersion !== null }) }), overlay ? (_jsx(Box, { flexGrow: 1, flexDirection: "column", borderStyle: "round", borderColor: overlay.kind === "remove" ? "yellow" : "cyan", children: overlay.kind === "create" ? (_jsx(CreateOverlayView, { overlay: overlay, onDescChange: onOverlayDescChange, onPromptChange: onOverlayPromptChange })) : (_jsx(RemoveOverlayView, { overlay: overlay })) })) : (_jsxs(Box, { flexGrow: 1, flexDirection: "row", children: [_jsx(Box, { width: listWidth, flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, children: displayed.length === 0 ? (_jsx(Text, { dimColor: true, children: activeTab === "issues"
+                                ? "No open issues assigned to you in this repo."
+                                : "No orphaned worktrees — anything in `.mintree/worktrees/` matches an open issue." })) : (_jsxs(_Fragment, { children: [listView.sticky.map((row, i) => (_jsx(ListRowView, { row: row, selectedIndex: selectedIndex, identifierWidth: identifierWidth, width: listContentWidth }, `sticky-${i}`))), listView.issuesAbove > 0 && (_jsxs(Text, { dimColor: true, children: ["\u2191 ", listView.issuesAbove, " more above"] })), listView.body.map((row, i) => (_jsx(ListRowView, { row: row, selectedIndex: selectedIndex, identifierWidth: identifierWidth, width: listContentWidth }, `body-${i}`))), listView.issuesBelow > 0 && (_jsxs(Text, { dimColor: true, children: ["\u2193 ", listView.issuesBelow, " more below"] }))] })) }), _jsx(Box, { width: detailWidth, flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 1, children: _jsx(DetailPane, { d: selected, contentWidth: detailWidth - 4, contentHeight: detailContentHeight, scrollOffset: state.detailScrollOffset }) })] })), _jsxs(Box, { paddingX: 1, flexDirection: "column", children: [toast && (_jsx(Box, { children: _jsxs(Text, { color: toast.kind === "success" ? "green" : toast.kind === "error" ? "red" : "cyan", children: [toast.kind === "success" ? "✓ " : toast.kind === "error" ? "✗ " : "· ", toast.text] }) })), refreshing && (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { dimColor: true, children: " refreshing" })] })), _jsx(FooterRow, { phase: "ready", overlayKind: overlay?.kind, latestVersion: latestVersion, listWidth: listWidth })] })] }));
 }

package/dist/commands/worktree/create.js

@@ -55,19 +55,20 @@ export default function Create({ args, options }) {
     const [result, setResult] = useState(null);
     const [transition, setTransition] = useState("idle");
     useEffect(() => {
-        setTimeout(() => {
+        (async () => {
             try {
-                setResult(runCreate(branch, {
+                const r = await runCreate(branch, {
                     base: options.base,
                     work: options.work,
                     prompt: options.prompt,
                     permissionMode: options.permissionMode,
-                }));
+                });
+                setResult(r);
             }
             catch (err) {
                 setResult({ ok: false, message: err instanceof Error ? err.message : String(err) });
             }
-        }, 0);
+        })();
     }, [branch, options.base, options.work, options.prompt, options.permissionMode]);
     // Kick the Project v2 transition once the worktree is in place. Only when
     // --work was on — non-work creates leave status untouched. Errors from the

package/dist/lib/worktreeCreate.d.ts

@@ -5,11 +5,24 @@ export type CreateStep = {
     label: string;
     detail?: string;
 };
+/**
+ * Optional progress callbacks used by the dashboard overlay to render a
+ * live setup log (santree-style). `onPending(label)` highlights the
+ * currently running blocking operation (rendered with a spinner); call
+ * `onPending(null)` when it ends. `onStep(step)` appends a completed step
+ * to the log. Between every emission the implementation yields the event
+ * loop for one frame so Ink can paint before the next blocking section.
+ */
+export type ProgressCallbacks = {
+    onStep?: (step: CreateStep) => void;
+    onPending?: (label: string | null) => void;
+};
 export type CreateOpts = {
     base?: string;
     work: boolean;
     prompt?: string;
     permissionMode?: PermissionMode;
+    progress?: ProgressCallbacks;
 };
 export type CreateResult = {
     ok: true;
@@ -32,14 +45,18 @@ export type CreateResult = {
  * resolves a base branch, runs `git worktree add`, persists metadata, runs
  * the optional `.mintree/init.sh`, and stages the --prompt to a temp file
  * for the work hand-off when relevant.
+ *
+ * Async only because progress callbacks need event-loop yields between
+ * blocking sections; without them the dashboard overlay would freeze.
  */
-export declare function runCreate(branchArg: string, opts: CreateOpts): CreateResult;
+export declare function runCreate(branchArg: string, opts: CreateOpts): Promise<CreateResult>;
 export type CreateDetachedOpts = {
     issueId: string;
     descKebab: string;
     work: boolean;
     prompt?: string;
     permissionMode?: PermissionMode;
+    progress?: ProgressCallbacks;
 };
 /**
  * Variant of `runCreate` that doesn't create a new branch — the worktree is
@@ -53,4 +70,4 @@ export type CreateDetachedOpts = {
  * branch-based flow so `worktree work` can still recover the issueId from
  * the dir name (where it can't read it from the branch).
  */
-export declare function runCreateDetached(opts: CreateDetachedOpts): CreateResult;
+export declare function runCreateDetached(opts: CreateDetachedOpts): Promise<CreateResult>;

package/dist/lib/worktreeCreate.js

@@ -37,14 +37,26 @@ function writePromptFile(prompt) {
     fs.writeFileSync(filePath, prompt);
     return filePath;
 }
+// Wait one frame (~16ms) so Ink has time to commit + paint the latest
+// state before the next blocking execSync. No-op when no progress
+// callbacks are set — CLI invocations skip the cost entirely.
+function nextFrame(progress) {
+    if (!progress || (!progress.onStep && !progress.onPending))
+        return Promise.resolve();
+    return new Promise((resolve) => setTimeout(resolve, 16));
+}
 /**
  * The whole `worktree create` flow as a pure function — same code path used
  * by the CLI command and by the dashboard's `w` overlay. Validates input,
  * resolves a base branch, runs `git worktree add`, persists metadata, runs
  * the optional `.mintree/init.sh`, and stages the --prompt to a temp file
  * for the work hand-off when relevant.
+ *
+ * Async only because progress callbacks need event-loop yields between
+ * blocking sections; without them the dashboard overlay would freeze.
  */
-export function runCreate(branchArg, opts) {
+export async function runCreate(branchArg, opts) {
+    const progress = opts.progress;
     const root = findMainRepoRoot();
     if (!root) {
         return {
@@ -81,18 +93,27 @@ export function runCreate(branchArg, opts) {
         };
     }
     const steps = [];
-    steps.push({
+    const pushStep = (step) => {
+        steps.push(step);
+        progress?.onStep?.(step);
+    };
+    pushStep({
         kind: "ok",
         label: "parsed branch",
         detail: `type=${parsed.type}, issue=${parsed.issueId}, desc=${parsed.desc}`,
     });
+    await nextFrame(progress);
     // Fetch before resolving refs so the worktree forks from fresh code, not a
     // stale local checkout. Best-effort: offline / no-remote just warns and we
     // fall back to whatever is already local.
+    progress?.onPending?.("Fetching origin...");
+    await nextFrame(progress);
     const fetch = fetchRemote(root);
-    steps.push(fetch.ok
+    progress?.onPending?.(null);
+    pushStep(fetch.ok
         ? { kind: "ok", label: "fetched origin", detail: "refs up to date" }
         : { kind: "warn", label: "skipped git fetch", detail: fetch.reason });
+    await nextFrame(progress);
     const existence = branchExists(root, parsed.branch);
     let base;
     if (existence === null) {
@@ -119,10 +140,13 @@ export function runCreate(branchArg, opts) {
     if (existence === null && base && fetch.ok && remoteBranchExists(root, base)) {
         baseRef = `origin/${base}`;
     }
+    progress?.onPending?.("Creating worktree...");
+    await nextFrame(progress);
     try {
         addWorktree({ repoRoot: root, branch: parsed.branch, worktreePath, base: baseRef });
     }
     catch (err) {
+        progress?.onPending?.(null);
         const stderr = err && typeof err === "object" && "stderr" in err
             ? String(err.stderr).trim()
             : err instanceof Error
@@ -130,48 +154,58 @@ export function runCreate(branchArg, opts) {
                 : String(err);
         return { ok: false, message: `git worktree add failed: ${stderr}` };
     }
+    progress?.onPending?.(null);
     if (existence === "remote") {
-        steps.push({
+        pushStep({
             kind: "ok",
             label: "checked out tracking branch",
             detail: `from origin/${parsed.branch}`,
         });
     }
     else if (existence === "local") {
-        steps.push({
+        pushStep({
             kind: "ok",
             label: "checked out existing local branch",
             detail: parsed.branch,
         });
     }
     else {
-        steps.push({
+        pushStep({
             kind: "ok",
             label: "created new branch",
             detail: `${parsed.branch} (from ${baseRef})`,
         });
     }
-    steps.push({ kind: "ok", label: "worktree created", detail: worktreePath });
+    await nextFrame(progress);
+    pushStep({ kind: "ok", label: "worktree created", detail: worktreePath });
+    await nextFrame(progress);
     upsertIssue(root, parsed.issueId, base ? { base_branch: base } : {});
-    steps.push({ kind: "ok", label: "metadata updated", detail: `issue ${parsed.issueId}` });
+    pushStep({ kind: "ok", label: "metadata updated", detail: `issue ${parsed.issueId}` });
+    await nextFrame(progress);
     const initShPath = getInitScriptPath(root);
+    if (pathExists(initShPath)) {
+        progress?.onPending?.("Running .mintree/init.sh...");
+        await nextFrame(progress);
+    }
     const initResult = tryRunInitScript(initShPath, worktreePath, root);
+    progress?.onPending?.(null);
     if (initResult.ran) {
-        steps.push({ kind: "ok", label: "ran .mintree/init.sh", detail: worktreePath });
+        pushStep({ kind: "ok", label: "ran .mintree/init.sh", detail: worktreePath });
     }
     else if (initResult.error) {
-        steps.push({ kind: "warn", label: "init.sh failed", detail: initResult.error });
+        pushStep({ kind: "warn", label: "init.sh failed", detail: initResult.error });
     }
     else if (!pathExists(initShPath)) {
-        steps.push({ kind: "skip", label: "no init.sh (skipping post-create hook)" });
+        pushStep({ kind: "skip", label: "no init.sh (skipping post-create hook)" });
     }
+    await nextFrame(progress);
     let promptFile;
     if (opts.work && opts.prompt && opts.prompt.length > 0) {
         try {
             promptFile = writePromptFile(opts.prompt);
         }
         catch (err) {
-            steps.push({
+            pushStep({
                 kind: "warn",
                 label: "failed to stage --prompt for hand-off",
                 detail: err instanceof Error ? err.message : String(err),
@@ -179,7 +213,7 @@ export function runCreate(branchArg, opts) {
         }
     }
     if (!opts.work && (opts.prompt || opts.permissionMode)) {
-        steps.push({
+        pushStep({
             kind: "warn",
             label: "ignoring --prompt / --permission-mode (only meaningful with --work)",
         });
@@ -208,7 +242,8 @@ export function runCreate(branchArg, opts) {
  * branch-based flow so `worktree work` can still recover the issueId from
  * the dir name (where it can't read it from the branch).
  */
-export function runCreateDetached(opts) {
+export async function runCreateDetached(opts) {
+    const progress = opts.progress;
     const root = findMainRepoRoot();
     if (!root) {
         return {
@@ -255,22 +290,34 @@ export function runCreateDetached(opts) {
         };
     }
     const steps = [];
-    steps.push({
+    const pushStep = (step) => {
+        steps.push(step);
+        progress?.onStep?.(step);
+    };
+    pushStep({
         kind: "ok",
         label: "detached worktree",
         detail: `issue=${opts.issueId}, base=${currentBranch}`,
     });
+    await nextFrame(progress);
     // Fetch so the detached worktree forks from the fresh remote tip of the
     // current branch instead of a stale local checkout. Best-effort.
+    progress?.onPending?.("Fetching origin...");
+    await nextFrame(progress);
     const fetch = fetchRemote(root);
-    steps.push(fetch.ok
+    progress?.onPending?.(null);
+    pushStep(fetch.ok
         ? { kind: "ok", label: "fetched origin", detail: "refs up to date" }
         : { kind: "warn", label: "skipped git fetch", detail: fetch.reason });
+    await nextFrame(progress);
     const baseRef = fetch.ok && remoteBranchExists(root, currentBranch) ? `origin/${currentBranch}` : currentBranch;
+    progress?.onPending?.("Creating worktree...");
+    await nextFrame(progress);
     try {
         execSync(`git worktree add --detach '${worktreePath.replace(/'/g, `'\\''`)}' '${baseRef.replace(/'/g, `'\\''`)}'`, { cwd: root, stdio: ["ignore", "pipe", "pipe"] });
     }
     catch (err) {
+        progress?.onPending?.(null);
         const stderr = err && typeof err === "object" && "stderr" in err
             ? String(err.stderr).trim()
             : err instanceof Error
@@ -278,32 +325,42 @@ export function runCreateDetached(opts) {
                 : String(err);
         return { ok: false, message: `git worktree add --detach failed: ${stderr}` };
     }
-    steps.push({
+    progress?.onPending?.(null);
+    pushStep({
         kind: "ok",
         label: "checked out detached HEAD",
         detail: `at tip of ${baseRef}`,
     });
-    steps.push({ kind: "ok", label: "worktree created", detail: worktreePath });
+    await nextFrame(progress);
+    pushStep({ kind: "ok", label: "worktree created", detail: worktreePath });
+    await nextFrame(progress);
     upsertIssue(root, opts.issueId, { base_branch: currentBranch });
-    steps.push({ kind: "ok", label: "metadata updated", detail: `issue ${opts.issueId}` });
+    pushStep({ kind: "ok", label: "metadata updated", detail: `issue ${opts.issueId}` });
+    await nextFrame(progress);
     const initShPath = getInitScriptPath(root);
+    if (pathExists(initShPath)) {
+        progress?.onPending?.("Running .mintree/init.sh...");
+        await nextFrame(progress);
+    }
     const initResult = tryRunInitScript(initShPath, worktreePath, root);
+    progress?.onPending?.(null);
     if (initResult.ran) {
-        steps.push({ kind: "ok", label: "ran .mintree/init.sh", detail: worktreePath });
+        pushStep({ kind: "ok", label: "ran .mintree/init.sh", detail: worktreePath });
     }
     else if (initResult.error) {
-        steps.push({ kind: "warn", label: "init.sh failed", detail: initResult.error });
+        pushStep({ kind: "warn", label: "init.sh failed", detail: initResult.error });
     }
     else if (!pathExists(initShPath)) {
-        steps.push({ kind: "skip", label: "no init.sh (skipping post-create hook)" });
+        pushStep({ kind: "skip", label: "no init.sh (skipping post-create hook)" });
     }
+    await nextFrame(progress);
     let promptFile;
     if (opts.work && opts.prompt && opts.prompt.length > 0) {
         try {
             promptFile = writePromptFile(opts.prompt);
         }
         catch (err) {
-            steps.push({
+            pushStep({
                 kind: "warn",
                 label: "failed to stage --prompt for hand-off",
                 detail: err instanceof Error ? err.message : String(err),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mintree",
-	"version": "0.3.2",
+	"version": "0.4.1",
 	"description": "Issue-driven git worktrees + Claude Code sessions for repos with an opinionated SDD+TDD flow.",
 	"license": "MIT",
 	"author": "Martin Mineo <mmineo@canarytechnologies.com>",