git-coco 0.62.3 → 0.63.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.62.3";
+const BUILD_VERSION = "0.63.0";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -2263,7 +2263,66 @@ const schema$1 = {
                 "material-lighter",
                 "papercolor-light",
                 "modus-operandi",
-                "quiet-light"
+                "quiet-light",
+                "catppuccin-frappe",
+                "rose-pine-moon",
+                "kanagawa-dragon",
+                "kanagawa-lotus",
+                "nordfox",
+                "duskfox",
+                "terafox",
+                "dawnfox",
+                "ayu-mirage",
+                "material-darker",
+                "tokyo-night-moon",
+                "gruvbox-material",
+                "gruvbox-material-light",
+                "modus-vivendi",
+                "zenburn",
+                "oxocarbon",
+                "tomorrow-night",
+                "monokai-pro",
+                "sonokai",
+                "doom-one",
+                "andromeda",
+                "aura",
+                "cyberdream",
+                "nightfly",
+                "panda",
+                "hyper-snazzy",
+                "apprentice",
+                "melange",
+                "melange-light",
+                "spaceduck",
+                "embark",
+                "bluloco-dark",
+                "bluloco-light",
+                "papercolor-dark",
+                "base16-ocean",
+                "base16-eighties",
+                "everblush",
+                "darcula",
+                "eldritch",
+                "edge-light",
+                "zenbones",
+                "iceberg-light",
+                "github-dark-dimmed",
+                "edge-dark",
+                "selenized-dark",
+                "selenized-black",
+                "selenized-light",
+                "monokai-pro-machine",
+                "monokai-pro-octagon",
+                "monokai-pro-ristretto",
+                "monokai-pro-spectrum",
+                "base16-default-dark",
+                "base16-default-light",
+                "tomorrow",
+                "tokyodark",
+                "spacemacs-dark",
+                "bamboo",
+                "citylights",
+                "oxocarbon-light"
             ]
         }
     }
@@ -7492,6 +7551,7 @@ var ZodFirstPartyTypeKind;
     ZodFirstPartyTypeKind["ZodReadonly"] = "ZodReadonly";
 })(ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {}));
 const stringType = ZodString.create;
+const booleanType = ZodBoolean.create;
 ZodNever.create;
 const arrayType = ZodArray.create;
 const objectType = ZodObject.create;
@@ -15449,6 +15509,14 @@ const CommitSplitPlanSchema = objectType({
         // that.)
         files: arrayType(stringType()).optional(),
         hunks: arrayType(stringType()).optional(),
+        // Internal flag (not emitted by the model). Set by
+        // `rescueMissingFiles` on the catch-all group of files the
+        // plan didn't confidently place: the apply step skips
+        // committing these, leaving them in the worktree for the user
+        // to handle, and the review overlay renders them as a "will
+        // stay — not committed" note rather than a numbered commit
+        // (#1180).
+        unclaimed: booleanType().optional(),
     })
         .refine((group) => (group.files?.length ?? 0) > 0 || (group.hunks?.length ?? 0) > 0, {
         message: 'Each group must include at least one file or hunk',
@@ -15766,11 +15834,16 @@ function rescueMissingFiles(plan, staged, hunkInventory) {
         groups: [
             ...plan.groups,
             {
-                title: 'chore: misc unclaimed changes',
-                body: 'Files the split plan did not assign to any other commit. Review and re-roll (`r`) if these belong in a specific commit.',
-                rationale: 'Recovered by validator rescue — model omitted these from every group.',
+                // Tagged `unclaimed`: the apply step skips committing this group
+                // (the files are left in the worktree), and the review overlay
+                // renders it as a "will stay — not committed" note rather than a
+                // numbered commit. The confident commits land; these come back
+                // to you on the status screen to handle (#1180).
+                title: 'Left for you — not committed',
+                body: `${missing.length} file${missing.length === 1 ? '' : 's'} the split couldn't confidently place. They stay in your worktree (uncommitted) — you'll land on the status screen to handle them. Re-roll (\`r\`) if they belong in a specific commit.`,
                 files: missing,
                 hunks: [],
+                unclaimed: true,
             },
         ],
     };
@@ -16212,6 +16285,15 @@ async function applyCommitSplitPlan({ plan, changes, hunkInventory, git, logger,
     // "git commit with nothing staged" failure mode mid-loop after
     // the up-front `git reset` has already wiped the index.
     const applicableGroups = plan.groups.filter((group) => {
+        // `unclaimed` groups are intentionally NOT committed (#1180): they
+        // hold the files the plan couldn't confidently place. The up-front
+        // `git reset` below unstages everything, and since these never get
+        // re-added they simply stay in the worktree for the user to handle.
+        // They still count as "claimed" for validatePlanForStagedFiles, so
+        // that check (run above) passes.
+        if (group.unclaimed) {
+            return false;
+        }
         const fileCount = (group.files || []).length;
         const hunkCount = (group.hunks || []).length;
         return fileCount + hunkCount > 0;
@@ -23824,11 +23906,12 @@ function computeLogInkFooterHints(options) {
                 global: NORMAL_GLOBAL_HINTS,
             };
         }
-        // Worktree (staging) diff. The hunk is the unit of action: ↑/↓ walk
-        // hunks, space stages/unstages the selected one, a stages the whole
-        // file, z discards the hunk.
+        // Worktree (staging) diff. Consistent with the commit/stash diffs
+        // (#1185): j/k scroll lines, [/] jump between hunks. space stages /
+        // unstages the hunk under the viewport, a stages the whole file, z
+        // discards the current hunk.
         return {
-            contextual: ['↑/↓ hunk', 'space stage', 'a stage file', 'z discard', 'o edit', 'esc back'],
+            contextual: ['j/k lines', '[/] hunk', 'space stage', 'a stage file', 'z discard', 'o edit', 'esc back'],
             global: NORMAL_GLOBAL_HINTS,
         };
     }
@@ -24201,14 +24284,23 @@ function getColorLevel(env = process.env) {
         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', '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']);
+/**
+ * The only presets whose palettes are ANSI-named (not hex): `default`
+ * renders faithfully on 16-color terminals, and `monochrome` carries no
+ * color at all. Every other preset in `THEME_PRESET_COLORS` is hand-authored
+ * in hex, so it's treated as truecolor by definition — no list to keep in
+ * sync as themes are added.
+ */
+const ANSI_NATIVE_PRESETS = new Set(['default', 'monochrome']);
 /**
  * `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.
+ * to the ANSI-named `default` palette on lower-capability terminals. Every
+ * preset except the two ANSI-native baselines uses hex, so this is derived
+ * rather than enumerated — new themes are covered automatically.
  */
 function presetUsesTrueColor(preset) {
-    return preset !== undefined && TRUECOLOR_PRESETS.has(preset);
+    return preset !== undefined && !ANSI_NATIVE_PRESETS.has(preset);
 }
 /**
  * WCAG 2.x relative luminance of a `#rrggbb` color, 0 (black) … 1 (white).
@@ -24937,6 +25029,832 @@ const THEME_PRESET_COLORS = {
         success: '#448c27',
         warning: '#a67d00',
     },
+    'catppuccin-frappe': {
+        accent: '#8caaee',
+        border: '#51576d',
+        danger: '#e78284',
+        focusBorder: '#81c8be',
+        gitAdded: '#a6d189',
+        gitDeleted: '#e78284',
+        gitModified: '#e5c890',
+        info: '#8caaee',
+        muted: '#737994',
+        selection: '#414559',
+        success: '#a6d189',
+        warning: '#e5c890',
+    },
+    'rose-pine-moon': {
+        accent: '#c4a7e7',
+        border: '#393552',
+        danger: '#eb6f92',
+        focusBorder: '#9ccfd8',
+        gitAdded: '#3e8fb0',
+        gitDeleted: '#eb6f92',
+        gitModified: '#f6c177',
+        info: '#9ccfd8',
+        muted: '#6e6a86',
+        selection: '#44415a',
+        success: '#3e8fb0',
+        warning: '#f6c177',
+    },
+    'kanagawa-dragon': {
+        accent: '#8ba4b0',
+        border: '#282727',
+        danger: '#c4746e',
+        focusBorder: '#8ea4a2',
+        gitAdded: '#87a987',
+        gitDeleted: '#c4746e',
+        gitModified: '#c4b28a',
+        info: '#8ba4b0',
+        muted: '#737c73',
+        selection: '#2d4f67',
+        success: '#87a987',
+        warning: '#c4b28a',
+    },
+    'kanagawa-lotus': {
+        accent: '#4d699b',
+        border: '#e5ddb0',
+        danger: '#c84053',
+        focusBorder: '#597b75',
+        gitAdded: '#6f894e',
+        gitDeleted: '#c84053',
+        gitModified: '#77713f',
+        info: '#4d699b',
+        muted: '#8a8980',
+        selection: '#dcd5ac',
+        success: '#6f894e',
+        warning: '#77713f',
+    },
+    nordfox: {
+        accent: '#81a1c1',
+        border: '#39404f',
+        danger: '#bf616a',
+        focusBorder: '#88c0d0',
+        gitAdded: '#a3be8c',
+        gitDeleted: '#bf616a',
+        gitModified: '#ebcb8b',
+        info: '#81a1c1',
+        muted: '#60728a',
+        selection: '#3e4a5b',
+        success: '#a3be8c',
+        warning: '#ebcb8b',
+    },
+    duskfox: {
+        accent: '#569fba',
+        border: '#2d2a45',
+        danger: '#eb6f92',
+        focusBorder: '#9ccfd8',
+        gitAdded: '#a3be8c',
+        gitDeleted: '#eb6f92',
+        gitModified: '#f6c177',
+        info: '#569fba',
+        muted: '#817c9c',
+        selection: '#433c59',
+        success: '#a3be8c',
+        warning: '#f6c177',
+    },
+    terafox: {
+        accent: '#5a93aa',
+        border: '#1d3337',
+        danger: '#e85c51',
+        focusBorder: '#a1cdd8',
+        gitAdded: '#7aa4a1',
+        gitDeleted: '#e85c51',
+        gitModified: '#fda47f',
+        info: '#5a93aa',
+        muted: '#6d7f8b',
+        selection: '#293e40',
+        success: '#7aa4a1',
+        warning: '#fda47f',
+    },
+    dawnfox: {
+        accent: '#286983',
+        border: '#ebe0df',
+        danger: '#b4637a',
+        focusBorder: '#56949f',
+        gitAdded: '#618774',
+        gitDeleted: '#b4637a',
+        gitModified: '#ea9d34',
+        info: '#286983',
+        muted: '#9893a5',
+        selection: '#eadcd8',
+        success: '#618774',
+        warning: '#ea9d34',
+    },
+    'ayu-mirage': {
+        accent: '#ffcc66',
+        border: '#323843',
+        danger: '#f28779',
+        focusBorder: '#95e6cb',
+        gitAdded: '#d5ff80',
+        gitDeleted: '#f28779',
+        gitModified: '#ffd173',
+        info: '#73d0ff',
+        muted: '#5c6773',
+        selection: '#33415e',
+        success: '#d5ff80',
+        warning: '#ffd173',
+    },
+    'material-darker': {
+        accent: '#82aaff',
+        border: '#343434',
+        danger: '#f07178',
+        focusBorder: '#89ddff',
+        gitAdded: '#c3e88d',
+        gitDeleted: '#f07178',
+        gitModified: '#ffcb6b',
+        info: '#82aaff',
+        muted: '#545454',
+        selection: '#404040',
+        success: '#c3e88d',
+        warning: '#ffcb6b',
+    },
+    'tokyo-night-moon': {
+        accent: '#82aaff',
+        border: '#2f334d',
+        danger: '#ff757f',
+        focusBorder: '#86e1fc',
+        gitAdded: '#c3e88d',
+        gitDeleted: '#ff757f',
+        gitModified: '#ffc777',
+        info: '#82aaff',
+        muted: '#636da6',
+        selection: '#2d3f76',
+        success: '#c3e88d',
+        warning: '#ffc777',
+    },
+    'gruvbox-material': {
+        accent: '#7daea3',
+        border: '#504945',
+        danger: '#ea6962',
+        focusBorder: '#89b482',
+        gitAdded: '#a9b665',
+        gitDeleted: '#ea6962',
+        gitModified: '#d8a657',
+        info: '#7daea3',
+        muted: '#928374',
+        selection: '#3c3836',
+        success: '#a9b665',
+        warning: '#d8a657',
+    },
+    'gruvbox-material-light': {
+        accent: '#45707a',
+        border: '#ddccab',
+        danger: '#c14a4a',
+        focusBorder: '#4c7a5d',
+        gitAdded: '#6c782e',
+        gitDeleted: '#c14a4a',
+        gitModified: '#b47109',
+        info: '#45707a',
+        muted: '#928374',
+        selection: '#eee0b7',
+        success: '#6c782e',
+        warning: '#b47109',
+    },
+    'modus-vivendi': {
+        accent: '#2fafff',
+        border: '#646464',
+        danger: '#ff5f59',
+        focusBorder: '#00d3d0',
+        gitAdded: '#44bc44',
+        gitDeleted: '#ff5f59',
+        gitModified: '#d0bc00',
+        info: '#2fafff',
+        muted: '#989898',
+        selection: '#5a5a5a',
+        success: '#44bc44',
+        warning: '#d0bc00',
+    },
+    zenburn: {
+        accent: '#8cd0d3',
+        border: '#4f4f4f',
+        danger: '#cc9393',
+        focusBorder: '#93e0e3',
+        gitAdded: '#7f9f7f',
+        gitDeleted: '#cc9393',
+        gitModified: '#f0dfaf',
+        info: '#8cd0d3',
+        muted: '#9f9f8f',
+        selection: '#5f5f5f',
+        success: '#7f9f7f',
+        warning: '#f0dfaf',
+    },
+    oxocarbon: {
+        accent: '#33b1ff',
+        border: '#525252',
+        danger: '#ee5396',
+        focusBorder: '#3ddbd9',
+        gitAdded: '#42be65',
+        gitDeleted: '#ee5396',
+        gitModified: '#ab8e34',
+        info: '#33b1ff',
+        muted: '#6f6f6f',
+        selection: '#2a2a2a',
+        success: '#42be65',
+        warning: '#ab8e34',
+    },
+    'tomorrow-night': {
+        accent: '#81a2be',
+        border: '#373b41',
+        danger: '#cc6666',
+        focusBorder: '#8abeb7',
+        gitAdded: '#b5bd68',
+        gitDeleted: '#cc6666',
+        gitModified: '#f0c674',
+        info: '#81a2be',
+        muted: '#969896',
+        selection: '#373b41',
+        success: '#b5bd68',
+        warning: '#f0c674',
+    },
+    'monokai-pro': {
+        accent: '#78dce8',
+        border: '#403e41',
+        danger: '#ff6188',
+        focusBorder: '#a9dc76',
+        gitAdded: '#a9dc76',
+        gitDeleted: '#ff6188',
+        gitModified: '#ffd866',
+        info: '#78dce8',
+        muted: '#727072',
+        selection: '#5b595c',
+        success: '#a9dc76',
+        warning: '#ffd866',
+    },
+    sonokai: {
+        accent: '#76cce0',
+        border: '#33353f',
+        danger: '#fc5d7c',
+        focusBorder: '#9ed072',
+        gitAdded: '#9ed072',
+        gitDeleted: '#fc5d7c',
+        gitModified: '#e7c664',
+        info: '#76cce0',
+        muted: '#7f8490',
+        selection: '#414550',
+        success: '#9ed072',
+        warning: '#e7c664',
+    },
+    'doom-one': {
+        accent: '#51afef',
+        border: '#3f444a',
+        danger: '#ff6c6b',
+        focusBorder: '#46d9ff',
+        gitAdded: '#98be65',
+        gitDeleted: '#ff6c6b',
+        gitModified: '#ecbe7b',
+        info: '#51afef',
+        muted: '#5b6268',
+        selection: '#42444a',
+        success: '#98be65',
+        warning: '#ecbe7b',
+    },
+    andromeda: {
+        accent: '#00e8c6',
+        border: '#2b2e36',
+        danger: '#ee5d43',
+        focusBorder: '#00e8c6',
+        gitAdded: '#96e072',
+        gitDeleted: '#ee5d43',
+        gitModified: '#ffe66d',
+        info: '#7cb7ff',
+        muted: '#a0a1a7',
+        selection: '#3d4352',
+        success: '#96e072',
+        warning: '#ffe66d',
+    },
+    aura: {
+        accent: '#a277ff',
+        border: '#363c49',
+        danger: '#ff6767',
+        focusBorder: '#61ffca',
+        gitAdded: '#61ffca',
+        gitDeleted: '#ff6767',
+        gitModified: '#ffca85',
+        info: '#82e2ff',
+        muted: '#6d6d6d',
+        selection: '#3d375e',
+        success: '#61ffca',
+        warning: '#ffca85',
+    },
+    cyberdream: {
+        accent: '#5ea1ff',
+        border: '#1e2124',
+        danger: '#ff6e5e',
+        focusBorder: '#5ef1ff',
+        gitAdded: '#5eff6c',
+        gitDeleted: '#ff6e5e',
+        gitModified: '#f1ff5e',
+        info: '#5ea1ff',
+        muted: '#7b8496',
+        selection: '#3c4048',
+        success: '#5eff6c',
+        warning: '#f1ff5e',
+    },
+    nightfly: {
+        accent: '#82aaff',
+        border: '#1d3b53',
+        danger: '#fc514e',
+        focusBorder: '#7fdbca',
+        gitAdded: '#a1cd5e',
+        gitDeleted: '#fc514e',
+        gitModified: '#e3d18a',
+        info: '#82aaff',
+        muted: '#7c8f8f',
+        selection: '#1d3b53',
+        success: '#a1cd5e',
+        warning: '#e3d18a',
+    },
+    panda: {
+        accent: '#ff75b5',
+        border: '#404954',
+        danger: '#ff4b82',
+        focusBorder: '#19f9d8',
+        gitAdded: '#19f9d8',
+        gitDeleted: '#ff4b82',
+        gitModified: '#ffb86c',
+        info: '#45a9f9',
+        muted: '#676b79',
+        selection: '#373841',
+        success: '#19f9d8',
+        warning: '#ffb86c',
+    },
+    'hyper-snazzy': {
+        accent: '#57c7ff',
+        border: '#43454f',
+        danger: '#ff5c57',
+        focusBorder: '#9aedfe',
+        gitAdded: '#5af78e',
+        gitDeleted: '#ff5c57',
+        gitModified: '#f3f99d',
+        info: '#57c7ff',
+        muted: '#686868',
+        selection: '#3a3d4d',
+        success: '#5af78e',
+        warning: '#f3f99d',
+    },
+    apprentice: {
+        accent: '#5f87af',
+        border: '#444444',
+        danger: '#af5f5f',
+        focusBorder: '#5f8787',
+        gitAdded: '#5f875f',
+        gitDeleted: '#af5f5f',
+        gitModified: '#ffffaf',
+        info: '#5f87af',
+        muted: '#6c6c6c',
+        selection: '#444444',
+        success: '#5f875f',
+        warning: '#ffffaf',
+    },
+    melange: {
+        accent: '#a3a9ce',
+        border: '#34302c',
+        danger: '#d47766',
+        focusBorder: '#89b3b6',
+        gitAdded: '#85b695',
+        gitDeleted: '#d47766',
+        gitModified: '#ebc06d',
+        info: '#a3a9ce',
+        muted: '#867462',
+        selection: '#403a36',
+        success: '#85b695',
+        warning: '#ebc06d',
+    },
+    'melange-light': {
+        accent: '#465aa4',
+        border: '#e9e1db',
+        danger: '#bf0021',
+        focusBorder: '#3d6568',
+        gitAdded: '#3a684a',
+        gitDeleted: '#bf0021',
+        gitModified: '#a06d00',
+        info: '#465aa4',
+        muted: '#7d6658',
+        selection: '#d9d3ce',
+        success: '#3a684a',
+        warning: '#a06d00',
+    },
+    spaceduck: {
+        accent: '#00a3cc',
+        border: '#30365f',
+        danger: '#e33400',
+        focusBorder: '#ce6f8f',
+        gitAdded: '#5ccc96',
+        gitDeleted: '#e33400',
+        gitModified: '#f2ce00',
+        info: '#7a5ccc',
+        muted: '#686f9a',
+        selection: '#30365f',
+        success: '#5ccc96',
+        warning: '#f2ce00',
+    },
+    embark: {
+        accent: '#d4bfff',
+        border: '#585273',
+        danger: '#f48fb1',
+        focusBorder: '#abf8f7',
+        gitAdded: '#a1efd3',
+        gitDeleted: '#f48fb1',
+        gitModified: '#ffe6b3',
+        info: '#91ddff',
+        muted: '#8a889d',
+        selection: '#3e3859',
+        success: '#a1efd3',
+        warning: '#ffe6b3',
+    },
+    'bluloco-dark': {
+        accent: '#3691ff',
+        border: '#3d434f',
+        danger: '#ff2e3f',
+        focusBorder: '#4483aa',
+        gitAdded: '#3fc56b',
+        gitDeleted: '#ff2e3f',
+        gitModified: '#f9c859',
+        info: '#3691ff',
+        muted: '#636d83',
+        selection: '#2f343e',
+        success: '#3fc56b',
+        warning: '#f9c859',
+    },
+    'bluloco-light': {
+        accent: '#275fe4',
+        border: '#d5d7d8',
+        danger: '#d52753',
+        focusBorder: '#40b8c5',
+        gitAdded: '#23974a',
+        gitDeleted: '#d52753',
+        gitModified: '#c5a332',
+        info: '#275fe4',
+        muted: '#a0a1a7',
+        selection: '#d2ecff',
+        success: '#23974a',
+        warning: '#c5a332',
+    },
+    'papercolor-dark': {
+        accent: '#5fafd7',
+        border: '#444444',
+        danger: '#af005f',
+        focusBorder: '#00afaf',
+        gitAdded: '#5faf00',
+        gitDeleted: '#af005f',
+        gitModified: '#d7af5f',
+        info: '#5fafd7',
+        muted: '#808080',
+        selection: '#303030',
+        success: '#5faf00',
+        warning: '#d7af5f',
+    },
+    'base16-ocean': {
+        accent: '#8fa1b3',
+        border: '#343d46',
+        danger: '#bf616a',
+        focusBorder: '#96b5b4',
+        gitAdded: '#a3be8c',
+        gitDeleted: '#bf616a',
+        gitModified: '#ebcb8b',
+        info: '#8fa1b3',
+        muted: '#65737e',
+        selection: '#4f5b66',
+        success: '#a3be8c',
+        warning: '#ebcb8b',
+    },
+    'base16-eighties': {
+        accent: '#6699cc',
+        border: '#393939',
+        danger: '#f2777a',
+        focusBorder: '#66cccc',
+        gitAdded: '#99cc99',
+        gitDeleted: '#f2777a',
+        gitModified: '#ffcc66',
+        info: '#6699cc',
+        muted: '#747369',
+        selection: '#515151',
+        success: '#99cc99',
+        warning: '#ffcc66',
+    },
+    everblush: {
+        accent: '#67b0e8',
+        border: '#232a2d',
+        danger: '#e57474',
+        focusBorder: '#6cbfbf',
+        gitAdded: '#8ccf7e',
+        gitDeleted: '#e57474',
+        gitModified: '#e5c76b',
+        info: '#67b0e8',
+        muted: '#5e6164',
+        selection: '#2d3437',
+        success: '#8ccf7e',
+        warning: '#e5c76b',
+    },
+    darcula: {
+        accent: '#cc7832',
+        border: '#3c3f41',
+        danger: '#ff6b68',
+        focusBorder: '#629755',
+        gitAdded: '#6a8759',
+        gitDeleted: '#ff6b68',
+        gitModified: '#ffc66d',
+        info: '#6897bb',
+        muted: '#808080',
+        selection: '#214283',
+        success: '#6a8759',
+        warning: '#ffc66d',
+    },
+    eldritch: {
+        accent: '#a48cf2',
+        border: '#292e42',
+        danger: '#f16c75',
+        focusBorder: '#04d1f9',
+        gitAdded: '#37f499',
+        gitDeleted: '#f16c75',
+        gitModified: '#f1fc79',
+        info: '#04d1f9',
+        muted: '#7081d0',
+        selection: '#2d3052',
+        success: '#37f499',
+        warning: '#f1fc79',
+    },
+    'edge-light': {
+        accent: '#5079be',
+        border: '#dde2e7',
+        danger: '#d05858',
+        focusBorder: '#3a8b84',
+        gitAdded: '#608e32',
+        gitDeleted: '#d05858',
+        gitModified: '#be7e05',
+        info: '#5079be',
+        muted: '#a0a1a7',
+        selection: '#e3e6eb',
+        success: '#608e32',
+        warning: '#be7e05',
+    },
+    zenbones: {
+        accent: '#286486',
+        border: '#cfd1d0',
+        danger: '#a8334c',
+        focusBorder: '#3b8992',
+        gitAdded: '#4f6c31',
+        gitDeleted: '#a8334c',
+        gitModified: '#944927',
+        info: '#286486',
+        muted: '#a8a29e',
+        selection: '#cbd9e3',
+        success: '#4f6c31',
+        warning: '#944927',
+    },
+    'iceberg-light': {
+        accent: '#2d539e',
+        border: '#cad0de',
+        danger: '#cc517a',
+        focusBorder: '#3f83a6',
+        gitAdded: '#668e3d',
+        gitDeleted: '#cc517a',
+        gitModified: '#c57339',
+        info: '#2d539e',
+        muted: '#8389a3',
+        selection: '#c9cdd7',
+        success: '#668e3d',
+        warning: '#c57339',
+    },
+    'github-dark-dimmed': {
+        accent: '#539bf5',
+        border: '#444c56',
+        danger: '#f47067',
+        focusBorder: '#39c5cf',
+        gitAdded: '#57ab5a',
+        gitDeleted: '#f47067',
+        gitModified: '#c69026',
+        info: '#539bf5',
+        muted: '#636e7b',
+        selection: '#2d333b',
+        success: '#57ab5a',
+        warning: '#c69026',
+    },
+    'edge-dark': {
+        accent: '#6cb6eb',
+        border: '#414550',
+        danger: '#ec7279',
+        focusBorder: '#5dbbc1',
+        gitAdded: '#a0c980',
+        gitDeleted: '#ec7279',
+        gitModified: '#deb974',
+        info: '#6cb6eb',
+        muted: '#758094',
+        selection: '#3b3e48',
+        success: '#a0c980',
+        warning: '#deb974',
+    },
+    'selenized-dark': {
+        accent: '#4695f7',
+        border: '#2d5b69',
+        danger: '#fa5750',
+        focusBorder: '#41c7b9',
+        gitAdded: '#75b938',
+        gitDeleted: '#fa5750',
+        gitModified: '#dbb32d',
+        info: '#4695f7',
+        muted: '#72898f',
+        selection: '#184956',
+        success: '#75b938',
+        warning: '#dbb32d',
+    },
+    'selenized-black': {
+        accent: '#368aeb',
+        border: '#3b3b3b',
+        danger: '#ed4a46',
+        focusBorder: '#3fc5b7',
+        gitAdded: '#70b433',
+        gitDeleted: '#ed4a46',
+        gitModified: '#dbb32d',
+        info: '#368aeb',
+        muted: '#777777',
+        selection: '#252525',
+        success: '#70b433',
+        warning: '#dbb32d',
+    },
+    'selenized-light': {
+        accent: '#0072d4',
+        border: '#d5cdb6',
+        danger: '#d2212d',
+        focusBorder: '#009c8f',
+        gitAdded: '#489100',
+        gitDeleted: '#d2212d',
+        gitModified: '#ad8900',
+        info: '#0072d4',
+        muted: '#909995',
+        selection: '#ece3cc',
+        success: '#489100',
+        warning: '#ad8900',
+    },
+    'monokai-pro-machine': {
+        accent: '#7cd5f1',
+        border: '#1d2528',
+        danger: '#ff6d7e',
+        focusBorder: '#a2e57b',
+        gitAdded: '#a2e57b',
+        gitDeleted: '#ff6d7e',
+        gitModified: '#ffed72',
+        info: '#7cd5f1',
+        muted: '#6b7678',
+        selection: '#3a4449',
+        success: '#a2e57b',
+        warning: '#ffed72',
+    },
+    'monokai-pro-octagon': {
+        accent: '#9cd1bb',
+        border: '#1e1f2b',
+        danger: '#ff657a',
+        focusBorder: '#bad761',
+        gitAdded: '#bad761',
+        gitDeleted: '#ff657a',
+        gitModified: '#ffd76d',
+        info: '#9cd1bb',
+        muted: '#696d77',
+        selection: '#3a3d4b',
+        success: '#bad761',
+        warning: '#ffd76d',
+    },
+    'monokai-pro-ristretto': {
+        accent: '#85dacc',
+        border: '#211c1c',
+        danger: '#fd6883',
+        focusBorder: '#adda78',
+        gitAdded: '#adda78',
+        gitDeleted: '#fd6883',
+        gitModified: '#f9cc6c',
+        info: '#85dacc',
+        muted: '#72696a',
+        selection: '#403838',
+        success: '#adda78',
+        warning: '#f9cc6c',
+    },
+    'monokai-pro-spectrum': {
+        accent: '#5ad4e6',
+        border: '#191919',
+        danger: '#fc618d',
+        focusBorder: '#7bd88f',
+        gitAdded: '#7bd88f',
+        gitDeleted: '#fc618d',
+        gitModified: '#fce566',
+        info: '#5ad4e6',
+        muted: '#69676c',
+        selection: '#363537',
+        success: '#7bd88f',
+        warning: '#fce566',
+    },
+    'base16-default-dark': {
+        accent: '#7cafc2',
+        border: '#282828',
+        danger: '#ab4642',
+        focusBorder: '#86c1b9',
+        gitAdded: '#a1b56c',
+        gitDeleted: '#ab4642',
+        gitModified: '#f7ca88',
+        info: '#7cafc2',
+        muted: '#585858',
+        selection: '#383838',
+        success: '#a1b56c',
+        warning: '#f7ca88',
+    },
+    'base16-default-light': {
+        accent: '#7cafc2',
+        border: '#e8e8e8',
+        danger: '#ab4642',
+        focusBorder: '#86c1b9',
+        gitAdded: '#a1b56c',
+        gitDeleted: '#ab4642',
+        gitModified: '#dc9656',
+        info: '#7cafc2',
+        muted: '#b8b8b8',
+        selection: '#d8d8d8',
+        success: '#a1b56c',
+        warning: '#dc9656',
+    },
+    tomorrow: {
+        accent: '#4271ae',
+        border: '#efefef',
+        danger: '#c82829',
+        focusBorder: '#3e999f',
+        gitAdded: '#718c00',
+        gitDeleted: '#c82829',
+        gitModified: '#eab700',
+        info: '#4271ae',
+        muted: '#8e908c',
+        selection: '#d6d6d6',
+        success: '#718c00',
+        warning: '#eab700',
+    },
+    tokyodark: {
+        accent: '#a485dd',
+        border: '#2a2c41',
+        danger: '#ee6d85',
+        focusBorder: '#38a89d',
+        gitAdded: '#95c561',
+        gitDeleted: '#ee6d85',
+        gitModified: '#d7a65f',
+        info: '#7199ee',
+        muted: '#4a5057',
+        selection: '#212234',
+        success: '#95c561',
+        warning: '#d7a65f',
+    },
+    'spacemacs-dark': {
+        accent: '#bc6ec5',
+        border: '#5d4d7a',
+        danger: '#f2241f',
+        focusBorder: '#2d9574',
+        gitAdded: '#67b11d',
+        gitDeleted: '#f2241f',
+        gitModified: '#b1951d',
+        info: '#4f97d7',
+        muted: '#6c6783',
+        selection: '#444155',
+        success: '#67b11d',
+        warning: '#b1951d',
+    },
+    bamboo: {
+        accent: '#8fb573',
+        border: '#3a3d37',
+        danger: '#e75a7c',
+        focusBorder: '#70c2be',
+        gitAdded: '#8fb573',
+        gitDeleted: '#e75a7c',
+        gitModified: '#dbb651',
+        info: '#57a5e5',
+        muted: '#838781',
+        selection: '#383b35',
+        success: '#8fb573',
+        warning: '#dbb651',
+    },
+    citylights: {
+        accent: '#5ec4ff',
+        border: '#2f3a42',
+        danger: '#e27e8d',
+        focusBorder: '#70e1e8',
+        gitAdded: '#54af83',
+        gitDeleted: '#e27e8d',
+        gitModified: '#ebda65',
+        info: '#68a1f0',
+        muted: '#41505e',
+        selection: '#363c43',
+        success: '#54af83',
+        warning: '#ebda65',
+    },
+    'oxocarbon-light': {
+        accent: '#0f62fe',
+        border: '#e0e0e0',
+        danger: '#ee5396',
+        focusBorder: '#08bdba',
+        gitAdded: '#42be65',
+        gitDeleted: '#ee5396',
+        gitModified: '#ff6f00',
+        info: '#0f62fe',
+        muted: '#525252',
+        selection: '#dde1e6',
+        success: '#42be65',
+        warning: '#ff6f00',
+    },
 };
 /**
  * Ordered list of every selectable theme preset, for the `coco ui` theme
@@ -25325,7 +26243,6 @@ function withPushedView(state, value) {
         // 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,
@@ -25359,7 +26276,6 @@ function withPoppedView(state) {
         // 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,
@@ -25488,7 +26404,6 @@ function withReplacedView(state, value) {
         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,
@@ -25626,9 +26541,29 @@ function nextHunkOffset(currentOffset, hunkOffsets, delta) {
     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));
+/**
+ * Which hunk the viewport is currently showing — the index of the last
+ * hunk whose `@@` header offset is at or above the viewport top
+ * (`offset`). This is the single source of truth for the worktree
+ * staging diff's "current hunk" (#1179): deriving it from the scroll
+ * position keeps the header, the in-body highlight, and `space`/`z`
+ * (stage / revert) all pointed at the hunk you're actually looking at,
+ * whether you got there by hunk-jump (↑/↓) or page-scroll (PgUp/PgDn).
+ * The old `indexOf(landedOffset)` approach reset to hunk 0 whenever the
+ * offset wasn't exactly on a boundary, and page-scroll never updated it
+ * at all — so the indicator stuck at "1/N".
+ */
+function hunkIndexAtOffset(offset, hunkOffsets) {
+    let index = 0;
+    for (let i = 0; i < hunkOffsets.length; i += 1) {
+        if (hunkOffsets[i] <= offset) {
+            index = i;
+        }
+        else {
+            break;
+        }
+    }
+    return index;
 }
 function getLogInkSidebarTabs() {
     return [...SIDEBAR_TABS];
@@ -25645,7 +26580,6 @@ function createLogInkState(rows, options = {}) {
         selectedIndex: 0,
         selectedFileIndex: 0,
         selectedWorktreeFileIndex: 0,
-        selectedWorktreeHunkIndex: 0,
         selectedBranchIndex: 0,
         selectedTagIndex: 0,
         selectedStashIndex: 0,
@@ -25846,7 +26780,6 @@ function applyLogInkAction(state, action) {
             return {
                 ...next,
                 selectedWorktreeFileIndex: clampIndex(state.selectedWorktreeFileIndex + action.delta, action.fileCount),
-                selectedWorktreeHunkIndex: 0,
                 worktreeDiffOffset: 0,
                 // Cursor moved to a real file row — drop header focus so the
                 // file Enter handler (open diff) is what fires next.
@@ -25890,7 +26823,6 @@ function applyLogInkAction(state, action) {
             return {
                 ...state,
                 selectedWorktreeFileIndex: Math.max(0, action.targetIndex),
-                selectedWorktreeHunkIndex: 0,
                 worktreeDiffOffset: 0,
                 statusGroupHeaderFocused: false,
                 pendingKey: undefined,
@@ -26130,16 +27062,19 @@ function applyLogInkAction(state, action) {
                 pendingKey: undefined,
             };
         case 'pageWorktreeDiff':
+            // The current staging hunk is derived from the scroll offset at
+            // the read sites (#1185), so paging only moves the offset.
             return {
                 ...state,
                 worktreeDiffOffset: clampIndex(state.worktreeDiffOffset + action.delta, action.lineCount),
                 pendingKey: undefined,
             };
         case 'jumpWorktreeHunk':
+            // `[`/`]` move the offset onto the next/previous hunk header; the
+            // current hunk is derived from that offset at the read sites.
             return {
                 ...state,
                 worktreeDiffOffset: nextHunkOffset(state.worktreeDiffOffset, action.hunkOffsets, action.delta),
-                selectedWorktreeHunkIndex: nextHunkIndex(state.worktreeDiffOffset, action.hunkOffsets, action.delta),
                 pendingKey: undefined,
             };
         case 'jumpCommitDiffHunk':
@@ -26184,7 +27119,6 @@ function applyLogInkAction(state, action) {
                 activeView: HOME_VIEW,
                 viewStack: [HOME_VIEW],
                 worktreeDiffOffset: 0,
-                selectedWorktreeHunkIndex: 0,
                 pendingCommitFocused: false,
                 pendingKey: undefined,
             };
@@ -26223,7 +27157,6 @@ function applyLogInkAction(state, action) {
             return {
                 ...next,
                 selectedWorktreeFileIndex: Math.max(0, action.fileIndex),
-                selectedWorktreeHunkIndex: 0,
                 worktreeDiffOffset: 0,
                 diffSource: 'worktree',
             };
@@ -26273,7 +27206,6 @@ function applyLogInkAction(state, action) {
             return {
                 ...next,
                 selectedWorktreeFileIndex: Math.max(0, action.fileIndex),
-                selectedWorktreeHunkIndex: 0,
                 worktreeDiffOffset: 0,
             };
         }
@@ -26385,6 +27317,10 @@ function applyLogInkAction(state, action) {
                 pendingMutationConfirmation: action.value ? undefined : state.pendingMutationConfirmation,
                 pendingKey: undefined,
             };
+        case 'setWorktreeCheckoutConflict':
+            return { ...state, worktreeCheckoutConflict: action.value, pendingKey: undefined };
+        case 'setPendingChoice':
+            return { ...state, pendingChoice: action.value, pendingKey: undefined };
         case 'setPendingMutationConfirmation':
             return {
                 ...state,
@@ -27756,6 +28692,46 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
         }
         return [];
     }
+    // Multi-option prompt (#1181) — the n-way generalization of the y/n
+    // confirmation. Match the keypress against the prompt's options; each
+    // either runs a workflow or fires a built-in navigation intent.
+    if (state.pendingChoice) {
+        const option = state.pendingChoice.options.find((opt) => opt.key === inputValue);
+        if (option) {
+            // `switch-worktree` is pure navigation — open the worktree as a
+            // nested repo frame. Handled here rather than via the workflow
+            // runner, whose post-action context refresh would mis-target the
+            // frame we just pushed.
+            if (option.intent === 'switch-worktree' && state.worktreeCheckoutConflict) {
+                const conflict = state.worktreeCheckoutConflict;
+                return [
+                    action({ type: 'pushRepoFrame', label: conflict.branch, workdir: conflict.worktreePath }),
+                    action({ type: 'setStatus', value: `Switched to worktree ${conflict.worktreePath} (${conflict.branch})` }),
+                    action({ type: 'setPendingChoice', value: undefined }),
+                    action({ type: 'setWorktreeCheckoutConflict', value: undefined }),
+                ];
+            }
+            if (option.workflowId) {
+                // The workflow runner owns the live context + clears any
+                // conflict state once it resolves.
+                return [
+                    { type: 'runWorkflowAction', id: option.workflowId },
+                    action({ type: 'setPendingChoice', value: undefined }),
+                ];
+            }
+            return [action({ type: 'setPendingChoice', value: undefined })];
+        }
+        if (inputValue === 'n' || key.escape) {
+            return [
+                action({ type: 'setPendingChoice', value: undefined }),
+                ...(state.worktreeCheckoutConflict
+                    ? [action({ type: 'setWorktreeCheckoutConflict', value: undefined })]
+                    : []),
+                action({ type: 'setStatus', value: 'cancelled' }),
+            ];
+        }
+        return [];
+    }
     if (state.pendingConfirmationId) {
         if (inputValue === 'y') {
             const workflowAction = getLogInkWorkflowActionById(state.pendingConfirmationId);
@@ -28629,22 +29605,16 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
                     fileCount: context.worktreeFileCount,
                 })];
         }
-        // Worktree (staging) diff: ↑/↓ move between hunks — the hunk is the
-        // unit you stage, so the cursor walks hunks (auto-scrolling to the
-        // selected one). Single-hunk files fall through to line-scroll so a
-        // long lone hunk stays readable; `[`/`]` remain hunk-jump aliases.
-        if (state.activeView === 'diff' && (context.worktreeHunkOffsets?.length ?? 0) > 1) {
-            return [action({
-                    type: 'jumpWorktreeHunk',
-                    delta: -1,
-                    hunkOffsets: context.worktreeHunkOffsets,
-                })];
-        }
+        // Worktree (staging) diff: ↑/↓ scroll lines — consistent with the
+        // commit / stash diffs (#1185). `[`/`]` jump between hunks (the
+        // staging unit), and the current hunk is derived from the scroll
+        // position, so line-scrolling still walks the staging target.
         if (state.activeView === 'diff' && context.worktreeDiffLineCount) {
             return [action({
                     type: 'pageWorktreeDiff',
                     delta: -1,
                     lineCount: context.worktreeDiffLineCount,
+                    hunkOffsets: context.worktreeHunkOffsets,
                 })];
         }
         if (state.activeView === 'diff' && context.previewLineCount) {
@@ -28754,20 +29724,14 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
                     fileCount: context.worktreeFileCount,
                 })];
         }
-        // Worktree (staging) diff: ↓ walks to the next hunk (see the ↑
-        // handler). Multi-hunk only; single-hunk files line-scroll.
-        if (state.activeView === 'diff' && (context.worktreeHunkOffsets?.length ?? 0) > 1) {
-            return [action({
-                    type: 'jumpWorktreeHunk',
-                    delta: 1,
-                    hunkOffsets: context.worktreeHunkOffsets,
-                })];
-        }
+        // Worktree (staging) diff: ↓ scrolls lines (see the ↑ handler) —
+        // `[`/`]` jump hunks (#1185).
         if (state.activeView === 'diff' && context.worktreeDiffLineCount) {
             return [action({
                     type: 'pageWorktreeDiff',
                     delta: 1,
                     lineCount: context.worktreeDiffLineCount,
+                    hunkOffsets: context.worktreeHunkOffsets,
                 })];
         }
         if (state.activeView === 'diff' && context.previewLineCount) {
@@ -28827,6 +29791,7 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
                     type: 'pageWorktreeDiff',
                     delta: -8,
                     lineCount: context.worktreeDiffLineCount,
+                    hunkOffsets: context.worktreeHunkOffsets,
                 })];
         }
         if (state.activeView === 'diff' && context.previewLineCount) {
@@ -28851,6 +29816,7 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
                     type: 'pageWorktreeDiff',
                     delta: 8,
                     lineCount: context.worktreeDiffLineCount,
+                    hunkOffsets: context.worktreeHunkOffsets,
                 })];
         }
         if (state.activeView === 'diff' && context.previewLineCount) {
@@ -33374,6 +34340,7 @@ function renderFooter$1(h, components, state, context, theme, idleTip, spinnerFr
         state.gitignorePicker ||
         state.inputPrompt ||
         state.pendingConfirmationId ||
+        state.pendingChoice ||
         state.pendingMutationConfirmation ||
         state.pendingKey ||
         state.filterMode);
@@ -36181,7 +37148,7 @@ function renderDiffSurface(ctx, diff) {
             ? []
             : splitActive
                 ? renderSplitDiffBody(h, components, previewHunks, state.diffPreviewOffset, visibleRows, width, theme, 'commit-diff-split', syntaxSpans)
-                : visiblePreviewHunks.map((line, index) => renderDiffLine(h, Text, line, theme, syntaxSpans, 140, `diff-surface-line-${state.diffPreviewOffset + index}`));
+                : visiblePreviewHunks.map((line, index) => renderDiffLine(h, Text, line, theme, syntaxSpans, Math.max(8, width - 5), `diff-surface-line-${state.diffPreviewOffset + index}`));
         return h(Box, {
             borderColor: focusBorderColor(theme, focused),
             borderStyle: theme.borderStyle,
@@ -36192,25 +37159,38 @@ function renderDiffSurface(ctx, diff) {
         }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle(splitActive ? 'Diff (split)' : 'Diff', focused)), h(Text, { dimColor: true }, selectedDetailFile?.path || 'no file')), ...headerLines.map((line, index) => h(Text, {
             key: `diff-surface-header-${index}`,
             dimColor: index > 0,
-        }, truncateCells(line, 140))), ...commitBodyNodes);
+        }, truncateCells(line, Math.max(20, width - 4)))), ...commitBodyNodes);
     }
     const diffLines = worktreeDiff?.lines || [];
-    const selectedHunk = worktreeHunks?.hunks[state.selectedWorktreeHunkIndex];
     const totalHunks = worktreeHunks?.hunks.length ?? 0;
     const stagedHunks = worktreeHunks?.hunks.filter((hunk) => hunk.state === 'staged').length ?? 0;
+    // The "current" hunk is derived from the scroll position (#1185) —
+    // the single source of truth is `worktreeDiffOffset`. ↑/↓ scroll
+    // lines and `[`/`]` jump hunks; either way the header, rail, and
+    // stage/revert target all follow what's on screen.
+    const currentHunkIndex = hunkIndexAtOffset(state.worktreeDiffOffset, worktreeDiff?.hunkOffsets ?? []);
     const visibleDiffLines = diffLines.slice(state.worktreeDiffOffset, state.worktreeDiffOffset + visibleRows);
-    // Hunk-position line: badge + selected hunk's state + a staged/total
-    // progress count, so the user always sees how far through staging they
-    // are. Untracked/new files have no hunks — point them at whole-file
-    // staging instead of a dead-end "no hunks" message.
+    // Hunk-position line: `Hunk n/N` + an at-a-glance staging rail + a
+    // staged/total count, so the user sees how far through staging they
+    // are without reading each hunk. The rail shows one marker per hunk —
+    // filled = staged, hollow = unstaged — with the current hunk bracketed
+    // (which also conveys whether the current hunk is staged, replacing
+    // the old standalone "● staged / ○ unstaged" badge). Untracked/new
+    // files have no hunks — point them at whole-file staging instead of a
+    // dead-end "no hunks" message.
+    const railMarker = (staged) => staged ? (theme.ascii ? 'x' : '●') : (theme.ascii ? '.' : '○');
+    const hunkRail = (worktreeHunks?.hunks ?? [])
+        .map((hunk, index) => {
+        const marker = railMarker(hunk.state === 'staged');
+        return index === currentHunkIndex ? `[${marker}]` : marker;
+    })
+        .join('');
     const hunkHeaderLine = worktreeHunksLoading
         ? 'Hunks loading…'
         : worktreeDiff?.untracked
             ? (theme.ascii ? 'New file — press space to stage it whole.' : '✚ New file — press space to stage it whole.')
             : totalHunks
-                ? `Hunk ${state.selectedWorktreeHunkIndex + 1}/${totalHunks} · ${selectedHunk?.state === 'staged'
-                    ? (theme.ascii ? '[x] staged' : '● staged')
-                    : (theme.ascii ? '[ ] unstaged' : '○ unstaged')} · ${stagedHunks}/${totalHunks} staged`
+                ? `Hunk ${currentHunkIndex + 1}/${totalHunks}  ${hunkRail}  ${stagedHunks}/${totalHunks} staged`
                 : 'No stageable hunks for this file.';
     const headerLines = isLogInkContextKeyLoading(contextStatus, 'worktree')
         ? ['Loading file context...']
@@ -36242,7 +37222,7 @@ function renderDiffSurface(ctx, diff) {
     h(Text, { dimColor: true }, worktreeDiff?.filePath || worktreeFile?.path || 'no file')), ...headerLines.map((line, index) => h(Text, {
         key: `diff-surface-header-${index}`,
         dimColor: index > 0,
-    }, truncateCells(line, 140))), ...(showDiffLines
+    }, truncateCells(line, Math.max(20, width - 4)))), ...(showDiffLines
         ? renderWorktreeDiffBody(h, components, {
             lines: diffLines,
             offset: state.worktreeDiffOffset,
@@ -36252,7 +37232,7 @@ function renderDiffSurface(ctx, diff) {
             syntaxSpans,
             hunkOffsets: worktreeDiff?.hunkOffsets || [],
             hunks: worktreeHunks?.hunks || [],
-            selectedIndex: state.selectedWorktreeHunkIndex,
+            selectedIndex: currentHunkIndex,
             keyPrefix: 'diff-surface-line',
         })
         : []));
@@ -37677,6 +38657,26 @@ function renderConfirmationPanel(h, components, state, width, theme, focused) {
         paddingX: 1,
     }, h(Text, { bold: true }, panelTitle('Confirm', focused)), h(Text, undefined, truncateCells(label, width - 4)), h(Text, { dimColor: true }, truncateCells(warning, width - 4)), h(Text, undefined, ''), h(Text, undefined, 'Press y to confirm or n/Esc to cancel.'));
 }
+/**
+ * Multi-option prompt panel (#1181) — the n-way generalization of the
+ * confirmation panel. Renders the prompt title, an optional warning, and
+ * one row per option (`<key>  <label>`, destructive options in the
+ * danger colour), plus a cancel hint. Resolution happens in the input
+ * layer by matching a keypress against the option keys.
+ */
+function renderChoicePanel(h, components, prompt, width, theme, focused) {
+    const { Box, Text } = components;
+    return h(Box, {
+        borderColor: focusBorderColor(theme, focused),
+        borderStyle: theme.borderStyle,
+        flexDirection: 'column',
+        width,
+        paddingX: 1,
+    }, h(Text, { bold: true }, panelTitle('Choose', focused)), h(Text, undefined, truncateCells(prompt.title, width - 4)), ...(prompt.warning ? [h(Text, { dimColor: true }, truncateCells(prompt.warning, width - 4))] : []), h(Text, undefined, ''), ...prompt.options.map((option) => h(Text, {
+        key: `choice-${prompt.id}-${option.key}`,
+        color: option.destructive && !theme.noColor ? theme.colors.danger : undefined,
+    }, truncateCells(`  ${option.key}  ${option.label}`, width - 4))), h(Text, { dimColor: true }, '  n/Esc  cancel'));
+}
 /**
  * First-launch onboarding overlay (P1.3). Shown once per machine, gated
  * by an XDG-style cache marker so subsequent launches go straight to the
@@ -38068,9 +39068,20 @@ function renderSplitPlanOverlay(h, components, state, width, bodyRows, theme, fo
         // overlay rather than crashing.
         return h(Box, { width }, h(Text, { dimColor: true }, 'No plan data available.'));
     }
+    // Committed groups are numbered 1..N; an `unclaimed` group (the files
+    // the split couldn't place) renders as a distinct "will stay" note
+    // rather than a phantom commit (#1180).
+    const committedGroups = plan.groups.filter((group) => !group.unclaimed);
     const lines = [];
-    plan.groups.forEach((group, index) => {
-        lines.push(`▎ ${index + 1}. ${group.title}`);
+    let commitNumber = 0;
+    plan.groups.forEach((group) => {
+        if (group.unclaimed) {
+            lines.push(`⚠ ${group.title}  (stays in your worktree — not committed)`);
+        }
+        else {
+            commitNumber += 1;
+            lines.push(`▎ ${commitNumber}. ${group.title}`);
+        }
         if (group.body) {
             group.body.split('\n').forEach((bodyLine) => lines.push(`  ${bodyLine}`));
         }
@@ -38095,9 +39106,10 @@ function renderSplitPlanOverlay(h, components, state, width, bodyRows, theme, fo
     const totalLines = lines.length;
     const scrollOffset = Math.min(overlay.scrollOffset, Math.max(0, totalLines - 1));
     const visible = lines.slice(scrollOffset, scrollOffset + listRows);
+    const unclaimedCount = plan.groups.length - committedGroups.length;
     const headerRight = overlay.status === 'applying'
         ? `${spinner} applying…`
-        : `${plan.groups.length} commit(s) · ${scrollOffset + 1}–${Math.min(totalLines, scrollOffset + listRows)} / ${totalLines}`;
+        : `${committedGroups.length} commit(s)${unclaimedCount ? ' · 1 set stays staged' : ''} · ${scrollOffset + 1}–${Math.min(totalLines, scrollOffset + listRows)} / ${totalLines}`;
     // Apply errors get the full available width — long validator
     // messages (the failure path that surfaced in PR #916 testing was
     // "unknown hunks: src/widgets/button.ts::hunk-1, ...") frequently
@@ -40571,6 +41583,9 @@ function renderDetailPanel(h, components, state, context, contextStatus, detail,
     if (state.inputPrompt) {
         return renderInputPromptPanel(h, components, state, width, theme, focused);
     }
+    if (state.pendingChoice) {
+        return renderChoicePanel(h, components, state.pendingChoice, width, theme, focused);
+    }
     if (state.pendingConfirmationId || state.pendingMutationConfirmation) {
         return renderConfirmationPanel(h, components, state, width, theme, focused);
     }
@@ -41424,7 +42439,7 @@ function LogInkApp(deps) {
     React.useEffect(() => {
         if (!state.statusMessage)
             return;
-        if (state.inputPrompt || state.pendingConfirmationId || state.pendingMutationConfirmation || state.showCommandPalette) {
+        if (state.inputPrompt || state.pendingConfirmationId || state.pendingChoice || state.pendingMutationConfirmation || state.showCommandPalette) {
             return;
         }
         // The `setTimeout` callback is a literal arrow function (not a
@@ -41441,6 +42456,7 @@ function LogInkApp(deps) {
         dispatch,
         state.inputPrompt,
         state.pendingConfirmationId,
+        state.pendingChoice,
         state.pendingMutationConfirmation,
         state.showCommandPalette,
         state.statusMessage,
@@ -42304,7 +43320,9 @@ function LogInkApp(deps) {
         setWorktreeHunks(undefined);
     }, [dispatch, git, refreshWorktreeContext, selectedWorktreeFile]);
     const toggleSelectedHunkStage = React.useCallback(async () => {
-        const selectedHunk = worktreeHunks?.hunks[state.selectedWorktreeHunkIndex];
+        // The staging target is the hunk under the viewport (#1185) —
+        // derived from the scroll offset, the single source of truth.
+        const selectedHunk = worktreeHunks?.hunks[hunkIndexAtOffset(state.worktreeDiffOffset, worktreeDiff?.hunkOffsets ?? [])];
         if (!selectedHunk) {
             dispatch({ type: 'setStatus', value: 'no hunk selected', kind: 'warning' });
             return;
@@ -42333,7 +43351,7 @@ function LogInkApp(deps) {
                 kind: 'error',
             });
         }
-    }, [dispatch, git, refreshWorktreeContext, state.selectedWorktreeHunkIndex, worktreeHunks]);
+    }, [dispatch, git, refreshWorktreeContext, state.worktreeDiffOffset, worktreeDiff, worktreeHunks]);
     const revertSelectedFile = React.useCallback(async () => {
         if (!selectedWorktreeFile) {
             dispatch({ type: 'setStatus', value: 'no worktree file selected', kind: 'warning' });
@@ -42347,7 +43365,7 @@ function LogInkApp(deps) {
         setWorktreeHunks(undefined);
     }, [dispatch, git, refreshWorktreeContext, selectedWorktreeFile]);
     const revertSelectedHunk = React.useCallback(async () => {
-        const selectedHunk = worktreeHunks?.hunks[state.selectedWorktreeHunkIndex];
+        const selectedHunk = worktreeHunks?.hunks[hunkIndexAtOffset(state.worktreeDiffOffset, worktreeDiff?.hunkOffsets ?? [])];
         if (!selectedHunk) {
             dispatch({ type: 'setStatus', value: 'no hunk selected', kind: 'warning' });
             return;
@@ -42367,7 +43385,7 @@ function LogInkApp(deps) {
                 kind: 'error',
             });
         }
-    }, [dispatch, git, refreshWorktreeContext, state.selectedWorktreeHunkIndex, worktreeHunks]);
+    }, [dispatch, git, refreshWorktreeContext, state.worktreeDiffOffset, worktreeDiff, worktreeHunks]);
     const createCommitFromCompose = React.useCallback(async () => {
         const stagedCount = context.worktree?.stagedCount || 0;
         if (!stagedCount) {
@@ -43249,9 +44267,19 @@ function LogInkApp(deps) {
         // navigateHome nukes the rest of the stack so `<` after apply
         // doesn't walk back into the now-empty compose / status state
         // the user just left behind.
+        // Did the plan leave files for the user (the `unclaimed` group the
+        // split couldn't confidently place)? They're now sitting unstaged in
+        // the worktree, so land on status — not history — so the user sees
+        // and handles them, rather than dropping them on a clean-looking
+        // history view (#1180).
+        const unclaimedGroup = splitPlan.plan.groups.find((group) => group.unclaimed);
+        const unclaimedFileCount = unclaimedGroup?.files?.length ?? 0;
         dispatch({ type: 'clearSplitPlan' });
         dispatch({ type: 'commitCompose', action: { type: 'reset' } });
         dispatch({ type: 'navigateHome' });
+        if (unclaimedFileCount > 0) {
+            dispatch({ type: 'pushView', value: 'status' });
+        }
         // Refresh BEFORE setting the final status so we can peek at the
         // post-apply worktree state and craft a directive next-step hint
         // ("X unstaged + Y untracked remaining — press gs to stage / I
@@ -43301,12 +44329,17 @@ function LogInkApp(deps) {
             return;
         }
         const successMessage = formatSplitApplySuccess(commitHashes.length, unstaged, untracked, result.fallback ? { reason: result.fallback.reason } : undefined);
+        // Name the files the split deliberately left behind so the jump to
+        // status reads as intentional, not a surprise (#1180).
+        const unclaimedNote = unclaimedFileCount > 0
+            ? ` · ${unclaimedFileCount} file${unclaimedFileCount === 1 ? '' : 's'} left for you on status`
+            : '';
         // Fallback path uses 'info' kind — apply technically succeeded
         // but the user should know it landed as a single combined commit
         // rather than a real LLM-driven multi-group split.
         dispatch({
             type: 'setStatus',
-            value: successMessage,
+            value: `${successMessage}${unclaimedNote}`,
             kind: result.fallback ? 'info' : 'success',
         });
     }, [dispatch, git, refreshContext, refreshHistoryRows, refreshWorktreeContext, state.splitPlan]);
@@ -43789,6 +44822,42 @@ function LogInkApp(deps) {
                 // path on the wrong target.
                 return removeWorktreeAndBranch(git, cursorTarget, context.branches?.localBranches || []);
             },
+            // Worktree-checkout-conflict resolutions (#1175). Unlike the
+            // cursor-targeted handlers above, these act on the worktree
+            // captured in `state.worktreeCheckoutConflict` (the one git named
+            // when it refused the checkout), not the worktrees-view cursor.
+            'conflict-remove-worktree-checkout': async () => {
+                const conflict = state.worktreeCheckoutConflict;
+                dispatch({ type: 'setWorktreeCheckoutConflict', value: undefined });
+                if (!conflict)
+                    return { ok: false, message: 'No worktree conflict to resolve.' };
+                const worktree = context.worktreeList?.worktrees?.find((w) => w.path === conflict.worktreePath);
+                if (!worktree)
+                    return { ok: false, message: `Worktree ${conflict.worktreePath} not found.` };
+                // removeWorktree refuses a dirty / current worktree and returns
+                // a clear message — surface it rather than forcing.
+                const removed = await removeWorktree(git, worktree);
+                if (!removed.ok)
+                    return removed;
+                const branch = (context.branches?.localBranches || []).find((b) => b.type === 'local' && b.shortName === conflict.branch);
+                if (!branch) {
+                    return { ok: true, message: `Removed worktree ${worktree.path}; branch ${conflict.branch} not found to check out.` };
+                }
+                const checkout = await checkoutBranch(git, branch);
+                return checkout.ok
+                    ? { ok: true, message: `Removed worktree ${worktree.path} and checked out ${conflict.branch}` }
+                    : { ok: false, message: `Removed worktree ${worktree.path}, but checkout failed: ${checkout.message}` };
+            },
+            'conflict-remove-worktree-branch': async () => {
+                const conflict = state.worktreeCheckoutConflict;
+                dispatch({ type: 'setWorktreeCheckoutConflict', value: undefined });
+                if (!conflict)
+                    return { ok: false, message: 'No worktree conflict to resolve.' };
+                const worktree = context.worktreeList?.worktrees?.find((w) => w.path === conflict.worktreePath);
+                if (!worktree)
+                    return { ok: false, message: `Worktree ${conflict.worktreePath} not found.` };
+                return removeWorktreeAndBranch(git, worktree, context.branches?.localBranches || []);
+            },
             'abort-operation': async () => {
                 const operation = context.operation?.operation;
                 if (!operation) {
@@ -44251,6 +45320,43 @@ function LogInkApp(deps) {
                     kind: 'warning',
                 });
             }
+            // Checking out a branch that's already checked out in another
+            // worktree is rejected by git ("already checked out at <path>").
+            // Rather than dead-end on that, capture the conflict and raise a
+            // multi-option prompt: switch into that worktree, remove it and
+            // check out here, or remove it and delete the branch (#1175, #1181).
+            if (id === 'checkout-branch' && !result?.ok && isBranchCheckedOutElsewhereError(result?.message)) {
+                const worktreePath = parseCheckedOutWorktreePath(result?.message);
+                const branchName = pendingItemAction?.id;
+                if (worktreePath && branchName) {
+                    const worktree = context.worktreeList?.worktrees?.find((w) => w.path === worktreePath);
+                    const dirty = worktree?.dirty ?? false;
+                    dispatch({
+                        type: 'setWorktreeCheckoutConflict',
+                        value: { branch: branchName, worktreePath, dirty },
+                    });
+                    dispatch({
+                        type: 'setPendingChoice',
+                        value: {
+                            id: 'worktree-checkout-conflict',
+                            title: `'${branchName}' is checked out in another worktree`,
+                            warning: `Checked out at ${worktreePath}.${dirty ? ' That worktree has uncommitted changes — removal will be refused until it is clean or stashed.' : ''}`,
+                            options: [
+                                { key: 'y', label: 'Switch to that worktree', intent: 'switch-worktree' },
+                                { key: 'r', label: 'Remove worktree & check out here', workflowId: 'conflict-remove-worktree-checkout', destructive: true },
+                                { key: 'x', label: 'Remove worktree & delete branch', workflowId: 'conflict-remove-worktree-branch', destructive: true },
+                            ],
+                        },
+                    });
+                }
+                else {
+                    dispatch({
+                        type: 'setStatus',
+                        value: `'${branchName ?? 'branch'}' is already checked out in another worktree.`,
+                        kind: 'warning',
+                    });
+                }
+            }
             // Refresh history rows AS WELL when the workflow could have
             // changed the commits the user sees (#945 follow-up). The
             // workflow IDs below all either create/rewrite local commits or
@@ -44260,6 +45366,10 @@ function LogInkApp(deps) {
             // metadata-only mutations (delete-tag, set-upstream, etc.).
             const historyMutatingIds = new Set([
                 'checkout-branch',
+                // Resolving a checkout conflict changes HEAD (checkout) and/or the
+                // ref set (branch delete), so the graph needs a refresh.
+                'conflict-remove-worktree-checkout',
+                'conflict-remove-worktree-branch',
                 'continue-operation',
                 'pull-current-branch',
                 // Fetch / pull / push bring in new commits and move
@@ -44295,7 +45405,7 @@ function LogInkApp(deps) {
             // (resolvePendingItemAction → action 'checkout'), so a silent
             // stale-while-revalidate swap keeps the list readable and just
             // repaints the current-branch marker once the new context lands.
-            if (id === 'checkout-branch' && result?.ok) {
+            if ((id === 'checkout-branch' || id === 'conflict-remove-worktree-checkout') && result?.ok) {
                 dispatch({ type: 'resetBranchSelection' });
                 await refreshContext({ silent: true });
             }
@@ -44362,7 +45472,7 @@ function LogInkApp(deps) {
     }, [context, dispatch, git, refreshContext, refreshHistoryRows, refreshWorktreeContext,
         state.branchSort, state.filter, state.selectedBranchIndex,
         state.selectedStashIndex, state.selectedTagIndex, state.selectedWorktreeListIndex, state.stashDiffRef,
-        state.statusFilterMask, state.tagSort]);
+        state.statusFilterMask, state.tagSort, state.worktreeCheckoutConflict]);
     // Resolve the active view's "yank target" (commit hash / branch /
     // tag / stash ref / file path) against the live filtered+sorted list,
     // copy it to the system clipboard, and surface the result on the
@@ -45173,6 +46283,7 @@ function LogInkApp(deps) {
             state.gitignorePicker ||
             state.inputPrompt ||
             state.pendingConfirmationId ||
+            state.pendingChoice ||
             state.pendingMutationConfirmation ||
             state.pendingKey
             ? 'inspector'
@@ -46880,7 +47991,9 @@ 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', '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'],
+        // Derived from the single source of truth (`THEME_PRESET_COLORS`) so the
+        // CLI choices can never drift from the themes the picker actually offers.
+        choices: getLogInkThemePresets(),
     },
 };
 const builder$1 = (yargs) => {
@@ -46908,7 +48021,9 @@ 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', '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'],
+        // Derived from the single source of truth (`THEME_PRESET_COLORS`) so the
+        // workspace CLI choices stay in sync with the themes the picker offers.
+        choices: getLogInkThemePresets(),
     },
 };
 const builder = (yargs) => {
@@ -47676,20 +48791,55 @@ function createWorkspaceState(init) {
     }
     return { ...base, selectedIndex: idx };
 }
+/**
+ * Single-entry memo for {@link selectVisibleRepos}. The visible list
+ * is a pure function of five referentially-stable state slices, and
+ * the hot path — cursor movement (`j`/`k`) — leaves all five untouched
+ * (`move-cursor` only swaps `selectedIndex`). Without the memo the
+ * renderer recomputes the full sort + tab-filter + text-filter three
+ * times per render (list window, header chips, and the direct call in
+ * `renderListBody`), plus once more in the reducer, on every keystroke.
+ *
+ * Keyed on object/string identity so a reducer transition that swaps
+ * any of `overview.repos`, `sortMode`, `tab`, `filter`, or
+ * `pullRequestCounts` is a guaranteed cache miss. Callers never mutate
+ * the returned array, so handing back the cached reference is safe and
+ * also stabilises the array identity for any future `React.memo`.
+ */
+let visibleReposCache = null;
 /**
  * Recompute the visible repo list — sort → tab filter → text filter.
  * The renderer consumes this; the reducer also uses it to rectify the
  * cursor after a filter/sort change so the selection stays in range.
+ * Memoized on its five inputs (see {@link visibleReposCache}).
  */
 function selectVisibleRepos(state) {
-    const sorted = sortWorkspaceRepos(state.overview.repos, state.sortMode);
+    const repos = state.overview.repos;
+    const cache = visibleReposCache;
+    if (cache !== null &&
+        cache.repos === repos &&
+        cache.sortMode === state.sortMode &&
+        cache.tab === state.tab &&
+        cache.filter === state.filter &&
+        cache.pullRequestCounts === state.pullRequestCounts) {
+        return cache.result;
+    }
+    const sorted = sortWorkspaceRepos(repos, state.sortMode);
     const tabFiltered = filterWorkspaceRepos(sorted, state.tab, {
         pullRequestCounts: state.pullRequestCounts,
     });
-    if (!state.filter) {
-        return tabFiltered;
-    }
-    return tabFiltered.filter((entry) => matchesWorkspaceText(entry, state.filter));
+    const result = state.filter
+        ? tabFiltered.filter((entry) => matchesWorkspaceText(entry, state.filter))
+        : tabFiltered;
+    visibleReposCache = {
+        repos,
+        sortMode: state.sortMode,
+        tab: state.tab,
+        filter: state.filter,
+        pullRequestCounts: state.pullRequestCounts,
+        result,
+    };
+    return result;
 }
 function clampCursor(index, length) {
     if (length <= 0) {