mintree 0.4.0 → 0.4.1

package/dist/commands/dashboard.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") {
@@ -646,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,
@@ -714,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)
@@ -788,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) {
@@ -824,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)
@@ -832,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) {
@@ -843,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) {
@@ -859,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({
@@ -1129,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;
@@ -1157,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,
@@ -1171,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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mintree",
-	"version": "0.4.0",
+	"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>",