git-coco 0.56.0 → 0.58.0

package/dist/index.js

@@ -78,7 +78,7 @@ var readline__namespace = /*#__PURE__*/_interopNamespaceDefault(readline);
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.56.0";
+const BUILD_VERSION = "0.58.0";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -1177,10 +1177,7 @@ const schema$1 = {
                             "items": {
                                 "type": "string"
                             },
-                            "description": "Directories to scan for git repositories. Each entry may use a `~` prefix; resolved against the user's home directory. Defaults to `['~/code']` when omitted.",
-                            "default": [
-                                "~/code"
-                            ]
+                            "description": "Directories to scan for git repositories. Each entry may use a `~` prefix; resolved against the user's home directory. When omitted (and no `--root` flag is passed), the workspace scans the current working directory — so a bare `coco` / `coco ws` discovers repos wherever you launched it. Set this to pin a fixed tree (e.g. `[\"~/code\"]`) regardless of where you run from.\n\n(No static `@default` — the effective default is the runtime cwd.)"
                         },
                         "knownRepos": {
                             "type": "array",
@@ -2156,6 +2153,10 @@ const schema$1 = {
                 "selection": {
                     "type": "string"
                 },
+                "selectionForeground": {
+                    "type": "string",
+                    "description": "Foreground for text sitting on the `selection` background. Derived automatically from `selection` (black on light, white on dark) so the selected row stays readable regardless of the user's terminal default foreground — but can be overridden per theme via `options.colors`."
+                },
                 "success": {
                     "type": "string"
                 },
@@ -2199,7 +2200,25 @@ const schema$1 = {
                 "vitesse-dark",
                 "vesper",
                 "flexoki",
-                "mellow"
+                "mellow",
+                "night-owl",
+                "cobalt2",
+                "oceanic-next",
+                "catppuccin-macchiato",
+                "gruvbox-light",
+                "tokyo-night-day",
+                "one-light",
+                "ayu-light",
+                "rose-pine-dawn",
+                "everforest-light",
+                "vitesse-light",
+                "dayfox",
+                "night-owl-light",
+                "flexoki-light",
+                "material-lighter",
+                "papercolor-light",
+                "modus-operandi",
+                "quiet-light"
             ]
         }
     }
@@ -15229,10 +15248,19 @@ const CommitSplitPlanSchema = objectType({
         title: stringType().min(1),
         body: stringType().optional(),
         rationale: stringType().optional(),
-        files: arrayType(stringType()),
-        hunks: arrayType(stringType()),
+        // Both optional: the model legitimately emits a group with *either*
+        // `files` or `hunks` (a file-level vs hunk-level grouping), not always
+        // both. Requiring both made Zod throw "Required" and the whole split
+        // chain failed to parse before the refine could run. The refine below
+        // still enforces "at least one", and every downstream consumer already
+        // reads these as `group.files || []`. (Kept `.optional()` rather than
+        // `.default([])` so the schema's input and output types stay identical
+        // — `executeChainWithSchema` takes a `z.ZodSchema<T>`, which requires
+        // that.)
+        files: arrayType(stringType()).optional(),
+        hunks: arrayType(stringType()).optional(),
     })
-        .refine((group) => group.files.length > 0 || group.hunks.length > 0, {
+        .refine((group) => (group.files?.length ?? 0) > 0 || (group.hunks?.length ?? 0) > 0, {
         message: 'Each group must include at least one file or hunk',
     }))
         .min(1),
@@ -22830,6 +22858,13 @@ const LOG_INK_KEY_BINDINGS = [
         description: 'Create a lightweight tag at the cursored commit.',
         contexts: ['history'],
     },
+    {
+        id: 'themePicker',
+        keys: ['gC'],
+        label: 'theme picker',
+        description: 'Browse, live-preview, and apply a color theme.',
+        contexts: ['normal'],
+    },
     {
         id: 'viewChangelog',
         keys: ['L'],
@@ -22919,6 +22954,7 @@ const BINDING_CATEGORY_BY_ID = {
     //    them above everything else.
     help: 'essentials',
     commandPalette: 'essentials',
+    themePicker: 'view',
     quit: 'essentials',
     refresh: 'essentials',
     navigateBack: 'essentials',
@@ -23554,635 +23590,1496 @@ function filterLogInkPaletteCommands(commands, filter, recent) {
 }
 
 /**
- * Canned filter presets for the issue / PR triage TUI views
- * (#882 phase 6). Each preset compiles to the same shape the
- * underlying list fetchers (`getIssueList` / `getPullRequestList`)
- * already accept — there's no new `gh` surface area, just a
- * curated set of common triage angles surfaced as a single
- * keystroke (`f` cycles).
+ * Explicit color-level detection for the Ink TUI (P5.2).
  *
- * The presets are deliberately *not* a 1:1 mirror across the two
- * surfaces:
+ * Chalk already approximates hex colors when the terminal can't render
+ * truecolor — but we want an explicit signal so the catppuccin / gruvbox
+ * presets (which use hex) can fall back to the ANSI-named `default` preset
+ * cleanly on minimal SSH sessions, instead of relying on chalk's
+ * heuristics. Users who set `NO_COLOR` or pick the `monochrome` preset
+ * still get the manual override.
  *
- *   - Issues have no draft / mergeable concept, so `draft` /
- *     `mergeable` are skipped on the issue list.
- *   - PRs have a `merged` state distinct from `closed`; issues
- *     don't.
- *   - `mine` semantics differ subtly: for issues it tends to
- *     mean "I'm the assignee" (issues are tasks people pick up);
- *     for PRs it means "I'm the author" (PRs are work people
- *     post). The presets bake those in so the user doesn't have
- *     to think about it.
- */
-/** Cycle order — must match the keystroke walk on `f`. */
-const ISSUE_FILTER_PRESETS = [
-    'open',
-    'closed',
-    'mine',
-    'assigned',
-];
-const PULL_REQUEST_FILTER_PRESETS = [
-    'open',
-    'draft',
-    'mine',
-    'assigned',
-    'closed',
-    'merged',
-];
-const ISSUE_FILTER_LABELS = {
-    open: 'open',
-    closed: 'closed',
-    mine: 'mine (assigned)',
-    assigned: 'assigned to me',
-};
-const PULL_REQUEST_FILTER_LABELS = {
-    open: 'open',
-    draft: 'draft',
-    mine: 'mine (authored)',
-    assigned: 'assigned to me',
-    closed: 'closed',
-    merged: 'merged',
-};
-/**
- * Resolve a preset to the filter object the data fetcher accepts.
- * Pure mapping — no `gh` calls. Kept separate from `getIssueList` /
- * `getPullRequestList` so unit tests can assert the mapping
- * independently from the fetch pipeline.
+ * Levels (matching the chalk taxonomy):
+ *   - 'mono'      → no ANSI escapes at all (NO_COLOR / TERM=dumb)
+ *   - '16'        → standard 16-color ANSI palette
+ *   - '256'       → xterm-256color
+ *   - 'truecolor' → 24-bit RGB (COLORTERM=truecolor or known terminals)
  */
-function issueFilterForPreset(preset) {
-    switch (preset) {
-        case 'open':
-            return { state: 'open' };
-        case 'closed':
-            return { state: 'closed' };
-        case 'mine':
-            // Issues are tasks — "mine" is what *I'm working on*, i.e.
-            // assigned to me + still open. Same as `assigned` plus the
-            // open-state filter for ergonomic single-keystroke focus on
-            // the active backlog.
-            return { state: 'open', assignee: '@me' };
-        case 'assigned':
-            return { assignee: '@me' };
+function getColorLevel(env = process.env) {
+    if (env.NO_COLOR)
+        return 'mono';
+    switch (env.FORCE_COLOR) {
+        case '0':
+            return 'mono';
+        case '1':
+            return '16';
+        case '2':
+            return '256';
+        case '3':
+            return 'truecolor';
     }
-}
-function pullRequestFilterForPreset(preset) {
-    switch (preset) {
-        case 'open':
-            return { state: 'open' };
-        case 'draft':
-            // gh's `--draft` flag implies `--state open`; surface that
-            // explicitly so the canonicalize step doesn't elide it.
-            return { state: 'open', draft: true };
-        case 'mine':
-            // PRs are work — "mine" is what *I authored*. Most useful
-            // when looking at one's own backlog of in-flight PRs.
-            return { state: 'open', author: '@me' };
-        case 'assigned':
-            return { assignee: '@me' };
-        case 'closed':
-            return { state: 'closed' };
-        case 'merged':
-            return { state: 'merged' };
+    const colorterm = env.COLORTERM?.toLowerCase();
+    if (colorterm === 'truecolor' || colorterm === '24bit') {
+        return 'truecolor';
     }
-}
-function cycleIssueFilterPreset(current) {
-    const index = ISSUE_FILTER_PRESETS.indexOf(current);
-    const next = (index + 1) % ISSUE_FILTER_PRESETS.length;
-    return ISSUE_FILTER_PRESETS[next];
-}
-function cyclePullRequestFilterPreset(current) {
-    const index = PULL_REQUEST_FILTER_PRESETS.indexOf(current);
-    const next = (index + 1) % PULL_REQUEST_FILTER_PRESETS.length;
-    return PULL_REQUEST_FILTER_PRESETS[next];
-}
-
-/**
- * Sort modes for the promoted views (P4.2).
- *
- * Pure: takes existing context entries + the active mode, returns a sorted
- * copy. Tested in isolation; the runtime just calls these helpers.
- *
- * Display label uses `▼` (U+25BC) under truecolor / UTF-8 and falls back to
- * `v` under ASCII. Letters (`recent` / `name` / `ahead`) carry meaning;
- * shape enhances.
- */
-const BRANCH_SORT_MODES = ['name', 'recent', 'ahead'];
-const DEFAULT_BRANCH_SORT_MODE = 'name';
-function cycleBranchSort(mode) {
-    const index = BRANCH_SORT_MODES.indexOf(mode);
-    if (index < 0)
-        return BRANCH_SORT_MODES[0];
-    return BRANCH_SORT_MODES[(index + 1) % BRANCH_SORT_MODES.length];
-}
-function sortBranches(branches, mode) {
-    // Pin the current branch at index 0 regardless of sort mode (#806
-    // follow-up). Lands the user's cursor on the active branch by
-    // default and keeps the most-relevant row glued to the top of the
-    // list as they cycle sorts.
-    const current = branches.find((entry) => entry.current);
-    const rest = branches.filter((entry) => !entry.current);
-    const sortedRest = rest.slice();
-    switch (mode) {
-        case 'name':
-            sortedRest.sort((a, b) => a.shortName.localeCompare(b.shortName));
-            break;
-        case 'recent':
-            // ISO-shaped dates compare byte-for-byte; descending so the freshest
-            // branch sits at the top.
-            sortedRest.sort((a, b) => (b.date || '').localeCompare(a.date || '') ||
-                a.shortName.localeCompare(b.shortName));
-            break;
-        case 'ahead':
-            // ahead-first; ties broken by behind, then by name. Keeps "this branch
-            // has unmerged work" in the user's first scroll.
-            sortedRest.sort((a, b) => b.ahead - a.ahead || b.behind - a.behind ||
-                a.shortName.localeCompare(b.shortName));
-            break;
+    // Modern terminal emulators that publicly advertise truecolor support.
+    if (env.KITTY_WINDOW_ID || env.TERM === 'xterm-kitty') {
+        return 'truecolor';
     }
-    return current ? [current, ...sortedRest] : sortedRest;
-}
-const TAG_SORT_MODES = ['recent', 'name'];
-const DEFAULT_TAG_SORT_MODE = 'recent';
-function cycleTagSort(mode) {
-    const index = TAG_SORT_MODES.indexOf(mode);
-    if (index < 0)
-        return TAG_SORT_MODES[0];
-    return TAG_SORT_MODES[(index + 1) % TAG_SORT_MODES.length];
-}
-function sortTags(tags, mode) {
-    const copy = tags.slice();
-    switch (mode) {
-        case 'name':
-            return copy.sort((a, b) => a.name.localeCompare(b.name));
-        case 'recent':
-            return copy.sort((a, b) => (b.date || '').localeCompare(a.date || '') ||
-                a.name.localeCompare(b.name));
-        default:
-            return copy;
+    if (env.WT_SESSION) {
+        return 'truecolor';
     }
+    switch (env.TERM_PROGRAM) {
+        case 'iTerm.app':
+        case 'WezTerm':
+        case 'vscode':
+        case 'ghostty':
+        case 'Hyper':
+            return 'truecolor';
+    }
+    if (env.TERM === 'dumb')
+        return 'mono';
+    if (env.TERM?.includes('256color'))
+        return '256';
+    return '16';
 }
-/* ---------------------------- header indicator -------------------------- */
-function formatSortIndicator(mode, options = {}) {
-    return `${options.ascii ? 'v' : '▼'} ${mode}`;
-}
-
-const DEFAULT_CHANGELOG_VIEW_STATE = {
-    status: 'idle',
-    scrollOffset: 0,
-};
-const DEFAULT_LOG_INK_STATUS_FILTER_MASK = {
-    staged: true,
-    unstaged: true,
-    untracked: true,
-};
+const TRUECOLOR_PRESETS = new Set(['catppuccin', 'gruvbox', 'dracula', 'nord', 'solarized-dark', 'tokyo-night', 'one-dark', 'rose-pine', 'kanagawa', 'everforest', 'monokai', 'synthwave', 'ayu-dark', 'palenight', 'github-dark', 'horizon', 'nightfox', 'carbonfox', 'tokyonight-storm', 'catppuccin-latte', 'solarized-light', 'github-light', 'iceberg', 'material-ocean', 'moonlight', 'poimandres', 'vitesse-dark', 'vesper', 'flexoki', 'mellow', 'night-owl', 'cobalt2', 'oceanic-next', 'catppuccin-macchiato', 'gruvbox-light', 'tokyo-night-day', 'one-light', 'ayu-light', 'rose-pine-dawn', 'everforest-light', 'vitesse-light', 'dayfox', 'night-owl-light', 'flexoki-light', 'material-lighter', 'papercolor-light', 'modus-operandi', 'quiet-light']);
 /**
- * Detect a history server-side filter prefix (#776). Returns the parsed
- * `LogInkHistoryFetchArgs` for `path:<value>` and `author:<value>`
- * prefixes, or `undefined` for a plain (client-side) filter. The whole
- * remainder of the string (post-prefix) becomes the value — paths and
- * author names commonly contain spaces, and we don't try to parse
- * shell-like syntax.
+ * `true` when the named preset relies on hex colors that look best under
+ * 24-bit RGB. Used by `createLogInkTheme` to decide whether to downgrade
+ * to the ANSI-named `default` palette on lower-capability terminals.
  */
-function parseLogInkHistoryFetchPrefix(filter) {
-    const trimmed = filter.trim();
-    if (trimmed.startsWith('path:')) {
-        const value = trimmed.slice('path:'.length).trim();
-        return value ? { path: value } : undefined;
-    }
-    if (trimmed.startsWith('author:')) {
-        const value = trimmed.slice('author:'.length).trim();
-        return value ? { author: value } : undefined;
-    }
-    return undefined;
-}
-const FOCUS_ORDER = ['sidebar', 'commits', 'detail'];
-const SIDEBAR_TABS = ['status', 'branches', 'tags', 'stashes', 'worktrees'];
-function searchableFields(commit) {
-    return [
-        commit.shortHash,
-        commit.hash,
-        commit.date,
-        commit.author,
-        commit.message,
-        ...commit.refs,
-    ];
-}
-function scoreField(field, term) {
-    const value = field.toLowerCase();
-    const normalized = term.toLowerCase();
-    if (!normalized) {
-        return 0;
-    }
-    if (value === normalized) {
-        return 1000;
-    }
-    if (value.startsWith(normalized)) {
-        return 800 - Math.min(value.length - normalized.length, 200);
-    }
-    const substringIndex = value.indexOf(normalized);
-    if (substringIndex >= 0) {
-        return 600 - Math.min(substringIndex, 200);
-    }
-    let searchIndex = 0;
-    let distance = 0;
-    for (const character of normalized) {
-        const nextIndex = value.indexOf(character, searchIndex);
-        if (nextIndex < 0) {
-            return undefined;
-        }
-        distance += nextIndex - searchIndex;
-        searchIndex = nextIndex + 1;
-    }
-    return 300 - Math.min(distance, 200);
-}
-function scoreLogInkCommitFilter(commit, filter) {
-    const terms = filter.trim().split(/\s+/).filter(Boolean);
-    if (terms.length === 0) {
-        return 0;
-    }
-    const fields = searchableFields(commit);
-    let score = 0;
-    for (const term of terms) {
-        const bestFieldScore = fields.reduce((best, field) => {
-            const fieldScore = scoreField(field, term);
-            if (fieldScore === undefined) {
-                return best;
-            }
-            return best === undefined ? fieldScore : Math.max(best, fieldScore);
-        }, undefined);
-        if (bestFieldScore === undefined) {
-            return undefined;
-        }
-        score += bestFieldScore;
-    }
-    return score;
-}
-function filterCommits(commits, filter) {
-    return commits
-        .map((commit, index) => ({
-        commit,
-        index,
-        score: scoreLogInkCommitFilter(commit, filter),
-    }))
-        .filter((entry) => entry.score !== undefined)
-        .sort((a, b) => b.score - a.score || a.index - b.index)
-        .map((entry) => entry.commit);
-}
-function clampIndex(index, length) {
-    if (length === 0) {
-        return 0;
-    }
-    return Math.max(0, Math.min(index, length - 1));
-}
-function cycleValue(values, current, delta) {
-    const currentIndex = Math.max(0, values.indexOf(current));
-    const nextIndex = (currentIndex + delta + values.length) % values.length;
-    return values[nextIndex];
-}
-const HOME_VIEW = 'history';
-function topOfStack(stack) {
-    return stack[stack.length - 1];
-}
-function withPushedView(state, value) {
-    if (topOfStack(state.viewStack) === value) {
-        return { ...state, pendingKey: undefined };
-    }
-    const viewStack = [...state.viewStack, value];
-    return {
-        ...state,
-        activeView: value,
-        viewStack,
-        // The compose + status views' right detail panels already show
-        // worktree info, so keeping the left sidebar on the Status tab
-        // duplicates that information. Auto-switch to Branches when entering
-        // either view; the user can swap back with [/] if they want.
-        //
-        // We update only the rendered `sidebarTab` here, never
-        // `userSidebarTab`, so this auto-switch is invisible to per-repo
-        // persistence and pop-view restores the previous tab.
-        sidebarTab: value === 'compose' || value === 'status' ? 'branches' : state.sidebarTab,
-        worktreeDiffOffset: value === 'diff' ? state.worktreeDiffOffset : 0,
-        selectedWorktreeHunkIndex: value === 'diff' ? state.selectedWorktreeHunkIndex : 0,
-        diffSource: value === 'diff' ? state.diffSource : undefined,
-        stashDiffRef: value === 'diff' ? state.stashDiffRef : undefined,
-        compareHead: value === 'diff' ? state.compareHead : undefined,
-        pendingCommitFocused: value === 'history' ? state.pendingCommitFocused : false,
-        statusGroupHeaderFocused: value === 'status' ? state.statusGroupHeaderFocused : false,
-        pendingKey: undefined,
-    };
-}
-function withPoppedView(state) {
-    if (state.viewStack.length <= 1) {
-        return { ...state, pendingKey: undefined };
-    }
-    const viewStack = state.viewStack.slice(0, -1);
-    const next = topOfStack(viewStack);
-    // #779 — compareBase is "cleared when the diff view is popped." We
-    // detect that case by checking if the *previous* top was 'diff'.
-    // The compare workflow ends when the user backs out of the compare
-    // diff; on the next mark they re-set the base. Other view pops
-    // preserve compareBase so the user can move between branches / tags /
-    // history while hunting for a head ref.
-    const wasOnDiff = state.activeView === 'diff';
-    return {
-        ...state,
-        activeView: next,
-        viewStack,
-        // Restore the user's last explicit tab choice so popping out of
-        // compose / status (which auto-switch the sidebar to Branches)
-        // returns the user to whatever they actually had open before.
-        sidebarTab: state.userSidebarTab,
-        worktreeDiffOffset: next === 'diff' ? state.worktreeDiffOffset : 0,
-        selectedWorktreeHunkIndex: next === 'diff' ? state.selectedWorktreeHunkIndex : 0,
-        diffSource: next === 'diff' ? state.diffSource : undefined,
-        stashDiffRef: next === 'diff' ? state.stashDiffRef : undefined,
-        compareBase: wasOnDiff ? undefined : state.compareBase,
-        compareHead: next === 'diff' ? state.compareHead : undefined,
-        pendingCommitFocused: next === 'history' ? state.pendingCommitFocused : false,
-        statusGroupHeaderFocused: next === 'status' ? state.statusGroupHeaderFocused : false,
-        pendingKey: undefined,
-    };
+function presetUsesTrueColor(preset) {
+    return preset !== undefined && TRUECOLOR_PRESETS.has(preset);
 }
 /**
- * Push a nested-repo frame onto `state.repoStack` (#931). Snapshots
- * the active view position into the new frame's `parentReturn` so a
- * subsequent pop lands the user back where they came from, then
- * resets the per-frame navigation state (active view, view stack,
- * row / file / submodule cursors, filter) so the nested frame opens
- * in a clean slate — the mental equivalent of a fresh `coco ui`
- * launched against the submodule's working dir.
- *
- * Sidebar tab + branch / tag sort are also captured into the return
- * snapshot (#995) so popping back restores the parent's choices
- * instead of letting the submodule's tab/sort bleed across the
- * boundary. The values on the *new* frame are left as-is (carried
- * over from the parent) — the load effect in app.ts re-reads
- * persistence keyed on the submodule's workdir and dispatches a
- * restore if the user has a submodule-specific saved preference.
- *
- * Other preferences (palette recents, inspector tab, diff view mode)
- * stay global by design — the user's preference shouldn't reset when
- * they cross a submodule boundary.
- *
- * Live runtime objects (`SimpleGit`, loaded `LogInkContext`) live
- * outside the reducer in `app.ts`'s parallel ref structure — this
- * helper only manages the pure view-model side of the push.
+ * WCAG 2.x relative luminance of a `#rrggbb` color, 0 (black) … 1 (white).
+ * Returns `null` for anything that isn't a 6-digit hex (e.g. ANSI-named
+ * colors), so callers can fall back rather than guess.
  */
-function withPushedRepoFrame(state, payload) {
-    const newFrame = {
-        label: payload.label,
-        workdir: payload.workdir,
-        entryRange: payload.entryRange,
-        parentReturn: {
-            activeView: state.activeView,
-            selectedIndex: state.selectedIndex,
-            selectedFileIndex: state.selectedFileIndex,
-            selectedSubmoduleIndex: state.selectedSubmoduleIndex,
-            filter: state.filter,
-            sidebarTab: state.sidebarTab,
-            userSidebarTab: state.userSidebarTab,
-            branchSort: state.branchSort,
-            tagSort: state.tagSort,
-        },
-    };
-    return {
-        ...state,
-        repoStack: [...state.repoStack, newFrame],
-        activeView: 'history',
-        viewStack: ['history'],
-        selectedIndex: 0,
-        selectedFileIndex: 0,
-        selectedSubmoduleIndex: 0,
-        filter: '',
-        filterMode: false,
-        pendingCommitFocused: false,
-        pendingKey: undefined,
-        pendingConfirmationId: undefined,
-        pendingConfirmationPayload: undefined,
-        pendingMutationConfirmation: undefined,
+function relativeLuminance(hex) {
+    const match = /^#?([0-9a-f]{6})$/i.exec(hex.trim());
+    if (!match)
+        return null;
+    const int = parseInt(match[1], 16);
+    const channel = (c) => {
+        const x = c / 255;
+        return x <= 0.03928 ? x / 12.92 : ((x + 0.055) / 1.055) ** 2.4;
     };
+    const r = channel((int >> 16) & 0xff);
+    const g = channel((int >> 8) & 0xff);
+    const b = channel(int & 0xff);
+    return 0.2126 * r + 0.7152 * g + 0.0722 * b;
 }
 /**
- * Pop the top repo frame off `state.repoStack` (#931) and restore
- * the parent's view position from the captured `parentReturn`. A
- * no-op when the stack is already at its single root frame so this
- * action is safe to dispatch from generic input handlers (e.g. the
- * Esc auto-pop wiring that lands in a follow-up PR).
+ * Pick a foreground guaranteed to stay readable on `bg` — black for light
+ * backgrounds, white for dark ones. The 0.179 threshold is the luminance
+ * crossover where black and white yield identical contrast, so the choice
+ * always maximizes it; every background clears WCAG AA (≥ 4.5:1).
  *
- * The defensive `parentReturn` fallback handles the never-supposed-
- * to-happen case where a non-root frame somehow has no return state
- * recorded — drop the frame but leave the user's view position
- * alone rather than crash mid-session.
+ * This is how the selected-row text stays legible across every theme:
+ * coco controls the selection *background* but not the user's terminal
+ * default foreground, so it must supply its own contrasting foreground
+ * instead of hoping the terminal's happens to contrast. Returns
+ * `undefined` for non-hex backgrounds (let the caller leave color alone).
  */
-function withPoppedRepoFrame(state) {
-    if (state.repoStack.length <= 1) {
-        return { ...state, pendingKey: undefined };
-    }
-    const topFrame = state.repoStack[state.repoStack.length - 1];
-    const ret = topFrame.parentReturn;
-    const repoStack = state.repoStack.slice(0, -1);
-    if (!ret) {
-        return { ...state, repoStack, pendingKey: undefined };
-    }
-    return {
-        ...state,
-        repoStack,
-        activeView: ret.activeView,
-        viewStack: [ret.activeView],
-        selectedIndex: ret.selectedIndex,
-        selectedFileIndex: ret.selectedFileIndex,
-        selectedSubmoduleIndex: ret.selectedSubmoduleIndex,
-        filter: ret.filter,
-        filterMode: false,
-        pendingCommitFocused: false,
-        // #995 — restore sidebar tab + sort preferences from the captured
-        // parentReturn. Without this, the submodule's tab / sort choice
-        // bleeds back into the parent after pop: the user picks 'tags' in
-        // a vendored submodule, pops back to the parent, and finds the
-        // parent's previously-selected 'branches' tab quietly replaced.
-        sidebarTab: ret.sidebarTab,
-        userSidebarTab: ret.userSidebarTab,
-        branchSort: ret.branchSort,
-        tagSort: ret.tagSort,
-        pendingKey: undefined,
-        pendingConfirmationId: undefined,
-        pendingConfirmationPayload: undefined,
-        pendingMutationConfirmation: undefined,
-    };
+function readableForegroundFor(bg) {
+    if (!bg)
+        return undefined;
+    const luminance = relativeLuminance(bg);
+    if (luminance === null)
+        return undefined;
+    return luminance > 0.179 ? '#000000' : '#ffffff';
 }
-function withReplacedView(state, value) {
-    if (topOfStack(state.viewStack) === value) {
-        return { ...state, pendingKey: undefined };
-    }
-    const viewStack = [...state.viewStack.slice(0, -1), value];
-    return {
-        ...state,
-        activeView: value,
-        viewStack,
-        worktreeDiffOffset: value === 'diff' ? state.worktreeDiffOffset : 0,
-        selectedWorktreeHunkIndex: value === 'diff' ? state.selectedWorktreeHunkIndex : 0,
-        diffSource: value === 'diff' ? state.diffSource : undefined,
-        stashDiffRef: value === 'diff' ? state.stashDiffRef : undefined,
-        compareHead: value === 'diff' ? state.compareHead : undefined,
-        pendingCommitFocused: value === 'history' ? state.pendingCommitFocused : false,
-        statusGroupHeaderFocused: value === 'status' ? state.statusGroupHeaderFocused : false,
-        pendingKey: undefined,
-    };
+
+const THEME_PRESET_COLORS = {
+    default: {
+        accent: 'cyan',
+        border: 'gray',
+        danger: 'red',
+        focusBorder: 'cyan',
+        gitAdded: 'green',
+        gitDeleted: 'red',
+        gitModified: 'yellow',
+        info: 'blue',
+        muted: 'gray',
+        selection: '#1a3a4a',
+        success: 'green',
+        warning: 'yellow',
+    },
+    catppuccin: {
+        accent: '#89b4fa',
+        border: '#585b70',
+        danger: '#f38ba8',
+        focusBorder: '#89dceb',
+        gitAdded: '#a6e3a1',
+        gitDeleted: '#f38ba8',
+        gitModified: '#f9e2af',
+        info: '#89b4fa',
+        muted: '#6c7086',
+        selection: '#45475a',
+        success: '#a6e3a1',
+        warning: '#f9e2af',
+    },
+    gruvbox: {
+        accent: '#83a598',
+        border: '#665c54',
+        danger: '#fb4934',
+        focusBorder: '#8ec07c',
+        gitAdded: '#b8bb26',
+        gitDeleted: '#fb4934',
+        gitModified: '#fabd2f',
+        info: '#83a598',
+        muted: '#928374',
+        selection: '#504945',
+        success: '#b8bb26',
+        warning: '#fabd2f',
+    },
+    dracula: {
+        accent: '#bd93f9',
+        border: '#44475a',
+        danger: '#ff5555',
+        focusBorder: '#ff79c6',
+        gitAdded: '#50fa7b',
+        gitDeleted: '#ff5555',
+        gitModified: '#f1fa8c',
+        info: '#8be9fd',
+        muted: '#6272a4',
+        selection: '#44475a',
+        success: '#50fa7b',
+        warning: '#f1fa8c',
+    },
+    nord: {
+        accent: '#88c0d0',
+        border: '#3b4252',
+        danger: '#bf616a',
+        focusBorder: '#81a1c1',
+        gitAdded: '#a3be8c',
+        gitDeleted: '#bf616a',
+        gitModified: '#ebcb8b',
+        info: '#81a1c1',
+        muted: '#4c566a',
+        selection: '#3b4252',
+        success: '#a3be8c',
+        warning: '#ebcb8b',
+    },
+    'solarized-dark': {
+        accent: '#268bd2',
+        border: '#073642',
+        danger: '#dc322f',
+        focusBorder: '#2aa198',
+        gitAdded: '#859900',
+        gitDeleted: '#dc322f',
+        gitModified: '#b58900',
+        info: '#268bd2',
+        muted: '#586e75',
+        selection: '#073642',
+        success: '#859900',
+        warning: '#b58900',
+    },
+    'tokyo-night': {
+        accent: '#7aa2f7',
+        border: '#3b4261',
+        danger: '#f7768e',
+        focusBorder: '#7dcfff',
+        gitAdded: '#9ece6a',
+        gitDeleted: '#f7768e',
+        gitModified: '#e0af68',
+        info: '#7aa2f7',
+        muted: '#565f89',
+        selection: '#33467c',
+        success: '#9ece6a',
+        warning: '#e0af68',
+    },
+    'one-dark': {
+        accent: '#61afef',
+        border: '#3e4452',
+        danger: '#e06c75',
+        focusBorder: '#56b6c2',
+        gitAdded: '#98c379',
+        gitDeleted: '#e06c75',
+        gitModified: '#e5c07b',
+        info: '#61afef',
+        muted: '#5c6370',
+        selection: '#3e4452',
+        success: '#98c379',
+        warning: '#e5c07b',
+    },
+    'rose-pine': {
+        accent: '#c4a7e7',
+        border: '#26233a',
+        danger: '#eb6f92',
+        focusBorder: '#9ccfd8',
+        gitAdded: '#31748f',
+        gitDeleted: '#eb6f92',
+        gitModified: '#f6c177',
+        info: '#9ccfd8',
+        muted: '#6e6a86',
+        selection: '#2a273f',
+        success: '#31748f',
+        warning: '#f6c177',
+    },
+    kanagawa: {
+        accent: '#7e9cd8',
+        border: '#2a2a37',
+        danger: '#e82424',
+        focusBorder: '#7fb4ca',
+        gitAdded: '#76946a',
+        gitDeleted: '#e82424',
+        gitModified: '#dca561',
+        info: '#7e9cd8',
+        muted: '#727169',
+        selection: '#2d4f67',
+        success: '#76946a',
+        warning: '#dca561',
+    },
+    everforest: {
+        accent: '#a7c080',
+        border: '#374145',
+        danger: '#e67e80',
+        focusBorder: '#83c092',
+        gitAdded: '#a7c080',
+        gitDeleted: '#e67e80',
+        gitModified: '#dbbc7f',
+        info: '#7fbbb3',
+        muted: '#859289',
+        selection: '#374145',
+        success: '#a7c080',
+        warning: '#dbbc7f',
+    },
+    monokai: {
+        accent: '#66d9ef',
+        border: '#49483e',
+        danger: '#f92672',
+        focusBorder: '#a6e22e',
+        gitAdded: '#a6e22e',
+        gitDeleted: '#f92672',
+        gitModified: '#e6db74',
+        info: '#66d9ef',
+        muted: '#75715e',
+        selection: '#49483e',
+        success: '#a6e22e',
+        warning: '#e6db74',
+    },
+    synthwave: {
+        accent: '#f97e72',
+        border: '#34294f',
+        danger: '#fe4450',
+        focusBorder: '#36f9f6',
+        gitAdded: '#72f1b8',
+        gitDeleted: '#fe4450',
+        gitModified: '#fede5d',
+        info: '#36f9f6',
+        muted: '#848bbd',
+        selection: '#34294f',
+        success: '#72f1b8',
+        warning: '#fede5d',
+    },
+    'ayu-dark': {
+        accent: '#e6b450',
+        border: '#11151c',
+        danger: '#f07178',
+        focusBorder: '#39bae6',
+        gitAdded: '#7fd962',
+        gitDeleted: '#f07178',
+        gitModified: '#e6b450',
+        info: '#39bae6',
+        muted: '#565b66',
+        selection: '#1a1f29',
+        success: '#7fd962',
+        warning: '#e6b450',
+    },
+    palenight: {
+        accent: '#82aaff',
+        border: '#3a3f58',
+        danger: '#ff5370',
+        focusBorder: '#89ddff',
+        gitAdded: '#c3e88d',
+        gitDeleted: '#ff5370',
+        gitModified: '#ffcb6b',
+        info: '#82aaff',
+        muted: '#676e95',
+        selection: '#3a3f58',
+        success: '#c3e88d',
+        warning: '#ffcb6b',
+    },
+    'github-dark': {
+        accent: '#58a6ff',
+        border: '#30363d',
+        danger: '#f85149',
+        focusBorder: '#58a6ff',
+        gitAdded: '#3fb950',
+        gitDeleted: '#f85149',
+        gitModified: '#d29922',
+        info: '#58a6ff',
+        muted: '#8b949e',
+        selection: '#264f78',
+        success: '#3fb950',
+        warning: '#d29922',
+    },
+    horizon: {
+        accent: '#e95678',
+        border: '#2e303e',
+        danger: '#e95678',
+        focusBorder: '#25b0bc',
+        gitAdded: '#09f7a0',
+        gitDeleted: '#e95678',
+        gitModified: '#fab795',
+        info: '#25b0bc',
+        muted: '#6c6f93',
+        selection: '#2e303e',
+        success: '#09f7a0',
+        warning: '#fab795',
+    },
+    nightfox: {
+        accent: '#719cd6',
+        border: '#2b3b51',
+        danger: '#c94f6d',
+        focusBorder: '#63cdcf',
+        gitAdded: '#81b29a',
+        gitDeleted: '#c94f6d',
+        gitModified: '#dbc074',
+        info: '#719cd6',
+        muted: '#738091',
+        selection: '#2b3b51',
+        success: '#81b29a',
+        warning: '#dbc074',
+    },
+    carbonfox: {
+        accent: '#78a9ff',
+        border: '#353535',
+        danger: '#ee5396',
+        focusBorder: '#33b1ff',
+        gitAdded: '#42be65',
+        gitDeleted: '#ee5396',
+        gitModified: '#ffe97b',
+        info: '#78a9ff',
+        muted: '#7b7c7e',
+        selection: '#353535',
+        success: '#42be65',
+        warning: '#ffe97b',
+    },
+    'tokyonight-storm': {
+        accent: '#7aa2f7',
+        border: '#2f334d',
+        danger: '#f7768e',
+        focusBorder: '#2ac3de',
+        gitAdded: '#9ece6a',
+        gitDeleted: '#f7768e',
+        gitModified: '#e0af68',
+        info: '#2ac3de',
+        muted: '#545c7e',
+        selection: '#2f334d',
+        success: '#9ece6a',
+        warning: '#e0af68',
+    },
+    'catppuccin-latte': {
+        accent: '#1e66f5',
+        border: '#ccd0da',
+        danger: '#d20f39',
+        focusBorder: '#179299',
+        gitAdded: '#40a02b',
+        gitDeleted: '#d20f39',
+        gitModified: '#df8e1d',
+        info: '#1e66f5',
+        muted: '#9ca0b0',
+        selection: '#ccd0da',
+        success: '#40a02b',
+        warning: '#df8e1d',
+    },
+    'solarized-light': {
+        accent: '#268bd2',
+        border: '#eee8d5',
+        danger: '#dc322f',
+        focusBorder: '#2aa198',
+        gitAdded: '#859900',
+        gitDeleted: '#dc322f',
+        gitModified: '#b58900',
+        info: '#268bd2',
+        muted: '#93a1a1',
+        selection: '#eee8d5',
+        success: '#859900',
+        warning: '#b58900',
+    },
+    'github-light': {
+        accent: '#0969da',
+        border: '#d0d7de',
+        danger: '#cf222e',
+        focusBorder: '#0969da',
+        gitAdded: '#1a7f37',
+        gitDeleted: '#cf222e',
+        gitModified: '#9a6700',
+        info: '#0969da',
+        muted: '#656d76',
+        selection: '#ddf4ff',
+        success: '#1a7f37',
+        warning: '#9a6700',
+    },
+    iceberg: {
+        accent: '#84a0c6',
+        border: '#1e2132',
+        danger: '#e27878',
+        focusBorder: '#89b8c2',
+        gitAdded: '#b4be82',
+        gitDeleted: '#e27878',
+        gitModified: '#e2a478',
+        info: '#84a0c6',
+        muted: '#6b7089',
+        selection: '#1e2132',
+        success: '#b4be82',
+        warning: '#e2a478',
+    },
+    'material-ocean': {
+        accent: '#82aaff',
+        border: '#2b2f3a',
+        danger: '#f07178',
+        focusBorder: '#89ddff',
+        gitAdded: '#c3e88d',
+        gitDeleted: '#f07178',
+        gitModified: '#ffcb6b',
+        info: '#82aaff',
+        muted: '#464b5d',
+        selection: '#2b2f3a',
+        success: '#c3e88d',
+        warning: '#ffcb6b',
+    },
+    moonlight: {
+        accent: '#82aaff',
+        border: '#2f334d',
+        danger: '#ff757f',
+        focusBorder: '#86e1fc',
+        gitAdded: '#c3e88d',
+        gitDeleted: '#ff757f',
+        gitModified: '#ffc777',
+        info: '#82aaff',
+        muted: '#636da6',
+        selection: '#2f334d',
+        success: '#c3e88d',
+        warning: '#ffc777',
+    },
+    poimandres: {
+        accent: '#add7ff',
+        border: '#1b1e28',
+        danger: '#d0679d',
+        focusBorder: '#5de4c7',
+        gitAdded: '#5de4c7',
+        gitDeleted: '#d0679d',
+        gitModified: '#fffac2',
+        info: '#add7ff',
+        muted: '#506477',
+        selection: '#1b1e28',
+        success: '#5de4c7',
+        warning: '#fffac2',
+    },
+    'vitesse-dark': {
+        accent: '#4d9375',
+        border: '#282828',
+        danger: '#cb7676',
+        focusBorder: '#4d9375',
+        gitAdded: '#4d9375',
+        gitDeleted: '#cb7676',
+        gitModified: '#e6cc77',
+        info: '#6394bf',
+        muted: '#758575',
+        selection: '#282828',
+        success: '#4d9375',
+        warning: '#e6cc77',
+    },
+    vesper: {
+        accent: '#ffc799',
+        border: '#232323',
+        danger: '#f5a191',
+        focusBorder: '#99ffe4',
+        gitAdded: '#99ffe4',
+        gitDeleted: '#f5a191',
+        gitModified: '#ffc799',
+        info: '#a0c4ff',
+        muted: '#575757',
+        selection: '#232323',
+        success: '#99ffe4',
+        warning: '#ffc799',
+    },
+    flexoki: {
+        accent: '#205ea6',
+        border: '#343331',
+        danger: '#af3029',
+        focusBorder: '#24837b',
+        gitAdded: '#66800b',
+        gitDeleted: '#af3029',
+        gitModified: '#ad8301',
+        info: '#205ea6',
+        muted: '#878580',
+        selection: '#343331',
+        success: '#66800b',
+        warning: '#ad8301',
+    },
+    mellow: {
+        accent: '#7eb8da',
+        border: '#2a2a2a',
+        danger: '#f5a191',
+        focusBorder: '#a3d4a0',
+        gitAdded: '#a3d4a0',
+        gitDeleted: '#f5a191',
+        gitModified: '#f0c674',
+        info: '#7eb8da',
+        muted: '#6b6b6b',
+        selection: '#2a2a2a',
+        success: '#a3d4a0',
+        warning: '#f0c674',
+    },
+    'night-owl': {
+        accent: '#82aaff',
+        border: '#1d3b53',
+        danger: '#ef5350',
+        focusBorder: '#7fdbca',
+        gitAdded: '#addb67',
+        gitDeleted: '#ef5350',
+        gitModified: '#ecc48d',
+        info: '#82aaff',
+        muted: '#637777',
+        selection: '#1d3b53',
+        success: '#addb67',
+        warning: '#ecc48d',
+    },
+    cobalt2: {
+        accent: '#ffc600',
+        border: '#234e6d',
+        danger: '#ff628c',
+        focusBorder: '#9effff',
+        gitAdded: '#3ad900',
+        gitDeleted: '#ff628c',
+        gitModified: '#ffc600',
+        info: '#9effff',
+        muted: '#627e99',
+        selection: '#0d3a58',
+        success: '#3ad900',
+        warning: '#ffc600',
+    },
+    'oceanic-next': {
+        accent: '#6699cc',
+        border: '#343d46',
+        danger: '#ec5f67',
+        focusBorder: '#5fb3b3',
+        gitAdded: '#99c794',
+        gitDeleted: '#ec5f67',
+        gitModified: '#fac863',
+        info: '#6699cc',
+        muted: '#65737e',
+        selection: '#4f5b66',
+        success: '#99c794',
+        warning: '#fac863',
+    },
+    'catppuccin-macchiato': {
+        accent: '#8aadf4',
+        border: '#494d64',
+        danger: '#ed8796',
+        focusBorder: '#91d7e3',
+        gitAdded: '#a6da95',
+        gitDeleted: '#ed8796',
+        gitModified: '#eed49f',
+        info: '#8aadf4',
+        muted: '#6e738d',
+        selection: '#363a4f',
+        success: '#a6da95',
+        warning: '#eed49f',
+    },
+    'gruvbox-light': {
+        accent: '#076678',
+        border: '#bdae93',
+        danger: '#9d0006',
+        focusBorder: '#427b58',
+        gitAdded: '#79740e',
+        gitDeleted: '#9d0006',
+        gitModified: '#b57614',
+        info: '#076678',
+        muted: '#7c6f64',
+        selection: '#ebdbb2',
+        success: '#79740e',
+        warning: '#b57614',
+    },
+    'tokyo-night-day': {
+        accent: '#2e7de9',
+        border: '#b7c1e3',
+        danger: '#f52a65',
+        focusBorder: '#007197',
+        gitAdded: '#587539',
+        gitDeleted: '#f52a65',
+        gitModified: '#8c6c3e',
+        info: '#2e7de9',
+        muted: '#848cb5',
+        selection: '#b7c1e3',
+        success: '#587539',
+        warning: '#8c6c3e',
+    },
+    'one-light': {
+        accent: '#4078f2',
+        border: '#d4d4d4',
+        danger: '#e45649',
+        focusBorder: '#0184bc',
+        gitAdded: '#50a14f',
+        gitDeleted: '#e45649',
+        gitModified: '#c18401',
+        info: '#4078f2',
+        muted: '#a0a1a7',
+        selection: '#e5e5e6',
+        success: '#50a14f',
+        warning: '#c18401',
+    },
+    'ayu-light': {
+        accent: '#fa8d3e',
+        border: '#e6e6e6',
+        danger: '#e65050',
+        focusBorder: '#4cbf99',
+        gitAdded: '#6cbf43',
+        gitDeleted: '#e65050',
+        gitModified: '#f2ae49',
+        info: '#399ee6',
+        muted: '#abb0b6',
+        selection: '#d1e4f4',
+        success: '#6cbf43',
+        warning: '#f2ae49',
+    },
+    'rose-pine-dawn': {
+        accent: '#907aa9',
+        border: '#dfdad9',
+        danger: '#b4637a',
+        focusBorder: '#56949f',
+        gitAdded: '#286983',
+        gitDeleted: '#b4637a',
+        gitModified: '#ea9d34',
+        info: '#56949f',
+        muted: '#9893a5',
+        selection: '#dfdad9',
+        success: '#286983',
+        warning: '#ea9d34',
+    },
+    'everforest-light': {
+        accent: '#8da101',
+        border: '#ddd8be',
+        danger: '#f85552',
+        focusBorder: '#35a77c',
+        gitAdded: '#8da101',
+        gitDeleted: '#f85552',
+        gitModified: '#dfa000',
+        info: '#3a94c5',
+        muted: '#939f91',
+        selection: '#edeada',
+        success: '#8da101',
+        warning: '#dfa000',
+    },
+    'vitesse-light': {
+        accent: '#1e754f',
+        border: '#e0e0e0',
+        danger: '#ab5959',
+        focusBorder: '#2993a3',
+        gitAdded: '#1e754f',
+        gitDeleted: '#ab5959',
+        gitModified: '#b07d48',
+        info: '#296aa3',
+        muted: '#999fa6',
+        selection: '#eaeaeb',
+        success: '#1e754f',
+        warning: '#b07d48',
+    },
+    dayfox: {
+        accent: '#2848a9',
+        border: '#e4dcd4',
+        danger: '#a5222f',
+        focusBorder: '#287980',
+        gitAdded: '#396847',
+        gitDeleted: '#a5222f',
+        gitModified: '#ac5402',
+        info: '#2848a9',
+        muted: '#908479',
+        selection: '#e7d2be',
+        success: '#396847',
+        warning: '#ac5402',
+    },
+    'night-owl-light': {
+        accent: '#288ed7',
+        border: '#d9d9d9',
+        danger: '#d3423e',
+        focusBorder: '#2aa298',
+        gitAdded: '#08916a',
+        gitDeleted: '#d3423e',
+        gitModified: '#daaa01',
+        info: '#288ed7',
+        muted: '#989fb1',
+        selection: '#e4e8f0',
+        success: '#08916a',
+        warning: '#daaa01',
+    },
+    'flexoki-light': {
+        accent: '#205ea6',
+        border: '#cecdc3',
+        danger: '#af3029',
+        focusBorder: '#24837b',
+        gitAdded: '#66800b',
+        gitDeleted: '#af3029',
+        gitModified: '#ad8301',
+        info: '#205ea6',
+        muted: '#6f6e69',
+        selection: '#e6e4d9',
+        success: '#66800b',
+        warning: '#ad8301',
+    },
+    'material-lighter': {
+        accent: '#39adb5',
+        border: '#e7eaec',
+        danger: '#e53935',
+        focusBorder: '#39adb5',
+        gitAdded: '#91b859',
+        gitDeleted: '#e53935',
+        gitModified: '#f6a434',
+        info: '#6182b8',
+        muted: '#90a4ae',
+        selection: '#d3e1e8',
+        success: '#91b859',
+        warning: '#f6a434',
+    },
+    'papercolor-light': {
+        accent: '#0087af',
+        border: '#d7d7d7',
+        danger: '#af0000',
+        focusBorder: '#005f87',
+        gitAdded: '#008700',
+        gitDeleted: '#af0000',
+        gitModified: '#d75f00',
+        info: '#0087af',
+        muted: '#878787',
+        selection: '#d0d0d0',
+        success: '#008700',
+        warning: '#d75f00',
+    },
+    'modus-operandi': {
+        accent: '#0031a9',
+        border: '#d7d7d7',
+        danger: '#a60000',
+        focusBorder: '#005e8b',
+        gitAdded: '#006800',
+        gitDeleted: '#a60000',
+        gitModified: '#6f5500',
+        info: '#0031a9',
+        muted: '#595959',
+        selection: '#c0deff',
+        success: '#006800',
+        warning: '#6f5500',
+    },
+    'quiet-light': {
+        accent: '#4b83cd',
+        border: '#e0e0e0',
+        danger: '#aa3731',
+        focusBorder: '#4b83cd',
+        gitAdded: '#448c27',
+        gitDeleted: '#aa3731',
+        gitModified: '#a67d00',
+        info: '#4b83cd',
+        muted: '#a3a6ad',
+        selection: '#c9d0d9',
+        success: '#448c27',
+        warning: '#a67d00',
+    },
+};
+/**
+ * Ordered list of every selectable theme preset, for the `coco ui` theme
+ * picker and any UI that enumerates themes. `monochrome` isn't a key in
+ * `THEME_PRESET_COLORS` (it's handled via `noColor`), so it's spliced in
+ * right after `default` — the two non-color baselines sit together at the
+ * top, followed by the color themes in catalog order.
+ */
+function getLogInkThemePresets() {
+    const keys = Object.keys(THEME_PRESET_COLORS);
+    const [first, ...rest] = keys;
+    return first === 'default'
+        ? ['default', 'monochrome', ...rest]
+        : ['monochrome', ...keys];
 }
-function withFilter(state, filter, promotedSelections) {
-    const filteredCommits = filterCommits(state.commits, filter);
-    // P4.5: rectify promoted-view selections when the filter changes. Prefer
-    // the runtime-supplied snapshot — which preserves the cursor on the same
-    // item when it's still in the filtered list and only snaps to result[0]
-    // when the previously-selected item dropped out. Falls back to the older
-    // "snap to 0" behavior when no snapshot was provided (test paths,
-    // dispatchers without context).
-    const filterChanged = state.filter !== filter;
-    const branchIndex = promotedSelections?.branchIndex ??
-        (filterChanged ? 0 : state.selectedBranchIndex);
-    const tagIndex = promotedSelections?.tagIndex ??
-        (filterChanged ? 0 : state.selectedTagIndex);
-    const stashIndex = promotedSelections?.stashIndex ??
-        (filterChanged ? 0 : state.selectedStashIndex);
-    // Reflog (#781) snaps to 0 on filter change rather than rectifying.
-    // The list is chronological and the user is unlikely to be tracking
-    // a specific entry through filter changes — the simpler reset
-    // matches the "find recovery target by typing" interaction.
-    const reflogIndex = filterChanged ? 0 : state.selectedReflogIndex;
-    return {
-        ...state,
-        filter,
-        filteredCommits,
-        selectedIndex: clampIndex(state.selectedIndex, filteredCommits.length),
-        selectedFileIndex: 0,
-        selectedBranchIndex: branchIndex,
-        selectedTagIndex: tagIndex,
-        selectedStashIndex: stashIndex,
-        selectedReflogIndex: reflogIndex,
-        diffPreviewOffset: 0,
-        pendingKey: undefined,
-    };
+function shouldUseAscii(term) {
+    if (!term) {
+        return false;
+    }
+    return term === 'dumb' || term.startsWith('vt100');
 }
-function replaceRows(state, rows) {
-    // Wholesale row replacement after a server-side re-fetch (#776).
-    // Resets the cursor to the top because the new commit set may not
-    // share any hashes with the old one (e.g. switching from `--all` to
-    // `-- some/path` typically dumps the previous selection).
-    const commits = getCommitRows(rows);
-    const filteredCommits = filterCommits(commits, state.filter);
+function createLogInkTheme(options = {}) {
+    const noColor = (options.noColor ?? Boolean(process.env.NO_COLOR)) ||
+        options.preset === 'monochrome';
+    const ascii = options.ascii ?? shouldUseAscii(options.term ?? process.env.TERM);
+    const requestedPreset = options.preset && options.preset !== 'monochrome' ? options.preset : 'default';
+    // P5.2 — gracefully downgrade hex presets (catppuccin / gruvbox) when
+    // the host terminal can't render truecolor. Chalk approximates hex in
+    // those modes anyway, but the default preset's ANSI-named palette
+    // renders far more faithfully on 16-color terminals.
+    const colorLevel = getColorLevel(options.env ?? process.env);
+    const preset = !noColor && presetUsesTrueColor(requestedPreset) && colorLevel !== 'truecolor'
+        ? 'default'
+        : requestedPreset;
+    const colors = noColor
+        ? {}
+        : {
+            ...THEME_PRESET_COLORS[preset],
+            // Preserve the requested theme's selection background even when the
+            // rest of the palette downgrades to `default`. The selection is a
+            // single background color the terminal can approximate; without this,
+            // a light theme inherits `default`'s dark selection (#1a3a4a) and the
+            // selected row renders as a dark bar on a light background.
+            ...(preset !== requestedPreset && THEME_PRESET_COLORS[requestedPreset]?.selection
+                ? { selection: THEME_PRESET_COLORS[requestedPreset].selection }
+                : {}),
+            ...options.colors,
+        };
+    // Derive a contrasting foreground for the selected row from its own
+    // selection background, unless the caller supplied one explicitly. coco
+    // owns the selection background but not the terminal's default foreground,
+    // so without this the selected row's text falls back to whatever the
+    // user's terminal foreground is — which may not contrast with the bar at
+    // all (the bug behind unreadable selected rows on many themes).
+    if (!noColor && colors.selection && !colors.selectionForeground) {
+        const selectionForeground = readableForegroundFor(colors.selection);
+        if (selectionForeground) {
+            colors.selectionForeground = selectionForeground;
+        }
+    }
     return {
-        ...state,
-        rows,
-        commits,
-        filteredCommits,
-        selectedIndex: 0,
-        selectedFileIndex: 0,
-        pendingCommitFocused: false,
-        pendingKey: undefined,
-        // Rows just landed — clear the boot-loading flag so the history
-        // surface drops the "Loading commits…" placeholder. Safe to clear
-        // unconditionally because `replaceRows` only fires after a real
-        // git log returns.
-        bootLoading: false,
+        noColor,
+        ascii,
+        borderStyle: options.borderStyle || (ascii ? 'classic' : 'round'),
+        colors,
     };
 }
-function appendRows(state, rows) {
-    const selected = getSelectedInkCommit(state);
-    const nextRows = [...state.rows, ...rows];
-    const seen = new Set();
-    const commits = getCommitRows(nextRows).filter((commit) => {
-        if (seen.has(commit.hash)) {
-            return false;
+
+/**
+ * Canned filter presets for the issue / PR triage TUI views
+ * (#882 phase 6). Each preset compiles to the same shape the
+ * underlying list fetchers (`getIssueList` / `getPullRequestList`)
+ * already accept — there's no new `gh` surface area, just a
+ * curated set of common triage angles surfaced as a single
+ * keystroke (`f` cycles).
+ *
+ * The presets are deliberately *not* a 1:1 mirror across the two
+ * surfaces:
+ *
+ *   - Issues have no draft / mergeable concept, so `draft` /
+ *     `mergeable` are skipped on the issue list.
+ *   - PRs have a `merged` state distinct from `closed`; issues
+ *     don't.
+ *   - `mine` semantics differ subtly: for issues it tends to
+ *     mean "I'm the assignee" (issues are tasks people pick up);
+ *     for PRs it means "I'm the author" (PRs are work people
+ *     post). The presets bake those in so the user doesn't have
+ *     to think about it.
+ */
+/** Cycle order — must match the keystroke walk on `f`. */
+const ISSUE_FILTER_PRESETS = [
+    'open',
+    'closed',
+    'mine',
+    'assigned',
+];
+const PULL_REQUEST_FILTER_PRESETS = [
+    'open',
+    'draft',
+    'mine',
+    'assigned',
+    'closed',
+    'merged',
+];
+const ISSUE_FILTER_LABELS = {
+    open: 'open',
+    closed: 'closed',
+    mine: 'mine (assigned)',
+    assigned: 'assigned to me',
+};
+const PULL_REQUEST_FILTER_LABELS = {
+    open: 'open',
+    draft: 'draft',
+    mine: 'mine (authored)',
+    assigned: 'assigned to me',
+    closed: 'closed',
+    merged: 'merged',
+};
+/**
+ * Resolve a preset to the filter object the data fetcher accepts.
+ * Pure mapping — no `gh` calls. Kept separate from `getIssueList` /
+ * `getPullRequestList` so unit tests can assert the mapping
+ * independently from the fetch pipeline.
+ */
+function issueFilterForPreset(preset) {
+    switch (preset) {
+        case 'open':
+            return { state: 'open' };
+        case 'closed':
+            return { state: 'closed' };
+        case 'mine':
+            // Issues are tasks — "mine" is what *I'm working on*, i.e.
+            // assigned to me + still open. Same as `assigned` plus the
+            // open-state filter for ergonomic single-keystroke focus on
+            // the active backlog.
+            return { state: 'open', assignee: '@me' };
+        case 'assigned':
+            return { assignee: '@me' };
+    }
+}
+function pullRequestFilterForPreset(preset) {
+    switch (preset) {
+        case 'open':
+            return { state: 'open' };
+        case 'draft':
+            // gh's `--draft` flag implies `--state open`; surface that
+            // explicitly so the canonicalize step doesn't elide it.
+            return { state: 'open', draft: true };
+        case 'mine':
+            // PRs are work — "mine" is what *I authored*. Most useful
+            // when looking at one's own backlog of in-flight PRs.
+            return { state: 'open', author: '@me' };
+        case 'assigned':
+            return { assignee: '@me' };
+        case 'closed':
+            return { state: 'closed' };
+        case 'merged':
+            return { state: 'merged' };
+    }
+}
+function cycleIssueFilterPreset(current) {
+    const index = ISSUE_FILTER_PRESETS.indexOf(current);
+    const next = (index + 1) % ISSUE_FILTER_PRESETS.length;
+    return ISSUE_FILTER_PRESETS[next];
+}
+function cyclePullRequestFilterPreset(current) {
+    const index = PULL_REQUEST_FILTER_PRESETS.indexOf(current);
+    const next = (index + 1) % PULL_REQUEST_FILTER_PRESETS.length;
+    return PULL_REQUEST_FILTER_PRESETS[next];
+}
+
+/**
+ * Sort modes for the promoted views (P4.2).
+ *
+ * Pure: takes existing context entries + the active mode, returns a sorted
+ * copy. Tested in isolation; the runtime just calls these helpers.
+ *
+ * Display label uses `▼` (U+25BC) under truecolor / UTF-8 and falls back to
+ * `v` under ASCII. Letters (`recent` / `name` / `ahead`) carry meaning;
+ * shape enhances.
+ */
+const BRANCH_SORT_MODES = ['name', 'recent', 'ahead'];
+const DEFAULT_BRANCH_SORT_MODE = 'name';
+function cycleBranchSort(mode) {
+    const index = BRANCH_SORT_MODES.indexOf(mode);
+    if (index < 0)
+        return BRANCH_SORT_MODES[0];
+    return BRANCH_SORT_MODES[(index + 1) % BRANCH_SORT_MODES.length];
+}
+function sortBranches(branches, mode) {
+    // Pin the current branch at index 0 regardless of sort mode (#806
+    // follow-up). Lands the user's cursor on the active branch by
+    // default and keeps the most-relevant row glued to the top of the
+    // list as they cycle sorts.
+    const current = branches.find((entry) => entry.current);
+    const rest = branches.filter((entry) => !entry.current);
+    const sortedRest = rest.slice();
+    switch (mode) {
+        case 'name':
+            sortedRest.sort((a, b) => a.shortName.localeCompare(b.shortName));
+            break;
+        case 'recent':
+            // ISO-shaped dates compare byte-for-byte; descending so the freshest
+            // branch sits at the top.
+            sortedRest.sort((a, b) => (b.date || '').localeCompare(a.date || '') ||
+                a.shortName.localeCompare(b.shortName));
+            break;
+        case 'ahead':
+            // ahead-first; ties broken by behind, then by name. Keeps "this branch
+            // has unmerged work" in the user's first scroll.
+            sortedRest.sort((a, b) => b.ahead - a.ahead || b.behind - a.behind ||
+                a.shortName.localeCompare(b.shortName));
+            break;
+    }
+    return current ? [current, ...sortedRest] : sortedRest;
+}
+const TAG_SORT_MODES = ['recent', 'name'];
+const DEFAULT_TAG_SORT_MODE = 'recent';
+function cycleTagSort(mode) {
+    const index = TAG_SORT_MODES.indexOf(mode);
+    if (index < 0)
+        return TAG_SORT_MODES[0];
+    return TAG_SORT_MODES[(index + 1) % TAG_SORT_MODES.length];
+}
+function sortTags(tags, mode) {
+    const copy = tags.slice();
+    switch (mode) {
+        case 'name':
+            return copy.sort((a, b) => a.name.localeCompare(b.name));
+        case 'recent':
+            return copy.sort((a, b) => (b.date || '').localeCompare(a.date || '') ||
+                a.name.localeCompare(b.name));
+        default:
+            return copy;
+    }
+}
+/* ---------------------------- header indicator -------------------------- */
+function formatSortIndicator(mode, options = {}) {
+    return `${options.ascii ? 'v' : '▼'} ${mode}`;
+}
+
+const DEFAULT_CHANGELOG_VIEW_STATE = {
+    status: 'idle',
+    scrollOffset: 0,
+};
+const DEFAULT_LOG_INK_STATUS_FILTER_MASK = {
+    staged: true,
+    unstaged: true,
+    untracked: true,
+};
+/**
+ * Detect a history server-side filter prefix (#776). Returns the parsed
+ * `LogInkHistoryFetchArgs` for `path:<value>` and `author:<value>`
+ * prefixes, or `undefined` for a plain (client-side) filter. The whole
+ * remainder of the string (post-prefix) becomes the value — paths and
+ * author names commonly contain spaces, and we don't try to parse
+ * shell-like syntax.
+ */
+function parseLogInkHistoryFetchPrefix(filter) {
+    const trimmed = filter.trim();
+    if (trimmed.startsWith('path:')) {
+        const value = trimmed.slice('path:'.length).trim();
+        return value ? { path: value } : undefined;
+    }
+    if (trimmed.startsWith('author:')) {
+        const value = trimmed.slice('author:'.length).trim();
+        return value ? { author: value } : undefined;
+    }
+    return undefined;
+}
+const FOCUS_ORDER = ['sidebar', 'commits', 'detail'];
+const SIDEBAR_TABS = ['status', 'branches', 'tags', 'stashes', 'worktrees'];
+function searchableFields(commit) {
+    return [
+        commit.shortHash,
+        commit.hash,
+        commit.date,
+        commit.author,
+        commit.message,
+        ...commit.refs,
+    ];
+}
+function scoreField(field, term) {
+    const value = field.toLowerCase();
+    const normalized = term.toLowerCase();
+    if (!normalized) {
+        return 0;
+    }
+    if (value === normalized) {
+        return 1000;
+    }
+    if (value.startsWith(normalized)) {
+        return 800 - Math.min(value.length - normalized.length, 200);
+    }
+    const substringIndex = value.indexOf(normalized);
+    if (substringIndex >= 0) {
+        return 600 - Math.min(substringIndex, 200);
+    }
+    let searchIndex = 0;
+    let distance = 0;
+    for (const character of normalized) {
+        const nextIndex = value.indexOf(character, searchIndex);
+        if (nextIndex < 0) {
+            return undefined;
         }
-        seen.add(commit.hash);
-        return true;
-    });
-    const filteredCommits = filterCommits(commits, state.filter);
-    const selectedIndex = selected
-        ? filteredCommits.findIndex((commit) => commit.hash === selected.hash)
-        : state.selectedIndex;
+        distance += nextIndex - searchIndex;
+        searchIndex = nextIndex + 1;
+    }
+    return 300 - Math.min(distance, 200);
+}
+function scoreLogInkCommitFilter(commit, filter) {
+    const terms = filter.trim().split(/\s+/).filter(Boolean);
+    if (terms.length === 0) {
+        return 0;
+    }
+    const fields = searchableFields(commit);
+    let score = 0;
+    for (const term of terms) {
+        const bestFieldScore = fields.reduce((best, field) => {
+            const fieldScore = scoreField(field, term);
+            if (fieldScore === undefined) {
+                return best;
+            }
+            return best === undefined ? fieldScore : Math.max(best, fieldScore);
+        }, undefined);
+        if (bestFieldScore === undefined) {
+            return undefined;
+        }
+        score += bestFieldScore;
+    }
+    return score;
+}
+function filterCommits(commits, filter) {
+    return commits
+        .map((commit, index) => ({
+        commit,
+        index,
+        score: scoreLogInkCommitFilter(commit, filter),
+    }))
+        .filter((entry) => entry.score !== undefined)
+        .sort((a, b) => b.score - a.score || a.index - b.index)
+        .map((entry) => entry.commit);
+}
+function clampIndex(index, length) {
+    if (length === 0) {
+        return 0;
+    }
+    return Math.max(0, Math.min(index, length - 1));
+}
+function cycleValue(values, current, delta) {
+    const currentIndex = Math.max(0, values.indexOf(current));
+    const nextIndex = (currentIndex + delta + values.length) % values.length;
+    return values[nextIndex];
+}
+const HOME_VIEW = 'history';
+function topOfStack(stack) {
+    return stack[stack.length - 1];
+}
+function withPushedView(state, value) {
+    if (topOfStack(state.viewStack) === value) {
+        return { ...state, pendingKey: undefined };
+    }
+    const viewStack = [...state.viewStack, value];
     return {
         ...state,
-        rows: nextRows,
-        commits,
-        filteredCommits,
-        selectedIndex: selectedIndex >= 0
-            ? selectedIndex
-            : clampIndex(state.selectedIndex, filteredCommits.length),
+        activeView: value,
+        viewStack,
+        // The compose + status views' right detail panels already show
+        // worktree info, so keeping the left sidebar on the Status tab
+        // duplicates that information. Auto-switch to Branches when entering
+        // either view; the user can swap back with [/] if they want.
+        //
+        // We update only the rendered `sidebarTab` here, never
+        // `userSidebarTab`, so this auto-switch is invisible to per-repo
+        // persistence and pop-view restores the previous tab.
+        sidebarTab: value === 'compose' || value === 'status' ? 'branches' : state.sidebarTab,
+        worktreeDiffOffset: value === 'diff' ? state.worktreeDiffOffset : 0,
+        selectedWorktreeHunkIndex: value === 'diff' ? state.selectedWorktreeHunkIndex : 0,
+        diffSource: value === 'diff' ? state.diffSource : undefined,
+        stashDiffRef: value === 'diff' ? state.stashDiffRef : undefined,
+        compareHead: value === 'diff' ? state.compareHead : undefined,
+        pendingCommitFocused: value === 'history' ? state.pendingCommitFocused : false,
+        statusGroupHeaderFocused: value === 'status' ? state.statusGroupHeaderFocused : false,
         pendingKey: undefined,
     };
 }
-function nextHunkOffset(currentOffset, hunkOffsets, delta) {
-    if (hunkOffsets.length === 0) {
-        return currentOffset;
-    }
-    if (delta > 0) {
-        const nextOffset = hunkOffsets.find((offset) => offset > currentOffset);
-        return nextOffset === undefined ? currentOffset : nextOffset;
+function withPoppedView(state) {
+    if (state.viewStack.length <= 1) {
+        return { ...state, pendingKey: undefined };
     }
-    const previousOffset = [...hunkOffsets].reverse().find((offset) => offset < currentOffset);
-    return previousOffset === undefined ? currentOffset : previousOffset;
-}
-function nextHunkIndex(currentOffset, hunkOffsets, delta) {
-    const offset = nextHunkOffset(currentOffset, hunkOffsets, delta);
-    return Math.max(0, hunkOffsets.indexOf(offset));
-}
-function getLogInkSidebarTabs() {
-    return [...SIDEBAR_TABS];
+    const viewStack = state.viewStack.slice(0, -1);
+    const next = topOfStack(viewStack);
+    // #779 — compareBase is "cleared when the diff view is popped." We
+    // detect that case by checking if the *previous* top was 'diff'.
+    // The compare workflow ends when the user backs out of the compare
+    // diff; on the next mark they re-set the base. Other view pops
+    // preserve compareBase so the user can move between branches / tags /
+    // history while hunting for a head ref.
+    const wasOnDiff = state.activeView === 'diff';
+    return {
+        ...state,
+        activeView: next,
+        viewStack,
+        // Restore the user's last explicit tab choice so popping out of
+        // compose / status (which auto-switch the sidebar to Branches)
+        // returns the user to whatever they actually had open before.
+        sidebarTab: state.userSidebarTab,
+        worktreeDiffOffset: next === 'diff' ? state.worktreeDiffOffset : 0,
+        selectedWorktreeHunkIndex: next === 'diff' ? state.selectedWorktreeHunkIndex : 0,
+        diffSource: next === 'diff' ? state.diffSource : undefined,
+        stashDiffRef: next === 'diff' ? state.stashDiffRef : undefined,
+        compareBase: wasOnDiff ? undefined : state.compareBase,
+        compareHead: next === 'diff' ? state.compareHead : undefined,
+        pendingCommitFocused: next === 'history' ? state.pendingCommitFocused : false,
+        statusGroupHeaderFocused: next === 'status' ? state.statusGroupHeaderFocused : false,
+        pendingKey: undefined,
+    };
 }
-function createLogInkState(rows, options = {}) {
-    const commits = getCommitRows(rows);
-    const initialView = options.activeView || 'history';
+/**
+ * Push a nested-repo frame onto `state.repoStack` (#931). Snapshots
+ * the active view position into the new frame's `parentReturn` so a
+ * subsequent pop lands the user back where they came from, then
+ * resets the per-frame navigation state (active view, view stack,
+ * row / file / submodule cursors, filter) so the nested frame opens
+ * in a clean slate — the mental equivalent of a fresh `coco ui`
+ * launched against the submodule's working dir.
+ *
+ * Sidebar tab + branch / tag sort are also captured into the return
+ * snapshot (#995) so popping back restores the parent's choices
+ * instead of letting the submodule's tab/sort bleed across the
+ * boundary. The values on the *new* frame are left as-is (carried
+ * over from the parent) — the load effect in app.ts re-reads
+ * persistence keyed on the submodule's workdir and dispatches a
+ * restore if the user has a submodule-specific saved preference.
+ *
+ * Other preferences (palette recents, inspector tab, diff view mode)
+ * stay global by design — the user's preference shouldn't reset when
+ * they cross a submodule boundary.
+ *
+ * Live runtime objects (`SimpleGit`, loaded `LogInkContext`) live
+ * outside the reducer in `app.ts`'s parallel ref structure — this
+ * helper only manages the pure view-model side of the push.
+ */
+function withPushedRepoFrame(state, payload) {
+    const newFrame = {
+        label: payload.label,
+        workdir: payload.workdir,
+        entryRange: payload.entryRange,
+        parentReturn: {
+            activeView: state.activeView,
+            selectedIndex: state.selectedIndex,
+            selectedFileIndex: state.selectedFileIndex,
+            selectedSubmoduleIndex: state.selectedSubmoduleIndex,
+            filter: state.filter,
+            sidebarTab: state.sidebarTab,
+            userSidebarTab: state.userSidebarTab,
+            branchSort: state.branchSort,
+            tagSort: state.tagSort,
+        },
+    };
     return {
-        activeView: initialView,
-        viewStack: [initialView],
-        rows,
-        commits,
-        filteredCommits: commits,
+        ...state,
+        repoStack: [...state.repoStack, newFrame],
+        activeView: 'history',
+        viewStack: ['history'],
         selectedIndex: 0,
         selectedFileIndex: 0,
-        selectedWorktreeFileIndex: 0,
-        selectedWorktreeHunkIndex: 0,
-        selectedBranchIndex: 0,
-        selectedTagIndex: 0,
-        selectedStashIndex: 0,
-        selectedWorktreeListIndex: 0,
-        selectedConflictFileIndex: 0,
-        selectedReflogIndex: 0,
         selectedSubmoduleIndex: 0,
-        selectedIssueIndex: 0,
-        selectedPullRequestTriageIndex: 0,
-        selectedIssueFilter: 'open',
-        selectedPullRequestFilter: 'open',
-        repoStack: [{ label: options.repoLabel || 'root', workdir: options.repoWorkdir }],
-        branchSort: DEFAULT_BRANCH_SORT_MODE,
-        tagSort: DEFAULT_TAG_SORT_MODE,
-        paletteFilter: '',
-        paletteSelectedIndex: 0,
-        paletteRecent: [],
-        commitCompose: createCommitComposeState(),
-        diffPreviewOffset: 0,
-        worktreeDiffOffset: 0,
         filter: '',
         filterMode: false,
-        // Default to the full multi-ref graph (`git log --all`) so users
-        // see how branches, tags, and stashes weave through the history
-        // out of the box. Pre-0.54.x this defaulted to false (current
-        // branch only); user feedback consistently asked for the
-        // GitKraken-style "see everything" view as the starting state.
-        // The `\` toggle still flips back to compact / current-branch
-        // mode for users who want the cleaner single-line graph. Tests
-        // override via `options.fullGraph` when they need the compact
-        // case explicitly.
-        fullGraph: options.fullGraph ?? true,
-        showHelp: false,
-        helpScrollOffset: 0,
-        showCommandPalette: false,
-        workflowActionId: undefined,
+        pendingCommitFocused: false,
+        pendingKey: undefined,
         pendingConfirmationId: undefined,
         pendingConfirmationPayload: undefined,
         pendingMutationConfirmation: undefined,
-        pendingKey: undefined,
+    };
+}
+/**
+ * Pop the top repo frame off `state.repoStack` (#931) and restore
+ * the parent's view position from the captured `parentReturn`. A
+ * no-op when the stack is already at its single root frame so this
+ * action is safe to dispatch from generic input handlers (e.g. the
+ * Esc auto-pop wiring that lands in a follow-up PR).
+ *
+ * The defensive `parentReturn` fallback handles the never-supposed-
+ * to-happen case where a non-root frame somehow has no return state
+ * recorded — drop the frame but leave the user's view position
+ * alone rather than crash mid-session.
+ */
+function withPoppedRepoFrame(state) {
+    if (state.repoStack.length <= 1) {
+        return { ...state, pendingKey: undefined };
+    }
+    const topFrame = state.repoStack[state.repoStack.length - 1];
+    const ret = topFrame.parentReturn;
+    const repoStack = state.repoStack.slice(0, -1);
+    if (!ret) {
+        return { ...state, repoStack, pendingKey: undefined };
+    }
+    return {
+        ...state,
+        repoStack,
+        activeView: ret.activeView,
+        viewStack: [ret.activeView],
+        selectedIndex: ret.selectedIndex,
+        selectedFileIndex: ret.selectedFileIndex,
+        selectedSubmoduleIndex: ret.selectedSubmoduleIndex,
+        filter: ret.filter,
+        filterMode: false,
+        pendingCommitFocused: false,
+        // #995 — restore sidebar tab + sort preferences from the captured
+        // parentReturn. Without this, the submodule's tab / sort choice
+        // bleeds back into the parent after pop: the user picks 'tags' in
+        // a vendored submodule, pops back to the parent, and finds the
+        // parent's previously-selected 'branches' tab quietly replaced.
+        sidebarTab: ret.sidebarTab,
+        userSidebarTab: ret.userSidebarTab,
+        branchSort: ret.branchSort,
+        tagSort: ret.tagSort,
+        pendingKey: undefined,
+        pendingConfirmationId: undefined,
+        pendingConfirmationPayload: undefined,
+        pendingMutationConfirmation: undefined,
+    };
+}
+function withReplacedView(state, value) {
+    if (topOfStack(state.viewStack) === value) {
+        return { ...state, pendingKey: undefined };
+    }
+    const viewStack = [...state.viewStack.slice(0, -1), value];
+    return {
+        ...state,
+        activeView: value,
+        viewStack,
+        worktreeDiffOffset: value === 'diff' ? state.worktreeDiffOffset : 0,
+        selectedWorktreeHunkIndex: value === 'diff' ? state.selectedWorktreeHunkIndex : 0,
+        diffSource: value === 'diff' ? state.diffSource : undefined,
+        stashDiffRef: value === 'diff' ? state.stashDiffRef : undefined,
+        compareHead: value === 'diff' ? state.compareHead : undefined,
+        pendingCommitFocused: value === 'history' ? state.pendingCommitFocused : false,
+        statusGroupHeaderFocused: value === 'status' ? state.statusGroupHeaderFocused : false,
+        pendingKey: undefined,
+    };
+}
+function withFilter(state, filter, promotedSelections) {
+    const filteredCommits = filterCommits(state.commits, filter);
+    // P4.5: rectify promoted-view selections when the filter changes. Prefer
+    // the runtime-supplied snapshot — which preserves the cursor on the same
+    // item when it's still in the filtered list and only snaps to result[0]
+    // when the previously-selected item dropped out. Falls back to the older
+    // "snap to 0" behavior when no snapshot was provided (test paths,
+    // dispatchers without context).
+    const filterChanged = state.filter !== filter;
+    const branchIndex = promotedSelections?.branchIndex ??
+        (filterChanged ? 0 : state.selectedBranchIndex);
+    const tagIndex = promotedSelections?.tagIndex ??
+        (filterChanged ? 0 : state.selectedTagIndex);
+    const stashIndex = promotedSelections?.stashIndex ??
+        (filterChanged ? 0 : state.selectedStashIndex);
+    // Reflog (#781) snaps to 0 on filter change rather than rectifying.
+    // The list is chronological and the user is unlikely to be tracking
+    // a specific entry through filter changes — the simpler reset
+    // matches the "find recovery target by typing" interaction.
+    const reflogIndex = filterChanged ? 0 : state.selectedReflogIndex;
+    return {
+        ...state,
+        filter,
+        filteredCommits,
+        selectedIndex: clampIndex(state.selectedIndex, filteredCommits.length),
+        selectedFileIndex: 0,
+        selectedBranchIndex: branchIndex,
+        selectedTagIndex: tagIndex,
+        selectedStashIndex: stashIndex,
+        selectedReflogIndex: reflogIndex,
+        diffPreviewOffset: 0,
+        pendingKey: undefined,
+    };
+}
+function replaceRows(state, rows) {
+    // Wholesale row replacement after a server-side re-fetch (#776).
+    // Resets the cursor to the top because the new commit set may not
+    // share any hashes with the old one (e.g. switching from `--all` to
+    // `-- some/path` typically dumps the previous selection).
+    const commits = getCommitRows(rows);
+    const filteredCommits = filterCommits(commits, state.filter);
+    return {
+        ...state,
+        rows,
+        commits,
+        filteredCommits,
+        selectedIndex: 0,
+        selectedFileIndex: 0,
+        pendingCommitFocused: false,
+        pendingKey: undefined,
+        // Rows just landed — clear the boot-loading flag so the history
+        // surface drops the "Loading commits…" placeholder. Safe to clear
+        // unconditionally because `replaceRows` only fires after a real
+        // git log returns.
+        bootLoading: false,
+    };
+}
+function appendRows(state, rows) {
+    const selected = getSelectedInkCommit(state);
+    const nextRows = [...state.rows, ...rows];
+    const seen = new Set();
+    const commits = getCommitRows(nextRows).filter((commit) => {
+        if (seen.has(commit.hash)) {
+            return false;
+        }
+        seen.add(commit.hash);
+        return true;
+    });
+    const filteredCommits = filterCommits(commits, state.filter);
+    const selectedIndex = selected
+        ? filteredCommits.findIndex((commit) => commit.hash === selected.hash)
+        : state.selectedIndex;
+    return {
+        ...state,
+        rows: nextRows,
+        commits,
+        filteredCommits,
+        selectedIndex: selectedIndex >= 0
+            ? selectedIndex
+            : clampIndex(state.selectedIndex, filteredCommits.length),
+        pendingKey: undefined,
+    };
+}
+function nextHunkOffset(currentOffset, hunkOffsets, delta) {
+    if (hunkOffsets.length === 0) {
+        return currentOffset;
+    }
+    if (delta > 0) {
+        const nextOffset = hunkOffsets.find((offset) => offset > currentOffset);
+        return nextOffset === undefined ? currentOffset : nextOffset;
+    }
+    const previousOffset = [...hunkOffsets].reverse().find((offset) => offset < currentOffset);
+    return previousOffset === undefined ? currentOffset : previousOffset;
+}
+function nextHunkIndex(currentOffset, hunkOffsets, delta) {
+    const offset = nextHunkOffset(currentOffset, hunkOffsets, delta);
+    return Math.max(0, hunkOffsets.indexOf(offset));
+}
+function getLogInkSidebarTabs() {
+    return [...SIDEBAR_TABS];
+}
+function createLogInkState(rows, options = {}) {
+    const commits = getCommitRows(rows);
+    const initialView = options.activeView || 'history';
+    return {
+        activeView: initialView,
+        viewStack: [initialView],
+        rows,
+        commits,
+        filteredCommits: commits,
+        selectedIndex: 0,
+        selectedFileIndex: 0,
+        selectedWorktreeFileIndex: 0,
+        selectedWorktreeHunkIndex: 0,
+        selectedBranchIndex: 0,
+        selectedTagIndex: 0,
+        selectedStashIndex: 0,
+        selectedWorktreeListIndex: 0,
+        selectedConflictFileIndex: 0,
+        selectedReflogIndex: 0,
+        selectedSubmoduleIndex: 0,
+        selectedIssueIndex: 0,
+        selectedPullRequestTriageIndex: 0,
+        selectedIssueFilter: 'open',
+        selectedPullRequestFilter: 'open',
+        repoStack: [{ label: options.repoLabel || 'root', workdir: options.repoWorkdir }],
+        branchSort: DEFAULT_BRANCH_SORT_MODE,
+        tagSort: DEFAULT_TAG_SORT_MODE,
+        paletteFilter: '',
+        paletteSelectedIndex: 0,
+        paletteRecent: [],
+        showThemePicker: false,
+        themePickerFilter: '',
+        themePickerIndex: 0,
+        commitCompose: createCommitComposeState(),
+        diffPreviewOffset: 0,
+        worktreeDiffOffset: 0,
+        filter: '',
+        filterMode: false,
+        // Default to the full multi-ref graph (`git log --all`) so users
+        // see how branches, tags, and stashes weave through the history
+        // out of the box. Pre-0.54.x this defaulted to false (current
+        // branch only); user feedback consistently asked for the
+        // GitKraken-style "see everything" view as the starting state.
+        // The `\` toggle still flips back to compact / current-branch
+        // mode for users who want the cleaner single-line graph. Tests
+        // override via `options.fullGraph` when they need the compact
+        // case explicitly.
+        fullGraph: options.fullGraph ?? true,
+        showHelp: false,
+        helpScrollOffset: 0,
+        showCommandPalette: false,
+        workflowActionId: undefined,
+        pendingConfirmationId: undefined,
+        pendingConfirmationPayload: undefined,
+        pendingMutationConfirmation: undefined,
+        pendingKey: undefined,
         focus: 'commits',
         // Default first-time tab is 'branches' — it's the most useful
         // landing surface in the workstation (current branch + recent
@@ -24921,6 +25818,46 @@ function applyLogInkAction(state, action) {
                 pendingKey: undefined,
             };
         }
+        case 'toggleThemePicker': {
+            const opening = !state.showThemePicker;
+            return {
+                ...state,
+                showThemePicker: opening,
+                // Only one overlay at a time — close help / palette on open.
+                showHelp: false,
+                showCommandPalette: false,
+                themePickerFilter: '',
+                themePickerIndex: 0,
+                pendingKey: undefined,
+            };
+        }
+        case 'moveThemePicker':
+            return {
+                ...state,
+                themePickerIndex: clampIndex(state.themePickerIndex + action.delta, action.presetCount),
+                pendingKey: undefined,
+            };
+        case 'appendThemePickerFilter':
+            return {
+                ...state,
+                themePickerFilter: `${state.themePickerFilter}${action.value}`,
+                themePickerIndex: 0,
+                pendingKey: undefined,
+            };
+        case 'backspaceThemePickerFilter':
+            return {
+                ...state,
+                themePickerFilter: state.themePickerFilter.slice(0, -1),
+                themePickerIndex: 0,
+                pendingKey: undefined,
+            };
+        case 'clearThemePickerFilter':
+            return {
+                ...state,
+                themePickerFilter: '',
+                themePickerIndex: 0,
+                pendingKey: undefined,
+            };
         case 'setChangelogLoading':
             return {
                 ...state,
@@ -25128,6 +26065,71 @@ function applyLogInkAction(state, action) {
             return state;
     }
 }
+/**
+ * Fuzzy (subsequence) score for a preset id against a lowercase query.
+ * Returns `null` when the query chars don't appear in order; otherwise a
+ * score where contiguous runs, a start-of-string match, and matches right
+ * after a `-` separator are rewarded — so `gl` ranks `gruvbox-light` /
+ * `github-light` above incidental matches, and `tn` finds `tokyo-night`.
+ */
+function fuzzyScoreThemePreset(preset, query) {
+    const target = preset.toLowerCase();
+    let qi = 0;
+    let score = 0;
+    let lastMatch = -2;
+    for (let i = 0; i < target.length && qi < query.length; i += 1) {
+        if (target[i] === query[qi]) {
+            score += 1;
+            if (i === lastMatch + 1)
+                score += 4; // contiguous run
+            if (i === 0)
+                score += 8; // matches the very start
+            else if (target[i - 1] === '-')
+                score += 4; // start of a word segment
+            lastMatch = i;
+            qi += 1;
+        }
+    }
+    return qi === query.length ? score : null;
+}
+/**
+ * Filter the full preset list by a fuzzy (subsequence) query, ranked best
+ * match first (ties broken by catalog order). An empty query returns every
+ * preset in catalog order. Shared by the theme picker overlay renderer, the
+ * input handler (for cursor bounds), and the live-preview selector so all
+ * three agree on the same filtered list.
+ */
+function filterThemePresets(filter) {
+    const query = filter.trim().toLowerCase();
+    const all = getLogInkThemePresets();
+    if (!query) {
+        return all;
+    }
+    return all
+        .map((preset, index) => ({ preset, index, score: fuzzyScoreThemePreset(preset, query) }))
+        .filter((entry) => entry.score !== null)
+        .sort((a, b) => b.score - a.score || a.index - b.index)
+        .map((entry) => entry.preset);
+}
+/**
+ * The preset currently under the theme-picker cursor (clamped to the
+ * filtered list). `undefined` when the filter matches nothing.
+ */
+function getThemePickerSelection(state) {
+    return getThemePickerSelectionFor(state.themePickerFilter, state.themePickerIndex);
+}
+/**
+ * State-model-agnostic variant: the preset under the picker cursor for a
+ * raw `filter` + `index`. Used by the workspace top-level surface, which
+ * keeps its own state shape but shares the picker filtering.
+ */
+function getThemePickerSelectionFor(filter, index) {
+    const filtered = filterThemePresets(filter);
+    if (filtered.length === 0) {
+        return undefined;
+    }
+    return filtered[clampIndex(index, filtered.length)];
+}
 
 /**
  * In-sidebar selection helpers (#791 follow-up — sidebar entity ops).
@@ -25589,6 +26591,10 @@ function getLogInkPaletteExecuteEvents(command, state) {
         case 'commandPalette':
             // Re-toggling closes; the dispatcher will close after execute anyway.
             return [];
+        case 'themePicker':
+            // Palette closes on execute (toggleCommandPalette runs first), then
+            // this opens the theme picker.
+            return [action({ type: 'toggleThemePicker' })];
         case 'workflowDeleteBranch':
         case 'workflowDeleteTag':
         case 'workflowDropStash':
@@ -26121,6 +27127,45 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
         // overlay open without dispatching any state change.
         return [];
     }
+    if (state.showThemePicker) {
+        const filtered = filterThemePresets(state.themePickerFilter);
+        if (key.escape) {
+            // Two-stage Esc: clear a non-empty filter first, then close (and
+            // revert the live preview to the previously-active theme).
+            if (state.themePickerFilter.length > 0) {
+                return [action({ type: 'clearThemePickerFilter' })];
+            }
+            return [action({ type: 'toggleThemePicker' })];
+        }
+        if (key.return) {
+            const selected = getThemePickerSelection(state);
+            if (!selected) {
+                return [action({ type: 'toggleThemePicker' })];
+            }
+            return [
+                action({ type: 'toggleThemePicker' }),
+                { type: 'applyThemePreset', preset: selected },
+            ];
+        }
+        if (key.upArrow || (key.ctrl && inputValue === 'p')) {
+            return [action({ type: 'moveThemePicker', delta: -1, presetCount: filtered.length })];
+        }
+        if (key.downArrow || (key.ctrl && inputValue === 'n')) {
+            return [action({ type: 'moveThemePicker', delta: 1, presetCount: filtered.length })];
+        }
+        if (key.backspace || key.delete) {
+            return [action({ type: 'backspaceThemePickerFilter' })];
+        }
+        if (key.ctrl && inputValue === 'u') {
+            return [action({ type: 'clearThemePickerFilter' })];
+        }
+        // All other printable input filters the list (so `j`/`k` type into the
+        // filter rather than navigating — matching the command palette).
+        if (inputValue && !key.ctrl && !key.meta) {
+            return [action({ type: 'appendThemePickerFilter', value: inputValue })];
+        }
+        return [];
+    }
     if (state.showCommandPalette) {
         const filtered = filterLogInkPaletteCommands(getLogInkPaletteCommands(), state.paletteFilter, state.paletteRecent);
         if (key.escape) {
@@ -26391,6 +27436,13 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
             action({ type: 'setStatus', value: 'gT creates a tag at the cursored commit on the history view', kind: 'warning' }),
         ];
     }
+    // gC — open the theme picker (browse + live-preview + apply a color theme).
+    if (state.pendingKey === 'g' && inputValue === 'C') {
+        return [
+            action({ type: 'setPendingKey', value: undefined }),
+            action({ type: 'toggleThemePicker' }),
+        ];
+    }
     // #784 — bisect view action keys. Scoped to `state.activeView ===
     // 'bisect' && state.focus === 'commits'` so the single-letter keys
     // stay free everywhere else. `g` and `b` collide with the global
@@ -27862,6 +28914,60 @@ function markOnboardingSeen() {
     }
 }
 
+/**
+ * Persist the user's chosen `coco ui` theme preset to the global XDG
+ * config (`$XDG_CONFIG_HOME/coco/config.json`, default `~/.config/...`),
+ * so a theme picked in the workstation sticks across every repo and
+ * launch. This is the same file `loadXDGConfig` reads.
+ *
+ * Read-modify-write that preserves every other key (we only touch
+ * `logTui.theme.preset`), unlike the whole-object project-config writer.
+ * Best-effort: a read-only HOME or malformed file never throws — the
+ * picker still applies the theme for the session.
+ */
+const VALID_PRESETS = new Set(getLogInkThemePresets());
+function getXdgConfigPath() {
+    const home = process.env.XDG_CONFIG_HOME || path__namespace$1.join(os__namespace$1.homedir(), '.config');
+    return path__namespace$1.join(home, 'coco', 'config.json');
+}
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+/**
+ * Write `logTui.theme.preset = <preset>` into the global config, merging
+ * into any existing content. Returns `true` on success, `false` if the
+ * preset is unknown or the write failed (caller treats failure as
+ * "applied for this session only").
+ */
+function saveThemePreset(preset) {
+    if (!VALID_PRESETS.has(preset)) {
+        return false;
+    }
+    const file = getXdgConfigPath();
+    try {
+        let config = {};
+        try {
+            const parsed = JSON.parse(fs__namespace$1.readFileSync(file, 'utf8'));
+            if (isRecord(parsed)) {
+                config = parsed;
+            }
+        }
+        catch {
+            // No existing file (or unreadable/malformed) — start fresh.
+            config = {};
+        }
+        const logTui = isRecord(config.logTui) ? config.logTui : {};
+        const theme = isRecord(logTui.theme) ? logTui.theme : {};
+        config.logTui = { ...logTui, theme: { ...theme, preset } };
+        fs__namespace$1.mkdirSync(path__namespace$1.dirname(file), { recursive: true });
+        fs__namespace$1.writeFileSync(file, `${JSON.stringify(config, null, 2)}\n`);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+
 /**
  * Status-line hints for "what to do next" after a workflow that
  * mutates the worktree (split-apply, etc.). Pure formatting — the
@@ -32197,6 +33303,10 @@ function renderBranchesSurface(h, components, state, context, contextStatus, bod
                 // row's dim and read as quiet chrome.
                 h(Text, { color: markerColor, dimColor: markerColor ? false : undefined }, marker.glyph), trailingName, h(Text, { dimColor: true }, timestampPadded), trailingDivergence);
             });
+    // Scroll indicators — same "N more above/below" pattern as the
+    // sidebar and help overlay so the user knows the list continues.
+    const branchesHasMoreAbove = startIndex > 0 && localBranches.length > 0;
+    const branchesHasMoreBelow = startIndex + listRows < localBranches.length;
     return h(Box, {
         borderColor: focusBorderColor(theme, focused),
         borderStyle: theme.borderStyle,
@@ -32204,7 +33314,11 @@ function renderBranchesSurface(h, components, state, context, contextStatus, bod
         flexShrink: 0,
         paddingX: 1,
         width,
-    }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Branches', focused)), h(Text, { dimColor: true }, headerRight)), ...renderPromotedFilterAffordance(h, Text, state, theme), ...lines);
+    }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Branches', focused)), h(Text, { dimColor: true }, headerRight)), ...renderPromotedFilterAffordance(h, Text, state, theme), ...(branchesHasMoreAbove
+        ? [h(Text, { key: 'branches-more-above', dimColor: true }, `  ↑ ${startIndex} more above`)]
+        : []), ...lines, ...(branchesHasMoreBelow
+        ? [h(Text, { key: 'branches-more-below', dimColor: true }, `  ↓ ${localBranches.length - (startIndex + listRows)} more below`)]
+        : []));
 }
 
 /**
@@ -32977,12 +34091,19 @@ function renderDiffSurface(h, components, state, context, contextStatus, worktre
                         // sees at a glance which file the cursor is inside.
                         const isActive = absoluteIndex === activeStartLine;
                         const arrow = theme.ascii ? '> ' : '▾ ';
+                        const activeHeader = isActive && focused && !theme.noColor;
                         return h(Text, {
                             key: `stash-diff-line-${absoluteIndex}`,
                             bold: true,
-                            color: theme.noColor ? undefined : theme.colors.accent,
-                            backgroundColor: isActive && focused && !theme.noColor ? theme.colors.selection : undefined,
-                            inverse: isActive && focused,
+                            // Active header sits on the selection bar with a
+                            // contrast-guaranteed foreground (matches history/status).
+                            // The old `inverse` swap turned the accent into the bar and
+                            // left the path in the selection color — low-contrast on
+                            // light themes (e.g. accent blue bar + light-gray text).
+                            color: activeHeader
+                                ? theme.colors.selectionForeground
+                                : (theme.noColor ? undefined : theme.colors.accent),
+                            backgroundColor: activeHeader ? theme.colors.selection : undefined,
                         }, (() => {
                             // Smart path truncation for the diff file header: keep
                             // the leading arrow glyph and elide middle path
@@ -34060,7 +35181,7 @@ function formatHistoryFetchArgs(args) {
  * Returns the spans flat so the caller can splat them into the row's
  * outer Text alongside other segments without an extra wrapper.
  */
-function renderTypedSubject(h, Text, text, theme, key) {
+function renderTypedSubject(h, Text, text, theme, key, suppressColor = false) {
     const parsed = parseConventionalCommitPrefix(text);
     if (!parsed) {
         return [h(Text, { key: `${key}-msg` }, text)];
@@ -34068,7 +35189,9 @@ function renderTypedSubject(h, Text, text, theme, key) {
     if (text.length < parsed.prefix.length) {
         return [h(Text, { key: `${key}-msg` }, text)];
     }
-    const color = getConventionalCommitColor(parsed, theme);
+    // When the row is selected (inverted), suppress the type color so
+    // text inherits the dark inverted foreground and stays readable.
+    const color = suppressColor ? undefined : getConventionalCommitColor(parsed, theme);
     return [
         h(Text, { key: `${key}-type`, color, bold: parsed.breaking }, parsed.prefix),
         h(Text, { key: `${key}-rest` }, text.slice(parsed.prefix.length)),
@@ -34089,15 +35212,10 @@ function renderLaneSegmentSpans(h, Text, segments, theme, padTo, keyPrefix, opti
     const elements = [];
     let totalLen = 0;
     segments.forEach((seg, idx) => {
-        const laneColor = getLaneColor(seg.laneId, theme);
+        const laneColor = options.suppressColor ? undefined : (getLaneColor(seg.laneId, theme) ?? muted);
         elements.push(h(Text, {
             key: `${keyPrefix}-${idx}`,
-            color: laneColor ?? muted,
-            // Ink does not cascade dimColor from a parent Text to children,
-            // so the caller's "this whole row should fade" intent has to
-            // travel here as an explicit flag (#831). Used for graph-only
-            // lane-closure rows, where the lane colors otherwise compete
-            // for attention with the commits they connect.
+            color: laneColor,
             dimColor: options.forceDim || (theme.noColor && seg.laneId === undefined),
         }, seg.text));
         totalLen += seg.text.length;
@@ -34148,18 +35266,26 @@ function renderCommitHistoryRow(h, Text, commit, graph, graphWidth, selected, th
     const messageRoom = Math.max(8, totalWidth - fixedWidth - cellWidth(refsTrunc));
     const message = truncateCells(commit.message, messageRoom);
     const selectedBg = selected && !theme.noColor ? theme.colors.selection : undefined;
-    const accent = theme.noColor ? undefined : theme.colors.accent;
-    const muted = theme.noColor ? undefined : theme.colors.muted;
+    // Don't use inverse — it makes child colors unreadable. Instead, set a
+    // background on the row AND an explicit, contrast-guaranteed foreground
+    // (`selectionForeground`, derived from the selection bg) on the outer
+    // span. Suppressing each child's own color to `undefined` then lets it
+    // inherit that readable foreground — so the whole selected row stays
+    // legible regardless of the user's terminal default foreground, which
+    // is what the old "rely on the default fg" approach got wrong.
+    const selectedFg = selected && !theme.noColor ? theme.colors.selectionForeground : undefined;
+    const accent = selected ? undefined : (theme.noColor ? undefined : theme.colors.accent);
+    const muted = selected ? undefined : (theme.noColor ? undefined : theme.colors.muted);
     // Lane-colored graph spans when full graph mode + non-ASCII rendering
     // is in play; otherwise fall back to the legacy single-muted span so
     // compact mode and legacy terminals stay visually unchanged.
     const graphChildren = laneSegments && !theme.ascii
-        ? renderLaneSegmentSpans(h, Text, laneSegments, theme, graphWidth, `c${index}`)
-        : [h(Text, { color: muted, dimColor: theme.noColor }, substituteGraphChars(graph.padEnd(graphWidth), { ascii: theme.ascii }))];
+        ? renderLaneSegmentSpans(h, Text, laneSegments, theme, graphWidth, `c${index}`, { suppressColor: selected })
+        : [h(Text, { color: muted, dimColor: !selected && theme.noColor }, substituteGraphChars(graph.padEnd(graphWidth), { ascii: theme.ascii }))];
     return h(Text, {
         key: `${commit.hash}-${index}`,
         backgroundColor: selectedBg,
-        inverse: selected,
+        color: selectedFg,
     }, ...graphChildren, ' ', 
     // "Just landed" marker — a single thick vertical bar in the
     // accent color before the short hash. Fades when the runtime
@@ -34181,11 +35307,11 @@ function renderCommitHistoryRow(h, Text, commit, graph, graphWidth, selected, th
     // Date column drops out entirely at `tight` density — no spacer
     // either, so the message column slides left into the freed cells.
     dateText
-        ? h(Text, { key: `${commit.hash}-${index}-date`, dimColor: true }, dateText, ' ')
+        ? h(Text, { key: `${commit.hash}-${index}-date`, dimColor: !selected }, dateText, ' ')
         : null, 
     // Branch chip prefix (full-graph mode only) lands right before the
     // message so the eye reads "branch · subject" as a unit.
-    chip.node, ...renderTypedSubject(h, Text, message, theme, `${commit.hash}-${index}-subj`), refsTrunc ? h(Text, { color: accent }, refsTrunc) : null);
+    chip.node, ...renderTypedSubject(h, Text, message, theme, `${commit.hash}-${index}-subj`, selected), refsTrunc ? h(Text, { color: accent }, refsTrunc) : null);
 }
 /**
  * Stacked variant used at `rowMode='stacked'` (rail tier). Each
@@ -34200,9 +35326,13 @@ function renderCommitHistoryRow(h, Text, commit, graph, graphWidth, selected, th
  */
 function renderStackedCommitHistoryRow(h, Text, Box, commit, graph, graphWidth, selected, theme, index, panelWidth, fullGraph, now, laneSegments, isRecent = false, remoteNames) {
     const totalWidth = Math.max(20, panelWidth - 4);
-    const accent = theme.noColor ? undefined : theme.colors.accent;
-    const muted = theme.noColor ? undefined : theme.colors.muted;
+    // Suppress child colors on selected rows so each span inherits the
+    // contrast-guaranteed `selectionForeground` set on the line-1 span,
+    // keeping the selected row readable against the selection bg.
+    const accent = selected ? undefined : (theme.noColor ? undefined : theme.colors.accent);
+    const muted = selected ? undefined : (theme.noColor ? undefined : theme.colors.muted);
     const selectedBg = selected && !theme.noColor ? theme.colors.selection : undefined;
+    const selectedFg = selected && !theme.noColor ? theme.colors.selectionForeground : undefined;
     // Line 1 — subject row. Mostly mirrors the single-line layout but
     // skips the date and refs so the message has the whole tail to
     // itself. Branch chip rides between the hash and the subject the
@@ -34214,15 +35344,15 @@ function renderStackedCommitHistoryRow(h, Text, Box, commit, graph, graphWidth,
     const lineOneFixed = graphWidth + 1 + commit.shortHash.length + 1 + recentMarkerWidth + chip.width;
     const subject = truncateCells(commit.message, Math.max(8, totalWidth - lineOneFixed));
     const graphChildren = laneSegments && !theme.ascii
-        ? renderLaneSegmentSpans(h, Text, laneSegments, theme, graphWidth, `cs${index}`)
-        : [h(Text, { color: muted, dimColor: theme.noColor }, substituteGraphChars(graph.padEnd(graphWidth), { ascii: theme.ascii }))];
+        ? renderLaneSegmentSpans(h, Text, laneSegments, theme, graphWidth, `cs${index}`, { suppressColor: selected })
+        : [h(Text, { color: muted, dimColor: !selected && theme.noColor }, substituteGraphChars(graph.padEnd(graphWidth), { ascii: theme.ascii }))];
     const lineOne = h(Text, {
         key: `${commit.hash}-${index}-l1`,
         backgroundColor: selectedBg,
-        inverse: selected,
+        color: selectedFg,
     }, ...graphChildren, ' ', isRecent
         ? h(Text, { color: accent, bold: true }, theme.ascii ? '* ' : '▎ ')
-        : null, h(Text, { color: accent, bold: selected || isRecent }, commit.shortHash), ' ', chip.node, ...renderTypedSubject(h, Text, subject, theme, `${commit.hash}-${index}-stk-subj`));
+        : null, h(Text, { color: accent, bold: selected || isRecent }, commit.shortHash), ' ', chip.node, ...renderTypedSubject(h, Text, subject, theme, `${commit.hash}-${index}-stk-subj`, selected));
     // Line 2 — metadata row, padded to align with the start of the
     // shortHash on line 1 so the eye still groups them as one commit.
     // Selection background does not extend here so we don't get a thick
@@ -34275,8 +35405,11 @@ function renderPendingCommitRow(h, Text, worktree, selected, theme) {
     return h(Text, {
         key: 'pending-commit-row',
         bold: true,
-        color: theme.noColor ? undefined : theme.colors.accent,
-        inverse: selected,
+        // On selection, swap to the contrast-guaranteed foreground so the
+        // accent label doesn't wash out against the selection bar.
+        color: selected && !theme.noColor
+            ? theme.colors.selectionForeground
+            : (theme.noColor ? undefined : theme.colors.accent),
         backgroundColor: selected && !theme.noColor ? theme.colors.selection : undefined,
     }, truncateCells(label, 140));
 }
@@ -34690,6 +35823,10 @@ function renderCommandPalette(h, components, state, width, theme, focused) {
                 dimColor: !isSelected,
             }, truncateCells(line, width - 4));
         });
+    // Scroll indicators for the palette list — same pattern as the
+    // sidebar and help overlay so the user knows there's more content.
+    const paletteHasMoreAbove = startIndex > 0 && filtered.length > 0;
+    const paletteHasMoreBelow = startIndex + listRows < filtered.length;
     return h(Box, {
         borderColor: focusBorderColor(theme, focused),
         borderStyle: theme.borderStyle,
@@ -34698,7 +35835,66 @@ function renderCommandPalette(h, components, state, width, theme, focused) {
         paddingX: 1,
     }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Command palette', focused)), h(Text, { dimColor: true }, matchSummary)), h(Text, { color: theme.colors.accent }, truncateCells(inputLine, width - 4)), h(Text, { dimColor: true }, truncateCells(hint, width - 4)), h(Text, undefined, ''), ...(showingRecent
         ? [h(Text, { key: 'palette-recent-hint', dimColor: true }, '· marks recently-used')]
-        : []), ...itemLines);
+        : []), ...(paletteHasMoreAbove
+        ? [h(Text, { key: 'palette-more-above', dimColor: true }, `  ↑ ${startIndex} more above`)]
+        : []), ...itemLines, ...(paletteHasMoreBelow
+        ? [h(Text, { key: 'palette-more-below', dimColor: true }, `  ↓ ${filtered.length - (startIndex + listRows)} more below`)]
+        : []));
+}
+/**
+ * Theme picker overlay (`gC`). Renders like the command palette so the
+ * rest of the surface live-previews the cursored theme underneath. Type to
+ * filter, ↑/↓ to move, Enter applies (and persists), Esc cancels. Takes the
+ * raw `filter` + `index` rather than a `LogInkState` so it's reusable by
+ * the workspace top-level surface, which has its own state model.
+ */
+function renderThemePickerOverlay(h, components, filter, index, width, theme, focused) {
+    const { Box, Text } = components;
+    const filtered = filterThemePresets(filter);
+    const selectedIndex = filtered.length === 0
+        ? 0
+        : Math.max(0, Math.min(index, filtered.length - 1));
+    const listRows = 14;
+    const startIndex = Math.max(0, selectedIndex - Math.floor(listRows / 2));
+    const visible = filtered.slice(startIndex, startIndex + listRows);
+    const inputLine = `> ${filter}_`;
+    const matchSummary = filtered.length === 0
+        ? 'no matches'
+        : `${filtered.length} ${filtered.length === 1 ? 'theme' : 'themes'}`;
+    const hint = '↑/↓ select · type to filter · enter apply · esc close';
+    const itemLines = filtered.length === 0
+        ? [h(Text, { key: 'theme-empty', dimColor: true }, 'No themes match the current filter.')]
+        : visible.map((preset, offset) => {
+            const index = startIndex + offset;
+            const isSelected = index === selectedIndex;
+            const cursor = isSelected ? '>' : ' ';
+            // Accent swatch per theme (no swatch for the monochrome baseline or
+            // when color is off). `default` is the only ANSI-named accent.
+            const accent = preset === 'monochrome'
+                ? undefined
+                : THEME_PRESET_COLORS[preset]?.accent;
+            const swatch = accent && !theme.noColor
+                ? h(Text, { key: `theme-swatch-${preset}`, color: accent }, '● ')
+                : h(Text, { key: `theme-swatch-${preset}`, dimColor: true }, '· ');
+            return h(Text, {
+                key: `theme-${preset}`,
+                bold: isSelected,
+                dimColor: !isSelected,
+            }, `${cursor} `, swatch, truncateCells(preset, width - 8));
+        });
+    const hasMoreAbove = startIndex > 0 && filtered.length > 0;
+    const hasMoreBelow = startIndex + listRows < filtered.length;
+    return h(Box, {
+        borderColor: focusBorderColor(theme, focused),
+        borderStyle: theme.borderStyle,
+        flexDirection: 'column',
+        width,
+        paddingX: 1,
+    }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Theme picker', focused)), h(Text, { dimColor: true }, matchSummary)), h(Text, { color: theme.colors.accent }, truncateCells(inputLine, width - 4)), h(Text, { dimColor: true }, truncateCells(hint, width - 4)), h(Text, undefined, ''), ...(hasMoreAbove
+        ? [h(Text, { key: 'theme-more-above', dimColor: true }, `  ↑ ${startIndex} more above`)]
+        : []), ...itemLines, ...(hasMoreBelow
+        ? [h(Text, { key: 'theme-more-below', dimColor: true }, `  ↓ ${filtered.length - (startIndex + listRows)} more below`)]
+        : []));
 }
 /**
  * Split-plan overlay (#907) — renders the proposed commit groups for
@@ -35554,6 +36750,8 @@ function renderStashSurface(h, components, state, context, contextStatus, bodyRo
                     dimColor: !isSelected,
                 }, truncateCells(`${cursor} ${stash.ref.padEnd(12)} ${stash.message}`, 140));
             });
+    const stashHasMoreAbove = startIndex > 0 && stashes.length > 0;
+    const stashHasMoreBelow = startIndex + listRows < stashes.length;
     return h(Box, {
         borderColor: focusBorderColor(theme, focused),
         borderStyle: theme.borderStyle,
@@ -35561,7 +36759,11 @@ function renderStashSurface(h, components, state, context, contextStatus, bodyRo
         flexShrink: 0,
         paddingX: 1,
         width,
-    }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Stash', focused)), h(Text, { dimColor: true }, headerRight)), ...renderPromotedFilterAffordance(h, Text, state, theme), ...lines);
+    }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Stash', focused)), h(Text, { dimColor: true }, headerRight)), ...renderPromotedFilterAffordance(h, Text, state, theme), ...(stashHasMoreAbove
+        ? [h(Text, { key: 'stash-more-above', dimColor: true }, `  ↑ ${startIndex} more above`)]
+        : []), ...lines, ...(stashHasMoreBelow
+        ? [h(Text, { key: 'stash-more-below', dimColor: true }, `  ↓ ${stashes.length - (startIndex + listRows)} more below`)]
+        : []));
 }
 
 /**
@@ -35657,7 +36859,7 @@ function renderStatusSurface(h, components, state, context, contextStatus, bodyR
                     bold: true,
                     dimColor: !headerSelected && rowIndex > cursorRowIndex,
                     backgroundColor: headerSelected && !theme.noColor ? theme.colors.selection : undefined,
-                    inverse: headerSelected,
+                    color: headerSelected && !theme.noColor ? theme.colors.selectionForeground : undefined,
                 }, truncateCells(text, 140));
             }
             const isSelected = !headerFocused && row.flatIndex === selectedIndex;
@@ -35677,8 +36879,11 @@ function renderStatusSurface(h, components, state, context, contextStatus, bodyR
                 key: `status-file-${row.flatIndex}-${rowIndex}`,
                 dimColor: !isSelected && rowIndex > cursorRowIndex,
                 backgroundColor: isSelected && focused && !theme.noColor ? theme.colors.selection : undefined,
-                inverse: isSelected && focused,
-            }, `  ${cursorPart}`, ...(useDot ? [h(Text, { color: dotColor }, STAGE_STATUS_DOT), ' '] : []), tailTrunc);
+                color: isSelected && focused && !theme.noColor ? theme.colors.selectionForeground : undefined,
+            }, `  ${cursorPart}`, 
+            // Suppress the dot's own color on selected rows so it inherits the
+            // contrast-guaranteed selection foreground set on the row span.
+            ...(useDot ? [h(Text, { color: (isSelected && focused) ? undefined : dotColor }, STAGE_STATUS_DOT), ' '] : []), tailTrunc);
         });
     // When the mask narrows the list to nothing but the underlying repo
     // is non-clean, surface why the panel looks empty so the user can
@@ -35693,6 +36898,10 @@ function renderStatusSurface(h, components, state, context, contextStatus, bodyR
                 : cleanHint
                     ? [cleanHint]
                     : ['Worktree clean'];
+    // Scroll indicators for the status file list — same pattern as
+    // branches and the sidebar so the user knows there's more content.
+    const statusHasMoreAbove = windowStart > 0 && surfaceRows.length > 0;
+    const statusHasMoreBelow = windowStart + listRows < surfaceRows.length;
     return h(Box, {
         borderColor: focusBorderColor(theme, focused),
         borderStyle: theme.borderStyle,
@@ -35708,7 +36917,11 @@ function renderStatusSurface(h, components, state, context, contextStatus, bodyR
     // never touch the filter.
     ...(isStatusFilterMaskActive(state.statusFilterMask)
         ? [h(Text, { key: 'status-mask-indicator', dimColor: true }, `filter: ${formatStatusFilterMask(state.statusFilterMask)}  (1/2/3 to toggle)`)]
-        : []), ...renderedRows, ...fallbackLines.map((line, index) => h(Text, {
+        : []), ...(statusHasMoreAbove
+        ? [h(Text, { key: 'status-more-above', dimColor: true }, `  ↑ ${windowStart} more above`)]
+        : []), ...renderedRows, ...(statusHasMoreBelow
+        ? [h(Text, { key: 'status-more-below', dimColor: true }, `  ↓ ${surfaceRows.length - (windowStart + listRows)} more below`)]
+        : []), ...fallbackLines.map((line, index) => h(Text, {
         key: `status-surface-fallback-${index}`,
         dimColor: index > 0,
     }, truncateCells(line, 140))));
@@ -35938,6 +37151,8 @@ function renderTagsSurface(h, components, state, context, contextStatus, bodyRow
                     dimColor: !isSelected,
                 }, before, formatHyperlink(namePadded, url), after);
             });
+    const tagsHasMoreAbove = startIndex > 0 && tags.length > 0;
+    const tagsHasMoreBelow = startIndex + listRows < tags.length;
     return h(Box, {
         borderColor: focusBorderColor(theme, focused),
         borderStyle: theme.borderStyle,
@@ -35945,7 +37160,11 @@ function renderTagsSurface(h, components, state, context, contextStatus, bodyRow
         flexShrink: 0,
         paddingX: 1,
         width,
-    }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Tags', focused)), h(Text, { dimColor: true }, headerRight)), ...renderPromotedFilterAffordance(h, Text, state, theme), ...lines);
+    }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Tags', focused)), h(Text, { dimColor: true }, headerRight)), ...renderPromotedFilterAffordance(h, Text, state, theme), ...(tagsHasMoreAbove
+        ? [h(Text, { key: 'tags-more-above', dimColor: true }, `  ↑ ${startIndex} more above`)]
+        : []), ...lines, ...(tagsHasMoreBelow
+        ? [h(Text, { key: 'tags-more-below', dimColor: true }, `  ↓ ${tags.length - (startIndex + listRows)} more below`)]
+        : []));
 }
 
 /**
@@ -36464,12 +37683,17 @@ function renderInspectorActionsSection(h, Text, context, width, theme, options =
         h(Text, { key: 'actions-title' }, cursorActive ? '[Actions]' : 'Actions:'),
         ...actions.map((action, index) => {
             const isSelected = cursorActive && index === cursorIndex;
+            // On the selected row, swap every span to the contrast-guaranteed
+            // selection foreground so the key glyph / destructive marker don't
+            // wash out against the selection bar; the row is already highlighted,
+            // and the label text still conveys which actions are destructive.
+            const selectedFg = isSelected && !theme.noColor ? theme.colors.selectionForeground : undefined;
             const keyCell = action.key.padEnd(KEY_COLUMN);
             const label = truncateCells(action.label, labelBudget);
             const children = [
                 h(Text, {
                     key: `actions-${index}-key`,
-                    color: action.destructive ? theme.colors.danger : theme.colors.accent,
+                    color: selectedFg ?? (action.destructive ? theme.colors.danger : theme.colors.accent),
                 }, keyCell),
                 GAP,
                 label,
@@ -36477,14 +37701,14 @@ function renderInspectorActionsSection(h, Text, context, width, theme, options =
             if (action.destructive) {
                 children.push(h(Text, {
                     key: `actions-${index}-mark`,
-                    color: theme.colors.danger,
+                    color: selectedFg ?? theme.colors.danger,
                     dimColor: false,
                 }, DESTRUCTIVE_SUFFIX));
             }
             return h(Text, {
                 key: `actions-${index}`,
                 backgroundColor: isSelected && !theme.noColor ? theme.colors.selection : undefined,
-                inverse: isSelected,
+                color: selectedFg,
             }, ...children);
         }),
     ];
@@ -36561,7 +37785,6 @@ function renderCommitFileList(h, Text, files, selectedIndex, focused, maxRows, w
         return h(Text, {
             key: `commit-file-${index}`,
             color: statusCodeColor(file.status, theme),
-            inverse: isSelected && focused && !theme.noColor,
             bold: isSelected,
         }, label);
     });
@@ -37109,6 +38332,9 @@ function renderDetailPanel(h, components, state, context, contextStatus, detail,
     if (state.showCommandPalette) {
         return renderCommandPalette(h, components, state, width, theme, focused);
     }
+    if (state.showThemePicker) {
+        return renderThemePickerOverlay(h, components, state.themePickerFilter, state.themePickerIndex, width, theme, focused);
+    }
     if (state.inputPrompt) {
         return renderInputPromptPanel(h, components, state, width, theme, focused);
     }
@@ -37403,9 +38629,21 @@ function enrichFilterActionWithRectification(action, state, context) {
     }
 }
 function LogInkApp(deps) {
-    const { appLabel, clipboardRunner, dateBucketingEnabled, git: rootGit, idleTipsEnabled, ink, initialView, loadRows, logArgv, React, resumeRef, rows, theme } = deps;
+    const { appLabel, clipboardRunner, dateBucketingEnabled, git: rootGit, idleTipsEnabled, ink, initialView, loadRows, logArgv, React, resumeRef, rows, theme: baseTheme, themeConfig } = deps;
     const { Box, Text, useApp, useInput, useWindowSize } = ink;
     const h = React.createElement;
+    // Theme picker (gC) — live preview + apply. `themePreviewPreset` follows
+    // the picker cursor while the overlay is open; `themeSessionPreset` is the
+    // applied choice that survives close. The effective theme is rebuilt from
+    // the original `themeConfig` so ascii/border/noColor + truecolor-downgrade
+    // semantics are preserved; when neither override is set we use the static
+    // `baseTheme` unchanged (so behavior is identical until the picker is used).
+    const [themePreviewPreset, setThemePreviewPreset] = React.useState(undefined);
+    const [themeSessionPreset, setThemeSessionPreset] = React.useState(undefined);
+    const effectiveThemePreset = themePreviewPreset ?? themeSessionPreset;
+    const theme = React.useMemo(() => effectiveThemePreset
+        ? createLogInkTheme({ ...themeConfig, preset: effectiveThemePreset })
+        : baseTheme, [effectiveThemePreset, themeConfig, baseTheme]);
     const { exit } = useApp();
     const windowSize = useWindowSize();
     // Bumping this on SIGCONT forces the existing tree to repaint so users
@@ -37434,6 +38672,17 @@ function LogInkApp(deps) {
         // immediately while the chrome still flags the refresh.
         bootLoading: Boolean(loadRows),
     }));
+    // Theme picker live preview: keep `themePreviewPreset` in sync with the
+    // preset under the picker cursor while the overlay is open; clear it when
+    // the overlay closes so the theme reverts to the applied session preset
+    // (or the original config theme). The derived-theme `useMemo` above does
+    // the actual re-render from this state.
+    const themePickerSelection = state.showThemePicker
+        ? getThemePickerSelection(state)
+        : undefined;
+    React.useEffect(() => {
+        setThemePreviewPreset(state.showThemePicker ? themePickerSelection : undefined);
+    }, [state.showThemePicker, themePickerSelection]);
     // Nested-repo runtime stack (#931). Each frame holds the live
     // `SimpleGit`, the loaded `LogInkContext`, and the per-key load
     // status the chrome reads. The active (top-of-stack) entry drives
@@ -40856,946 +42105,423 @@ function LogInkApp(deps) {
                 // (failure), surfacing the right message.
             }
             else {
-                dispatch({
-                    type: 'setStatus',
-                    value: `${target.label} target commit returned no rows — orphan ref?`,
-                    kind: 'warning',
-                });
-            }
-        }
-        catch (error) {
-            if (mountedRef.current) {
-                dispatch({
-                    type: 'setStatus',
-                    value: `Failed to load context for ${target.label}: ${error instanceof Error ? error.message : String(error)}`,
-                    kind: 'error',
-                });
-            }
-        }
-    }, [dispatch, git]);
-    React.useEffect(() => {
-        loadCommitContextRef.current = loadCommitContext;
-    }, [loadCommitContext]);
-    // Server-side history filter (#776). When the user submits `path:foo`
-    // or `author:foo`, the filter parser dispatches setHistoryFetchArgs;
-    // this effect picks up the change, re-runs `getLogRows` with merged
-    // args, and replaces the rows. Clearing the fetch args (Ctrl+U inside
-    // filter mode) re-fetches with the original logArgv so the user gets
-    // the live full log back, not a stale snapshot of the initial rows.
-    const historyFetchEffectInitialized = React.useRef(false);
-    const historyFetchRequestRef = React.useRef(0);
-    React.useEffect(() => {
-        if (!logArgv)
-            return;
-        // Skip the first run — initial rows came in via deps.rows; we only
-        // want to fetch in response to *changes* to historyFetchArgs.
-        if (!historyFetchEffectInitialized.current) {
-            historyFetchEffectInitialized.current = true;
-            return;
-        }
-        const requestId = historyFetchRequestRef.current + 1;
-        historyFetchRequestRef.current = requestId;
-        const fetchArgs = state.historyFetchArgs;
-        const merged = {
-            ...logArgv,
-            ...(fetchArgs?.author ? { author: fetchArgs.author } : {}),
-            ...(fetchArgs?.path ? { path: fetchArgs.path } : {}),
-        };
-        const description = fetchArgs?.author
-            ? `author:${fetchArgs.author}`
-            : fetchArgs?.path
-                ? `path:${fetchArgs.path}`
-                : undefined;
-        dispatch({
-            type: 'setStatus',
-            value: description ? `Refetching with ${description}` : 'Restoring full log',
-        });
-        void (async () => {
-            const stashHashes = await getStashCommitHashes(git).catch(() => []);
-            const nextRows = await safe(getLogRows(git, merged, {
-                limit: LOG_INTERACTIVE_DEFAULT_LIMIT,
-                extraRefs: stashHashes,
-            }));
-            if (!mountedRef.current || historyFetchRequestRef.current !== requestId) {
-                return;
-            }
-            if (!nextRows) {
-                dispatch({ type: 'setStatus', value: 'Failed to refetch with active filter', kind: 'error' });
-                return;
-            }
-            dispatch({ type: 'replaceRows', rows: nextRows });
-            const matched = getCommitRows(nextRows).length;
-            setHasMoreCommits(matched >= LOG_INTERACTIVE_DEFAULT_LIMIT);
-            dispatch({
-                type: 'setStatus',
-                value: description
-                    ? `Showing ${matched} commits matching ${description}`
-                    : 'Showing full log',
-                kind: 'success',
-            });
-        })();
-    }, [dispatch, git, logArgv, state.historyFetchArgs]);
-    // Graph mode toggle (`g` key, #791 follow-up). The header label flips
-    // between "compact graph" and "full graph", but unless we re-fetch with
-    // the right `view`, the underlying rows still come from the user's
-    // initial argv (default `--first-parent --no-merges`) and the renderer
-    // has no topology to draw — defeating the per-lane / junction work.
-    // Mirrors the historyFetchArgs effect: skip first run, request-id ref
-    // for stale-completion guard, swap rows in place via replaceRows.
-    const toggleGraphEffectInitialized = React.useRef(false);
-    const toggleGraphRequestRef = React.useRef(0);
-    React.useEffect(() => {
-        if (!logArgv)
-            return;
-        if (!toggleGraphEffectInitialized.current) {
-            toggleGraphEffectInitialized.current = true;
-            return;
-        }
-        const requestId = toggleGraphRequestRef.current + 1;
-        toggleGraphRequestRef.current = requestId;
-        const merged = buildToggleGraphArgs(logArgv, state.fullGraph);
-        dispatch({
-            type: 'setStatus',
-            value: state.fullGraph
-                ? 'Loading full topology…'
-                : 'Loading compact history…',
-        });
-        void (async () => {
-            // Include stash commits as graph roots so the toggle's re-fetch
-            // sees the same rich graph the boot loader assembles. Without
-            // this, flipping `\` into full mode and back loses the stash
-            // anchors that loadRowsWithStashes seeded on boot.
-            const stashHashes = await getStashCommitHashes(git).catch(() => []);
-            const nextRows = await safe(getLogRows(git, merged, {
-                limit: LOG_INTERACTIVE_DEFAULT_LIMIT,
-                extraRefs: stashHashes,
-            }));
-            if (!mountedRef.current || toggleGraphRequestRef.current !== requestId) {
-                return;
-            }
-            if (!nextRows) {
-                dispatch({ type: 'setStatus', value: 'Failed to refetch graph rows', kind: 'error' });
-                return;
-            }
-            dispatch({ type: 'replaceRows', rows: nextRows });
-            const matched = getCommitRows(nextRows).length;
-            setHasMoreCommits(matched >= LOG_INTERACTIVE_DEFAULT_LIMIT);
-            dispatch({
-                type: 'setStatus',
-                value: state.fullGraph
-                    ? `Showing ${matched} commits across all branches`
-                    : `Showing ${matched} commits (compact)`,
-                kind: 'success',
-            });
-        })();
-    }, [dispatch, git, logArgv, state.fullGraph]);
-    const commitDiffHunkOffsets = React.useMemo(() => (filePreview?.hunks
-        .map((line, index) => (line.startsWith('@@') ? index : -1))
-        .filter((index) => index >= 0)), [filePreview]);
-    const worktreeDirty = Boolean(context.worktree &&
-        (context.worktree.stagedCount + context.worktree.unstagedCount + context.worktree.untrackedCount) > 0);
-    useInput((inputValue, key) => {
-        // First-launch onboarding (P1.3): any keystroke dismisses the overlay
-        // and writes the seen-marker. Swallow the keystroke so the same key
-        // doesn't also trigger normal input dispatch.
-        if (showOnboarding) {
-            setShowOnboarding(false);
-            markOnboardingSeen();
-            return;
-        }
-        // P4.5: navigation in branches/tags/stash uses the FILTERED list
-        // length when a filter is active so j/k stay live instead of getting
-        // stuck against a full-list count that no longer matches what's on
-        // screen. The filtered lists are memoized at LogInkApp scope (#808
-        // perf pass) — reading them here is O(1) instead of O(branches +
-        // tags + stashes + worktrees) per keystroke.
-        const branchVisibleCount = filteredBranchList.length;
-        const branchSelectedShortName = filteredBranchList[Math.min(state.selectedBranchIndex, Math.max(0, filteredBranchList.length - 1))]?.shortName;
-        const tagVisibleCount = filteredTagList.length;
-        const tagSelectedName = filteredTagList[Math.min(state.selectedTagIndex, Math.max(0, filteredTagList.length - 1))]?.name;
-        const stashVisibleCount = filteredStashList.length;
-        const stashSelectedRef = filteredStashList[Math.min(state.selectedStashIndex, Math.max(0, filteredStashList.length - 1))]?.ref;
-        const reflogVisibleCount = filteredReflogList.length;
-        const reflogSelectedHash = filteredReflogList[Math.min(state.selectedReflogIndex, Math.max(0, filteredReflogList.length - 1))]?.hash;
-        const submoduleVisibleCount = filteredSubmoduleList.length;
-        filteredSubmoduleList[Math.min(state.selectedSubmoduleIndex, Math.max(0, filteredSubmoduleList.length - 1))]?.path;
-        const issueVisibleCount = filteredIssueList.length;
-        const issueSelectedUrl = filteredIssueList[Math.min(state.selectedIssueIndex, Math.max(0, filteredIssueList.length - 1))]?.url;
-        const pullRequestTriageVisibleCount = filteredPullRequestTriageList.length;
-        const pullRequestTriageSelectedUrl = filteredPullRequestTriageList[Math.min(state.selectedPullRequestTriageIndex, Math.max(0, filteredPullRequestTriageList.length - 1))]?.url;
-        const worktreeVisibleCount = filteredWorktreeList.length;
-        // When the diff view is showing a stash patch, swap the previewLineCount
-        // to the stash diff length so the existing pageDetailPreview path
-        // (j/k, PgUp/PgDn) scrolls through it without a parallel pipeline.
-        const diffPreviewLineCount = state.diffSource === 'stash'
-            ? stashDiffLines?.length
-            : filePreview?.hunks.length;
-        // Per-file segmentation for stash diffs reads the LogInkApp-scoped
-        // memo so navigation keys + the input-context derivation share a
-        // single parse pass per stash patch instead of re-walking the
-        // entire patch text on every keystroke.
-        const stashDiffFiles = state.diffSource === 'stash' ? stashDiffParsedFiles : [];
-        const stashDiffFileOffsets = stashDiffFiles.map((file) => file.startLine);
-        const stashDiffSelectedPath = state.diffSource === 'stash'
-            ? findStashFileForOffset(stashDiffFiles, state.diffPreviewOffset)?.path
-            : undefined;
-        getLogInkInputEvents(state, inputValue, key, {
-            detailFileCount: detail?.files.length,
-            previewLineCount: diffPreviewLineCount,
-            worktreeDiffLineCount: worktreeDiff?.lines.length,
-            worktreeFileCount: visibleWorktreeFilesGrouped.length,
-            worktreeHunkOffsets: worktreeDiff?.hunkOffsets,
-            commitDiffHunkOffsets,
-            branchCount: branchVisibleCount,
-            branchSelectedShortName,
-            tagCount: tagVisibleCount,
-            tagSelectedName,
-            stashCount: stashVisibleCount,
-            reflogCount: reflogVisibleCount,
-            reflogSelectedHash,
-            submoduleCount: submoduleVisibleCount,
-            issueCount: issueVisibleCount,
-            issueSelectedUrl,
-            pullRequestTriageCount: pullRequestTriageVisibleCount,
-            pullRequestTriageSelectedUrl,
-            stashSelectedRef,
-            stashDiffFileOffsets: stashDiffFileOffsets.length ? stashDiffFileOffsets : undefined,
-            stashDiffSelectedPath,
-            worktreeListCount: worktreeVisibleCount,
-            worktreeSelectedPath: visibleWorktreeFilesGrouped[state.selectedWorktreeFileIndex]?.path,
-            statusGroups: visibleWorktreeGroups.map((group) => ({
-                state: group.state,
-                count: group.files.length,
-                startIndex: group.startIndex,
-            })),
-            inspectorActionCount: getInspectorActionsForState(state).length,
-            commitDiffSelectedPath: state.diffSource === 'commit'
-                ? selectedDetailFile?.path
-                : undefined,
-            commitDiffSelectedSha: state.diffSource === 'commit'
-                ? selected?.hash
-                : undefined,
-            // #931 PR 3b — Submodule drill-in target for the cursored file
-            // in a commit diff. Resolved per-render so the Enter handler in
-            // `inkInput.ts` doesn't have to re-walk the submodule overview;
-            // undefined whenever the cursored file isn't a registered
-            // submodule (or the overview / repo root haven't loaded yet).
-            commitDiffSubmoduleDrillIn: state.diffSource === 'commit' && selectedDetailFile
-                ? resolveCommitDiffDrillInTarget({
-                    selectedFile: {
-                        path: selectedDetailFile.path,
-                        submoduleChange: filePreview?.path === selectedDetailFile.path
-                            ? filePreview.submoduleChange
-                            : undefined,
-                    },
-                    submodules: context.submodules,
-                    activeRepoRoot,
-                })
-                : undefined,
-            // #931 PR 4 / #932 — Submodule drill-in target for the cursored
-            // row in the dedicated submodules view. Resolved per-render so
-            // the Enter handler in `inkInput.ts` doesn't have to re-walk the
-            // submodule overview. Gated on `activeView === 'submodules'` so
-            // a stale resolution from a different view can't accidentally
-            // fire — the runtime only ever populates it when the user is
-            // actually on the view.
-            submoduleViewDrillIn: state.activeView === 'submodules'
-                ? resolveSubmoduleViewDrillInTarget({
-                    selectedIndex: state.selectedSubmoduleIndex,
-                    submodules: context.submodules,
-                    activeRepoRoot,
-                })
-                : undefined,
-            worktreeDirty,
-            conflictFileCount: context.operation?.conflictedFiles.length,
-            conflictSelectedPath: (() => {
-                const files = context.operation?.conflictedFiles;
-                if (!files || files.length === 0)
-                    return undefined;
-                const clamped = Math.min(state.selectedConflictFileIndex, files.length - 1);
-                return files[clamped]?.path;
-            })(),
-            // H / gH need the actual diff text (not just hunk offsets) to
-            // slice the cursored hunk into a `git apply` patch. Stash uses
-            // the full `git stash show -p` output; commit-diff uses the
-            // per-file `filePreview.hunks` array. Either way, extractDiffHunk
-            // walks `@@` headers and synthesizes a fresh diff --git / --- /
-            // +++ header set using the path the caller already resolved.
-            diffLinesForHunkApply: state.diffSource === 'stash'
-                ? stashDiffLines
-                : state.diffSource === 'commit'
-                    ? filePreview?.hunks
-                    : undefined,
-            // Line count of the changelog text, used by the changelog view's
-            // j/k/PgUp/PgDn scroll bindings to clamp `pageChangelog` deltas.
-            // Computed from view state rather than threaded through context
-            // because the surface owns its own content — no external loader.
-            changelogLineCount: state.changelogView.text?.split('\n').length,
-            // Approximate line count for the split-plan overlay. Each group
-            // renders as a header + (body if any) + files block + (rationale
-            // if any) + blank separator. Used by j/k/PgUp/PgDn to clamp the
-            // scroll offset. The exact render math lives in the overlay
-            // module — this is a close-enough heuristic for clamping.
-            // #879 item 3 — short sha of the bisect terminator (if any).
-            // Gates `y`/`Y` yank on the completion panel and lets the
-            // runtime resolve the value without re-parsing the log.
-            bisectCompletionSha: context.bisect?.active
-                ? getBisectCompletion(context.bisect.log)?.sha
-                : undefined,
-            // #879 item 4 — disambiguates the bisect view's `s` keystroke
-            // (skip current candidate vs. start the wizard).
-            bisectActive: Boolean(context.bisect?.active),
-            splitPlanLineCount: state.splitPlan?.plan
-                ? state.splitPlan.plan.groups.reduce((sum, group) => {
-                    let lines = 2; // title + separator
-                    if (group.body)
-                        lines += group.body.split('\n').length + 1;
-                    if (group.rationale)
-                        lines += 2;
-                    lines += (group.files?.length || 0) + 1;
-                    if ((group.hunks?.length || 0) > 0)
-                        lines += group.hunks.length + 1;
-                    return sum + lines;
-                }, 0)
-                : undefined,
-        }).forEach((event) => {
-            if (event.type === 'exit') {
-                exit();
-            }
-            else if (event.type === 'refreshContext') {
-                void refreshContext();
-            }
-            else if (event.type === 'toggleSelectedFileStage') {
-                void toggleSelectedFileStage();
-            }
-            else if (event.type === 'toggleSelectedHunkStage') {
-                void toggleSelectedHunkStage();
-            }
-            else if (event.type === 'revertSelectedFile') {
-                void revertSelectedFile();
-            }
-            else if (event.type === 'revertSelectedHunk') {
-                void revertSelectedHunk();
-            }
-            else if (event.type === 'createManualCommit') {
-                void createCommitFromCompose();
-            }
-            else if (event.type === 'runAiCommitDraft') {
-                void runAiCommitDraft();
-            }
-            else if (event.type === 'cancelAiCommitDraft') {
-                cancelAiCommitDraft();
-            }
-            else if (event.type === 'startCreatePullRequest') {
-                void startCreatePullRequest();
-            }
-            else if (event.type === 'cancelPullRequestBodyDraft') {
-                cancelPullRequestBodyDraft();
-            }
-            else if (event.type === 'startChangelogView') {
-                void startChangelogView();
-            }
-            else if (event.type === 'regenerateChangelog') {
-                regenerateChangelog();
-            }
-            else if (event.type === 'yankChangelog') {
-                yankChangelog();
-            }
-            else if (event.type === 'openChangelogInEditor') {
-                openChangelogInEditor();
-            }
-            else if (event.type === 'openComposeInEditor') {
-                openComposeInEditor();
-            }
-            else if (event.type === 'startCommitSplit') {
-                void startCommitSplit();
-            }
-            else if (event.type === 'applyCommitSplit') {
-                void applyCommitSplit();
-            }
-            else if (event.type === 'cancelCommitSplit') {
-                cancelCommitSplit();
-            }
-            else if (event.type === 'yankText') {
-                void yankText(event.value, event.label);
-            }
-            else if (event.type === 'runWorkflowAction') {
-                void runWorkflowAction(event.id, event.payload);
-            }
-            else if (event.type === 'openFileInEditor') {
-                openInEditor(event.path);
-            }
-            else if (event.type === 'yankFromActiveView') {
-                void yankFromActiveView(event.short);
-            }
-            else {
-                // P4.5: enrich filter-mutating actions with a precomputed
-                // selection snapshot so the reducer can preserve the cursor on
-                // the same item when it's still in the filtered result, only
-                // snapping to result[0] when the previously selected item drops
-                // out. The snapshot lives in the action so the reducer never
-                // needs context items.
-                const enriched = enrichFilterActionWithRectification(event.action, state, context);
-                dispatch(enriched);
-            }
-        });
-    });
-    // Layout depends on focus (sidebar grows when focused), so it's
-    // computed here — after state is in scope but before the render path.
-    const layout = getLogInkLayout({
-        columns: windowSize.columns || process.stdout.columns || LOG_INK_DEFAULT_COLUMNS,
-        rows: windowSize.rows || process.stdout.rows || LOG_INK_DEFAULT_ROWS,
-        sidebarFocused: state.focus === 'sidebar',
-        inspectorFocused: state.focus === 'detail',
-        helpOverlayActive: state.showHelp,
-    });
-    if (layout.tooSmall) {
-        return h(Box, {
-            flexDirection: 'column',
-            height: layout.rows,
-            paddingX: 1,
-            paddingY: 1,
-        }, h(Text, { bold: true }, appLabel), h(Text, undefined, `Terminal too small: ${layout.columns}x${layout.rows}`), h(Text, { dimColor: true }, `Minimum size is ${LOG_INK_MIN_COLUMNS}x${LOG_INK_MIN_ROWS}.`), h(Text, { dimColor: true }, 'Resize the terminal or run plain coco log.'));
-    }
-    // First-launch onboarding overlay (P1.3) replaces the entire UI for
-    // one render — any keystroke dismisses it and persists the seen-marker.
-    if (showOnboarding) {
-        return renderOnboardingOverlay(h, { Box, Text }, layout.rows, layout.columns, theme, appLabel);
-    }
-    return h(Box, { flexDirection: 'column', height: layout.rows }, renderHeader$1(h, { Box, Text }, state, context, contextStatus, layout.columns, theme, appLabel), h(Box, { flexDirection: 'row', height: layout.bodyRows }, renderSidebar$1(h, { Box, Text }, state, context, contextStatus, layout.sidebarWidth, layout.bodyRows, theme, layout.sidebarRailed), renderMainPanel(h, { Box, Text }, state, context, contextStatus, worktreeDiff, worktreeDiffLoading, worktreeHunks, worktreeHunksLoading, filePreview, filePreviewLoading, commitDiffHunkOffsets, selectedDetailFile, stashDiffLines, stashDiffLoading, compareDiffLines, compareDiffLoading, bisectCandidateDetail, bisectCandidateLoading, layout.bodyRows, layout.mainPanelWidth, theme, hasMoreCommits, loadingMoreCommits, spinnerFrame, layout.density, layout.historyRowMode, Boolean(dateBucketingEnabled)), renderDetailPanel(h, { Box, Text }, state, context, contextStatus, detail, detailLoading, filePreview, filePreviewLoading, layout.detailWidth, layout.inspectorTabbed, theme, layout.inspectorRailed, layout.bodyRows)), renderFooter$1(h, { Box, Text }, state, context, theme, idleTip, spinnerFrame));
-}
-
-/**
- * Explicit color-level detection for the Ink TUI (P5.2).
- *
- * Chalk already approximates hex colors when the terminal can't render
- * truecolor — but we want an explicit signal so the catppuccin / gruvbox
- * presets (which use hex) can fall back to the ANSI-named `default` preset
- * cleanly on minimal SSH sessions, instead of relying on chalk's
- * heuristics. Users who set `NO_COLOR` or pick the `monochrome` preset
- * still get the manual override.
- *
- * Levels (matching the chalk taxonomy):
- *   - 'mono'      → no ANSI escapes at all (NO_COLOR / TERM=dumb)
- *   - '16'        → standard 16-color ANSI palette
- *   - '256'       → xterm-256color
- *   - 'truecolor' → 24-bit RGB (COLORTERM=truecolor or known terminals)
- */
-function getColorLevel(env = process.env) {
-    if (env.NO_COLOR)
-        return 'mono';
-    switch (env.FORCE_COLOR) {
-        case '0':
-            return 'mono';
-        case '1':
-            return '16';
-        case '2':
-            return '256';
-        case '3':
-            return 'truecolor';
-    }
-    const colorterm = env.COLORTERM?.toLowerCase();
-    if (colorterm === 'truecolor' || colorterm === '24bit') {
-        return 'truecolor';
-    }
-    // Modern terminal emulators that publicly advertise truecolor support.
-    if (env.KITTY_WINDOW_ID || env.TERM === 'xterm-kitty') {
-        return 'truecolor';
-    }
-    if (env.WT_SESSION) {
-        return 'truecolor';
-    }
-    switch (env.TERM_PROGRAM) {
-        case 'iTerm.app':
-        case 'WezTerm':
-        case 'vscode':
-        case 'ghostty':
-        case 'Hyper':
-            return 'truecolor';
-    }
-    if (env.TERM === 'dumb')
-        return 'mono';
-    if (env.TERM?.includes('256color'))
-        return '256';
-    return '16';
-}
-const TRUECOLOR_PRESETS = new Set(['catppuccin', 'gruvbox', 'dracula', 'nord', 'solarized-dark', 'tokyo-night', 'one-dark', 'rose-pine', 'kanagawa', 'everforest', 'monokai', 'synthwave', 'ayu-dark', 'palenight', 'github-dark', 'horizon', 'nightfox', 'carbonfox', 'tokyonight-storm', 'catppuccin-latte', 'solarized-light', 'github-light', 'iceberg', 'material-ocean', 'moonlight', 'poimandres', 'vitesse-dark', 'vesper', 'flexoki', 'mellow']);
-/**
- * `true` when the named preset relies on hex colors that look best under
- * 24-bit RGB. Used by `createLogInkTheme` to decide whether to downgrade
- * to the ANSI-named `default` palette on lower-capability terminals.
- */
-function presetUsesTrueColor(preset) {
-    return preset !== undefined && TRUECOLOR_PRESETS.has(preset);
-}
-
-const THEME_PRESET_COLORS = {
-    default: {
-        accent: 'cyan',
-        border: 'gray',
-        danger: 'red',
-        focusBorder: 'cyan',
-        gitAdded: 'green',
-        gitDeleted: 'red',
-        gitModified: 'yellow',
-        info: 'blue',
-        muted: 'gray',
-        selection: 'cyan',
-        success: 'green',
-        warning: 'yellow',
-    },
-    catppuccin: {
-        accent: '#89b4fa',
-        border: '#585b70',
-        danger: '#f38ba8',
-        focusBorder: '#89dceb',
-        gitAdded: '#a6e3a1',
-        gitDeleted: '#f38ba8',
-        gitModified: '#f9e2af',
-        info: '#89b4fa',
-        muted: '#6c7086',
-        selection: '#45475a',
-        success: '#a6e3a1',
-        warning: '#f9e2af',
-    },
-    gruvbox: {
-        accent: '#83a598',
-        border: '#665c54',
-        danger: '#fb4934',
-        focusBorder: '#8ec07c',
-        gitAdded: '#b8bb26',
-        gitDeleted: '#fb4934',
-        gitModified: '#fabd2f',
-        info: '#83a598',
-        muted: '#928374',
-        selection: '#504945',
-        success: '#b8bb26',
-        warning: '#fabd2f',
-    },
-    dracula: {
-        accent: '#bd93f9',
-        border: '#44475a',
-        danger: '#ff5555',
-        focusBorder: '#ff79c6',
-        gitAdded: '#50fa7b',
-        gitDeleted: '#ff5555',
-        gitModified: '#f1fa8c',
-        info: '#8be9fd',
-        muted: '#6272a4',
-        selection: '#44475a',
-        success: '#50fa7b',
-        warning: '#f1fa8c',
-    },
-    nord: {
-        accent: '#88c0d0',
-        border: '#3b4252',
-        danger: '#bf616a',
-        focusBorder: '#81a1c1',
-        gitAdded: '#a3be8c',
-        gitDeleted: '#bf616a',
-        gitModified: '#ebcb8b',
-        info: '#81a1c1',
-        muted: '#4c566a',
-        selection: '#3b4252',
-        success: '#a3be8c',
-        warning: '#ebcb8b',
-    },
-    'solarized-dark': {
-        accent: '#268bd2',
-        border: '#073642',
-        danger: '#dc322f',
-        focusBorder: '#2aa198',
-        gitAdded: '#859900',
-        gitDeleted: '#dc322f',
-        gitModified: '#b58900',
-        info: '#268bd2',
-        muted: '#586e75',
-        selection: '#073642',
-        success: '#859900',
-        warning: '#b58900',
-    },
-    'tokyo-night': {
-        accent: '#7aa2f7',
-        border: '#3b4261',
-        danger: '#f7768e',
-        focusBorder: '#7dcfff',
-        gitAdded: '#9ece6a',
-        gitDeleted: '#f7768e',
-        gitModified: '#e0af68',
-        info: '#7aa2f7',
-        muted: '#565f89',
-        selection: '#33467c',
-        success: '#9ece6a',
-        warning: '#e0af68',
-    },
-    'one-dark': {
-        accent: '#61afef',
-        border: '#3e4452',
-        danger: '#e06c75',
-        focusBorder: '#56b6c2',
-        gitAdded: '#98c379',
-        gitDeleted: '#e06c75',
-        gitModified: '#e5c07b',
-        info: '#61afef',
-        muted: '#5c6370',
-        selection: '#3e4452',
-        success: '#98c379',
-        warning: '#e5c07b',
-    },
-    'rose-pine': {
-        accent: '#c4a7e7',
-        border: '#26233a',
-        danger: '#eb6f92',
-        focusBorder: '#9ccfd8',
-        gitAdded: '#31748f',
-        gitDeleted: '#eb6f92',
-        gitModified: '#f6c177',
-        info: '#9ccfd8',
-        muted: '#6e6a86',
-        selection: '#2a273f',
-        success: '#31748f',
-        warning: '#f6c177',
-    },
-    kanagawa: {
-        accent: '#7e9cd8',
-        border: '#2a2a37',
-        danger: '#e82424',
-        focusBorder: '#7fb4ca',
-        gitAdded: '#76946a',
-        gitDeleted: '#e82424',
-        gitModified: '#dca561',
-        info: '#7e9cd8',
-        muted: '#727169',
-        selection: '#2d4f67',
-        success: '#76946a',
-        warning: '#dca561',
-    },
-    everforest: {
-        accent: '#a7c080',
-        border: '#374145',
-        danger: '#e67e80',
-        focusBorder: '#83c092',
-        gitAdded: '#a7c080',
-        gitDeleted: '#e67e80',
-        gitModified: '#dbbc7f',
-        info: '#7fbbb3',
-        muted: '#859289',
-        selection: '#374145',
-        success: '#a7c080',
-        warning: '#dbbc7f',
-    },
-    monokai: {
-        accent: '#66d9ef',
-        border: '#49483e',
-        danger: '#f92672',
-        focusBorder: '#a6e22e',
-        gitAdded: '#a6e22e',
-        gitDeleted: '#f92672',
-        gitModified: '#e6db74',
-        info: '#66d9ef',
-        muted: '#75715e',
-        selection: '#49483e',
-        success: '#a6e22e',
-        warning: '#e6db74',
-    },
-    synthwave: {
-        accent: '#f97e72',
-        border: '#34294f',
-        danger: '#fe4450',
-        focusBorder: '#36f9f6',
-        gitAdded: '#72f1b8',
-        gitDeleted: '#fe4450',
-        gitModified: '#fede5d',
-        info: '#36f9f6',
-        muted: '#848bbd',
-        selection: '#34294f',
-        success: '#72f1b8',
-        warning: '#fede5d',
-    },
-    'ayu-dark': {
-        accent: '#e6b450',
-        border: '#11151c',
-        danger: '#f07178',
-        focusBorder: '#39bae6',
-        gitAdded: '#7fd962',
-        gitDeleted: '#f07178',
-        gitModified: '#e6b450',
-        info: '#39bae6',
-        muted: '#565b66',
-        selection: '#1a1f29',
-        success: '#7fd962',
-        warning: '#e6b450',
-    },
-    palenight: {
-        accent: '#82aaff',
-        border: '#3a3f58',
-        danger: '#ff5370',
-        focusBorder: '#89ddff',
-        gitAdded: '#c3e88d',
-        gitDeleted: '#ff5370',
-        gitModified: '#ffcb6b',
-        info: '#82aaff',
-        muted: '#676e95',
-        selection: '#3a3f58',
-        success: '#c3e88d',
-        warning: '#ffcb6b',
-    },
-    'github-dark': {
-        accent: '#58a6ff',
-        border: '#30363d',
-        danger: '#f85149',
-        focusBorder: '#58a6ff',
-        gitAdded: '#3fb950',
-        gitDeleted: '#f85149',
-        gitModified: '#d29922',
-        info: '#58a6ff',
-        muted: '#8b949e',
-        selection: '#264f78',
-        success: '#3fb950',
-        warning: '#d29922',
-    },
-    horizon: {
-        accent: '#e95678',
-        border: '#2e303e',
-        danger: '#e95678',
-        focusBorder: '#25b0bc',
-        gitAdded: '#09f7a0',
-        gitDeleted: '#e95678',
-        gitModified: '#fab795',
-        info: '#25b0bc',
-        muted: '#6c6f93',
-        selection: '#2e303e',
-        success: '#09f7a0',
-        warning: '#fab795',
-    },
-    nightfox: {
-        accent: '#719cd6',
-        border: '#2b3b51',
-        danger: '#c94f6d',
-        focusBorder: '#63cdcf',
-        gitAdded: '#81b29a',
-        gitDeleted: '#c94f6d',
-        gitModified: '#dbc074',
-        info: '#719cd6',
-        muted: '#738091',
-        selection: '#2b3b51',
-        success: '#81b29a',
-        warning: '#dbc074',
-    },
-    carbonfox: {
-        accent: '#78a9ff',
-        border: '#353535',
-        danger: '#ee5396',
-        focusBorder: '#33b1ff',
-        gitAdded: '#42be65',
-        gitDeleted: '#ee5396',
-        gitModified: '#ffe97b',
-        info: '#78a9ff',
-        muted: '#7b7c7e',
-        selection: '#353535',
-        success: '#42be65',
-        warning: '#ffe97b',
-    },
-    'tokyonight-storm': {
-        accent: '#7aa2f7',
-        border: '#2f334d',
-        danger: '#f7768e',
-        focusBorder: '#2ac3de',
-        gitAdded: '#9ece6a',
-        gitDeleted: '#f7768e',
-        gitModified: '#e0af68',
-        info: '#2ac3de',
-        muted: '#545c7e',
-        selection: '#2f334d',
-        success: '#9ece6a',
-        warning: '#e0af68',
-    },
-    'catppuccin-latte': {
-        accent: '#1e66f5',
-        border: '#ccd0da',
-        danger: '#d20f39',
-        focusBorder: '#179299',
-        gitAdded: '#40a02b',
-        gitDeleted: '#d20f39',
-        gitModified: '#df8e1d',
-        info: '#1e66f5',
-        muted: '#9ca0b0',
-        selection: '#ccd0da',
-        success: '#40a02b',
-        warning: '#df8e1d',
-    },
-    'solarized-light': {
-        accent: '#268bd2',
-        border: '#eee8d5',
-        danger: '#dc322f',
-        focusBorder: '#2aa198',
-        gitAdded: '#859900',
-        gitDeleted: '#dc322f',
-        gitModified: '#b58900',
-        info: '#268bd2',
-        muted: '#93a1a1',
-        selection: '#eee8d5',
-        success: '#859900',
-        warning: '#b58900',
-    },
-    'github-light': {
-        accent: '#0969da',
-        border: '#d0d7de',
-        danger: '#cf222e',
-        focusBorder: '#0969da',
-        gitAdded: '#1a7f37',
-        gitDeleted: '#cf222e',
-        gitModified: '#9a6700',
-        info: '#0969da',
-        muted: '#656d76',
-        selection: '#ddf4ff',
-        success: '#1a7f37',
-        warning: '#9a6700',
-    },
-    iceberg: {
-        accent: '#84a0c6',
-        border: '#1e2132',
-        danger: '#e27878',
-        focusBorder: '#89b8c2',
-        gitAdded: '#b4be82',
-        gitDeleted: '#e27878',
-        gitModified: '#e2a478',
-        info: '#84a0c6',
-        muted: '#6b7089',
-        selection: '#1e2132',
-        success: '#b4be82',
-        warning: '#e2a478',
-    },
-    'material-ocean': {
-        accent: '#82aaff',
-        border: '#2b2f3a',
-        danger: '#f07178',
-        focusBorder: '#89ddff',
-        gitAdded: '#c3e88d',
-        gitDeleted: '#f07178',
-        gitModified: '#ffcb6b',
-        info: '#82aaff',
-        muted: '#464b5d',
-        selection: '#2b2f3a',
-        success: '#c3e88d',
-        warning: '#ffcb6b',
-    },
-    moonlight: {
-        accent: '#82aaff',
-        border: '#2f334d',
-        danger: '#ff757f',
-        focusBorder: '#86e1fc',
-        gitAdded: '#c3e88d',
-        gitDeleted: '#ff757f',
-        gitModified: '#ffc777',
-        info: '#82aaff',
-        muted: '#636da6',
-        selection: '#2f334d',
-        success: '#c3e88d',
-        warning: '#ffc777',
-    },
-    poimandres: {
-        accent: '#add7ff',
-        border: '#1b1e28',
-        danger: '#d0679d',
-        focusBorder: '#5de4c7',
-        gitAdded: '#5de4c7',
-        gitDeleted: '#d0679d',
-        gitModified: '#fffac2',
-        info: '#add7ff',
-        muted: '#506477',
-        selection: '#1b1e28',
-        success: '#5de4c7',
-        warning: '#fffac2',
-    },
-    'vitesse-dark': {
-        accent: '#4d9375',
-        border: '#282828',
-        danger: '#cb7676',
-        focusBorder: '#4d9375',
-        gitAdded: '#4d9375',
-        gitDeleted: '#cb7676',
-        gitModified: '#e6cc77',
-        info: '#6394bf',
-        muted: '#758575',
-        selection: '#282828',
-        success: '#4d9375',
-        warning: '#e6cc77',
-    },
-    vesper: {
-        accent: '#ffc799',
-        border: '#232323',
-        danger: '#f5a191',
-        focusBorder: '#99ffe4',
-        gitAdded: '#99ffe4',
-        gitDeleted: '#f5a191',
-        gitModified: '#ffc799',
-        info: '#a0c4ff',
-        muted: '#575757',
-        selection: '#232323',
-        success: '#99ffe4',
-        warning: '#ffc799',
-    },
-    flexoki: {
-        accent: '#205ea6',
-        border: '#343331',
-        danger: '#af3029',
-        focusBorder: '#24837b',
-        gitAdded: '#66800b',
-        gitDeleted: '#af3029',
-        gitModified: '#ad8301',
-        info: '#205ea6',
-        muted: '#878580',
-        selection: '#343331',
-        success: '#66800b',
-        warning: '#ad8301',
-    },
-    mellow: {
-        accent: '#7eb8da',
-        border: '#2a2a2a',
-        danger: '#f5a191',
-        focusBorder: '#a3d4a0',
-        gitAdded: '#a3d4a0',
-        gitDeleted: '#f5a191',
-        gitModified: '#f0c674',
-        info: '#7eb8da',
-        muted: '#6b6b6b',
-        selection: '#2a2a2a',
-        success: '#a3d4a0',
-        warning: '#f0c674',
-    },
-};
-function shouldUseAscii(term) {
-    if (!term) {
-        return false;
-    }
-    return term === 'dumb' || term.startsWith('vt100');
-}
-function createLogInkTheme(options = {}) {
-    const noColor = (options.noColor ?? Boolean(process.env.NO_COLOR)) ||
-        options.preset === 'monochrome';
-    const ascii = options.ascii ?? shouldUseAscii(options.term ?? process.env.TERM);
-    const requestedPreset = options.preset && options.preset !== 'monochrome' ? options.preset : 'default';
-    // P5.2 — gracefully downgrade hex presets (catppuccin / gruvbox) when
-    // the host terminal can't render truecolor. Chalk approximates hex in
-    // those modes anyway, but the default preset's ANSI-named palette
-    // renders far more faithfully on 16-color terminals.
-    const colorLevel = getColorLevel(options.env ?? process.env);
-    const preset = !noColor && presetUsesTrueColor(requestedPreset) && colorLevel !== 'truecolor'
-        ? 'default'
-        : requestedPreset;
-    const colors = noColor
-        ? {}
-        : {
-            ...THEME_PRESET_COLORS[preset],
-            ...options.colors,
+                dispatch({
+                    type: 'setStatus',
+                    value: `${target.label} target commit returned no rows — orphan ref?`,
+                    kind: 'warning',
+                });
+            }
+        }
+        catch (error) {
+            if (mountedRef.current) {
+                dispatch({
+                    type: 'setStatus',
+                    value: `Failed to load context for ${target.label}: ${error instanceof Error ? error.message : String(error)}`,
+                    kind: 'error',
+                });
+            }
+        }
+    }, [dispatch, git]);
+    React.useEffect(() => {
+        loadCommitContextRef.current = loadCommitContext;
+    }, [loadCommitContext]);
+    // Server-side history filter (#776). When the user submits `path:foo`
+    // or `author:foo`, the filter parser dispatches setHistoryFetchArgs;
+    // this effect picks up the change, re-runs `getLogRows` with merged
+    // args, and replaces the rows. Clearing the fetch args (Ctrl+U inside
+    // filter mode) re-fetches with the original logArgv so the user gets
+    // the live full log back, not a stale snapshot of the initial rows.
+    const historyFetchEffectInitialized = React.useRef(false);
+    const historyFetchRequestRef = React.useRef(0);
+    React.useEffect(() => {
+        if (!logArgv)
+            return;
+        // Skip the first run — initial rows came in via deps.rows; we only
+        // want to fetch in response to *changes* to historyFetchArgs.
+        if (!historyFetchEffectInitialized.current) {
+            historyFetchEffectInitialized.current = true;
+            return;
+        }
+        const requestId = historyFetchRequestRef.current + 1;
+        historyFetchRequestRef.current = requestId;
+        const fetchArgs = state.historyFetchArgs;
+        const merged = {
+            ...logArgv,
+            ...(fetchArgs?.author ? { author: fetchArgs.author } : {}),
+            ...(fetchArgs?.path ? { path: fetchArgs.path } : {}),
         };
-    return {
-        noColor,
-        ascii,
-        borderStyle: options.borderStyle || (ascii ? 'classic' : 'round'),
-        colors,
-    };
+        const description = fetchArgs?.author
+            ? `author:${fetchArgs.author}`
+            : fetchArgs?.path
+                ? `path:${fetchArgs.path}`
+                : undefined;
+        dispatch({
+            type: 'setStatus',
+            value: description ? `Refetching with ${description}` : 'Restoring full log',
+        });
+        void (async () => {
+            const stashHashes = await getStashCommitHashes(git).catch(() => []);
+            const nextRows = await safe(getLogRows(git, merged, {
+                limit: LOG_INTERACTIVE_DEFAULT_LIMIT,
+                extraRefs: stashHashes,
+            }));
+            if (!mountedRef.current || historyFetchRequestRef.current !== requestId) {
+                return;
+            }
+            if (!nextRows) {
+                dispatch({ type: 'setStatus', value: 'Failed to refetch with active filter', kind: 'error' });
+                return;
+            }
+            dispatch({ type: 'replaceRows', rows: nextRows });
+            const matched = getCommitRows(nextRows).length;
+            setHasMoreCommits(matched >= LOG_INTERACTIVE_DEFAULT_LIMIT);
+            dispatch({
+                type: 'setStatus',
+                value: description
+                    ? `Showing ${matched} commits matching ${description}`
+                    : 'Showing full log',
+                kind: 'success',
+            });
+        })();
+    }, [dispatch, git, logArgv, state.historyFetchArgs]);
+    // Graph mode toggle (`g` key, #791 follow-up). The header label flips
+    // between "compact graph" and "full graph", but unless we re-fetch with
+    // the right `view`, the underlying rows still come from the user's
+    // initial argv (default `--first-parent --no-merges`) and the renderer
+    // has no topology to draw — defeating the per-lane / junction work.
+    // Mirrors the historyFetchArgs effect: skip first run, request-id ref
+    // for stale-completion guard, swap rows in place via replaceRows.
+    const toggleGraphEffectInitialized = React.useRef(false);
+    const toggleGraphRequestRef = React.useRef(0);
+    React.useEffect(() => {
+        if (!logArgv)
+            return;
+        if (!toggleGraphEffectInitialized.current) {
+            toggleGraphEffectInitialized.current = true;
+            return;
+        }
+        const requestId = toggleGraphRequestRef.current + 1;
+        toggleGraphRequestRef.current = requestId;
+        const merged = buildToggleGraphArgs(logArgv, state.fullGraph);
+        dispatch({
+            type: 'setStatus',
+            value: state.fullGraph
+                ? 'Loading full topology…'
+                : 'Loading compact history…',
+        });
+        void (async () => {
+            // Include stash commits as graph roots so the toggle's re-fetch
+            // sees the same rich graph the boot loader assembles. Without
+            // this, flipping `\` into full mode and back loses the stash
+            // anchors that loadRowsWithStashes seeded on boot.
+            const stashHashes = await getStashCommitHashes(git).catch(() => []);
+            const nextRows = await safe(getLogRows(git, merged, {
+                limit: LOG_INTERACTIVE_DEFAULT_LIMIT,
+                extraRefs: stashHashes,
+            }));
+            if (!mountedRef.current || toggleGraphRequestRef.current !== requestId) {
+                return;
+            }
+            if (!nextRows) {
+                dispatch({ type: 'setStatus', value: 'Failed to refetch graph rows', kind: 'error' });
+                return;
+            }
+            dispatch({ type: 'replaceRows', rows: nextRows });
+            const matched = getCommitRows(nextRows).length;
+            setHasMoreCommits(matched >= LOG_INTERACTIVE_DEFAULT_LIMIT);
+            dispatch({
+                type: 'setStatus',
+                value: state.fullGraph
+                    ? `Showing ${matched} commits across all branches`
+                    : `Showing ${matched} commits (compact)`,
+                kind: 'success',
+            });
+        })();
+    }, [dispatch, git, logArgv, state.fullGraph]);
+    const commitDiffHunkOffsets = React.useMemo(() => (filePreview?.hunks
+        .map((line, index) => (line.startsWith('@@') ? index : -1))
+        .filter((index) => index >= 0)), [filePreview]);
+    const worktreeDirty = Boolean(context.worktree &&
+        (context.worktree.stagedCount + context.worktree.unstagedCount + context.worktree.untrackedCount) > 0);
+    useInput((inputValue, key) => {
+        // First-launch onboarding (P1.3): any keystroke dismisses the overlay
+        // and writes the seen-marker. Swallow the keystroke so the same key
+        // doesn't also trigger normal input dispatch.
+        if (showOnboarding) {
+            setShowOnboarding(false);
+            markOnboardingSeen();
+            return;
+        }
+        // P4.5: navigation in branches/tags/stash uses the FILTERED list
+        // length when a filter is active so j/k stay live instead of getting
+        // stuck against a full-list count that no longer matches what's on
+        // screen. The filtered lists are memoized at LogInkApp scope (#808
+        // perf pass) — reading them here is O(1) instead of O(branches +
+        // tags + stashes + worktrees) per keystroke.
+        const branchVisibleCount = filteredBranchList.length;
+        const branchSelectedShortName = filteredBranchList[Math.min(state.selectedBranchIndex, Math.max(0, filteredBranchList.length - 1))]?.shortName;
+        const tagVisibleCount = filteredTagList.length;
+        const tagSelectedName = filteredTagList[Math.min(state.selectedTagIndex, Math.max(0, filteredTagList.length - 1))]?.name;
+        const stashVisibleCount = filteredStashList.length;
+        const stashSelectedRef = filteredStashList[Math.min(state.selectedStashIndex, Math.max(0, filteredStashList.length - 1))]?.ref;
+        const reflogVisibleCount = filteredReflogList.length;
+        const reflogSelectedHash = filteredReflogList[Math.min(state.selectedReflogIndex, Math.max(0, filteredReflogList.length - 1))]?.hash;
+        const submoduleVisibleCount = filteredSubmoduleList.length;
+        filteredSubmoduleList[Math.min(state.selectedSubmoduleIndex, Math.max(0, filteredSubmoduleList.length - 1))]?.path;
+        const issueVisibleCount = filteredIssueList.length;
+        const issueSelectedUrl = filteredIssueList[Math.min(state.selectedIssueIndex, Math.max(0, filteredIssueList.length - 1))]?.url;
+        const pullRequestTriageVisibleCount = filteredPullRequestTriageList.length;
+        const pullRequestTriageSelectedUrl = filteredPullRequestTriageList[Math.min(state.selectedPullRequestTriageIndex, Math.max(0, filteredPullRequestTriageList.length - 1))]?.url;
+        const worktreeVisibleCount = filteredWorktreeList.length;
+        // When the diff view is showing a stash patch, swap the previewLineCount
+        // to the stash diff length so the existing pageDetailPreview path
+        // (j/k, PgUp/PgDn) scrolls through it without a parallel pipeline.
+        const diffPreviewLineCount = state.diffSource === 'stash'
+            ? stashDiffLines?.length
+            : filePreview?.hunks.length;
+        // Per-file segmentation for stash diffs reads the LogInkApp-scoped
+        // memo so navigation keys + the input-context derivation share a
+        // single parse pass per stash patch instead of re-walking the
+        // entire patch text on every keystroke.
+        const stashDiffFiles = state.diffSource === 'stash' ? stashDiffParsedFiles : [];
+        const stashDiffFileOffsets = stashDiffFiles.map((file) => file.startLine);
+        const stashDiffSelectedPath = state.diffSource === 'stash'
+            ? findStashFileForOffset(stashDiffFiles, state.diffPreviewOffset)?.path
+            : undefined;
+        getLogInkInputEvents(state, inputValue, key, {
+            detailFileCount: detail?.files.length,
+            previewLineCount: diffPreviewLineCount,
+            worktreeDiffLineCount: worktreeDiff?.lines.length,
+            worktreeFileCount: visibleWorktreeFilesGrouped.length,
+            worktreeHunkOffsets: worktreeDiff?.hunkOffsets,
+            commitDiffHunkOffsets,
+            branchCount: branchVisibleCount,
+            branchSelectedShortName,
+            tagCount: tagVisibleCount,
+            tagSelectedName,
+            stashCount: stashVisibleCount,
+            reflogCount: reflogVisibleCount,
+            reflogSelectedHash,
+            submoduleCount: submoduleVisibleCount,
+            issueCount: issueVisibleCount,
+            issueSelectedUrl,
+            pullRequestTriageCount: pullRequestTriageVisibleCount,
+            pullRequestTriageSelectedUrl,
+            stashSelectedRef,
+            stashDiffFileOffsets: stashDiffFileOffsets.length ? stashDiffFileOffsets : undefined,
+            stashDiffSelectedPath,
+            worktreeListCount: worktreeVisibleCount,
+            worktreeSelectedPath: visibleWorktreeFilesGrouped[state.selectedWorktreeFileIndex]?.path,
+            statusGroups: visibleWorktreeGroups.map((group) => ({
+                state: group.state,
+                count: group.files.length,
+                startIndex: group.startIndex,
+            })),
+            inspectorActionCount: getInspectorActionsForState(state).length,
+            commitDiffSelectedPath: state.diffSource === 'commit'
+                ? selectedDetailFile?.path
+                : undefined,
+            commitDiffSelectedSha: state.diffSource === 'commit'
+                ? selected?.hash
+                : undefined,
+            // #931 PR 3b — Submodule drill-in target for the cursored file
+            // in a commit diff. Resolved per-render so the Enter handler in
+            // `inkInput.ts` doesn't have to re-walk the submodule overview;
+            // undefined whenever the cursored file isn't a registered
+            // submodule (or the overview / repo root haven't loaded yet).
+            commitDiffSubmoduleDrillIn: state.diffSource === 'commit' && selectedDetailFile
+                ? resolveCommitDiffDrillInTarget({
+                    selectedFile: {
+                        path: selectedDetailFile.path,
+                        submoduleChange: filePreview?.path === selectedDetailFile.path
+                            ? filePreview.submoduleChange
+                            : undefined,
+                    },
+                    submodules: context.submodules,
+                    activeRepoRoot,
+                })
+                : undefined,
+            // #931 PR 4 / #932 — Submodule drill-in target for the cursored
+            // row in the dedicated submodules view. Resolved per-render so
+            // the Enter handler in `inkInput.ts` doesn't have to re-walk the
+            // submodule overview. Gated on `activeView === 'submodules'` so
+            // a stale resolution from a different view can't accidentally
+            // fire — the runtime only ever populates it when the user is
+            // actually on the view.
+            submoduleViewDrillIn: state.activeView === 'submodules'
+                ? resolveSubmoduleViewDrillInTarget({
+                    selectedIndex: state.selectedSubmoduleIndex,
+                    submodules: context.submodules,
+                    activeRepoRoot,
+                })
+                : undefined,
+            worktreeDirty,
+            conflictFileCount: context.operation?.conflictedFiles.length,
+            conflictSelectedPath: (() => {
+                const files = context.operation?.conflictedFiles;
+                if (!files || files.length === 0)
+                    return undefined;
+                const clamped = Math.min(state.selectedConflictFileIndex, files.length - 1);
+                return files[clamped]?.path;
+            })(),
+            // H / gH need the actual diff text (not just hunk offsets) to
+            // slice the cursored hunk into a `git apply` patch. Stash uses
+            // the full `git stash show -p` output; commit-diff uses the
+            // per-file `filePreview.hunks` array. Either way, extractDiffHunk
+            // walks `@@` headers and synthesizes a fresh diff --git / --- /
+            // +++ header set using the path the caller already resolved.
+            diffLinesForHunkApply: state.diffSource === 'stash'
+                ? stashDiffLines
+                : state.diffSource === 'commit'
+                    ? filePreview?.hunks
+                    : undefined,
+            // Line count of the changelog text, used by the changelog view's
+            // j/k/PgUp/PgDn scroll bindings to clamp `pageChangelog` deltas.
+            // Computed from view state rather than threaded through context
+            // because the surface owns its own content — no external loader.
+            changelogLineCount: state.changelogView.text?.split('\n').length,
+            // Approximate line count for the split-plan overlay. Each group
+            // renders as a header + (body if any) + files block + (rationale
+            // if any) + blank separator. Used by j/k/PgUp/PgDn to clamp the
+            // scroll offset. The exact render math lives in the overlay
+            // module — this is a close-enough heuristic for clamping.
+            // #879 item 3 — short sha of the bisect terminator (if any).
+            // Gates `y`/`Y` yank on the completion panel and lets the
+            // runtime resolve the value without re-parsing the log.
+            bisectCompletionSha: context.bisect?.active
+                ? getBisectCompletion(context.bisect.log)?.sha
+                : undefined,
+            // #879 item 4 — disambiguates the bisect view's `s` keystroke
+            // (skip current candidate vs. start the wizard).
+            bisectActive: Boolean(context.bisect?.active),
+            splitPlanLineCount: state.splitPlan?.plan
+                ? state.splitPlan.plan.groups.reduce((sum, group) => {
+                    let lines = 2; // title + separator
+                    if (group.body)
+                        lines += group.body.split('\n').length + 1;
+                    if (group.rationale)
+                        lines += 2;
+                    lines += (group.files?.length || 0) + 1;
+                    const hunkCount = group.hunks?.length || 0;
+                    if (hunkCount > 0)
+                        lines += hunkCount + 1;
+                    return sum + lines;
+                }, 0)
+                : undefined,
+        }).forEach((event) => {
+            if (event.type === 'exit') {
+                exit();
+            }
+            else if (event.type === 'refreshContext') {
+                void refreshContext();
+            }
+            else if (event.type === 'toggleSelectedFileStage') {
+                void toggleSelectedFileStage();
+            }
+            else if (event.type === 'toggleSelectedHunkStage') {
+                void toggleSelectedHunkStage();
+            }
+            else if (event.type === 'revertSelectedFile') {
+                void revertSelectedFile();
+            }
+            else if (event.type === 'revertSelectedHunk') {
+                void revertSelectedHunk();
+            }
+            else if (event.type === 'createManualCommit') {
+                void createCommitFromCompose();
+            }
+            else if (event.type === 'runAiCommitDraft') {
+                void runAiCommitDraft();
+            }
+            else if (event.type === 'cancelAiCommitDraft') {
+                cancelAiCommitDraft();
+            }
+            else if (event.type === 'startCreatePullRequest') {
+                void startCreatePullRequest();
+            }
+            else if (event.type === 'cancelPullRequestBodyDraft') {
+                cancelPullRequestBodyDraft();
+            }
+            else if (event.type === 'startChangelogView') {
+                void startChangelogView();
+            }
+            else if (event.type === 'regenerateChangelog') {
+                regenerateChangelog();
+            }
+            else if (event.type === 'yankChangelog') {
+                yankChangelog();
+            }
+            else if (event.type === 'openChangelogInEditor') {
+                openChangelogInEditor();
+            }
+            else if (event.type === 'openComposeInEditor') {
+                openComposeInEditor();
+            }
+            else if (event.type === 'startCommitSplit') {
+                void startCommitSplit();
+            }
+            else if (event.type === 'applyCommitSplit') {
+                void applyCommitSplit();
+            }
+            else if (event.type === 'cancelCommitSplit') {
+                cancelCommitSplit();
+            }
+            else if (event.type === 'yankText') {
+                void yankText(event.value, event.label);
+            }
+            else if (event.type === 'runWorkflowAction') {
+                void runWorkflowAction(event.id, event.payload);
+            }
+            else if (event.type === 'openFileInEditor') {
+                openInEditor(event.path);
+            }
+            else if (event.type === 'yankFromActiveView') {
+                void yankFromActiveView(event.short);
+            }
+            else if (event.type === 'applyThemePreset') {
+                // Apply for the session immediately, and best-effort persist to the
+                // global config so it sticks across launches. The picker has already
+                // dispatched `toggleThemePicker` (closing it), which clears the
+                // preview via the sync effect below — the session preset takes over.
+                const preset = event.preset;
+                setThemeSessionPreset(preset);
+                saveThemePreset(preset);
+            }
+            else {
+                // P4.5: enrich filter-mutating actions with a precomputed
+                // selection snapshot so the reducer can preserve the cursor on
+                // the same item when it's still in the filtered result, only
+                // snapping to result[0] when the previously selected item drops
+                // out. The snapshot lives in the action so the reducer never
+                // needs context items.
+                const enriched = enrichFilterActionWithRectification(event.action, state, context);
+                dispatch(enriched);
+            }
+        });
+    });
+    // Layout depends on focus (sidebar grows when focused), so it's
+    // computed here — after state is in scope but before the render path.
+    const layout = getLogInkLayout({
+        columns: windowSize.columns || process.stdout.columns || LOG_INK_DEFAULT_COLUMNS,
+        rows: windowSize.rows || process.stdout.rows || LOG_INK_DEFAULT_ROWS,
+        sidebarFocused: state.focus === 'sidebar',
+        inspectorFocused: state.focus === 'detail',
+        helpOverlayActive: state.showHelp,
+    });
+    if (layout.tooSmall) {
+        return h(Box, {
+            flexDirection: 'column',
+            height: layout.rows,
+            paddingX: 1,
+            paddingY: 1,
+        }, h(Text, { bold: true }, appLabel), h(Text, undefined, `Terminal too small: ${layout.columns}x${layout.rows}`), h(Text, { dimColor: true }, `Minimum size is ${LOG_INK_MIN_COLUMNS}x${LOG_INK_MIN_ROWS}.`), h(Text, { dimColor: true }, 'Resize the terminal or run plain coco log.'));
+    }
+    // First-launch onboarding overlay (P1.3) replaces the entire UI for
+    // one render — any keystroke dismisses it and persists the seen-marker.
+    if (showOnboarding) {
+        return renderOnboardingOverlay(h, { Box, Text }, layout.rows, layout.columns, theme, appLabel);
+    }
+    return h(Box, { flexDirection: 'column', height: layout.rows }, renderHeader$1(h, { Box, Text }, state, context, contextStatus, layout.columns, theme, appLabel), h(Box, { flexDirection: 'row', height: layout.bodyRows }, renderSidebar$1(h, { Box, Text }, state, context, contextStatus, layout.sidebarWidth, layout.bodyRows, theme, layout.sidebarRailed), renderMainPanel(h, { Box, Text }, state, context, contextStatus, worktreeDiff, worktreeDiffLoading, worktreeHunks, worktreeHunksLoading, filePreview, filePreviewLoading, commitDiffHunkOffsets, selectedDetailFile, stashDiffLines, stashDiffLoading, compareDiffLines, compareDiffLoading, bisectCandidateDetail, bisectCandidateLoading, layout.bodyRows, layout.mainPanelWidth, theme, hasMoreCommits, loadingMoreCommits, spinnerFrame, layout.density, layout.historyRowMode, Boolean(dateBucketingEnabled)), renderDetailPanel(h, { Box, Text }, state, context, contextStatus, detail, detailLoading, filePreview, filePreviewLoading, layout.detailWidth, layout.inspectorTabbed, theme, layout.inspectorRailed, layout.bodyRows)), renderFooter$1(h, { Box, Text }, state, context, theme, idleTip, spinnerFrame));
 }
 
 /**
@@ -41973,6 +42699,7 @@ async function startInkInteractiveLog(git, rows, streams = {}, options = {}) {
         React,
         rows,
         theme: createLogInkTheme(options.theme),
+        themeConfig: options.theme,
         resumeRef,
     });
     const instance = ink.render(app, getLogInkRenderOptions({ input, output, error }));
@@ -43418,7 +44145,7 @@ const options$1 = {
     },
     theme: {
         description: 'TUI theme preset',
-        choices: ['default', 'monochrome', 'catppuccin', 'gruvbox', 'dracula', 'nord', 'solarized-dark', 'tokyo-night', 'one-dark', 'rose-pine', 'kanagawa', 'everforest', 'monokai', 'synthwave', 'ayu-dark', 'palenight', 'github-dark', 'horizon', 'nightfox', 'carbonfox', 'tokyonight-storm', 'catppuccin-latte', 'solarized-light', 'github-light', 'iceberg', 'material-ocean', 'moonlight', 'poimandres', 'vitesse-dark', 'vesper', 'flexoki', 'mellow'],
+        choices: ['default', 'monochrome', 'catppuccin', 'gruvbox', 'dracula', 'nord', 'solarized-dark', 'tokyo-night', 'one-dark', 'rose-pine', 'kanagawa', 'everforest', 'monokai', 'synthwave', 'ayu-dark', 'palenight', 'github-dark', 'horizon', 'nightfox', 'carbonfox', 'tokyonight-storm', 'catppuccin-latte', 'solarized-light', 'github-light', 'iceberg', 'material-ocean', 'moonlight', 'poimandres', 'vitesse-dark', 'vesper', 'flexoki', 'mellow', 'night-owl', 'cobalt2', 'oceanic-next', 'catppuccin-macchiato', 'gruvbox-light', 'tokyo-night-day', 'one-light', 'ayu-light', 'rose-pine-dawn', 'everforest-light', 'vitesse-light', 'dayfox', 'night-owl-light', 'flexoki-light', 'material-lighter', 'papercolor-light', 'modus-operandi', 'quiet-light'],
     },
 };
 const builder$1 = (yargs) => {
@@ -43446,7 +44173,7 @@ const options = {
     },
     theme: {
         description: 'TUI theme preset',
-        choices: ['default', 'monochrome', 'catppuccin', 'gruvbox', 'dracula', 'nord', 'solarized-dark', 'tokyo-night', 'one-dark', 'rose-pine', 'kanagawa', 'everforest', 'monokai', 'synthwave', 'ayu-dark', 'palenight', 'github-dark', 'horizon', 'nightfox', 'carbonfox', 'tokyonight-storm', 'catppuccin-latte', 'solarized-light', 'github-light', 'iceberg', 'material-ocean', 'moonlight', 'poimandres', 'vitesse-dark', 'vesper', 'flexoki', 'mellow'],
+        choices: ['default', 'monochrome', 'catppuccin', 'gruvbox', 'dracula', 'nord', 'solarized-dark', 'tokyo-night', 'one-dark', 'rose-pine', 'kanagawa', 'everforest', 'monokai', 'synthwave', 'ayu-dark', 'palenight', 'github-dark', 'horizon', 'nightfox', 'carbonfox', 'tokyonight-storm', 'catppuccin-latte', 'solarized-light', 'github-light', 'iceberg', 'material-ocean', 'moonlight', 'poimandres', 'vitesse-dark', 'vesper', 'flexoki', 'mellow', 'night-owl', 'cobalt2', 'oceanic-next', 'catppuccin-macchiato', 'gruvbox-light', 'tokyo-night-day', 'one-light', 'ayu-light', 'rose-pine-dawn', 'everforest-light', 'vitesse-light', 'dayfox', 'night-owl-light', 'flexoki-light', 'material-lighter', 'papercolor-light', 'modus-operandi', 'quiet-light'],
     },
 };
 const builder = (yargs) => {
@@ -44149,6 +44876,9 @@ function createWorkspaceState(init) {
         roots: init.roots,
         showHelp: false,
         showOnboarding: Boolean(init.showOnboarding),
+        showThemePicker: false,
+        themePickerFilter: '',
+        themePickerIndex: 0,
         knownRepoPaths: init.knownRepoPaths ?? [],
         pullRequestFetching: [],
     };
@@ -44319,6 +45049,39 @@ function applyWorkspaceAction(state, action) {
         case 'close-help': {
             return { ...state, showHelp: false };
         }
+        case 'toggle-theme-picker': {
+            return {
+                ...state,
+                showThemePicker: !state.showThemePicker,
+                showHelp: false,
+                showOnboarding: false,
+                themePickerFilter: '',
+                themePickerIndex: 0,
+            };
+        }
+        case 'move-theme-picker': {
+            return {
+                ...state,
+                themePickerIndex: clampCursor(state.themePickerIndex + action.delta, action.presetCount),
+            };
+        }
+        case 'append-theme-picker-filter': {
+            return {
+                ...state,
+                themePickerFilter: `${state.themePickerFilter}${action.value}`,
+                themePickerIndex: 0,
+            };
+        }
+        case 'backspace-theme-picker-filter': {
+            return {
+                ...state,
+                themePickerFilter: state.themePickerFilter.slice(0, -1),
+                themePickerIndex: 0,
+            };
+        }
+        case 'clear-theme-picker-filter': {
+            return { ...state, themePickerFilter: '', themePickerIndex: 0 };
+        }
         case 'dismiss-onboarding': {
             return { ...state, showOnboarding: false };
         }
@@ -44730,33 +45493,48 @@ function buildWorkspaceHeaderChips(state, options = { focusLabel: 'List' }) {
     });
     return chips;
 }
-// Footer hints prioritize discoverable / forgettable actions and
-// drop the bindings users can find on their own (arrow keys, Enter
-// for "open", Tab for "switch panels"). The full keymap lives behind
-// `?` so nothing is hidden, just decluttered.
-const LIST_HINT = 's sort · / filter · r/R refresh · a add · d remove · ? help · q quit';
-const SIDEBAR_HINT = '? help · q quit';
-const FILTER_HINT = 'type to filter · enter apply · esc cancel';
-const ADD_REPO_HINT = 'type path · tab to complete · enter to add · esc to cancel';
-const CONFIRM_DELETE_HINT = 'press y to remove · any other key to cancel';
-function hintFor(focus) {
+// Footer hints are split into two slots — same pattern as `coco ui`:
+//   - contextual : per-mode actions (sort, filter, refresh, add/remove)
+//   - global     : always-on essentials (help, quit) — never crowded out
+//
+// The contextual slot drops bindings users can find via the help
+// overlay (arrow keys, tab); the global slot is the safety net so
+// `? help` and `q quit` never disappear.
+const LIST_CONTEXTUAL = ['s sort', '/ filter', 'r/R refresh', 'a add', 'd remove'];
+const SIDEBAR_CONTEXTUAL = ['↑/↓ cycle tab', 'enter open'];
+const FILTER_CONTEXTUAL = ['type to filter', 'enter apply', 'esc cancel'];
+const ADD_REPO_CONTEXTUAL = ['type path', 'tab to complete', 'enter to add', 'esc to cancel'];
+const CONFIRM_DELETE_CONTEXTUAL = ['y confirm', 'any other key cancels'];
+const GLOBAL_HINTS = ['? help', 'q quit'];
+function contextualHintsFor(focus) {
     switch (focus) {
         case 'sidebar':
-            return SIDEBAR_HINT;
+            return SIDEBAR_CONTEXTUAL;
         case 'filter':
-            return FILTER_HINT;
+            return FILTER_CONTEXTUAL;
         case 'add-repo':
-            return ADD_REPO_HINT;
+            return ADD_REPO_CONTEXTUAL;
         case 'confirm-delete':
-            return CONFIRM_DELETE_HINT;
+            return CONFIRM_DELETE_CONTEXTUAL;
         case 'list':
         default:
-            return LIST_HINT;
+            return LIST_CONTEXTUAL;
     }
 }
 function buildWorkspaceFooter(state) {
+    const contextual = contextualHintsFor(state.focus);
+    // Modal modes (filter / add-repo / confirm-delete) suppress the
+    // global hints — those bindings are not reachable while a prompt
+    // is open and showing them would be misleading.
+    const isModal = state.focus === 'filter' ||
+        state.focus === 'add-repo' ||
+        state.focus === 'confirm-delete';
+    const global = isModal ? [] : GLOBAL_HINTS;
+    const allHints = [...contextual, ...global];
     return {
-        hint: hintFor(state.focus),
+        hint: allHints.join(' · '),
+        contextual,
+        global,
         status: state.status,
         filterMode: state.focus === 'filter',
     };
@@ -44766,11 +45544,26 @@ function buildWorkspaceFooter(state) {
  * sections so users can scan by intent ("how do I navigate?" "how
  * do I act?") rather than reading a flat alphabetized list.
  *
+ * Section order mirrors `coco ui`'s help convention — Essentials
+ * first so newcomers see `?`/`esc`/`q` immediately, then move outward
+ * to navigation, modification, and the destructive verbs last.
+ *
  * The view layer composes these into a panel with section titles,
  * a leading app/title bar, and a closing hint at the bottom.
  */
 function buildWorkspaceHelpSections() {
     return [
+        {
+            title: 'Essentials',
+            subtitle: 'The keys you reach for most often.',
+            rows: [
+                { glyph: '?', keys: '?', description: 'Toggle this help overlay' },
+                { glyph: '⎋', keys: 'esc', description: 'Clear filter / close overlay / cancel prompt' },
+                { glyph: '◴', keys: 'q · ctrl+c', description: 'Quit the workspace surface' },
+                { glyph: '↵', keys: 'enter', description: 'Drill into the cursored repo (coco ui)' },
+                { glyph: '◧', keys: 'T', description: 'Theme picker — browse, live-preview & apply a color theme' },
+            ],
+        },
         {
             title: 'Navigate',
             subtitle: 'Move the cursor and switch focus between panels.',
@@ -44780,7 +45573,6 @@ function buildWorkspaceHelpSections() {
                 { glyph: '←', keys: 'h', description: 'Jump focus to the sidebar' },
                 { glyph: '→', keys: 'l', description: 'Jump focus to the list' },
                 { glyph: '⤒', keys: 'g / G', description: 'Jump to top / bottom of the list' },
-                { glyph: '↵', keys: 'enter', description: 'Drill into the cursored repo (coco ui)' },
             ],
         },
         {
@@ -44800,14 +45592,6 @@ function buildWorkspaceHelpSections() {
                 { glyph: '✕', keys: 'd', description: 'Remove the cursored repo from the known-repos store' },
             ],
         },
-        {
-            title: 'General',
-            rows: [
-                { glyph: '?', keys: '?', description: 'Toggle this help overlay' },
-                { glyph: '⎋', keys: 'esc', description: 'Clear filter / close overlay / cancel prompt' },
-                { glyph: '◴', keys: 'q · ctrl+c', description: 'Quit the workspace surface' },
-            ],
-        },
     ];
 }
 function buildWorkspaceOnboarding(state) {
@@ -45254,13 +46038,19 @@ function renderFooter(deps) {
     // height shifted by a row every time a status banner came and went,
     // forcing the panel chrome to reflow.
     const statusContent = model.status ?? '';
+    const contextualText = model.contextual.join('   ');
+    const globalText = model.global.join(' · ');
     return React.createElement(Box, {
         borderColor: focusBorderColor(theme, false),
         borderStyle: theme.borderStyle,
         paddingX: 1,
         flexDirection: 'column',
         height: FOOTER_HEIGHT,
-    }, React.createElement(Text, { dimColor: true }, model.hint), React.createElement(Text, {
+    }, 
+    // Row 1: contextual ↔ global hints. justifyContent pushes them
+    // to opposite edges so the eye scans each cluster as one block —
+    // same shape as `coco ui`'s footer post-0.54.2 redesign.
+    React.createElement(Box, { flexDirection: 'row', justifyContent: 'space-between' }, React.createElement(Text, { dimColor: true }, contextualText), React.createElement(Text, { dimColor: true }, globalText)), React.createElement(Text, {
         color: model.status ? toneColor('warn', theme) : undefined,
         dimColor: !model.status,
     }, statusContent || ' '));
@@ -45296,6 +46086,11 @@ function renderWorkspaceApp(deps) {
     if (deps.state.showHelp) {
         return React.createElement(Box, { flexDirection: 'column', height: rootHeight }, renderHeader(deps), renderHelpOverlay(deps), renderFooter(deps));
     }
+    // Theme picker is modal too — the chrome live-previews underneath via
+    // the reactive `deps.theme`, while the overlay replaces the body.
+    if (deps.state.showThemePicker) {
+        return React.createElement(Box, { flexDirection: 'column', height: rootHeight }, renderHeader(deps), renderThemePickerOverlay(React.createElement, { Box: ink.Box, Text: ink.Text }, deps.state.themePickerFilter, deps.state.themePickerIndex, bodyWidth, deps.theme, true), renderFooter(deps));
+    }
     const bodyHeight = computeBodyHeight(deps);
     return React.createElement(Box, { flexDirection: 'column', height: rootHeight }, renderHeader(deps), React.createElement(Box, { flexDirection: 'row', height: bodyHeight }, renderSidebar(deps, bodyHeight), renderListBody(deps, bodyWidth - sidebarWidthFor(deps) - 2, bodyHeight)), renderOnboardingBanner(deps), renderAddRepoPrompt(deps), renderConfirmDelete(deps), renderFooter(deps));
 }
@@ -45336,6 +46131,37 @@ function resolveWorkspaceInput(input, key, state) {
         }
         return { kind: 'noop' };
     }
+    // Theme picker is modal (like `coco ui`'s gC): type to filter, ↑/↓ to
+    // move, Enter applies + persists, Esc clears the filter then closes.
+    if (state.showThemePicker) {
+        const filtered = filterThemePresets(state.themePickerFilter);
+        if (key.escape) {
+            if (state.themePickerFilter.length > 0) {
+                return { kind: 'action', action: { type: 'clear-theme-picker-filter' } };
+            }
+            return { kind: 'action', action: { type: 'toggle-theme-picker' } };
+        }
+        if (key.return) {
+            const selected = getThemePickerSelectionFor(state.themePickerFilter, state.themePickerIndex);
+            if (!selected) {
+                return { kind: 'action', action: { type: 'toggle-theme-picker' } };
+            }
+            return { kind: 'apply-theme', preset: selected };
+        }
+        if (key.upArrow || (key.ctrl && input === 'p')) {
+            return { kind: 'action', action: { type: 'move-theme-picker', delta: -1, presetCount: filtered.length } };
+        }
+        if (key.downArrow || (key.ctrl && input === 'n')) {
+            return { kind: 'action', action: { type: 'move-theme-picker', delta: 1, presetCount: filtered.length } };
+        }
+        if (key.backspace || key.delete) {
+            return { kind: 'action', action: { type: 'backspace-theme-picker-filter' } };
+        }
+        if (input && !key.ctrl && !key.meta) {
+            return { kind: 'action', action: { type: 'append-theme-picker-filter', value: input } };
+        }
+        return { kind: 'noop' };
+    }
     if (state.focus === 'filter') {
         if (key.escape) {
             return { kind: 'action', action: { type: 'clear-filter' } };
@@ -45453,6 +46279,12 @@ function resolveWorkspaceInput(input, key, state) {
     if (input === '?') {
         return { kind: 'action', action: { type: 'toggle-help' } };
     }
+    // `T` opens the theme picker (browse + live-preview + apply a color
+    // theme). Single key here rather than `coco ui`'s gC chord since the
+    // workspace keymap is flat (no g-prefix continuations).
+    if (input === 'T') {
+        return { kind: 'action', action: { type: 'toggle-theme-picker' } };
+    }
     return { kind: 'noop' };
 }
 
@@ -45834,6 +46666,7 @@ async function startWorkspace(options) {
         ink,
         React,
         theme,
+        themeConfig: options.theme,
         resumeRef,
     });
     // Override exitOnCtrlC. Ink's default ctrl+c handler reaches into
@@ -45999,6 +46832,17 @@ function WorkspaceInkApp(props) {
     // (see effect below) so idle workspaces don't burn CPU on animation
     // frames.
     const [spinnerTick, setSpinnerTick] = React.useState(0);
+    // Theme picker (`T`) — reactive theme so the chrome live-previews the
+    // cursored theme. `themePreviewPreset` follows the picker cursor while
+    // open; `themeSessionPreset` is the applied choice. The effective theme
+    // rebuilds from the original config; when neither is set we use the
+    // static `props.theme` unchanged (mirrors `coco ui`).
+    const [themePreviewPreset, setThemePreviewPreset] = React.useState(undefined);
+    const [themeSessionPreset, setThemeSessionPreset] = React.useState(undefined);
+    const effectiveThemePreset = themePreviewPreset ?? themeSessionPreset;
+    const theme = React.useMemo(() => effectiveThemePreset
+        ? createLogInkTheme({ ...props.themeConfig, preset: effectiveThemePreset })
+        : props.theme, [effectiveThemePreset, props.themeConfig, props.theme]);
     const dispatch = React.useCallback((action) => {
         setState((prev) => applyWorkspaceAction(prev, action));
     }, []);
@@ -46373,6 +47217,13 @@ function WorkspaceInkApp(props) {
             case 'action':
                 dispatch(intent.action);
                 break;
+            case 'apply-theme':
+                // Apply for the session + persist to the global config (best-effort),
+                // then close the picker (clearing the preview via the sync effect).
+                setThemeSessionPreset(intent.preset);
+                saveThemePreset(intent.preset);
+                dispatch({ type: 'toggle-theme-picker' });
+                break;
             case 'quit':
                 workspaceDebug('→ exit() called from quit intent');
                 exitRefHolder.current.current = { kind: 'quit' };
@@ -46422,11 +47273,20 @@ function WorkspaceInkApp(props) {
             filter: state.filter,
         });
     }, [props.roots, state.sortMode, state.tab, state.filter]);
+    // Keep the live preview in sync with the preset under the picker cursor
+    // while the overlay is open; clear it on close so the theme reverts to
+    // the applied session preset (or the original config theme).
+    const themePickerSelection = state.showThemePicker
+        ? getThemePickerSelectionFor(state.themePickerFilter, state.themePickerIndex)
+        : undefined;
+    React.useEffect(() => {
+        setThemePreviewPreset(state.showThemePicker ? themePickerSelection : undefined);
+    }, [state.showThemePicker, themePickerSelection]);
     return renderWorkspaceApp({
         React,
         ink: { Box: ink.Box, Text: ink.Text },
         state,
-        theme: props.theme,
+        theme,
         appLabel: props.appLabel,
         filterDraft,
         addRepoDraft,
@@ -46437,8 +47297,20 @@ function WorkspaceInkApp(props) {
     });
 }
 
-const DEFAULT_ROOTS = ['~/code'];
-function resolveWorkspaceRoots(argv, config) {
+/**
+ * Resolve the directories the workspace scans for git repos, in
+ * precedence order:
+ *   1. `--root` CLI flag(s)
+ *   2. `workspace.roots` from config
+ *   3. the current working directory (`cwd`)
+ *
+ * Falling back to `cwd` (rather than a hardcoded `~/code`) means a bare
+ * `coco` / `coco ws` discovers repos wherever you launched it — the
+ * handler chdir's to honor `--repo` / `--cwd` before this runs, so `cwd`
+ * already reflects the targeted directory. `cwd` is a parameter (not a
+ * direct `process.cwd()` call) so the resolver stays a pure unit.
+ */
+function resolveWorkspaceRoots(argv, config, cwd = process.cwd()) {
     const raw = argv.root;
     if (Array.isArray(raw) && raw.length > 0) {
         return raw.map((entry) => String(entry));
@@ -46449,7 +47321,7 @@ function resolveWorkspaceRoots(argv, config) {
     if (config.workspace?.roots && config.workspace.roots.length > 0) {
         return [...config.workspace.roots];
     }
-    return [...DEFAULT_ROOTS];
+    return [cwd];
 }
 function resolveWorkspaceKnownRepos(config) {
     return config.workspace?.knownRepos ? [...config.workspace.knownRepos] : [];
@@ -46563,6 +47435,148 @@ var workspace = {
     options,
 };
 
+/**
+ * Default-command router for `coco` invoked with no positional
+ * arguments. Decides where to send the user based on the state of
+ * their machine:
+ *
+ *   ┌─────────────────────────┬─────────────────────┬──────────────┐
+ *   │ Config present?         │ In a git repo?      │ Action       │
+ *   ├─────────────────────────┼─────────────────────┼──────────────┤
+ *   │ No (default-only)       │ —                   │ run `init`   │
+ *   │ Yes                     │ Yes (worktree)      │ run `ui`     │
+ *   │ Yes                     │ No                  │ run `ws`     │
+ *   └─────────────────────────┴─────────────────────┴──────────────┘
+ *
+ * The pre-existing default — fall through to `commit` — was hostile
+ * to first-time users: a fresh install with no config landed
+ * straight in the API-key error path, with no hint that `coco init`
+ * was the right next step. Routing fresh installs to `init` and
+ * configured users to the workstation/UI matches what every other
+ * git-aware CLI does (lazygit, tig, gitui all open their TUI on bare
+ * invocation).
+ *
+ * `coco commit` keeps its dedicated subcommand entry so existing
+ * scripts (`git aliases`, hook integrations, CI jobs) that call
+ * `coco commit` continue to work unchanged.
+ *
+ * The router is a thin shim — it forwards to the existing handlers
+ * via their public exports rather than re-implementing the logic.
+ */
+/**
+ * Pure decision function — given probed signals (whether config
+ * exists, whether the current directory is a git repo, whether the
+ * user opted into legacy commit-by-default), decides which command
+ * to invoke. Kept pure so unit tests can cover every quadrant of
+ * the router table without spawning processes.
+ *
+ * "Config exists" is defined as: the loader detected at least one
+ * source beyond `default` — i.e., the user has either a project
+ * config, a git config `[coco]` section, an env var, or an XDG
+ * config. A pure-defaults run is treated as "never been configured"
+ * because `coco init` is the only way to populate any of those
+ * sources.
+ */
+function decideDefaultRoute(input) {
+    if (input.envOverride === 'commit' || input.explicitCommit) {
+        return {
+            kind: 'commit',
+            reason: input.envOverride === 'commit' ? 'env-override' : 'explicit-flag',
+        };
+    }
+    if (!input.hasConfigSource) {
+        return { kind: 'init', reason: 'no-config' };
+    }
+    if (input.isGitRepo) {
+        return { kind: 'ui', reason: 'config-and-repo' };
+    }
+    return { kind: 'workspace', reason: 'config-no-repo' };
+}
+/**
+ * Probe whether the cwd (after `--repo` is honored) is inside a git
+ * worktree. Tolerant of every error class — a thrown simple-git
+ * call should never block the router; it should fall back to
+ * "not a repo" so the user lands somewhere sensible (workspace
+ * surface) rather than crashing on an empty machine.
+ */
+async function probeIsGitRepo() {
+    try {
+        // Lazy-import simple-git so the cold-start path stays fast for
+        // users running `coco --help` / `coco doctor` etc.
+        const { default: simpleGit } = await import('simple-git');
+        const git = simpleGit();
+        return await git.checkIsRepo();
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Build a synthetic argv for one of the targeted handlers. Each
+ * handler reads its own typed argv contract (`CommitArgv`,
+ * `InitArgv`, `UiArgv`, `WorkspaceArgv`) so we can't just spread the
+ * raw default argv — we have to project the shared fields and let
+ * the handler fill in command-specific defaults.
+ */
+function buildSyntheticArgv(argv) {
+    return {
+        _: ['$0'],
+        $0: argv.$0,
+        repo: argv.repo,
+        cwd: argv.cwd,
+        verbose: argv.verbose ?? false,
+        interactive: true,
+        version: false,
+        help: false,
+    };
+}
+/**
+ * Default-command handler installed under yargs's `$0` slot. Probes
+ * the environment, computes the right route, and forwards to the
+ * matching command handler. Falls through to commit if any
+ * unexpected error blocks routing — preserves backwards-compat
+ * for users on weird setups while still giving newcomers the
+ * onboarding path they deserve.
+ */
+const defaultRouteHandler = async (argv, logger) => {
+    // The `--repo` flag has to land before any probe runs — otherwise
+    // we'd sniff the launcher's cwd instead of the targeted repo.
+    applyRepoCwd(argv);
+    // Trigger a config load so `getConfigSources()` returns the active
+    // source list. We discard the config object — the decision only
+    // cares about which sources contributed.
+    void loadConfig(argv);
+    const sources = getConfigSources();
+    const hasConfigSource = sources.some((source) => source.source !== 'default');
+    const isGitRepo = await probeIsGitRepo();
+    const decision = decideDefaultRoute({
+        hasConfigSource,
+        isGitRepo,
+        explicitCommit: Boolean(argv.commit),
+        envOverride: process.env.COCO_DEFAULT,
+    });
+    switch (decision.kind) {
+        case 'init':
+            // Friendly hint before the wizard kicks in — sets expectations
+            // that the user is being walked through setup, not silently
+            // routed to a different command.
+            logger.log('No coco config detected — running `coco init` to set up your provider + key.', { color: 'cyan' });
+            logger.log('');
+            await handler$7(buildSyntheticArgv(argv), logger);
+            return;
+        case 'ui':
+            await handler$5(buildSyntheticArgv(argv));
+            return;
+        case 'workspace':
+            await handler(buildSyntheticArgv(argv));
+            return;
+        case 'commit':
+        default:
+            await handler$9(buildSyntheticArgv(argv), logger);
+            return;
+    }
+};
+
 var types = /*#__PURE__*/Object.freeze({
   __proto__: null
 });
@@ -46581,7 +47595,37 @@ y.option('repo', {
     description: 'Target a specific repository directory instead of the current working directory.',
     global: true,
 });
-y.command([commit.command, '$0'], commit.desc, commit.builder, commit.handler);
+// Global `--verbose` (alias `-v`) — every subcommand inherits it.
+// Flips `argv.verbose: true` so `commandExecutor` and `Logger` print
+// stack traces / debug spans. Previously only settable via the
+// `COCO_VERBOSE=true` env var or `coco.verbose` git/json config —
+// `BaseArgvOptions.verbose` was typed but never declared as a yargs
+// option, so passing `--verbose` from the CLI was a silent no-op.
+y.option('verbose', {
+    type: 'boolean',
+    alias: 'v',
+    description: 'Print verbose diagnostic output (stack traces on errors, debug spans).',
+    default: false,
+    global: true,
+});
+// `$0` (no positional args) routes through the smart default router
+// rather than aliasing directly to `coco commit`. The router probes
+// the user's environment (config presence, git-repo presence) and
+// forwards to `init` / `ui` / `workspace` / `commit` based on which
+// of those is most likely to be helpful. Mirrors what other modern
+// git-aware CLIs do (lazygit / tig / gitui) — fresh installs land in
+// a setup wizard, configured users land in the TUI, scripts that
+// rely on `coco commit` keep their dedicated subcommand entry.
+y.command('$0', 'Smart entry point — routes to init / ui / workspace / commit based on your environment.', (yargs) => yargs.option('commit', {
+    type: 'boolean',
+    description: 'Force the legacy default — run `coco commit` regardless of routing.',
+    default: false,
+}), 
+// `commandExecutor` wraps every command with config loading, error
+// formatting, and exit-code handling. The router is a regular
+// command so it lights up the same plumbing for free.
+commandExecutor(defaultRouteHandler));
+y.command(commit.command, commit.desc, commit.builder, commit.handler);
 y.command(changelog.command, changelog.desc, changelog.builder, changelog.handler);
 y.command(recap.command, recap.desc, recap.builder, recap.handler);
 y.command(review.command, review.desc, review.builder, review.handler);