santree 0.7.5 → 0.7.6

package/dist/lib/dashboard/data.js

@@ -1,5 +1,6 @@
-import { listWorktrees, extractTicketId, getBaseBranch, getDefaultBranch, readAllMetadata, readSessionState, isSessionAlive, clearSessionState, clearSessionId, getGitStatusAsync, getCommitsAheadAsync, getCommitsBehindAsync, getDiffShortstatAsync, } from "../git.js";
+import { listWorktrees, extractTicketId, getBaseBranch, getDefaultBranch, readAllMetadata, clearSessionId, getGitStatusAsync, getCommitsAheadAsync, getCommitsBehindAsync, getDiffShortstatAsync, } from "../git.js";
 import { runAsync } from "../exec.js";
+import { readFixLoopRuntime } from "../fix-loop.js";
 import { readMainAgentTodos, findClaudeSessionCwd } from "../claude-todos.js";
 import { getPRInfoAsync, getPRChecksAsync, getPRReviewsAsync, getPRConversationCommentsAsync, getPRViewAsync, getReviewRequestedPRsAsync, getRepoNameAsync, getGitHubUserNameAsync, } from "../github.js";
 import { getIssueTracker, getCandidateTrackers } from "../trackers/index.js";
@@ -46,13 +47,6 @@ export async function loadDashboardData(repoRoot) {
                 getPRInfoAsync(wt.branch),
                 getDiffShortstatAsync(wt.path, base),
             ]);
-            let sessState = readSessionState(repoRoot, issue.identifier);
-            // Validate against the active multiplexer — if the session has gone, clear stale state
-            if (sessState && !isSessionAlive(issue.identifier)) {
-                clearSessionState(repoRoot, issue.identifier);
-                sessState = null;
-            }
-            const ss = sessState?.state ?? null;
             const storedId = metadata[issue.identifier]?.session_id ?? null;
             // Verify the session is still resumable. Claude Code clears old
             // transcript files (or `/clear` mints a new ID), leaving our stored
@@ -69,10 +63,7 @@ export async function loadDashboardData(repoRoot) {
                 clearSessionId(repoRoot, issue.identifier);
                 sessionId = null;
             }
-            // Hide stale todos when the session has exited or its file is gone —
-            // the on-disk todos file outlives the process and showing them
-            // would lie about state.
-            const claudeTodos = sessionId && ss !== "exited" ? readMainAgentTodos(sessionId) : null;
+            const claudeTodos = sessionId ? readMainAgentTodos(sessionId) : null;
             worktreeInfo = {
                 path: wt.path,
                 branch: wt.branch,
@@ -82,8 +73,6 @@ export async function loadDashboardData(repoRoot) {
                 sessionId,
                 sessionCwd,
                 gitStatus: gitStatusOutput,
-                sessionState: ss === "exited" ? null : ss,
-                sessionMessage: sessState?.message ?? null,
                 diffStats: shortstat,
                 claudeTodos,
             };
@@ -101,6 +90,7 @@ export async function loadDashboardData(repoRoot) {
             pr: prInfo,
             checks: checksInfo,
             reviews: reviewsInfo,
+            fixLoop: readFixLoopRuntime(repoRoot, issue.identifier),
         };
     }));
     // Build orphan DashboardIssue objects for worktrees not matched to any fetched issue
@@ -132,12 +122,6 @@ export async function loadDashboardData(repoRoot) {
             : wt.branch.replace(/^[^/]+\//, ""))
             .replace(/-/g, " ")
             .trim() || tid;
-        let sessState = readSessionState(repoRoot, tid);
-        if (sessState && !isSessionAlive(tid)) {
-            clearSessionState(repoRoot, tid);
-            sessState = null;
-        }
-        const ss = sessState?.state ?? null;
         const storedId = metadata[tid]?.session_id ?? null;
         const sessionCwd = storedId ? findClaudeSessionCwd(wt.path, storedId) : null;
         let sessionId = storedId;
@@ -145,7 +129,7 @@ export async function loadDashboardData(repoRoot) {
             clearSessionId(repoRoot, tid);
             sessionId = null;
         }
-        const claudeTodos = sessionId && ss !== "exited" ? readMainAgentTodos(sessionId) : null;
+        const claudeTodos = sessionId ? readMainAgentTodos(sessionId) : null;
         return {
             issue: {
                 identifier: tid,
@@ -168,14 +152,13 @@ export async function loadDashboardData(repoRoot) {
                 sessionId,
                 sessionCwd,
                 gitStatus: gitStatusOutput,
-                sessionState: ss === "exited" ? null : ss,
-                sessionMessage: sessState?.message ?? null,
                 diffStats: shortstat,
                 claudeTodos,
             },
             pr,
             checks: checksInfo,
             reviews: reviewsInfo,
+            fixLoop: readFixLoopRuntime(repoRoot, tid),
         };
     }));
     // ── Compute parent-child relationships ──────────────────────────
@@ -367,8 +350,6 @@ async function buildMainEntry(repoRoot) {
             sessionId: null,
             sessionCwd: null,
             gitStatus: gitStatusOutput,
-            sessionState: null,
-            sessionMessage: null,
             diffStats: shortstat,
             claudeTodos: null,
         },
@@ -421,12 +402,6 @@ export async function loadReviewsData(repoRoot) {
                     getCommitsAheadAsync(wt.path, base),
                     getDiffShortstatAsync(wt.path, base),
                 ]);
-                let sessState = ticketId ? readSessionState(repoRoot, ticketId) : null;
-                if (sessState && ticketId && !isSessionAlive(ticketId)) {
-                    clearSessionState(repoRoot, ticketId);
-                    sessState = null;
-                }
-                const ss = sessState?.state ?? null;
                 const storedId = ticketId ? (metadata[ticketId]?.session_id ?? null) : null;
                 const sessionCwd = storedId ? findClaudeSessionCwd(wt.path, storedId) : null;
                 let sessionId = storedId;
@@ -434,7 +409,7 @@ export async function loadReviewsData(repoRoot) {
                     clearSessionId(repoRoot, ticketId);
                     sessionId = null;
                 }
-                const claudeTodos = sessionId && ss !== "exited" ? readMainAgentTodos(sessionId) : null;
+                const claudeTodos = sessionId ? readMainAgentTodos(sessionId) : null;
                 worktreeInfo = {
                     path: wt.path,
                     branch: wt.branch,
@@ -444,8 +419,6 @@ export async function loadReviewsData(repoRoot) {
                     sessionId,
                     sessionCwd,
                     gitStatus: gitStatusOutput,
-                    sessionState: ss === "exited" ? null : ss,
-                    sessionMessage: sessState?.message ?? null,
                     diffStats: shortstat,
                     claudeTodos,
                 };

package/dist/lib/dashboard/external-editor.d.ts

@@ -7,6 +7,6 @@ export interface EditExternallyResult {
  * Open the user's editor on a temp file seeded with `initial`, then return the
  * saved content. Empty buffer is treated as cancel (matches `git commit`).
  *
- * Editor resolution: SANTREE_EDITOR > VISUAL > EDITOR > "vim".
+ * Editor resolution: santree config editor (or SANTREE_EDITOR) > VISUAL > EDITOR > "vim".
  */
 export declare function editExternally(initial: string, ext?: string): EditExternallyResult;

package/dist/lib/dashboard/external-editor.js

@@ -2,6 +2,7 @@ import { spawnSync } from "child_process";
 import * as fs from "fs";
 import * as os from "os";
 import * as path from "path";
+import { getConfiguredEditor } from "../config-store.js";
 // GUI editors that detach by default and need a `--wait` flag to make spawnSync
 // block until the file is closed. Terminal editors (vim, nvim, nano, emacs -nw)
 // already block, so they aren't listed here.
@@ -17,10 +18,10 @@ const GUI_EDITORS_NEEDING_WAIT = new Set([
  * Open the user's editor on a temp file seeded with `initial`, then return the
  * saved content. Empty buffer is treated as cancel (matches `git commit`).
  *
- * Editor resolution: SANTREE_EDITOR > VISUAL > EDITOR > "vim".
+ * Editor resolution: santree config editor (or SANTREE_EDITOR) > VISUAL > EDITOR > "vim".
  */
 export function editExternally(initial, ext = "md") {
-    const editorRaw = process.env["SANTREE_EDITOR"] || process.env["VISUAL"] || process.env["EDITOR"] || "vim";
+    const editorRaw = getConfiguredEditor() || process.env["VISUAL"] || process.env["EDITOR"] || "vim";
     const filePath = path.join(os.tmpdir(), `santree-edit-${Date.now()}.${ext.replace(/^\./, "")}`);
     try {
         fs.writeFileSync(filePath, initial);

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

@@ -1,6 +1,8 @@
 import type { PRInfo, PRCheck, PRReview, PRConversationComment, SearchPR } from "../github.js";
 import type { ClaudeTodo } from "../claude-todos.js";
+import type { FixLoopRuntime } from "../fix-loop.js";
 import type { AssignedIssue, Comment, Issue, TriageSchedule } from "../trackers/types.js";
+export type { FixLoopRuntime } from "../fix-loop.js";
 export type { AssignedIssue, Comment, Issue, TriageSchedule } from "../trackers/types.js";
 export interface WorktreeInfo {
     path: string;
@@ -22,8 +24,6 @@ export interface WorktreeInfo {
      * sessionId is null or the underlying file can't be located. */
     sessionCwd: string | null;
     gitStatus: string;
-    sessionState: "waiting" | "idle" | "active" | null;
-    sessionMessage: string | null;
     diffStats: {
         filesChanged: number;
         insertions: number;
@@ -37,6 +37,8 @@ export interface DashboardIssue {
     pr: PRInfo | null;
     checks: PRCheck[] | null;
     reviews: PRReview[] | null;
+    /** Active/recent auto-fix loop for this ticket (from .santree/fix-loops/). */
+    fixLoop?: FixLoopRuntime | null;
     parentTicketId?: string;
     children?: DashboardIssue[];
 }
@@ -169,6 +171,12 @@ export interface DashboardState {
      * surfaces the real PR), and are reconciled away by SET_DATA.
      */
     pendingPrs: Record<string, PRInfo>;
+    /**
+     * Active/recent auto-fix loops keyed by ticket id, used to render the per-row
+     * ⟳ badge + detail line. Seeded optimistically by FIXLOOP_START and rebuilt
+     * from the `.santree/fix-loops/` markers on every SET_DATA.
+     */
+    fixLoopTickets: Record<string, FixLoopRuntime>;
     commitPhase: CommitPhase;
     commitMessage: string;
     commitError: string | null;
@@ -361,6 +369,9 @@ export type DashboardAction = {
     type: "DELETE_ERROR";
     ticketId: string;
     error: string;
+} | {
+    type: "FIXLOOP_START";
+    ticketId: string;
 } | {
     type: "COMMIT_START";
     /** Null when committing on a non-ticket branch (e.g. the main

package/dist/lib/dashboard/types.js

@@ -49,6 +49,7 @@ export const initialState = {
     creationError: null,
     deletingTickets: {},
     pendingPrs: {},
+    fixLoopTickets: {},
     commitPhase: "idle",
     commitMessage: "",
     commitError: null,
@@ -132,6 +133,14 @@ export function reducer(state, action) {
                 reconciledTrees = reconciledTrees.map((d, i) => (i === idx ? { ...d, pr: optimistic } : d));
                 pendingPrs[id] = optimistic; // still pending → keep showing it
             }
+            // Rebuild the fix-loop badge map authoritatively from the freshly-read
+            // markers (drops loops whose marker was cleared); optimistic FIXLOOP_START
+            // entries are superseded here once the marker file is picked up.
+            const fixLoopTickets = {};
+            for (const d of reconciledTrees) {
+                if (d.fixLoop)
+                    fixLoopTickets[d.issue.identifier] = d.fixLoop;
+            }
             return {
                 ...state,
                 groups: action.groups,
@@ -139,6 +148,7 @@ export function reducer(state, action) {
                 treeGroups: action.treeGroups,
                 flatTrees: reconciledTrees,
                 pendingPrs,
+                fixLoopTickets,
                 triageGroups: action.triageGroups,
                 flatTriage: action.flatTriage,
                 deletingTickets,
@@ -360,6 +370,23 @@ export function reducer(state, action) {
                 },
             };
         }
+        case "FIXLOOP_START": {
+            // Optimistic running badge until SET_DATA reads the marker the launcher wrote.
+            const now = new Date().toISOString();
+            return {
+                ...state,
+                fixLoopTickets: {
+                    ...state.fixLoopTickets,
+                    [action.ticketId]: {
+                        phase: "running",
+                        status: "running",
+                        startedAt: now,
+                        at: now,
+                        ageMs: 0,
+                    },
+                },
+            };
+        }
         case "COMMIT_START":
             return {
                 ...state,
@@ -431,9 +458,13 @@ export function reducer(state, action) {
             const ticketId = state.prCreateTicketId;
             let flatTrees = state.flatTrees;
             let pendingPrs = state.pendingPrs;
-            if (ticketId) {
+            // Only attach the optimistic PR if we can parse a real number from the
+            // returned URL — a `"?"` placeholder would break later `gh pr view <n>`
+            // calls. If it doesn't match, the next refresh surfaces the real PR.
+            const prNumber = action.url.match(/\/pull\/(\d+)/)?.[1];
+            if (ticketId && prNumber) {
                 const optimistic = {
-                    number: action.url.match(/\/pull\/(\d+)/)?.[1] ?? "?",
+                    number: prNumber,
                     state: "OPEN",
                     isDraft: state.prCreateDraft,
                     url: action.url,

package/dist/lib/exec.d.ts

@@ -1,3 +1,16 @@
+/**
+ * Run a command with array args (NO shell) and return `{ stdout, stderr }`.
+ * Rejects on non-zero exit with an error carrying `.stdout`/`.stderr`/`.message`,
+ * matching promisified `exec` semantics. Use this — not a `exec(\`… ${x}\`)`
+ * template — whenever any argument is user-supplied, to avoid shell injection.
+ */
+export declare function execFileAsync(file: string, args: string[], options?: {
+    cwd?: string;
+    env?: NodeJS.ProcessEnv;
+}): Promise<{
+    stdout: string;
+    stderr: string;
+}>;
 /**
  * Run a shell command and return trimmed stdout, or null on failure.
  */

package/dist/lib/exec.js

@@ -1,6 +1,16 @@
-import { execSync, exec, spawn } from "child_process";
+import { execSync, exec, execFile, spawn } from "child_process";
 import { promisify } from "util";
 const execPromise = promisify(exec);
+const execFilePromise = promisify(execFile);
+/**
+ * Run a command with array args (NO shell) and return `{ stdout, stderr }`.
+ * Rejects on non-zero exit with an error carrying `.stdout`/`.stderr`/`.message`,
+ * matching promisified `exec` semantics. Use this — not a `exec(\`… ${x}\`)`
+ * template — whenever any argument is user-supplied, to avoid shell injection.
+ */
+export async function execFileAsync(file, args, options) {
+    return execFilePromise(file, args, { encoding: "utf-8", ...options });
+}
 /**
  * Run a shell command and return trimmed stdout, or null on failure.
  */

package/dist/lib/fix-loop.d.ts

@@ -0,0 +1,45 @@
+/**
+ * Marker store for the auto-fix `/loop` (see `santree pr fix --loop`).
+ *
+ * Each running loop writes `.santree/fix-loops/<ticketId>.json` and heartbeats it
+ * every iteration. The dashboard reads these markers to render a per-ticket fix-loop
+ * badge — kept as files (not in dashboard memory) because the loop runs in a separate
+ * process/window and must survive dashboard restarts. Staleness is timestamp-based:
+ * the loop has a known cadence, so a "running" marker that hasn't heartbeat in a
+ * while is treated as stalled.
+ *
+ * Standalone module (only `fs`/`path`/`metadata`) so both commands and the dashboard
+ * data layer can import it without pulling in git/tracker cycles.
+ */
+/** Lifecycle status written by the loop. `stopped:*` are terminal. */
+export type FixLoopStatus = "running" | "merging" | "fixing" | "waiting-ci" | "stopped:clean" | "stopped:stuck";
+export interface FixLoopMarker {
+    status: FixLoopStatus;
+    /** Loop interval in minutes (used for staleness math). */
+    intervalMin: number;
+    /** ISO timestamp the loop first launched. */
+    startedAt: string;
+    /** ISO timestamp of the last heartbeat / status change. */
+    at: string;
+}
+/** Display phase derived from a marker + the current time. */
+export type FixLoopPhase = "running" | "stalled" | "stopped-clean" | "stopped-stuck";
+export interface FixLoopRuntime {
+    phase: FixLoopPhase;
+    status: FixLoopStatus;
+    startedAt: string;
+    at: string;
+    ageMs: number;
+}
+/** Create/overwrite a marker as a freshly-started running loop. */
+export declare function startFixLoop(repoRoot: string, ticketId: string, intervalMin: number): void;
+/**
+ * Update an existing marker's status and heartbeat. If no marker exists yet (e.g. a
+ * signal arrives before the launcher wrote one), a minimal one is created so the
+ * dashboard still reflects the loop.
+ */
+export declare function signalFixLoop(repoRoot: string, ticketId: string, status: FixLoopStatus): void;
+export declare function readFixLoopMarker(repoRoot: string, ticketId: string): FixLoopMarker | null;
+export declare function clearFixLoop(repoRoot: string, ticketId: string): void;
+/** Derive the dashboard-facing phase from a marker. Returns null if no marker. */
+export declare function readFixLoopRuntime(repoRoot: string, ticketId: string, now?: number): FixLoopRuntime | null;

package/dist/lib/fix-loop.js

@@ -0,0 +1,83 @@
+import * as fs from "fs";
+import * as path from "path";
+import { getSantreeDir } from "./metadata.js";
+function getFixLoopsDir(repoRoot) {
+    return path.join(getSantreeDir(repoRoot), "fix-loops");
+}
+function markerPath(repoRoot, ticketId) {
+    return path.join(getFixLoopsDir(repoRoot), `${ticketId}.json`);
+}
+/** Create/overwrite a marker as a freshly-started running loop. */
+export function startFixLoop(repoRoot, ticketId, intervalMin) {
+    const now = new Date().toISOString();
+    writeMarker(repoRoot, ticketId, {
+        status: "running",
+        intervalMin,
+        startedAt: now,
+        at: now,
+    });
+}
+/**
+ * Update an existing marker's status and heartbeat. If no marker exists yet (e.g. a
+ * signal arrives before the launcher wrote one), a minimal one is created so the
+ * dashboard still reflects the loop.
+ */
+export function signalFixLoop(repoRoot, ticketId, status) {
+    const prev = readFixLoopMarker(repoRoot, ticketId);
+    const now = new Date().toISOString();
+    writeMarker(repoRoot, ticketId, {
+        status,
+        intervalMin: prev?.intervalMin ?? 5,
+        startedAt: prev?.startedAt ?? now,
+        at: now,
+    });
+}
+function writeMarker(repoRoot, ticketId, marker) {
+    const dir = getFixLoopsDir(repoRoot);
+    fs.mkdirSync(dir, { recursive: true });
+    fs.writeFileSync(markerPath(repoRoot, ticketId), JSON.stringify(marker, null, 2) + "\n");
+}
+export function readFixLoopMarker(repoRoot, ticketId) {
+    const filePath = markerPath(repoRoot, ticketId);
+    if (!fs.existsSync(filePath))
+        return null;
+    try {
+        return JSON.parse(fs.readFileSync(filePath, "utf-8"));
+    }
+    catch {
+        return null;
+    }
+}
+export function clearFixLoop(repoRoot, ticketId) {
+    try {
+        fs.unlinkSync(markerPath(repoRoot, ticketId));
+    }
+    catch {
+        // Ignore if missing.
+    }
+}
+/**
+ * A heartbeating loop that hasn't checked in for ~2.5 intervals is treated as
+ * stalled (its window was probably closed). Floor of 10 min so a slow first
+ * iteration isn't mistaken for a dead loop.
+ */
+function staleThresholdMs(intervalMin) {
+    return Math.max(intervalMin * 2.5, 10) * 60_000;
+}
+/** Derive the dashboard-facing phase from a marker. Returns null if no marker. */
+export function readFixLoopRuntime(repoRoot, ticketId, now = Date.now()) {
+    const marker = readFixLoopMarker(repoRoot, ticketId);
+    if (!marker)
+        return null;
+    const ageMs = now - new Date(marker.at).getTime();
+    let phase;
+    if (marker.status === "stopped:clean")
+        phase = "stopped-clean";
+    else if (marker.status === "stopped:stuck")
+        phase = "stopped-stuck";
+    else if (ageMs > staleThresholdMs(marker.intervalMin))
+        phase = "stalled";
+    else
+        phase = "running";
+    return { phase, status: marker.status, startedAt: marker.startedAt, at: marker.at, ageMs };
+}

package/dist/lib/git.d.ts

@@ -1,10 +1,4 @@
 export { getSantreeDir, readAllMetadata, writeAllMetadata } from "./metadata.js";
-export interface SessionState {
-    state: "waiting" | "idle" | "active" | "exited";
-    message: string | null;
-    session_id: string;
-    at: string;
-}
 export interface Worktree {
     path: string;
     branch: string;
@@ -191,17 +185,14 @@ export declare function getCommitsAheadAsync(cwd: string, baseBranch: string): P
  */
 export declare function getCommitsBehindAsync(cwd: string, baseBranch: string): Promise<number>;
 /**
- * Read the SANTREE_DIFF_TOOL env var, returning the configured diff pager
- * command (e.g. "delta", "diff-so-fancy") or null if unset/invalid.
+ * Resolve the configured diff pager command (e.g. "delta", "diff-so-fancy"),
+ * or null if unset/invalid. Source order: `SANTREE_DIFF_TOOL` env override →
+ * santree's config file (set from `santree config`). See `lib/config-store.ts`.
  *
  * The CLI `worktree diff` flow lets the pager do its full job (render +
  * scroll) via git's `core.pager`. The dashboard's `[v]` overlay only uses
  * the rendering half — it captures the pager's stdout as a string and
  * handles scrolling itself in Ink.
- *
- * The value is restricted to a safe shell-token character set since it ends
- * up in arguments passed to spawn() — even though we never use shell:true,
- * keeping the surface tight defends against accidental misconfigurations.
  */
 export declare function getDiffTool(): string | null;
 export interface DiffShortstat {
@@ -315,20 +306,3 @@ export declare function unstageAll(cwd: string): Promise<void>;
  * - Untracked: deletes the file from disk via fs.unlink.
  */
 export declare function discardFile(cwd: string, filePath: string, isUntracked: boolean): Promise<void>;
-/**
- * Read the session state file for a given ticket.
- * Returns null if missing or "exited".
- */
-export declare function readSessionState(repoRoot: string, ticketId: string): SessionState | null;
-/**
- * Check if a session for the given ticket is still alive in the active multiplexer.
- * Delegates to the configured multiplexer (tmux: pane_pid + pgrep claude;
- * cmux: workspace lookup; none: always false). Callers should also consult the
- * .santree/session-states/<ticketId>.json file — that's the authoritative signal
- * written by Claude Code hooks, while this is the "is the terminal still up" backstop.
- */
-export declare function isSessionAlive(ticketId: string): boolean;
-/**
- * Delete the session state file for a given ticket.
- */
-export declare function clearSessionState(repoRoot: string, ticketId: string): void;

package/dist/lib/git.js

@@ -3,7 +3,7 @@ import { promisify } from "util";
 import * as path from "path";
 import * as fs from "fs";
 import { run, runAsync, spawnAsync } from "./exec.js";
-import { getMultiplexer } from "./multiplexer/index.js";
+import { getConfiguredDiffTool } from "./config-store.js";
 import { getSantreeDir, readAllMetadata, writeAllMetadata } from "./metadata.js";
 import { getIssueTracker } from "./trackers/index.js";
 export { getSantreeDir, readAllMetadata, writeAllMetadata } from "./metadata.js";
@@ -217,7 +217,7 @@ export async function removeWorktree(branchName, repoRoot, force = false, onProg
             }
             fs.rmSync(worktreePath, { recursive: true, force: true });
         }
-        // Clean up centralized metadata entry and session state
+        // Clean up centralized metadata entry
         const ticketId = extractTicketId(branchName);
         if (ticketId) {
             const all = readAllMetadata(repoRoot);
@@ -225,7 +225,6 @@ export async function removeWorktree(branchName, repoRoot, force = false, onProg
                 delete all[ticketId];
                 writeAllMetadata(repoRoot, all);
             }
-            clearSessionState(repoRoot, ticketId);
         }
         // Also delete the branch
         report("Deleting branch…");
@@ -457,26 +456,17 @@ export async function getCommitsBehindAsync(cwd, baseBranch) {
     return output ? parseInt(output, 10) || 0 : 0;
 }
 /**
- * Read the SANTREE_DIFF_TOOL env var, returning the configured diff pager
- * command (e.g. "delta", "diff-so-fancy") or null if unset/invalid.
+ * Resolve the configured diff pager command (e.g. "delta", "diff-so-fancy"),
+ * or null if unset/invalid. Source order: `SANTREE_DIFF_TOOL` env override →
+ * santree's config file (set from `santree config`). See `lib/config-store.ts`.
  *
  * The CLI `worktree diff` flow lets the pager do its full job (render +
  * scroll) via git's `core.pager`. The dashboard's `[v]` overlay only uses
  * the rendering half — it captures the pager's stdout as a string and
  * handles scrolling itself in Ink.
- *
- * The value is restricted to a safe shell-token character set since it ends
- * up in arguments passed to spawn() — even though we never use shell:true,
- * keeping the surface tight defends against accidental misconfigurations.
  */
 export function getDiffTool() {
-    const raw = process.env["SANTREE_DIFF_TOOL"];
-    if (!raw || !raw.trim())
-        return null;
-    const tool = raw.trim();
-    if (!/^[a-zA-Z0-9_\-/.+]+$/.test(tool))
-        return null;
-    return tool;
+    return getConfiguredDiffTool() ?? null;
 }
 /**
  * Compute branch-only diff stats vs base (uses merge-base, like a GitHub PR
@@ -704,49 +694,3 @@ export async function discardFile(cwd, filePath, isUntracked) {
         throw new Error(`git checkout HEAD failed: ${output.trim()}`);
     }
 }
-/**
- * Get the path to the .santree/session-states directory.
- */
-function getSessionStatesDir(repoRoot) {
-    return path.join(getSantreeDir(repoRoot), "session-states");
-}
-/**
- * Read the session state file for a given ticket.
- * Returns null if missing or "exited".
- */
-export function readSessionState(repoRoot, ticketId) {
-    const filePath = path.join(getSessionStatesDir(repoRoot), `${ticketId}.json`);
-    if (!fs.existsSync(filePath))
-        return null;
-    try {
-        const data = JSON.parse(fs.readFileSync(filePath, "utf-8"));
-        if (data.state === "exited")
-            return null;
-        return data;
-    }
-    catch {
-        return null;
-    }
-}
-/**
- * Check if a session for the given ticket is still alive in the active multiplexer.
- * Delegates to the configured multiplexer (tmux: pane_pid + pgrep claude;
- * cmux: workspace lookup; none: always false). Callers should also consult the
- * .santree/session-states/<ticketId>.json file — that's the authoritative signal
- * written by Claude Code hooks, while this is the "is the terminal still up" backstop.
- */
-export function isSessionAlive(ticketId) {
-    return getMultiplexer().isSessionAlive(ticketId);
-}
-/**
- * Delete the session state file for a given ticket.
- */
-export function clearSessionState(repoRoot, ticketId) {
-    const filePath = path.join(getSessionStatesDir(repoRoot), `${ticketId}.json`);
-    try {
-        fs.unlinkSync(filePath);
-    }
-    catch {
-        // Ignore if file doesn't exist
-    }
-}