santree 0.5.2 → 0.5.4

package/README.md

@@ -16,7 +16,7 @@
 
 <p align="center">
   Create, switch, and manage Git worktrees with ease.<br/>
-  Integrates with GitHub PRs and Linear tickets via Claude AI.
+  Integrates with GitHub PRs and pluggable issue trackers (Linear, GitHub Issues) via Claude AI.
 </p>
 
 ---
@@ -112,13 +112,29 @@ With the `stw` alias: `stw create`, `stw list`, `stw switch`, `stw work`, `stw c
 | `santree pr fix`    | Fix PR review comments with AI        |
 | `santree pr review` | Review changes against ticket with AI |
 
-### Linear (`santree linear`)
+### Issue trackers
+
+Santree supports Linear and GitHub Issues behind a single interface. Each repo picks one. Use the generic `santree issue` commands for tracker-agnostic actions; use `santree linear` / `santree github` for backend-specific auth.
+
+#### Generic — `santree issue`
+
+| Command                                | Description                                                  |
+| -------------------------------------- | ------------------------------------------------------------ |
+| `santree issue switch <linear\|github>` | Pick the active tracker for this repo                        |
+| `santree issue open`                   | Open the current branch's issue in the browser               |
+
+#### Linear (`santree linear`)
 
 | Command                 | Description                                   |
 | ----------------------- | --------------------------------------------- |
 | `santree linear auth`   | Authenticate with Linear (OAuth)              |
 | `santree linear switch` | Switch Linear workspace for this repo         |
-| `santree linear open`   | Open the current Linear ticket in the browser |
+
+#### GitHub Issues (`santree github`)
+
+| Command               | Description                                                            |
+| --------------------- | ---------------------------------------------------------------------- |
+| `santree github auth` | Verify `gh auth status`, run `gh auth login` if needed, set tracker=github |
 
 ### Helpers (`santree helpers`)
 
@@ -137,16 +153,75 @@ With the `stw` alias: `stw create`, `stw list`, `stw switch`, `stw work`, `stw c
 
 | Command             | Description                                     |
 | ------------------- | ----------------------------------------------- |
-| `santree dashboard` | Interactive dashboard of all your Linear issues |
+| `santree dashboard` | Interactive dashboard of all your assigned issues |
 | `santree doctor`    | Check system requirements and integrations      |
 
 ---
 
 ## Features
 
+### Workflow
+
+End-to-end flow, from picking an issue to merging the PR. Everything runs inside the terminal multiplexer; the dashboard orchestrates and the AI agent does the heavy lifting at two distinct stages.
+
+```mermaid
+flowchart TB
+    subgraph Term["Terminal · tmux / cmux"]
+        direction TB
+        Dashboard(["① Dashboard<br/>pick issue · add context"]):::action
+        Editor["Editor<br/><sub>zed · cursor · vscode · nvim · jetbrains</sub>"]:::tool
+        AI(("② / ⑤ AI agent<br/>Claude Code")):::agent
+        Pager["③ Diff pager<br/><sub>delta · diff-so-fancy · built-in</sub>"]:::tool
+        Decision{good?}:::decision
+        Ship(["④ git commit + PR"]):::action
+        GitHub[("GitHub<br/>PRs · CI")]:::external
+
+        Dashboard ==>|implement| AI
+        Dashboard -. write context .-> Editor
+        Editor -. context · hand-edit .-> AI
+        AI ==> Pager
+        Pager ==> Decision
+        Decision -->|hand-edit| Editor
+        Decision -->|resume| AI
+        Decision ==>|ship| Ship
+        Ship ==> GitHub
+        GitHub -->|reviews · CI| AI
+        AI -->|push fix| Ship
+    end
+
+    classDef action fill:#dbeafe,stroke:#3b82f6,stroke-width:2px,color:#1e3a8a
+    classDef tool fill:#f3f4f6,stroke:#9ca3af,color:#374151
+    classDef agent fill:#ede9fe,stroke:#8b5cf6,stroke-width:2px,color:#4c1d95
+    classDef external fill:#fef3c7,stroke:#f59e0b,stroke-width:2px,color:#78350f
+    classDef decision fill:#fee2e2,stroke:#ef4444,stroke-width:2px,color:#7f1d1d
+```
+
+Bold edges (`==>`) follow the happy path; thin edges (`-->`) are branches/loops; dotted edges (`-.->`) are optional editor side-trips. Colors group nodes by role: blue actions, purple agent, gray tools, yellow external service, red decision.
+
+**Stages, in order:**
+
+1. **Pick + add context** — open the dashboard, browse assigned issues, pick one. The inline context box lets you add custom instructions to the prompt; `Ctrl+O` drops into your editor for longer prose.
+2. **AI agent (Claude)** — runs in the worktree's mux window with the rendered ticket + your context. Implements or plans.
+3. **Diff pager (review)** — `[v]` opens the diff overlay. From here you iterate: hand-edit in your editor, or resume the Claude session to keep going.
+4. **Ship** — once the diff looks right, `[C]` for inline commit + push, then `[c]` to create the PR (`--fill` runs Claude non-interactively against the PR template).
+5. **PR feedback loop** — `[f]` (fix) and `[r]` (self-review) re-launch the AI with PR comments + CI failures as input. Patches are pushed; CI re-runs; loop until merged.
+
+**Supported tools per stage:**
+
+| Stage | Supported today | Planned |
+|---|---|---|
+| **Issue tracker** (① Dashboard) | Linear, GitHub Issues | Jira, Shortcut, etc. |
+| **AI agent** (②, ⑤) | Claude Code (`claude` CLI) | OpenAI Codex, OpenCode, Cursor agent |
+| **Diff pager** (③) | delta, diff-so-fancy, any unified-diff pager — built-in colorizer when none set | — |
+| **Editor** (side branch) | Anything taking a path: zed, nvim, jetbrains, cursor, vscode. cursor + vscode also handle `.code-workspace` files via `[E]` workspace shortcut | — |
+| **Forge** (④) | GitHub via `gh` CLI | GitLab, Bitbucket, Gitea |
+| **Terminal multiplexer** (outer frame) | tmux, cmux *(macOS-only — see [#1472](https://github.com/manaflow-ai/cmux/issues/1472))*, none | zellij |
+
+The AI agent and issue tracker are already behind interfaces (`lib/trackers/`, plus the `claude` CLI shim in `lib/ai.ts`). Adding a new option in either category means writing one new module and wiring it into the factory — no changes to UI/dashboard code.
+
 ### Interactive Dashboard
 
-`santree dashboard` opens a full-screen TUI to manage all your work in one place. It shows your Linear issues grouped by project, with live status for worktrees, PRs, CI checks, and reviews.
+`santree dashboard` opens a full-screen TUI to manage all your work in one place. It shows your assigned issues from the active tracker (Linear or GitHub Issues) grouped by project, with live status for worktrees, PRs, CI checks, and reviews.
 
 **Left pane** — issue list. Issues without worktrees show as a single row (priority + ID + title). Issues with worktrees expand into nested sub-rows below the title showing `· diff` (files/adds/deletes/commits-ahead), `· pr` (number, state, CI, review count), and `· session` (state + Claude session ID). Click any row (main or sub) to select; scroll wheel navigates; drag the divider to resize panes.
 
@@ -162,7 +237,7 @@ With the `stw` alias: `stw create`, `stw list`, `stw switch`, `stw work`, `stw c
 | `c` | Create PR (fill from commits or open in browser) |
 | `v` | Inline diff overlay — file tree + diff content (mouse + keyboard) |
 | `f` / `r` | Fix PR / Review PR (launches in tmux) |
-| `o` / `p` | Open Linear ticket / PR in browser |
+| `o` / `p` | Open issue (in Linear or GitHub) / PR in browser |
 | `d` | Remove worktree |
 
 Commit, PR creation, and diff review happen inline without leaving the dashboard. Work, fix, and review open in new tmux windows.
@@ -177,9 +252,9 @@ Create isolated worktrees for each feature branch. No more stashing or committin
 
 See PR status directly in your worktree list. Clean up worktrees automatically when PRs are merged or closed.
 
-### Linear Integration
+### Issue Tracker Integration
 
-Santree fetches Linear ticket data (title, description, comments, images) and injects it into prompts when running `santree worktree work`. See [Linear Integration](#linear-integration-1) for setup.
+Santree fetches issue data (title, description, comments, images) from the active tracker — Linear or GitHub Issues — and injects it into prompts when running `santree worktree work`. See [Issue Tracker Integration](#issue-tracker-integration-1) for setup.
 
 ### Claude AI Integration
 
@@ -210,16 +285,46 @@ npm install
 
 ### Branch Naming
 
-For Linear integration, use branch names with ticket IDs:
+Branch names need to encode the issue ID so santree can link the worktree back to the right ticket. The accepted format depends on the active tracker:
 
 ```
+# Linear (uppercased letter prefix + dash + digits)
 user/TEAM-123-feature-description
 feature/PROJ-456-add-auth
+
+# GitHub Issues (explicit prefix required, to avoid `fix-typo-1` matching)
+feature/issue-42-add-auth
+gh-42-add-auth
+42-add-auth
+```
+
+GitHub's parser is strict on purpose: a commit-style branch like `fix-typo-1` will *not* match (no explicit prefix, no slash-led number).
+
+### Issue Tracker Integration
+
+Each repo picks one tracker. The active tracker is resolved in this order: `SANTREE_TRACKER` env var → per-repo `_tracker.kind` (in `.santree/metadata.json`) → legacy `_linear.org` (treated as Linear) → auto-detect (any Linear creds → Linear, else GitHub).
+
+#### Choosing a tracker
+
+```bash
+# Explicitly pick the active tracker for this repo
+santree issue switch linear
+santree issue switch github
+
+# Or let an auth command set it as a side effect:
+santree linear auth        # Sets _tracker.kind = "linear" after OAuth
+santree github auth        # Sets _tracker.kind = "github" after `gh auth login`
+```
+
+For a one-off override (testing, scripting):
+
+```bash
+SANTREE_TRACKER=github santree dashboard
 ```
 
-### Linear Integration
+#### Linear
 
-Santree fetches Linear ticket data (title, description, comments, images) and injects it into prompts when running `santree worktree work`.
+Santree fetches Linear ticket data via the GraphQL API (OAuth PKCE).
 
 ```bash
 # Authenticate with Linear (opens browser for OAuth)
@@ -233,12 +338,26 @@ santree linear auth --test TEAM-123
 
 # Log out
 santree linear auth --logout
+
+# Switch between authenticated workspaces
+santree linear switch
 ```
 
 On first run, `santree linear auth` opens your browser to authorize the app with your Linear workspace. Tokens are stored in `$XDG_CONFIG_HOME/santree/auth.json` (defaults to `~/.config/santree/auth.json`) and auto-refresh transparently.
 
 If you have multiple workspaces authenticated, running `santree linear auth` in a new repo will let you pick which one to link. Images from tickets are downloaded to a temp directory and cleaned up after Claude exits.
 
+#### GitHub Issues
+
+Santree uses the existing `gh` CLI — no separate OAuth flow.
+
+```bash
+# Verify gh is authenticated; flips this repo's tracker to GitHub
+santree github auth
+```
+
+Issues are listed via `gh search issues --assignee=@me --state=open --repo <owner>/<name>` (current repo only — cross-repo issues aren't surfaced today). Priority is derived from labels matching `P0`/`P1`/`P2`/`P3`/`urgent`/`critical`/`high`/`medium`/`low`, falling back to `No priority`. Attached images on `user-images.githubusercontent.com` and `github.com/.../assets/` are downloaded so Claude can read them when filling PR templates.
+
 ### Claude Code Statusline (Optional)
 
 Santree provides a custom statusline for Claude Code showing git info, model, context usage, and cost.
@@ -286,45 +405,11 @@ To preview the JSON without writing: `santree helpers session-signal install --d
 
 Verify with `santree doctor` — look for the "Session Signal Hooks" row under Claude Code.
 
-### Session Hooks (Optional)
-
-Run custom scripts when Claude's session state changes. Create executable scripts in `.santree/hooks/`:
-
-```
-.santree/hooks/
-  on-waiting.sh    # Runs when session needs permission approval
-  on-active.sh     # Runs when user submits a new prompt
-  on-idle.sh       # Runs when session finishes and waits for next prompt
-  on-exited.sh     # Runs when session ends
-```
-
-Each script receives these environment variables:
-
-| Variable | Description |
-|----------|-------------|
-| `SANTREE_TICKET_ID` | e.g. `TEAM-123` |
-| `SANTREE_SESSION_STATE` | `waiting`, `active`, `idle`, or `exited` |
-| `SANTREE_SESSION_ID` | The Claude session ID |
-| `SANTREE_WORKTREE_PATH` | Absolute path to the worktree |
-| `SANTREE_REPO_ROOT` | Absolute path to the main repo |
-| `SANTREE_MESSAGE` | Notification message (only for `waiting`) |
-
-Scripts are optional — only executed if they exist and are executable. They run fire-and-forget with a 5-second timeout.
-
-**Example** — log when Claude is waiting for approval:
-
-```bash
-#!/bin/bash
-# .santree/hooks/on-waiting.sh
-echo "$(date): $SANTREE_TICKET_ID waiting — $SANTREE_MESSAGE" >> /tmp/santree-hooks.log
-```
-
-Make it executable: `chmod +x .santree/hooks/on-waiting.sh`
-
 ### Environment Variables
 
 | Variable | Effect |
 |---|---|
+| `SANTREE_TRACKER` | Override the active issue tracker for a single invocation: `linear` or `github`. Takes precedence over the per-repo `_tracker.kind`. If unset, falls back to repo config → legacy `_linear.org` → auto-detect. |
 | `SANTREE_EDITOR` | Editor used by `e` (open in editor) actions in the dashboard. Defaults to `code`. Examples: `cursor`, `zed`, `code`, `nvim`. |
 | `SANTREE_MULTIPLEXER` | Terminal multiplexer used by the dashboard and `worktree create --window`. One of `tmux`, `cmux`, `none`. If unset, auto-detects from `$TMUX` / `$CMUX_SURFACE_ID`. cmux is macOS-only and limited by [manaflow-ai/cmux#1472](https://github.com/manaflow-ai/cmux/issues/1472). |
 | `SANTREE_DIFF_TOOL` | Pager used by `worktree diff` (CLI) and the dashboard diff overlay. Passed to git as `-c core.pager=<tool>` for the CLI, and used to pipe content for the overlay. Examples: `delta`, `diff-so-fancy`. Must accept a unified diff on stdin. Names are restricted to `[A-Za-z0-9_\-/.+]`. |
@@ -384,7 +469,7 @@ Shows a branch-only unified diff against the base branch's merge-base — same s
 | -------- | ------------------------------- |
 | `--plan` | Only create implementation plan |
 
-Automatically fetches Linear ticket data if authenticated. Degrades gracefully if not.
+Automatically fetches issue data from the active tracker (Linear or GitHub Issues) if authenticated. Degrades gracefully if not.
 
 ### pr create
 
@@ -426,16 +511,16 @@ Santree currently locks in to specific providers for some integrations and is in
 
 | Area | Supported | Not yet supported |
 | --- | --- | --- |
-| **Ticket system** | Linear (via `santree linear auth`) | Jira, GitHub Issues, Shortcut, Asana, Linear-equivalents |
 | **Source control / forge** | GitHub (via `gh` CLI) | GitLab, Bitbucket, Gitea, Codeberg, self-hosted Forgejo |
 | **Coding agent** | Claude Code (`claude` CLI) | OpenAI Codex, OpenCode, Cursor agent, Aider, others |
 
-These are hardwired in `lib/linear.ts`, `lib/github.ts`, and `lib/ai.ts` respectively. Adding a second provider means abstracting an interface (similar to `lib/multiplexer/`) and wiring a selection mechanism.
+These are hardwired in `lib/github.ts` and `lib/ai.ts` respectively. Adding a second provider means abstracting an interface (similar to `lib/trackers/` or `lib/multiplexer/`) and wiring a selection mechanism.
 
 ### Multi-provider (already interchangeable)
 
 | Area | How to switch | Examples |
 | --- | --- | --- |
+| **Issue tracker** | `santree issue switch <linear\|github>` (or `SANTREE_TRACKER` env var, or as a side effect of `santree linear auth` / `santree github auth`) | Linear (OAuth + GraphQL), GitHub Issues (via `gh` CLI). Adding a third tracker = one new directory under `lib/trackers/`. |
 | **Editor** | `SANTREE_EDITOR` env var (or `--editor` flag on `worktree open`) | `code`, `cursor`, `zed`, `nvim`, `subl`, `webstorm` — any executable that takes a path argument |
 | **Terminal multiplexer** | `SANTREE_MULTIPLEXER` env var | `tmux` (default, all platforms), `cmux` (macOS only — see [#1472](https://github.com/manaflow-ai/cmux/issues/1472)), `none`. Zellij is planned but not implemented. |
 | **Diff renderer** | `SANTREE_DIFF_TOOL` env var | `delta`, `diff-so-fancy`, or any pager that accepts a unified diff. Falls back to plain `git diff` colorization when unset. |
@@ -502,11 +587,17 @@ source/
 ├── cli.tsx              # Entry point (Pastel app runner)
 ├── lib/
 │   ├── ai.ts            # Shared AI logic (context, prompt, launch)
-│   ├── git.ts           # Git helpers (worktrees, branches, metadata)
+│   ├── git.ts           # Git helpers (worktrees, branches); extractTicketId is a tracker shim
 │   ├── github.ts        # GitHub CLI wrapper (PR info, auth, push, checks, reviews)
-│   ├── linear.ts        # Linear GraphQL API client (OAuth, tickets, images)
 │   ├── exec.ts          # Shell command helpers
+│   ├── metadata.ts      # .santree/metadata.json r/w (extracted to break import cycles)
 │   ├── prompts.ts       # Nunjucks template renderer
+│   ├── trackers/        # Issue tracker abstraction (Linear, GitHub Issues)
+│   │   ├── types.ts     # IssueTracker interface + generic Issue/AssignedIssue types
+│   │   ├── index.ts     # getIssueTracker(repoRoot) factory
+│   │   ├── linear/      # OAuth PKCE + GraphQL + image rewriter
+│   │   └── github/      # `gh` CLI wrappers; priority derived from labels
+│   ├── multiplexer/     # tmux/cmux/none abstraction (windows/sessions)
 │   └── dashboard/       # Dashboard UI components
 │       ├── types.ts     # State types, action types, phase enums
 │       ├── IssueList.tsx # Left pane — issue list with priority, session, PR, CI columns
@@ -516,7 +607,9 @@ source/
     ├── dashboard.tsx     # Top-level: interactive dashboard
     ├── worktree/         # Worktree management (create, list, switch, etc.)
     ├── pr/               # PR lifecycle (create, open, fix, review)
-    ├── linear/           # Linear integration (auth, open)
+    ├── linear/           # Linear-specific OAuth (auth, switch)
+    ├── github/           # GitHub-specific auth (gh wrapper)
+    ├── issue/            # Tracker-agnostic actions (switch, open)
     └── helpers/          # Shell init, statusline
 prompts/                 # Nunjucks templates: implement, plan, review, fix-pr, fill-pr, ticket
 shell/                   # Shell integration templates: init.zsh.njk, init.bash.njk

package/dist/commands/dashboard.d.ts

@@ -1,2 +1,2 @@
-export declare const description = "Interactive dashboard of your Linear issues";
+export declare const description = "Interactive dashboard of your assigned issues";
 export default function Dashboard(): import("react/jsx-runtime").JSX.Element;

package/dist/commands/dashboard.js

@@ -17,7 +17,7 @@ import { extractTicketId } from "../lib/git.js";
 import { getMultiplexer } from "../lib/multiplexer/index.js";
 import { getPRTemplate } from "../lib/github.js";
 import { renderPrompt, renderDiff, renderTicket } from "../lib/prompts.js";
-import { getTicketContent } from "../lib/linear.js";
+import { getIssueTracker } from "../lib/trackers/index.js";
 import * as os from "os";
 import { initialState, reducer } from "../lib/dashboard/types.js";
 import { loadDashboardData, loadReviewsData } from "../lib/dashboard/data.js";
@@ -30,7 +30,7 @@ import { CommitOverlay, PrCreateOverlay } from "../lib/dashboard/Overlays.js";
 import { MultilineTextArea } from "../lib/dashboard/MultilineTextArea.js";
 import DiffOverlay, { flattenTreeFiles, computeDiffLayout, clampDiffLeftWidth, DIFF_DIVIDER_WIDTH, } from "../lib/dashboard/DiffOverlay.js";
 import { CURRENT_VERSION, CLAUDE_CODE_PACKAGE, getLatestVersion, getCachedLatestVersion, getLatestVersionFor, getCachedLatestVersionFor, isUpdateAvailable, } from "../lib/version.js";
-export const description = "Interactive dashboard of your Linear issues";
+export const description = "Interactive dashboard of your assigned issues";
 const execAsync = promisify(exec);
 // Resolved at module load — cheap. Honors cmux's bundled binary when running
 // inside cmux so the header reflects the binary santree will actually use.
@@ -42,17 +42,74 @@ const CLAUDE_VERSION = getInstalledClaudeVersion() ?? "";
  *   R100\told/path\tnew/path
  * For renames/copies, the status code has a similarity suffix we strip.
  */
+/**
+ * Split combined-parameter SGR sequences (e.g. `\x1b[48;2;R;G;B;38;2;R;G;B m`)
+ * into separate single-attribute SGRs (`\x1b[48;2;...m\x1b[38;2;...m`).
+ *
+ * Why: Ink uses `slice-ansi` to clip text horizontally, and `slice-ansi`
+ * miscounts visible width on combined RGB bg+fg SGRs — it cuts the line at
+ * roughly half the requested visible width. Delta emits exactly this combined
+ * form on every styled token, so the diff pane was rendering content cut at
+ * arbitrary points (e.g. `from datetime i` instead of `from datetime import
+ * timedelta`). Splitting them sidesteps the slice-ansi bug without losing any
+ * styling — the terminal renders the two SGRs identically to the combined one.
+ */
+function splitCombinedSgr(s) {
+    return s.replace(/\x1b\[([0-9;]+)m/g, (_match, params) => {
+        const tokens = params.split(";");
+        const groups = [];
+        for (let i = 0; i < tokens.length; i++) {
+            const t = tokens[i];
+            if ((t === "38" || t === "48") && tokens[i + 1] === "2") {
+                groups.push([t, "2", tokens[i + 2], tokens[i + 3], tokens[i + 4]].join(";"));
+                i += 4;
+            }
+            else if ((t === "38" || t === "48") && tokens[i + 1] === "5") {
+                groups.push([t, "5", tokens[i + 2]].join(";"));
+                i += 2;
+            }
+            else {
+                groups.push(t);
+            }
+        }
+        if (groups.length <= 1)
+            return `\x1b[${params}m`;
+        return groups.map((g) => `\x1b[${g}m`).join("");
+    });
+}
 /**
  * Pipe `git diff` output through an external tool (e.g. delta) and return the
  * combined ANSI output. Uses spawn pipes — no shell — so the tool name is safe
  * even though we already validate it in getDiffTool().
  */
-function runPipedDiff(cwd, mergeBase, filePath, tool) {
+function runPipedDiff(cwd, gitArgs, tool, themeMode) {
     return new Promise((resolve, reject) => {
-        const git = spawn("git", ["-C", cwd, "diff", "--color=always", mergeBase, "--", filePath], {
+        const git = spawn("git", ["-C", cwd, ...gitArgs], {
             stdio: ["ignore", "pipe", "pipe"],
         });
-        const pager = spawn(tool, [], { stdio: ["pipe", "pipe", "pipe"] });
+        // Delta's syntax theme defaults are tuned for dark backgrounds — pale
+        // Monokai foreground on a light terminal becomes invisible. Force the
+        // theme flag matching santree's detected mode so colors stay readable.
+        const pagerArgs = tool === "delta" ? [themeMode === "light" ? "--light" : "--dark"] : [];
+        // Disable hyperlinks for delta: OSC 8 sequences (`\x1b]8;...`) are not
+        // handled by truncateVisible() — its CSI-only regex counts the URL
+        // bytes as visible characters, mangling line truncation and breaking
+        // terminal rendering of the wrapped text. Delta's CLI rejects an
+        // inline `--hyperlinks=false`, so override via GIT_CONFIG_PARAMETERS
+        // (delta reads its config from git). Also drop line-numbers — they
+        // eat ~6 cols of an already-narrow right pane.
+        const pagerEnv = tool === "delta"
+            ? {
+                ...process.env,
+                GIT_CONFIG_PARAMETERS: "'delta.hyperlinks=false' 'delta.line-numbers=false'",
+            }
+            : process.env;
+        // We use the pager only for its rendering — the dashboard owns
+        // scrolling/search itself in Ink, so we capture stdout as a string.
+        const pager = spawn(tool, pagerArgs, {
+            stdio: ["pipe", "pipe", "pipe"],
+            env: pagerEnv,
+        });
         let out = "";
         let err = "";
         git.stdout.pipe(pager.stdin);
@@ -72,7 +129,7 @@ function runPipedDiff(cwd, mergeBase, filePath, tool) {
                 reject(new Error(err || `${tool} exited with code ${code}`));
             }
             else {
-                resolve(out);
+                resolve(splitCombinedSgr(out));
             }
         });
     });
@@ -664,16 +721,24 @@ export default function Dashboard() {
                 if (file.isUntracked) {
                     // Untracked files aren't in `git diff` output — fake a "full
                     // addition" diff via --no-index against /dev/null. git exits 1
-                    // when files differ; that's expected, so capture stdout via
-                    // spawnAsync rather than execAsync (which throws on non-zero).
-                    const { output } = await spawnAsync("git", ["-C", cwd, "diff", "--no-color", "--no-index", "--", "/dev/null", file.path], { cwd });
-                    dispatch({ type: "DIFF_CONTENT_LOADED", content: output });
+                    // when files differ; that's expected, so we capture stdout
+                    // regardless. Pipe through the configured tool when set so
+                    // untracked files get the same syntax highlighting as tracked
+                    // ones; otherwise fall back to spawnAsync + manual colorize.
+                    if (tool) {
+                        const content = await runPipedDiff(cwd, ["diff", "--color=always", "--no-index", "--", "/dev/null", file.path], tool, theme.mode);
+                        dispatch({ type: "DIFF_CONTENT_LOADED", content });
+                    }
+                    else {
+                        const { output } = await spawnAsync("git", ["-C", cwd, "diff", "--no-color", "--no-index", "--", "/dev/null", file.path], { cwd });
+                        dispatch({ type: "DIFF_CONTENT_LOADED", content: output });
+                    }
                 }
                 else if (tool) {
                     // Pipe git diff (with colors enabled so the tool can pass them
                     // through if desired) into the configured tool. Use spawn pipes
                     // rather than shell to avoid quoting concerns.
-                    const content = await runPipedDiff(cwd, mergeBase, file.path, tool);
+                    const content = await runPipedDiff(cwd, ["diff", "--color=always", mergeBase, "--", file.path], tool, theme.mode);
                     dispatch({ type: "DIFF_CONTENT_LOADED", content });
                 }
                 else {
@@ -693,6 +758,7 @@ export default function Dashboard() {
         state.diffMergeBase,
         state.diffFileIndex,
         state.diffFiles,
+        theme.mode,
     ]);
     // ── Actions ───────────────────────────────────────────────────────
     const launchWorkInTmux = useCallback(async (di, mode, worktreePath, contextFile) => {
@@ -733,13 +799,13 @@ export default function Dashboard() {
                     type: "SET_ACTION_MESSAGE",
                     message: resumeCmd
                         ? `Resumed session in new window: ${windowName}`
-                        : `Launched ${mode} in ${mux.kind} window: ${windowName}`,
+                        : `Launched ${mode} in new window: ${windowName}`,
                 });
             }
             else {
                 dispatch({
                     type: "SET_ACTION_MESSAGE",
-                    message: `Failed to create ${mux.kind} window${created.message ? `: ${created.message}` : ""}`,
+                    message: `Failed to create window${created.message ? `: ${created.message}` : ""}`,
                 });
             }
         }
@@ -768,7 +834,7 @@ export default function Dashboard() {
             else {
                 dispatch({
                     type: "SET_ACTION_MESSAGE",
-                    message: `Worktree created, but ${mux.kind} failed${created.message ? `: ${created.message}` : ""}`,
+                    message: `Worktree created, but window launch failed${created.message ? `: ${created.message}` : ""}`,
                 });
             }
             setTimeout(() => refresh(), 3000);
@@ -1097,12 +1163,14 @@ export default function Dashboard() {
             dispatch({ type: "PR_CREATE_PHASE", phase: "filling" });
             const ticketId = extractTicketId(s.prCreateBranch) ?? "";
             const mainRepoRoot = findMainRepoRoot();
-            // Fetch ticket content (downloads images for Linear tickets)
+            // Fetch issue content from the active tracker (downloads images
+            // inline so Claude can read them via --allowedTools Read).
             let ticketContent;
             if (ticketId && mainRepoRoot) {
-                const ticket = await getTicketContent(ticketId, mainRepoRoot);
-                if (ticket) {
-                    ticketContent = renderTicket(ticket);
+                const tracker = getIssueTracker(mainRepoRoot);
+                const result = await tracker.getIssue(ticketId, mainRepoRoot);
+                if (result.ok) {
+                    ticketContent = renderTicket(result.value, tracker.displayName);
                 }
             }
             const commitLog = run(`git log ${base}..HEAD --format="- %s"`, { cwd }) || null;
@@ -1759,7 +1827,7 @@ export default function Dashboard() {
                         dispatch({
                             type: "SET_ACTION_MESSAGE",
                             message: created.ok
-                                ? `Launched AI review in ${mux.kind}`
+                                ? "Launched AI review in new window"
                                 : `Failed to launch review${created.message ? `: ${created.message}` : ""}`,
                         });
                     })();
@@ -1864,7 +1932,7 @@ export default function Dashboard() {
                     if (!created.ok) {
                         dispatch({
                             type: "SET_ACTION_MESSAGE",
-                            message: `Failed to switch ${mux.kind} window${created.message ? `: ${created.message}` : ""}`,
+                            message: `Failed to switch window${created.message ? `: ${created.message}` : ""}`,
                         });
                     }
                 })();
@@ -1876,10 +1944,10 @@ export default function Dashboard() {
             }
             return;
         }
-        // Open in Linear
+        // Open issue in tracker (Linear/GitHub web UI)
         if (input === "o") {
             if (!di.issue.url) {
-                dispatch({ type: "SET_ACTION_MESSAGE", message: "No Linear ticket URL" });
+                dispatch({ type: "SET_ACTION_MESSAGE", message: "No issue URL available" });
                 return;
             }
             const openCmd = process.platform === "darwin" ? "open" : "xdg-open";
@@ -1935,7 +2003,7 @@ export default function Dashboard() {
                     dispatch({
                         type: "SET_ACTION_MESSAGE",
                         message: created.ok
-                            ? `Launched review in ${mux.kind}`
+                            ? "Launched review in new window"
                             : `Failed to launch review${created.message ? `: ${created.message}` : ""}`,
                     });
                 })();
@@ -2002,7 +2070,7 @@ export default function Dashboard() {
                     dispatch({
                         type: "SET_ACTION_MESSAGE",
                         message: created.ok
-                            ? `Launched PR fix in ${mux.kind}`
+                            ? "Launched PR fix in new window"
                             : `Failed to launch PR fix${created.message ? `: ${created.message}` : ""}`,
                     });
                 })();
@@ -2063,14 +2131,14 @@ export default function Dashboard() {
                                 }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "j/k to navigate, Enter to select, ESC to cancel" })] }) })) : state.overlay === "confirm-delete" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "red", paddingX: 3, paddingY: 1, children: [_jsx(Text, { bold: true, color: "red", children: "Remove worktree?" }), _jsx(Text, { children: " " }), _jsx(Text, { children: selectedIssue?.worktree?.branch ?? "" }), selectedIssue?.worktree?.dirty && (_jsx(Text, { color: "yellow", children: "Warning: worktree has uncommitted changes" })), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "red", bold: true, children: "y" }), "  Confirm"] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: "n" }), "  Cancel"] })] }) })) : state.overlay === "diff" ? (_jsx(DiffOverlay, { width: innerWidth, height: contentHeight, ticketId: state.diffTicketId ?? "", baseBranch: state.diffBaseBranch ?? "", files: state.diffFiles, fileIndex: state.diffFileIndex, fileScrollOffset: state.diffFileScrollOffset, content: state.diffContent, contentScrollOffset: state.diffContentScrollOffset, loadingFiles: state.diffLoadingFiles, loadingContent: state.diffLoadingContent, error: state.diffError, selectionBg: theme.selectionBg, leftWidthOverride: diffLeftWidth ?? undefined, pendingDiscard: state.diffPendingDiscard })) : state.overlay === "confirm-setup" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 3, paddingY: 1, children: [_jsx(Text, { bold: true, children: "Run setup script?" }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: ".santree/init.sh" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "green", bold: true, children: "y" }), "  Run setup"] }), _jsxs(Text, { children: [_jsx(Text, { color: "yellow", bold: true, children: "n" }), "  Skip"] })] }) })) : (_jsxs(Box, { flexGrow: 1, children: [_jsx(Box, { width: leftWidth, children: state.activeTab === "reviews" ? (_jsx(ReviewList, { flatReviews: state.flatReviews, selectedIndex: state.reviewSelectedIndex, scrollOffset: state.reviewListScrollOffset, height: contentHeight, width: leftWidth, selectionBg: theme.selectionBg })) : state.flatIssues.length === 0 ? (_jsx(Box, { width: leftWidth, height: contentHeight, justifyContent: "center", alignItems: "center", children: _jsx(Text, { color: "yellow", children: "No active issues" }) })) : (_jsx(IssueList, { groups: state.groups, flatIssues: state.flatIssues, selectedIndex: state.selectedIndex, scrollOffset: state.listScrollOffset, height: contentHeight, width: leftWidth, selectionBg: theme.selectionBg })) }), _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, dispatch: dispatch })) : (_jsx(DetailPanel, { issue: selectedIssue, scrollOffset: state.detailScrollOffset, height: contentHeight, width: rightWidth, creatingForTicket: state.creatingForTicket, creationLogs: state.creationLogs })) })] })), _jsx(Box, { children: state.overlay === "diff" ? (_jsx(Box, { width: innerWidth, paddingX: 1, children: _jsx(CommandBar, { showWorkspace: hasWorkspaceFile, mode: "diff" }) })) : (_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 }) })] })) })] })] }));
+                                            .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, dispatch: dispatch })) : (_jsx(DetailPanel, { issue: selectedIssue, scrollOffset: state.detailScrollOffset, height: contentHeight, width: rightWidth, creatingForTicket: state.creatingForTicket, creationLogs: state.creationLogs })) })] })), _jsx(Box, { children: state.overlay === "diff" ? (_jsx(Box, { width: innerWidth, paddingX: 1, children: _jsx(CommandBar, { showWorkspace: hasWorkspaceFile, mode: "diff" }) })) : (_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: getIssueTracker(repoRootRef.current).displayName }) })] })) })] })] }));
 }
 /**
  * Renders the per-issue action key hints (Resume / Editor / View diff / …)
  * lifted out of the detail panels so they sit on the same row as the global
  * command bar. Empty when nothing is selected.
  */
-function ActionRow({ activeTab, selectedIssue, selectedReview, overlay, }) {
+function ActionRow({ activeTab, selectedIssue, selectedReview, overlay, trackerName, }) {
     // During the diff overlay, none of the per-issue actions apply (View diff
     // is what got us here, Commit/PR/etc. need the detail panel context). Keep
     // the row blank so the diff-specific CommandBar reads cleanly.
@@ -2081,7 +2149,7 @@ function ActionRow({ activeTab, selectedIssue, selectedReview, overlay, }) {
             ? buildReviewActions(selectedReview)
             : []
         : selectedIssue
-            ? buildIssueActions(selectedIssue)
+            ? buildIssueActions(selectedIssue, trackerName)
             : [];
     if (items.length === 0)
         return _jsx(Text, { children: " " });