santree 0.7.5 → 0.7.6

package/dist/commands/dashboard.js

@@ -9,12 +9,15 @@ import * as path from "path";
 const require = createRequire(import.meta.url);
 const { version } = require("../../package.json");
 import { findMainRepoRoot, createWorktree, getDefaultBranch, getBaseBranch, hasInitScript, getInitScriptPath, removeWorktree, getDiffTool, getWorktreeStatus, stageFile, unstageFile, stageAll, unstageAll, discardFile, } from "../lib/git.js";
-import { run, spawnAsync } from "../lib/exec.js";
+import { run, spawnAsync, execFileAsync } from "../lib/exec.js";
+import { getConfiguredEditor } from "../lib/config-store.js";
 import { printCdHint } from "../lib/cd-hint.js";
 import { resolveAgentBinary, resolveClaudeBinary, fillCommitMessage, askTicketQuestion, } from "../lib/ai.js";
 import { readTriageInvestigateConfig, isTriageInvestigateConfigured, buildInvestigatePrompt, buildInvestigateCommand, } from "../lib/triage-config.js";
 import { getInstalledClaudeVersion } from "../lib/version.js";
 import { extractTicketId, getStagedDiffContent } from "../lib/git.js";
+import { santreeSelfArgv } from "../lib/setup/apply.js";
+import { startFixLoop } from "../lib/fix-loop.js";
 import { getMultiplexer } from "../lib/multiplexer/index.js";
 import { shellEscape } from "../lib/multiplexer/types.js";
 import Spinner from "ink-spinner";
@@ -294,6 +297,32 @@ function Tab({ active, label, mode }) {
     }
     return _jsx(Text, { children: ` ${label} ` });
 }
+const TAB_NAMES = {
+    triage: "Triage",
+    issues: "Issues",
+    trees: "Trees",
+    reviews: "Reviews",
+};
+/**
+ * Column ranges (1-based, absolute) of each tab pill in the tab strip, so a
+ * row-2 click maps to the right tab. Must mirror the renderer exactly: the strip
+ * Box has `paddingX={1}` (first pill at col 2), each `<Tab>` pill is `" label "`
+ * (label + 2), and a 1-space separator sits between pills. Labels embed the live
+ * counts, so widths shift as data refreshes — always pass current counts.
+ */
+function computeTabHitboxes(order, counts) {
+    const boxes = [];
+    let col = 2; // paddingX={1} on the row-2 Box → first pill starts at col 2
+    order.forEach((tab, i) => {
+        if (i > 0)
+            col += 1; // 1-space separator between pills
+        const label = `${i + 1} ${TAB_NAMES[tab]} (${counts[tab]})`;
+        const width = label.length + 2; // pill renders ` label `
+        boxes.push({ tab, start: col, end: col + width - 1 });
+        col += width;
+    });
+    return boxes;
+}
 /**
  * Single-line global keymap shown at the bottom-left of the dashboard. The
  * `E workspace` hint only appears when the action is meaningful
@@ -336,6 +365,10 @@ export default function Dashboard() {
     const repoRootRef = useRef(null);
     const stateRef = useRef(state);
     stateRef.current = state;
+    // Kept in sync so the long-lived mouse handler can rebuild the tab order
+    // (which depends on whether Triage is present) for click-to-switch.
+    const supportsTriageRef = useRef(supportsTriage);
+    supportsTriageRef.current = supportsTriage;
     const draggingRef = useRef(null);
     const [termSize, setTermSize] = useState({
         columns: stdout?.columns ?? 80,
@@ -411,10 +444,11 @@ export default function Dashboard() {
             return;
         }
         try {
-            // Re-detect terminal theme alongside data fetch so light↔dark
-            // switches propagate within one refresh cycle (≤5min, or sooner
-            // on a manual `R`). Skip the
-            // OSC 11 query when a text-input overlay is active — the
+            // Refresh the colorscheme FIRST — it's the most visible change, so on a
+            // manual `R` (or a light↔dark switch) the theme should flip immediately
+            // rather than waiting on the slower gh-backed data fetch below. Detect +
+            // apply it, then load everything else.
+            // Skip the OSC 11 query when a text-input overlay is active — the
             // terminal's response would otherwise leak into the user's
             // commit/PR/context message via Ink's stdin handler.
             const overlay = stateRef.current.overlay;
@@ -422,18 +456,17 @@ export default function Dashboard() {
                 (overlay === "triage-ask" && stateRef.current.triageAskPhase === "input") ||
                 (overlay === "pr-create" && stateRef.current.prCreatePhase === "review") ||
                 (overlay === "commit" && stateRef.current.commitPhase === "awaiting-message");
-            const themeP = inTextInput ? Promise.resolve(null) : detectTerminalTheme();
-            const [data, reviewData, themeMode] = await Promise.all([
+            const themeMode = inTextInput ? null : await detectTerminalTheme();
+            if (themeMode !== null)
+                setTheme(getThemeForMode(themeMode));
+            const [data, reviewData] = await Promise.all([
                 loadDashboardData(repoRoot),
                 loadReviewsData(repoRoot),
-                themeP,
             ]);
-            if (themeMode !== null)
-                setTheme(getThemeForMode(themeMode));
             // Workspace file presence — only meaningful when the editor consumes
             // `.code-workspace` files. Cheap directory read; recomputed each cycle
             // in case the user adds/removes one.
-            const editor = (process.env.SANTREE_EDITOR ?? "code").toLowerCase();
+            const editor = (getConfiguredEditor() ?? "code").toLowerCase();
             const editorAcceptsWorkspace = editor === "code" || editor === "cursor";
             let hasWs = false;
             if (editorAcceptsWorkspace) {
@@ -599,6 +632,28 @@ export default function Dashboard() {
             }
             if (!isPress)
                 return;
+            // Tab strip click (row 2) — switch tabs by clicking, like the 1–N keys.
+            // Ignored while any overlay is up or data isn't ready.
+            {
+                const s = stateRef.current;
+                if (row === 2 && s.overlay === null && !s.loading && !s.error) {
+                    const order = supportsTriageRef.current
+                        ? ["triage", "issues", "trees", "reviews"]
+                        : ["issues", "trees", "reviews"];
+                    const counts = {
+                        triage: s.flatTriage.length,
+                        issues: s.flatIssues.length,
+                        trees: s.flatTrees.length,
+                        reviews: s.flatReviews.length,
+                    };
+                    const hit = computeTabHitboxes(order, counts).find((b) => col >= b.start && col <= b.end);
+                    if (hit) {
+                        if (hit.tab !== s.activeTab)
+                            dispatch({ type: "SET_TAB", tab: hit.tab });
+                        return;
+                    }
+                }
+            }
             // Diff overlay click: drag divider, or select file row in left pane
             {
                 const s = stateRef.current;
@@ -1078,6 +1133,8 @@ export default function Dashboard() {
                 name: windowName,
                 cwd: worktreePath,
                 command: cmd,
+                group: di.issue.projectName ?? undefined,
+                tabName: "work",
             });
             if (created.ok) {
                 dispatch({
@@ -1097,7 +1154,7 @@ export default function Dashboard() {
         // Delayed refresh to pick up session ID created by `santree worktree work`
         setTimeout(() => refresh(), 3000);
     }, [refresh]);
-    const launchAfterCreation = useCallback(async (mode, worktreePath, ticketId, contextFile) => {
+    const launchAfterCreation = useCallback(async (mode, worktreePath, ticketId, contextFile, group) => {
         const mux = getMultiplexer();
         if (mux.isActive()) {
             const windowName = ticketId;
@@ -1109,6 +1166,8 @@ export default function Dashboard() {
                 name: windowName,
                 cwd: worktreePath,
                 command: workCmd,
+                group,
+                tabName: "work",
             });
             if (created.ok) {
                 dispatch({
@@ -1244,7 +1303,7 @@ export default function Dashboard() {
         }
         // 4. Done — launch work
         dispatch({ type: "CREATION_DONE" });
-        launchAfterCreation(mode, result.path, ticketId, contextFile);
+        launchAfterCreation(mode, result.path, ticketId, contextFile, di.issue.projectName ?? undefined);
     }, [launchAfterCreation]);
     // Holds the context file path through multi-step flows (mode-select → base-select → confirm-setup → create)
     const pendingContextFileRef = useRef(null);
@@ -1414,7 +1473,7 @@ export default function Dashboard() {
         if (!user) {
             dispatch({
                 type: "TRACKER_SELECT_MESSAGE",
-                message: "GitHub CLI not authenticated. Run: santree github auth",
+                message: "GitHub CLI not authenticated. Run: gh auth login",
             });
             return;
         }
@@ -1581,7 +1640,9 @@ export default function Dashboard() {
         const msg = tid && !trimmed.includes(`[${tid}]`) ? `[${tid}] ${trimmed}` : trimmed;
         dispatch({ type: "COMMIT_PHASE", phase: "committing" });
         try {
-            await execAsync(`git commit -m "${msg.replace(/"/g, '\\"')}"`, {
+            // Array args (no shell) — the message is user-typed and may contain
+            // backticks, `$(…)`, quotes, or backslashes.
+            await execFileAsync("git", ["commit", "-m", msg], {
                 cwd: s.commitWorktreePath,
             });
         }
@@ -1594,7 +1655,9 @@ export default function Dashboard() {
         }
         dispatch({ type: "COMMIT_PHASE", phase: "pushing" });
         try {
-            await execAsync(`git push -u origin "${s.commitBranch}"`, { cwd: s.commitWorktreePath });
+            await execFileAsync("git", ["push", "-u", "origin", s.commitBranch], {
+                cwd: s.commitWorktreePath,
+            });
         }
         catch (e) {
             dispatch({ type: "COMMIT_ERROR", error: e?.stderr?.trim() || e?.message || "Push failed" });
@@ -1608,7 +1671,7 @@ export default function Dashboard() {
     }, [refresh]);
     // ── Editor actions ───────────────────────────────────────────────
     const openInEditor = useCallback((wtPath) => {
-        const editor = process.env.SANTREE_EDITOR || "code";
+        const editor = getConfiguredEditor() || "code";
         spawn(editor, [wtPath], { detached: true, stdio: "ignore" }).unref();
         dispatch({
             type: "SET_ACTION_MESSAGE",
@@ -1619,7 +1682,7 @@ export default function Dashboard() {
         const repoRoot = repoRootRef.current;
         if (!repoRoot)
             return;
-        const editor = process.env.SANTREE_EDITOR || "code";
+        const editor = getConfiguredEditor() || "code";
         try {
             const entries = fs.readdirSync(repoRoot);
             const wsFile = entries.find((f) => f.endsWith(".code-workspace"));
@@ -2486,7 +2549,9 @@ export default function Dashboard() {
                 (async () => {
                     try {
                         dispatch({ type: "CREATION_LOG", logs: `Fetching ${ri.branch}...\n` });
-                        await execAsync(`git fetch origin ${ri.branch}`, { cwd: repoRoot });
+                        // Array args (no shell) — foreign PR branch names are not
+                        // locally slugified and could otherwise inject.
+                        await execFileAsync("git", ["fetch", "origin", ri.branch], { cwd: repoRoot });
                         dispatch({ type: "CREATION_LOG", logs: `Creating worktree...\n` });
                         const result = await createWorktree(ri.branch, ri.baseBranch ?? getDefaultBranch(), repoRoot);
                         if (!result.success || !result.path) {
@@ -2537,7 +2602,7 @@ export default function Dashboard() {
                         dispatch({ type: "CREATION_DONE" });
                         dispatch({ type: "SET_ACTION_MESSAGE", message: `Worktree created for ${ticketId}` });
                         // Open in editor automatically
-                        const editor = process.env.SANTREE_EDITOR || "code";
+                        const editor = getConfiguredEditor() || "code";
                         spawn(editor, [result.path], { detached: true, stdio: "ignore" }).unref();
                         refresh();
                     }
@@ -2553,7 +2618,7 @@ export default function Dashboard() {
                     dispatch({ type: "SET_ACTION_MESSAGE", message: "No worktree (press w to checkout)" });
                     return;
                 }
-                const editor = process.env.SANTREE_EDITOR || "code";
+                const editor = getConfiguredEditor() || "code";
                 spawn(editor, [ri.worktree.path], { detached: true, stdio: "ignore" }).unref();
                 dispatch({ type: "SET_ACTION_MESSAGE", message: `Opened in ${editor}` });
                 return;
@@ -2569,18 +2634,22 @@ export default function Dashboard() {
                 }
                 const mux = getMultiplexer();
                 if (mux.isActive()) {
-                    const windowName = `review-${extractTicketId(ri.branch ?? "") ?? ri.pr.number}`;
+                    const ticketId = extractTicketId(ri.branch ?? "") ?? `pr-${ri.pr.number}`;
                     const cwd = ri.worktree.path;
                     void (async () => {
-                        const created = await mux.createWindow({
-                            name: windowName,
+                        // Open review as a `review` tab inside the ticket's workspace
+                        // when one exists; addTab falls back to a new window otherwise.
+                        const created = await mux.addTab({
+                            windowName: ticketId,
+                            tabName: "review",
                             cwd,
                             command: "santree pr review",
+                            group: ri.ticket?.projectName ?? undefined,
                         });
                         dispatch({
                             type: "SET_ACTION_MESSAGE",
                             message: created.ok
-                                ? "Launched AI review in new window"
+                                ? "Launched AI review in review tab"
                                 : `Failed to launch review${created.message ? `: ${created.message}` : ""}`,
                         });
                     })();
@@ -2656,7 +2725,7 @@ export default function Dashboard() {
                 if (di.worktree?.sessionId) {
                     dispatch({
                         type: "SET_ACTION_MESSAGE",
-                        message: "Session active — switch to the Trees tab to resume.",
+                        message: "A Claude session exists — switch to the Trees tab to resume.",
                     });
                     return;
                 }
@@ -2695,7 +2764,12 @@ export default function Dashboard() {
                 const command = buildInvestigateCommand(resolveClaudeBinary() ?? "claude", prompt);
                 const windowName = `investigate-${di.issue.identifier}`;
                 void (async () => {
-                    const created = await mux.createWindow({ name: windowName, cwd: root, command });
+                    const created = await mux.createWindow({
+                        name: windowName,
+                        cwd: root,
+                        command,
+                        group: di.issue.projectName ?? undefined,
+                    });
                     dispatch({
                         type: "SET_ACTION_MESSAGE",
                         message: created.ok
@@ -2758,7 +2832,7 @@ export default function Dashboard() {
                 if (di.worktree?.sessionId) {
                     dispatch({
                         type: "SET_ACTION_MESSAGE",
-                        message: "Session active — switch to the Trees tab to resume.",
+                        message: "A Claude session exists — switch to the Trees tab to resume.",
                     });
                     return;
                 }
@@ -2825,7 +2899,7 @@ export default function Dashboard() {
             if (di.worktree?.sessionId) {
                 dispatch({
                     type: "SET_ACTION_MESSAGE",
-                    message: "Session active. Press Enter to resume.",
+                    message: "A Claude session exists. Press Enter to resume.",
                 });
                 return;
             }
@@ -2857,6 +2931,8 @@ export default function Dashboard() {
                         name: windowName,
                         cwd: worktreePath,
                         command: cmd,
+                        group: di.issue.projectName ?? undefined,
+                        tabName: "work",
                     });
                     if (!created.ok) {
                         dispatch({
@@ -2921,18 +2997,21 @@ export default function Dashboard() {
             }
             const mux = getMultiplexer();
             if (mux.isActive()) {
-                const windowName = `review-${di.issue.identifier}`;
                 const cwd = di.worktree.path;
                 void (async () => {
-                    const created = await mux.createWindow({
-                        name: windowName,
+                    // Open review as a `review` tab inside the ticket's workspace
+                    // (next to `work`), not as a separate window.
+                    const created = await mux.addTab({
+                        windowName: di.issue.identifier,
+                        tabName: "review",
                         cwd,
                         command: "santree pr review",
+                        group: di.issue.projectName ?? undefined,
                     });
                     dispatch({
                         type: "SET_ACTION_MESSAGE",
                         message: created.ok
-                            ? "Launched review in new window"
+                            ? "Launched review in review tab"
                             : `Failed to launch review${created.message ? `: ${created.message}` : ""}`,
                     });
                 })();
@@ -2982,35 +3061,50 @@ export default function Dashboard() {
             });
             return;
         }
-        // Fix PR
+        // Fix PR — launch a self-driving fix loop (re-checks CI + conflicts every 5 min)
         if (input === "f") {
             if (!di.pr || !di.worktree) {
                 dispatch({ type: "SET_ACTION_MESSAGE", message: "No PR to fix" });
                 return;
             }
             const mux = getMultiplexer();
-            if (mux.isActive()) {
-                const windowName = `fix-${di.issue.identifier}`;
-                const cwd = di.worktree.path;
-                void (async () => {
-                    const created = await mux.createWindow({
-                        name: windowName,
-                        cwd,
-                        command: "santree pr fix",
-                    });
-                    dispatch({
-                        type: "SET_ACTION_MESSAGE",
-                        message: created.ok
-                            ? "Launched PR fix in new window"
-                            : `Failed to launch PR fix${created.message ? `: ${created.message}` : ""}`,
-                    });
-                })();
-            }
-            else {
-                leaveAltScreen();
-                printCdHint({ path: di.worktree.path });
-                exit();
+            if (!mux.isActive()) {
+                dispatch({
+                    type: "SET_ACTION_MESSAGE",
+                    message: "Fix loop needs tmux or cmux — run `santree pr fix --loop` in the worktree",
+                });
+                return;
             }
+            const ticketId = di.issue.identifier;
+            const cwd = di.worktree.path;
+            // Absolute santree invocation: the new window's shell may not have
+            // `santree` on PATH (cmux workspaces start a fresh login shell).
+            const self = santreeSelfArgv(["pr", "fix", "--loop"]);
+            const command = [self.cmd, ...self.args].join(" ");
+            // Seed the marker + optimistic badge so the loop shows immediately,
+            // before the launched process writes its own marker.
+            const root = repoRootRef.current ?? findMainRepoRoot();
+            if (root)
+                startFixLoop(root, ticketId, 5);
+            dispatch({ type: "FIXLOOP_START", ticketId });
+            void (async () => {
+                // Add the loop as a `fix-loop` tab inside the ticket's workspace
+                // (next to its `work` tab). On tmux this falls back to a separate
+                // `fix-loop-<ticket>` window.
+                const created = await mux.addTab({
+                    windowName: ticketId,
+                    tabName: "fix-loop",
+                    cwd,
+                    command,
+                    group: di.issue.projectName ?? undefined,
+                });
+                dispatch({
+                    type: "SET_ACTION_MESSAGE",
+                    message: created.ok
+                        ? "Started fix loop (re-checks every 5 min) in fix-loop tab"
+                        : `Failed to start fix loop${created.message ? `: ${created.message}` : ""}`,
+                });
+            })();
             return;
         }
         // View diff (inline overlay)
@@ -3068,6 +3162,11 @@ export default function Dashboard() {
             : state.flatIssues[state.selectedIndex]) ?? null;
     const selectedReview = state.flatReviews[state.reviewSelectedIndex] ?? null;
     const activeTracker = getIssueTracker(repoRootRef.current);
+    // The tracker actually in use right now — null until the repo is configured,
+    // so the `t` overlay doesn't mark a tracker the user never picked.
+    const configuredTrackerKind = isRepoTrackerConfigured(repoRootRef.current)
+        ? activeTracker.kind
+        : null;
     // Comments for the selected triage issue (lazily loaded; undefined = still
     // fetching, which the detail panel renders as "loading…").
     const triageComments = state.activeTab === "triage" && selectedIssue
@@ -3107,12 +3206,17 @@ export default function Dashboard() {
                                         const sel = i === state.trackerSelectIndex;
                                         return (_jsxs(Text, { color: sel ? "cyan" : undefined, bold: sel, children: [sel ? "> " : "  ", org.name, " (", org.slug, ")"] }, org.slug));
                                     }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "j/k to navigate, Enter to link, ESC to go back" })] })) : (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: "Select an issue tracker for this repo:" }), _jsx(Text, { children: " " }), [
-                                        { label: "Local", hint: "built-in, file-based — no account needed" },
-                                        { label: "Linear", hint: "OAuth workspace" },
-                                        { label: "GitHub", hint: "GitHub Issues via gh CLI" },
+                                        {
+                                            kind: "local",
+                                            label: "Local",
+                                            hint: "built-in, file-based — no account needed",
+                                        },
+                                        { kind: "linear", label: "Linear", hint: "OAuth workspace" },
+                                        { kind: "github", label: "GitHub", hint: "GitHub Issues via gh CLI" },
                                     ].map((t, i) => {
                                         const sel = i === state.trackerSelectIndex;
-                                        return (_jsxs(Text, { children: [_jsxs(Text, { color: sel ? "cyan" : undefined, bold: sel, children: [sel ? "> " : "  ", t.label] }), _jsxs(Text, { dimColor: true, children: [" \u2014 ", t.hint] })] }, t.label));
+                                        const active = t.kind === configuredTrackerKind;
+                                        return (_jsxs(Text, { children: [_jsxs(Text, { color: sel ? "cyan" : undefined, bold: sel, children: [sel ? "> " : "  ", t.label] }), active ? _jsx(Text, { color: "green", children: " \u25CF in use" }) : null, _jsxs(Text, { dimColor: true, children: [" \u2014 ", t.hint] })] }, t.label));
                                     }), _jsx(Text, { children: " " }), state.trackerSelectMessage ? (_jsx(Text, { color: "yellow", children: state.trackerSelectMessage })) : null, _jsx(Text, { dimColor: true, children: "j/k to navigate, Enter to select, q to quit" })] })) }) })) : state.overlay === "confirm-delete-issue" ? (_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: "Delete issue?" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [selectedIssue?.issue.identifier, "  ", selectedIssue?.issue.title] }), _jsx(Text, { dimColor: true, children: "This removes the issue file from .santree/issues/" }), _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 === "issue-form" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", paddingX: 2, width: Math.min(columns - 8, 100), children: [_jsxs(Text, { bold: true, color: "cyan", children: [state.issueFormMode === "edit" ? `Edit ${state.issueFormId}` : "New issue", " · ", state.issueFormPhase === "title"
                                             ? "title"
                                             : state.issueFormPhase === "description"
@@ -3144,7 +3248,7 @@ export default function Dashboard() {
                                     })(), _jsx(Text, { children: " " }), _jsxs(Text, { dimColor: true, children: [_jsx(Text, { color: "cyan", bold: true, children: "\u21E7\u2191\u2193/j/k" }), " scroll  ·  ", _jsx(Text, { color: "cyan", bold: true, children: "a" }), " ask again  ·  ", _jsx(Text, { color: "cyan", bold: true, children: "q" }), " close"] })] }))] })) : (_jsxs(Box, { flexGrow: 1, children: [_jsx(Box, { width: leftWidth, children: state.activeTab === "reviews" ? (_jsx(ReviewList, { flatReviews: state.flatReviews, selectedIndex: state.reviewSelectedIndex, scrollOffset: state.reviewListScrollOffset, height: contentHeight, width: leftWidth, selectionBg: theme.selectionBg })) : state.activeTab === "triage" ? (state.flatTriage.length === 0 ? (_jsx(Box, { width: leftWidth, height: contentHeight, justifyContent: "center", alignItems: "center", children: _jsx(Text, { color: "yellow", children: "Triage inbox empty" }) })) : (_jsx(IssueList, { groups: state.triageGroups, flatIssues: state.flatTriage, selectedIndex: state.triageSelectedIndex, scrollOffset: state.triageListScrollOffset, height: contentHeight, width: leftWidth, selectionBg: theme.selectionBg, variant: "triage" }))) : (state.activeTab === "trees" ? state.flatTrees : state.flatIssues).length ===
                                     0 ? (_jsxs(Box, { width: leftWidth, height: contentHeight, justifyContent: "center", alignItems: "center", flexDirection: "column", children: [_jsx(Text, { color: "yellow", children: state.activeTab === "trees" ? "No worktrees yet" : "No active issues" }), state.activeTab === "issues" && activeTracker.canMutate ? (_jsx(Text, { dimColor: true, children: "Press n to create one" })) : null] })) : (_jsx(IssueList, { groups: state.activeTab === "trees" ? state.treeGroups : state.groups, flatIssues: state.activeTab === "trees" ? state.flatTrees : state.flatIssues, selectedIndex: state.activeTab === "trees" ? state.treeSelectedIndex : state.selectedIndex, scrollOffset: state.activeTab === "trees"
                                         ? state.treeListScrollOffset
-                                        : state.listScrollOffset, height: contentHeight, width: leftWidth, selectionBg: theme.selectionBg, deletingIds: state.activeTab === "trees" ? deletingIds : undefined, variant: state.activeTab === "issues" ? "issues" : "default" })) }), _jsx(Box, { flexDirection: "column", width: 3, children: Array.from({ length: contentHeight }).map((_, i) => (_jsx(Text, { dimColor: true, children: " │ " }, i))) }), _jsx(Box, { width: rightWidth, children: state.activeTab === "reviews" && state.creatingForTicket ? (_jsxs(Box, { flexDirection: "column", width: rightWidth, height: contentHeight, children: [_jsxs(Text, { color: "yellow", bold: true, children: ["Setting up worktree for ", state.creatingForTicket, "..."] }), state.creationLogs
+                                        : state.listScrollOffset, height: contentHeight, width: leftWidth, selectionBg: theme.selectionBg, deletingIds: state.activeTab === "trees" ? deletingIds : undefined, fixLoops: state.activeTab === "trees" ? state.fixLoopTickets : undefined, variant: state.activeTab === "issues" ? "issues" : "default" })) }), _jsx(Box, { flexDirection: "column", width: 3, children: Array.from({ length: contentHeight }).map((_, i) => (_jsx(Text, { dimColor: true, children: " │ " }, i))) }), _jsx(Box, { width: rightWidth, children: state.activeTab === "reviews" && state.creatingForTicket ? (_jsxs(Box, { flexDirection: "column", width: rightWidth, height: contentHeight, children: [_jsxs(Text, { color: "yellow", bold: true, children: ["Setting up worktree for ", state.creatingForTicket, "..."] }), state.creationLogs
                                             .split("\n")
                                             .slice(-(contentHeight - 1))
                                             .map((line, i) => (_jsx(Box, { children: _jsx(Text, { dimColor: true, children: line }) }, i)))] })) : state.activeTab === "reviews" ? (_jsx(ReviewDetailPanel, { item: selectedReview, scrollOffset: state.reviewDetailScrollOffset, height: contentHeight, width: rightWidth })) : state.overlay === "commit" ? (_jsx(CommitOverlay, { width: rightWidth, height: contentHeight, branch: state.commitBranch, ticketId: state.commitTicketId, gitStatus: state.commitGitStatus, phase: state.commitPhase, message: state.commitMessage, error: state.commitError, dispatch: dispatch, onSubmit: handleCommitSubmit })) : state.overlay === "pr-create" ? (_jsx(PrCreateOverlay, { width: rightWidth, height: contentHeight, branch: state.prCreateBranch, ticketId: state.prCreateTicketId, phase: state.prCreatePhase, error: state.prCreateError, url: state.prCreateUrl, body: state.prCreateBody, title: state.prCreateTitle, draft: state.prCreateDraft, dispatch: dispatch })) : state.activeTab === "triage" && !selectedIssue ? (
@@ -3155,7 +3259,7 @@ export default function Dashboard() {
                                         ? state.treeDetailScrollOffset
                                         : state.activeTab === "triage"
                                             ? state.triageDetailScrollOffset
-                                            : state.detailScrollOffset, height: contentHeight, width: rightWidth, creatingForTicket: state.creatingForTicket, creationLogs: state.creationLogs, deleteStatus: selectedDeleteStatus, prSyncing: !!selectedIssue && !!state.pendingPrs[selectedIssue.issue.identifier], triage: state.activeTab === "triage", comments: triageComments, onCall: onCall })) })] })), _jsx(Box, { children: state.overlay === "diff" ? (_jsx(Box, { width: innerWidth, paddingX: 1, children: _jsx(CommandBar, { showWorkspace: hasWorkspaceFile, mode: "diff" }) })) : state.overlay === "triage-schedule" ? (_jsx(Box, { width: innerWidth, paddingX: 1, children: _jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: "j/k" }), _jsx(Text, { dimColor: true, children: " scroll" }), _jsx(Text, { dimColor: true, children: "  ·  " }), _jsx(Text, { color: "cyan", bold: true, children: "q" }), _jsx(Text, { dimColor: true, children: " close" })] }) })) : (_jsxs(_Fragment, { children: [_jsx(Box, { width: leftWidth + separatorWidth, paddingX: 1, children: _jsx(CommandBar, { showWorkspace: hasWorkspaceFile, mode: "default" }) }), _jsx(Box, { width: rightWidth, children: _jsx(ActionRow, { activeTab: state.activeTab, selectedIssue: selectedIssue, selectedReview: selectedReview, overlay: state.overlay, trackerName: activeTracker.displayName, canMutate: activeTracker.canMutate === true, triageInvestigateConfigured: triageInvestigateConfigured }) })] })) })] })] }));
+                                            : state.detailScrollOffset, height: contentHeight, width: rightWidth, creatingForTicket: state.creatingForTicket, creationLogs: state.creationLogs, deleteStatus: selectedDeleteStatus, prSyncing: !!selectedIssue && !!state.pendingPrs[selectedIssue.issue.identifier], fixLoop: selectedIssue ? state.fixLoopTickets[selectedIssue.issue.identifier] : undefined, triage: state.activeTab === "triage", comments: triageComments, onCall: onCall })) })] })), _jsx(Box, { children: state.overlay === "diff" ? (_jsx(Box, { width: innerWidth, paddingX: 1, children: _jsx(CommandBar, { showWorkspace: hasWorkspaceFile, mode: "diff" }) })) : state.overlay === "triage-schedule" ? (_jsx(Box, { width: innerWidth, paddingX: 1, children: _jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: "j/k" }), _jsx(Text, { dimColor: true, children: " scroll" }), _jsx(Text, { dimColor: true, children: "  ·  " }), _jsx(Text, { color: "cyan", bold: true, children: "q" }), _jsx(Text, { dimColor: true, children: " close" })] }) })) : (_jsxs(_Fragment, { children: [_jsx(Box, { width: leftWidth + separatorWidth, paddingX: 1, children: _jsx(CommandBar, { showWorkspace: hasWorkspaceFile, mode: "default" }) }), _jsx(Box, { width: rightWidth, children: _jsx(ActionRow, { activeTab: state.activeTab, selectedIssue: selectedIssue, selectedReview: selectedReview, overlay: state.overlay, trackerName: activeTracker.displayName, canMutate: activeTracker.canMutate === true, triageInvestigateConfigured: triageInvestigateConfigured }) })] })) })] })] }));
 }
 /**
  * Renders the per-issue action key hints (Resume / Editor / View diff / …)

package/dist/commands/helpers/statusline.js

@@ -83,28 +83,6 @@ function isWorktree(cwd) {
 function isSantreeWorktree(cwd) {
     return cwd.includes("/.santree/worktrees/");
 }
-// Read session state from per-ticket state file
-function readSessionStateFile(cwd) {
-    const marker = "/.santree/worktrees/";
-    const idx = cwd.indexOf(marker);
-    if (idx === -1)
-        return null;
-    const repoRoot = cwd.slice(0, idx);
-    const rest = cwd.slice(idx + marker.length);
-    const ticketId = rest.split("/")[0];
-    if (!ticketId)
-        return null;
-    const filePath = path.join(repoRoot, ".santree", "session-states", `${ticketId}.json`);
-    try {
-        const data = JSON.parse(fs.readFileSync(filePath, "utf-8"));
-        if (data.state === "exited")
-            return null;
-        return data.state;
-    }
-    catch {
-        return null;
-    }
-}
 // Extract ticket ID from branch name (e.g., feature/TEAM-123-desc -> TEAM-123)
 function extractTicketId(branch) {
     const match = branch.match(/([a-zA-Z]+)-(\d+)/);
@@ -181,14 +159,6 @@ function buildSantreeStatusline(cwd, model, usedPercentage) {
     // Git changes
     const changes = getGitChanges(cwd);
     parts.push(formatChanges(changes));
-    // Session state
-    const sessState = readSessionStateFile(cwd);
-    if (sessState === "waiting") {
-        parts.push(`${c.red}WAITING${c.reset}`);
-    }
-    else if (sessState === "idle") {
-        parts.push(`${c.yellow}idle${c.reset}`);
-    }
     // Model
     if (model) {
         parts.push(`${c.blue}${model}${c.reset}`);

package/dist/commands/issue/index.d.ts

@@ -1 +1 @@
-export declare const description = "Issue tracker commands (Linear / GitHub)";
+export declare const description = "Issue actions (open the current branch's issue)";

package/dist/commands/issue/index.js

@@ -1 +1 @@
-export const description = "Issue tracker commands (Linear / GitHub)";
+export const description = "Issue actions (open the current branch's issue)";

package/dist/commands/pr/context.d.ts

@@ -0,0 +1,7 @@
+export declare const description = "Print the fix-loop iteration brief (state + the exact actions to take)";
+/**
+ * Read-only command the auto-fix `/loop` runs each iteration to refresh state.
+ * No Ink UI — it writes the rendered brief straight to stdout and exits (same
+ * pattern as the statusline helper) so the agent can read it cleanly.
+ */
+export default function PRContext(): null;

package/dist/commands/pr/context.js

@@ -0,0 +1,36 @@
+import { useEffect, useRef } from "react";
+import { resolveAIContext, fetchAndRenderFixContext } from "../../lib/ai.js";
+import { santreeSelfArgv } from "../../lib/setup/apply.js";
+export const description = "Print the fix-loop iteration brief (state + the exact actions to take)";
+/**
+ * Read-only command the auto-fix `/loop` runs each iteration to refresh state.
+ * No Ink UI — it writes the rendered brief straight to stdout and exits (same
+ * pattern as the statusline helper) so the agent can read it cleanly.
+ */
+export default function PRContext() {
+    const hasRun = useRef(false);
+    useEffect(() => {
+        if (hasRun.current)
+            return;
+        hasRun.current = true;
+        (async () => {
+            const result = await resolveAIContext();
+            if (!result.ok) {
+                process.stderr.write(result.error + "\n");
+                process.exit(1);
+            }
+            // Embed the absolute santree invocation so the brief's own `--signal` /
+            // resolve commands work in a shell that may not have santree on PATH.
+            const self = santreeSelfArgv([]);
+            const santreeCmd = [self.cmd, ...self.args].join(" ");
+            const md = await fetchAndRenderFixContext(result.context.branch, santreeCmd);
+            if (!md) {
+                process.stderr.write(`No pull request found for branch '${result.context.branch}'\n`);
+                process.exit(1);
+            }
+            process.stdout.write(md.trimEnd() + "\n");
+            process.exit(0);
+        })();
+    }, []);
+    return null;
+}

package/dist/commands/pr/fix.d.ts

@@ -1,2 +1,11 @@
-export declare const description = "Fix PR review comments";
-export default function Fix(): import("react/jsx-runtime").JSX.Element;
+import { z } from "zod";
+export declare const description = "Run the self-driving fix loop: merge conflicts, fixable CI, and \uD83D\uDC4D-approved review comments";
+export declare const options: z.ZodObject<{
+    loop: z.ZodDefault<z.ZodBoolean>;
+    signal: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+type Props = {
+    options: z.infer<typeof options>;
+};
+export default function Fix({ options: opts }: Props): import("react/jsx-runtime").JSX.Element;
+export {};