git-coco 0.62.1 → 0.62.3

package/dist/index.esm.mjs

@@ -61,7 +61,7 @@ import { pathToFileURL } from 'url';
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.62.1";
+const BUILD_VERSION = "0.62.3";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -25162,12 +25162,14 @@ function formatSortIndicator(mode, options = {}) {
 }
 
 /**
- * True when `pending` (a `state.pendingDeletion`) targets this exact row.
- * Shared by every deletable surface + the sidebar so the spinner-swap
- * test is identical everywhere. Takes the field value (not the whole
- * state) so it can live next to the type without a forward reference.
+ * True when `pending` (a `state.pendingItemAction`) targets this exact
+ * row. Action-agnostic on purpose — every surface + the sidebar render
+ * the same spinner whether the row is being deleted or checked out, so
+ * the spinner-swap test stays identical everywhere. Takes the field
+ * value (not the whole state) so it can live next to the type without a
+ * forward reference.
  */
-function isPendingDeletion(pending, kind, id) {
+function isPendingItemAction(pending, kind, id) {
     return pending?.kind === kind && pending.id === id;
 }
 const DEFAULT_CHANGELOG_VIEW_STATE = {
@@ -26375,10 +26377,11 @@ function applyLogInkAction(state, action) {
                 workflowActionId: action.value ? undefined : state.workflowActionId,
                 pendingKey: undefined,
             };
-        case 'setPendingDeletion':
-            // Pure marker for the in-flight delete; touches nothing else so the
-            // list keeps rendering normally underneath the one spinner'd row.
-            return { ...state, pendingDeletion: action.value };
+        case 'setPendingItemAction':
+            // Pure marker for the in-flight row action (delete / checkout);
+            // touches nothing else so the list keeps rendering normally
+            // underneath the one spinner'd row.
+            return { ...state, pendingItemAction: action.value };
         case 'toggleFilterMode':
             return {
                 ...state,
@@ -31001,6 +31004,29 @@ function deleteBranch(git, branch, force = false) {
 function isBranchNotFullyMergedError(message) {
     return /not fully merged/i.test(message || '');
 }
+/**
+ * True when a branch delete was rejected because the branch is checked
+ * out in a worktree. Unlike "not fully merged" there's no force escape
+ * hatch — git refuses `git branch -D` on a worktree-checked-out branch
+ * too — so the UI should surface a clear "free up the worktree first"
+ * message rather than offering a force-delete that would fail the same
+ * way. Matches git's wording: `Cannot delete branch 'x' checked out at
+ * '<path>'` / `used by worktree at '<path>'`.
+ */
+function isBranchCheckedOutElsewhereError(message) {
+    return /checked out at|used by worktree/i.test(message || '');
+}
+/**
+ * Pull the worktree path out of git's "checked out at '<path>'" /
+ * "used by worktree at '<path>'" rejection so the UI can name where the
+ * branch is still in use. Returns undefined when the message doesn't
+ * carry a path (older git phrasings) so callers can fall back to a
+ * generic message.
+ */
+function parseCheckedOutWorktreePath(message) {
+    const match = /(?:checked out at|used by worktree at) '([^']+)'/i.exec(message || '');
+    return match?.[1];
+}
 function fetchRemotes(git) {
     return runAction$5(() => git.raw(['fetch', '--all', '--prune']), 'Fetched all remotes');
 }
@@ -34325,7 +34351,13 @@ function sidebarTabLabel(tab) {
  * Sliding window keeps the cursor in view as the user navigates a long
  * list; truncation hints surface the count of hidden rows.
  */
-function renderSelectableSidebarRows(h, Text, items, selectedIndex, focused, width, theme, toRowText, keyPrefix, visibleCount) {
+function renderSelectableSidebarRows(h, Text, items, selectedIndex, focused, width, theme, toRowText, keyPrefix, visibleCount, 
+// Optional per-row foreground colour (e.g. the current branch in
+// green). Applied only when the row is NOT the active selection —
+// the selection's inverse/background styling owns the row's colour in
+// that case, and layering a foreground under `inverse` would swap it
+// into an unexpected background tint.
+rowColor) {
     if (items.length === 0)
         return [];
     const window = getSidebarVisibleWindow(items.length, selectedIndex, visibleCount);
@@ -34342,10 +34374,12 @@ function renderSelectableSidebarRows(h, Text, items, selectedIndex, focused, wid
             break;
         const isSelected = focused && index === selectedIndex;
         const text = toRowText(items[index], index);
+        const color = isSelected ? undefined : rowColor?.(items[index], index);
         elements.push(h(Text, {
             key: `${keyPrefix}-row-${index}`,
             backgroundColor: isSelected && !theme.noColor ? theme.colors.selection : undefined,
             inverse: isSelected,
+            color,
         }, truncateCells(`  ${text}`, width - 4)));
     }
     if (window.truncatedBelow > 0) {
@@ -34412,7 +34446,7 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
     // shows this spinner in place of its leading marker (branches /
     // worktrees) or appended to the row (tags / stashes, which have no
     // leading status icon). `pending` is the single in-flight target.
-    const pending = state.pendingDeletion;
+    const pending = state.pendingItemAction;
     const spin = inlineSpinnerGlyph(spinnerFrame, theme.ascii);
     // Available rows for the active tab's list. The sidebar chrome
     // takes ~10 rows (panel title + spacer + 5 tab headers + 4 inter-tab
@@ -34451,11 +34485,15 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
         return [
             ...headerRows,
             ...renderSelectableSidebarRows(h, Text, sortedBranches, state.selectedBranchIndex, focused, width, theme, (branch) => {
-                const glyph = isPendingDeletion(pending, 'branch', branch.shortName)
+                const glyph = isPendingItemAction(pending, 'branch', branch.shortName)
                     ? spin
                     : branchRowMarker(branch, { ascii: theme.ascii }).glyph;
                 return `${glyph} ${branch.shortName}`;
-            }, 'tab-branches', visibleListCount),
+            }, 'tab-branches', visibleListCount, 
+            // Paint the checked-out branch green so "where am I?" reads at a
+            // glance, matching the green HEAD marker the branches surface
+            // already uses. NO_COLOR themes fall back to the `*` glyph alone.
+            (branch) => (branch.current && !theme.noColor ? theme.colors.success : undefined)),
         ];
     }
     if (tab === 'tags') {
@@ -34470,7 +34508,7 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
             const base = `${truncateCells(tag.name, 16)} ${tag.subject}`;
             // Tags have no leading status icon, so the pending spinner is
             // appended to the row instead of replacing a glyph.
-            return isPendingDeletion(pending, 'tag', tag.name) ? `${base} ${spin}` : base;
+            return isPendingItemAction(pending, 'tag', tag.name) ? `${base} ${spin}` : base;
         }, 'tab-tags', visibleListCount);
     }
     if (tab === 'stashes') {
@@ -34485,7 +34523,7 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
             const base = `@{${index}} ${stash.message || '(no message)'}`;
             // `@{N}` is the stash ref, not a status icon, so append the
             // spinner rather than replacing it.
-            return isPendingDeletion(pending, 'stash', stash.ref) ? `${base} ${spin}` : base;
+            return isPendingItemAction(pending, 'stash', stash.ref) ? `${base} ${spin}` : base;
         }, 'tab-stashes', visibleListCount);
     }
     // worktrees
@@ -34497,7 +34535,7 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
         return [h(Text, { key: 'tab-worktrees-empty', dimColor: true }, '  No linked worktrees')];
     }
     return renderSelectableSidebarRows(h, Text, worktrees, state.selectedWorktreeListIndex, focused, width, theme, (worktree) => {
-        const marker = isPendingDeletion(pending, 'worktree', worktree.path)
+        const marker = isPendingItemAction(pending, 'worktree', worktree.path)
             ? spin
             : worktree.current ? '*' : ' ';
         const wstate = worktree.dirty ? 'dirty' : 'clean';
@@ -34933,7 +34971,7 @@ function renderBranchesSurface(ctx, spinnerFrame = 0) {
                 // While this branch's delete is in flight, its sync-state marker
                 // is replaced by an inline spinner (accent-coloured) so the row
                 // reads as "deleting" until it vanishes on refresh.
-                const deleting = isPendingDeletion(state.pendingDeletion, 'branch', branch.shortName);
+                const deleting = isPendingItemAction(state.pendingItemAction, 'branch', branch.shortName);
                 const glyph = deleting ? inlineSpinnerGlyph(spinnerFrame, theme.ascii) : marker.glyph;
                 const glyphColor = deleting
                     ? (theme.noColor ? undefined : theme.colors.accent)
@@ -34956,11 +34994,16 @@ function renderBranchesSurface(ctx, spinnerFrame = 0) {
                 const truncated = truncateCells(fullText, Math.max(20, width - 4));
                 // If truncation chopped into the timestamp/divergence portion,
                 // fall back to a single Text to keep the visible width honest.
+                // The checked-out branch is painted green (matching its green
+                // HEAD marker) so "where am I?" reads at a glance. NO_COLOR
+                // themes fall back to the `*` glyph alone.
+                const currentColor = branch.current && !theme.noColor ? theme.colors.success : undefined;
                 if (truncated !== fullText) {
                     return h(Text, {
                         key: `branch-${index}`,
                         bold: isSelected,
                         dimColor: lineDim,
+                        color: currentColor,
                     }, truncated);
                 }
                 return h(Text, {
@@ -34975,7 +35018,12 @@ function renderBranchesSurface(ctx, spinnerFrame = 0) {
                 // no-upstream kinds return undefined from
                 // `getBranchRowMarkerColor`, so those markers inherit the
                 // row's dim and read as quiet chrome.
-                h(Text, { color: glyphColor, dimColor: glyphColor ? false : undefined }, glyph), trailingName, h(Text, { dimColor: true }, timestampPadded), trailingDivergence);
+                h(Text, { color: glyphColor, dimColor: glyphColor ? false : undefined }, glyph), 
+                // Name span: green for the current branch (dimColor:false keeps
+                // it bright), otherwise it inherits the row's normal styling.
+                currentColor
+                    ? h(Text, { color: currentColor, dimColor: false }, trailingName)
+                    : 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.
@@ -38774,6 +38822,15 @@ function renderReflogSurface(ctx) {
  * Extracted from `src/commands/log/inkRuntime.ts` as part of phase 5a.1
  * of #890. No behavior change.
  */
+const GAP = 2; // cells between columns
+/** Truncate to `w` cells, then pad to `w` (left = padEnd, right = padStart). */
+function cell(value, w, align = 'left') {
+    const t = truncateCells(value, w);
+    // padStart/padEnd count code units; refs / ages / counts / branch
+    // names are ASCII in practice, matching the branches surface's
+    // padEnd-based column alignment.
+    return align === 'right' ? t.padStart(w) : t.padEnd(w);
+}
 function renderStashSurface(ctx, spinnerFrame = 0) {
     const { h, components, state, context, contextStatus, bodyRows, width, theme } = ctx;
     const { Box, Text } = components;
@@ -38784,7 +38841,9 @@ function renderStashSurface(ctx, spinnerFrame = 0) {
         ? allStashes.filter((stash) => matchesPromotedFilter([stash.ref, stash.message], state.filter))
         : allStashes;
     const selected = Math.max(0, Math.min(state.selectedStashIndex, Math.max(0, stashes.length - 1)));
-    const listRows = Math.max(4, bodyRows - 4);
+    // One extra row reserved (vs the other surfaces' `- 4`) for the column
+    // header row below.
+    const listRows = Math.max(4, bodyRows - 5);
     const startIndex = Math.max(0, selected - Math.floor(listRows / 2));
     const visible = stashes.slice(startIndex, startIndex + listRows);
     const filterLabel = state.filter ? ` | filter: ${state.filter}` : '';
@@ -38794,10 +38853,67 @@ function renderStashSurface(ctx, spinnerFrame = 0) {
     const emptyLabel = formatLogInkStashEmpty({ filter: state.filter });
     const loadingLabel = formatLogInkLoading({ resource: 'stashes' });
     const now = getRenderNow();
-    // Available width for a row: box width minus the 2-cell horizontal
-    // padding. Truncate to it (with a small floor) instead of a magic 140
-    // so the richer meta degrades gracefully on narrow terminals.
-    const rowWidth = Math.max(20, width - 2);
+    // Usable interior width: panel width minus the border (2) and the
+    // paddingX:1 (2). The previous `width - 2` under-counted the border
+    // and made every near-full row overflow by 2 cells and wrap — the
+    // single biggest readability hit in the old list.
+    const contentWidth = Math.max(20, width - 4);
+    const ageOf = (s) => formatCompactRelativeDate(s.date, now);
+    // Column widths derived from the visible window (#833 pattern) so rows
+    // align without re-measuring the whole list. Each column is at least
+    // as wide as its header label so the header never truncates ("age",
+    // "branch", "files"); age tops out at 5 ("today" is the longest value
+    // formatCompactRelativeDate emits).
+    const refCol = visible.length
+        ? Math.min(11, Math.max(3, ...visible.map((s) => cellWidth(s.ref))))
+        : 9;
+    const ageCol = visible.length
+        ? Math.min(5, Math.max(3, ...visible.map((s) => cellWidth(ageOf(s)))))
+        : 3;
+    const branchColMax = visible.length
+        ? Math.max(0, ...visible.map((s) => cellWidth(s.branch || '')))
+        : 0;
+    const filesCol = visible.length
+        ? Math.max(5, ...visible.map((s) => String(s.files.length).length))
+        : 5;
+    // Responsive degradation. Keep ref + message always; when the message
+    // floor is threatened, shed columns the preview pane already shows —
+    // branch first, then age, then the file count — before squeezing the
+    // message.
+    // Widen to fit the "branch" header when any stash carries a branch;
+    // stays 0 (column dropped) when none do.
+    let branchCol = branchColMax > 0 ? Math.min(18, Math.max(6, branchColMax)) : 0;
+    let showAge = true;
+    let showFiles = true;
+    const fixedWidth = () => 2 + refCol +
+        (showAge ? GAP + ageCol : 0) +
+        (branchCol > 0 ? GAP + branchCol : 0) +
+        (showFiles ? GAP + filesCol : 0) +
+        GAP; // gap before the message column
+    let messageWidth = contentWidth - fixedWidth();
+    if (messageWidth < 24 && branchCol > 0) {
+        branchCol = 0;
+        messageWidth = contentWidth - fixedWidth();
+    }
+    if (messageWidth < 16 && showAge) {
+        showAge = false;
+        messageWidth = contentWidth - fixedWidth();
+    }
+    if (messageWidth < 12 && showFiles) {
+        showFiles = false;
+        messageWidth = contentWidth - fixedWidth();
+    }
+    messageWidth = Math.max(8, messageWidth);
+    // Column header. Right-aligned labels over the right-aligned numeric
+    // columns (age, files) so header and data share an edge.
+    let headerText = `  ${cell('ref', refCol)}`;
+    if (showAge)
+        headerText += `${' '.repeat(GAP)}${cell('age', ageCol, 'right')}`;
+    if (branchCol > 0)
+        headerText += `${' '.repeat(GAP)}${cell('branch', branchCol)}`;
+    if (showFiles)
+        headerText += `${' '.repeat(GAP)}${cell('files', filesCol, 'right')}`;
+    headerText += `${' '.repeat(GAP)}message`;
     const lines = loading
         ? [h(Text, { key: 'stash-loading', dimColor: true }, loadingLabel)]
         : stashes.length === 0
@@ -38806,32 +38922,22 @@ function renderStashSurface(ctx, spinnerFrame = 0) {
                 const index = startIndex + offset;
                 const isSelected = index === selected;
                 const cursor = isSelected ? '>' : ' ';
-                // Surface the metadata the StashEntry already carries — origin
-                // branch, file count, and relative age — between the ref and the
-                // message, so the list answers "which stash is this?" without an
-                // Enter→diff round trip.
-                const age = formatCompactRelativeDate(stash.date, now);
-                const fileCount = stash.files.length;
-                const meta = [
-                    stash.branch ? `on ${stash.branch}` : '',
-                    fileCount > 0 ? `${fileCount} file${fileCount === 1 ? '' : 's'}` : '',
-                    age,
-                ].filter(Boolean).join(' · ');
-                const rowText = meta
-                    ? `${cursor} ${stash.ref.padEnd(11)} ${meta}  ${stash.message}`
-                    : `${cursor} ${stash.ref.padEnd(11)} ${stash.message}`;
+                const deleting = isPendingItemAction(state.pendingItemAction, 'stash', stash.ref);
                 // The `stash@{N}` ref is an identifier, not a status icon, so a
                 // delete-in-flight appends an accent spinner at the row's end
-                // (2 cells reserved from the width budget).
-                const deleting = isPendingDeletion(state.pendingDeletion, 'stash', stash.ref);
+                // (2 cells reserved from the message budget).
                 const spinnerSpan = deleting
                     ? h(Text, { color: theme.noColor ? undefined : theme.colors.accent, dimColor: false }, ` ${inlineSpinnerGlyph(spinnerFrame, theme.ascii)}`)
                     : null;
+                const message = truncateCells(stash.message, messageWidth - (deleting ? 2 : 0));
+                // ref + message read as primary; age / branch / file-count are
+                // dim metadata (kept dim even on the bold selected row so the
+                // message stays the focal point).
                 return h(Text, {
                     key: `stash-${index}`,
                     bold: isSelected,
                     dimColor: !isSelected,
-                }, truncateCells(rowText, rowWidth - (deleting ? 2 : 0)), spinnerSpan);
+                }, `${cursor} `, cell(stash.ref, refCol), showAge ? h(Text, { dimColor: true }, `${' '.repeat(GAP)}${cell(ageOf(stash), ageCol, 'right')}`) : null, branchCol > 0 ? h(Text, { dimColor: true }, `${' '.repeat(GAP)}${cell(stash.branch || '', branchCol)}`) : null, showFiles ? h(Text, { dimColor: true }, `${' '.repeat(GAP)}${cell(String(stash.files.length), filesCol, 'right')}`) : null, `${' '.repeat(GAP)}${message}`, spinnerSpan);
             });
     const stashHasMoreAbove = startIndex > 0 && stashes.length > 0;
     const stashHasMoreBelow = startIndex + listRows < stashes.length;
@@ -38842,7 +38948,11 @@ function renderStashSurface(ctx, spinnerFrame = 0) {
         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), ...(stashHasMoreAbove
+    }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Stash', focused)), h(Text, { dimColor: true }, headerRight)), ...renderPromotedFilterAffordance(h, Text, state, theme), 
+    // Column header — only when there are rows to label.
+    ...(!loading && stashes.length > 0
+        ? [h(Text, { key: 'stash-col-header', dimColor: true }, truncateCells(headerText, contentWidth))]
+        : []), ...(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`)]
@@ -39223,7 +39333,7 @@ function renderTagsSurface(ctx, spinnerFrame = 0) {
                 // Tags have no leading status icon, so a delete-in-flight appends
                 // an accent spinner at the row's end. Reserve its 2 cells from the
                 // truncation budget so it never pushes the row past the panel.
-                const deleting = isPendingDeletion(state.pendingDeletion, 'tag', tag.name);
+                const deleting = isPendingItemAction(state.pendingItemAction, 'tag', tag.name);
                 const spinnerSpan = deleting
                     ? h(Text, { color: theme.noColor ? undefined : theme.colors.accent, dimColor: false }, ` ${inlineSpinnerGlyph(spinnerFrame, theme.ascii)}`)
                     : null;
@@ -39305,7 +39415,7 @@ function renderWorktreesSurface(ctx, spinnerFrame = 0) {
                 const index = startIndex + offset;
                 const isSelected = index === selected;
                 const cursor = isSelected ? '>' : ' ';
-                const marker = isPendingDeletion(state.pendingDeletion, 'worktree', entry.path)
+                const marker = isPendingItemAction(state.pendingItemAction, 'worktree', entry.path)
                     ? inlineSpinnerGlyph(spinnerFrame, theme.ascii)
                     : entry.current ? '*' : ' ';
                 const branchLabel = entry.branch ? entry.branch : entry.head || '<detached>';
@@ -40774,15 +40884,28 @@ const REMOTE_OP_LOADERS = {
  * Returns `undefined` for non-delete workflows (and when nothing is
  * selected), which the runner treats as "no pending marker".
  */
-function resolvePendingDeletion(id, state, context) {
+function resolvePendingItemAction(id, state, context) {
     const { filter } = state;
+    // Checking out a branch gets the same inline spinner on its row as a
+    // delete does — the action just runs `git checkout` instead of
+    // `git branch -d`. Resolved the same way as the delete branch case
+    // (and identically to the checkout-branch handler) so the spinner
+    // lands on exactly the row the user pressed enter on.
+    if (id === 'checkout-branch') {
+        const all = sortBranches(context.branches?.localBranches || [], state.branchSort);
+        const visible = filter
+            ? all.filter((b) => matchesPromotedFilter([b.shortName, b.upstream || ''], filter))
+            : all;
+        const branch = visible[Math.min(state.selectedBranchIndex, visible.length - 1)];
+        return branch ? { kind: 'branch', id: branch.shortName, action: 'checkout' } : undefined;
+    }
     if (id === 'delete-branch' || id === 'force-delete-branch') {
         const all = sortBranches(context.branches?.localBranches || [], state.branchSort);
         const visible = filter
             ? all.filter((b) => matchesPromotedFilter([b.shortName, b.upstream || ''], filter))
             : all;
         const branch = visible[Math.min(state.selectedBranchIndex, visible.length - 1)];
-        return branch ? { kind: 'branch', id: branch.shortName } : undefined;
+        return branch ? { kind: 'branch', id: branch.shortName, action: 'delete' } : undefined;
     }
     if (id === 'delete-tag') {
         const all = sortTags(context.tags?.tags || [], state.tagSort);
@@ -40790,7 +40913,7 @@ function resolvePendingDeletion(id, state, context) {
             ? all.filter((t) => matchesPromotedFilter([t.name, t.subject], filter))
             : all;
         const tag = visible[Math.min(state.selectedTagIndex, visible.length - 1)];
-        return tag ? { kind: 'tag', id: tag.name } : undefined;
+        return tag ? { kind: 'tag', id: tag.name, action: 'delete' } : undefined;
     }
     if (id === 'drop-stash') {
         const all = context.stashes?.stashes || [];
@@ -40798,7 +40921,7 @@ function resolvePendingDeletion(id, state, context) {
             ? all.filter((s) => matchesPromotedFilter([s.ref, s.message], filter))
             : all;
         const stash = visible[Math.min(state.selectedStashIndex, visible.length - 1)];
-        return stash ? { kind: 'stash', id: stash.ref } : undefined;
+        return stash ? { kind: 'stash', id: stash.ref, action: 'delete' } : undefined;
     }
     if (id === 'remove-worktree') {
         const all = context.worktreeList?.worktrees || [];
@@ -40808,7 +40931,7 @@ function resolvePendingDeletion(id, state, context) {
         const wt = visible.length
             ? visible[Math.min(state.selectedWorktreeListIndex, visible.length - 1)]
             : all[Math.min(state.selectedWorktreeListIndex, Math.max(0, all.length - 1))];
-        return wt ? { kind: 'worktree', id: wt.path } : undefined;
+        return wt ? { kind: 'worktree', id: wt.path, action: 'delete' } : undefined;
     }
     return undefined;
 }
@@ -41129,9 +41252,10 @@ function LogInkApp(deps) {
         state.commitCompose.loading ||
         Boolean(state.remoteOp) ||
         Boolean(state.statusLoading) ||
-        // Keep the shared spinner ticking while a list-item delete is in
-        // flight so its inline pending glyph animates instead of freezing.
-        Boolean(state.pendingDeletion);
+        // Keep the shared spinner ticking while a list-item action (delete
+        // or checkout) is in flight so its inline pending glyph animates
+        // instead of freezing.
+        Boolean(state.pendingItemAction);
     React.useEffect(() => {
         if (!anyLoading) {
             // Reset to 0 so the next loading state starts from a known
@@ -44071,14 +44195,15 @@ function LogInkApp(deps) {
         if (remoteOp) {
             dispatch({ type: 'setRemoteOp', value: remoteOp });
         }
-        // Mark the cursored row as deleting so it shows an inline pending
-        // spinner while the git call runs. Cleared in `finally` after the
-        // refresh, so a successful delete hands straight off to the row
-        // vanishing, and a failed one (e.g. an unmerged branch) restores
-        // the row's normal icon alongside the error status.
-        const pendingDeletion = resolvePendingDeletion(id, state, context);
-        if (pendingDeletion) {
-            dispatch({ type: 'setPendingDeletion', value: pendingDeletion });
+        // Mark the cursored row as busy so it shows an inline pending
+        // spinner while the git call runs (delete or checkout). Cleared in
+        // `finally` after the refresh, so a successful delete hands straight
+        // off to the row vanishing, a checkout to the sidebar repainting
+        // with the new current branch, and a failure (e.g. an unmerged
+        // branch) restores the row's normal icon alongside the error status.
+        const pendingItemAction = resolvePendingItemAction(id, state, context);
+        if (pendingItemAction) {
+            dispatch({ type: 'setPendingItemAction', value: pendingItemAction });
         }
         try {
             const result = await handler();
@@ -44091,6 +44216,24 @@ function LogInkApp(deps) {
             if (id === 'delete-branch' && !result?.ok && isBranchNotFullyMergedError(result?.message)) {
                 dispatch({ type: 'setPendingConfirmation', value: 'force-delete-branch' });
             }
+            // A branch checked out in a worktree can't be deleted — and unlike
+            // the unmerged case, `git branch -D` won't force it either, so we
+            // don't offer a confirmation. Replace git's raw rejection with a
+            // clear "free up the worktree first" message that names where the
+            // branch is still in use.
+            if ((id === 'delete-branch' || id === 'force-delete-branch') &&
+                !result?.ok &&
+                isBranchCheckedOutElsewhereError(result?.message)) {
+                const worktreePath = parseCheckedOutWorktreePath(result?.message);
+                const branchName = pendingItemAction?.id;
+                dispatch({
+                    type: 'setStatus',
+                    value: worktreePath
+                        ? `Can't delete ${branchName ? `'${branchName}'` : 'branch'} — checked out in worktree ${worktreePath}. Switch that worktree off the branch or remove it first.`
+                        : `Can't delete ${branchName ? `'${branchName}'` : 'branch'} — it's checked out in another worktree. Switch that worktree off the branch or remove it first.`,
+                    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
@@ -44126,15 +44269,18 @@ function LogInkApp(deps) {
             if (result?.ok && historyMutatingIds.has(id)) {
                 await refreshHistoryRows();
             }
-            // Checkout-branch is the one workflow where we want a *visible*
-            // refresh so the user sees the branches sidebar repaint with the
-            // new current branch (per #806 follow-up). Snap the cursor to
-            // position 0 first so when the refresh completes and the new
-            // current branch lands at the top (per #809's pin-current rule),
-            // the cursor is already there waiting.
+            // Checkout-branch snaps the cursor to position 0 first so when the
+            // refresh completes and the new current branch lands at the top
+            // (per #809's pin-current rule), the cursor is already there
+            // waiting. The refresh is *silent*: the loud refresh used to blank
+            // every branch name behind a "loading branches…" placeholder (#806),
+            // but the in-flight row now carries its own inline pending spinner
+            // (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) {
                 dispatch({ type: 'resetBranchSelection' });
-                await refreshContext();
+                await refreshContext({ silent: true });
             }
             else {
                 // Silent refresh so the deleted item disappears from the list
@@ -44189,11 +44335,11 @@ function LogInkApp(deps) {
             if (remoteOp) {
                 dispatch({ type: 'setRemoteOp', value: undefined });
             }
-            // Same guarantee for the per-row delete spinner: clear it whether
-            // the delete succeeded, failed, or the refresh threw, so no row is
-            // left spinning forever.
-            if (pendingDeletion) {
-                dispatch({ type: 'setPendingDeletion', value: undefined });
+            // Same guarantee for the per-row pending spinner (delete or
+            // checkout): clear it whether the action succeeded, failed, or the
+            // refresh threw, so no row is left spinning forever.
+            if (pendingItemAction) {
+                dispatch({ type: 'setPendingItemAction', value: undefined });
             }
         }
     }, [context, dispatch, git, refreshContext, refreshHistoryRows, refreshWorktreeContext,

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.1";
+const BUILD_VERSION = "0.62.3";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -25179,12 +25179,14 @@ function formatSortIndicator(mode, options = {}) {
 }
 
 /**
- * True when `pending` (a `state.pendingDeletion`) targets this exact row.
- * Shared by every deletable surface + the sidebar so the spinner-swap
- * test is identical everywhere. Takes the field value (not the whole
- * state) so it can live next to the type without a forward reference.
+ * True when `pending` (a `state.pendingItemAction`) targets this exact
+ * row. Action-agnostic on purpose — every surface + the sidebar render
+ * the same spinner whether the row is being deleted or checked out, so
+ * the spinner-swap test stays identical everywhere. Takes the field
+ * value (not the whole state) so it can live next to the type without a
+ * forward reference.
  */
-function isPendingDeletion(pending, kind, id) {
+function isPendingItemAction(pending, kind, id) {
     return pending?.kind === kind && pending.id === id;
 }
 const DEFAULT_CHANGELOG_VIEW_STATE = {
@@ -26392,10 +26394,11 @@ function applyLogInkAction(state, action) {
                 workflowActionId: action.value ? undefined : state.workflowActionId,
                 pendingKey: undefined,
             };
-        case 'setPendingDeletion':
-            // Pure marker for the in-flight delete; touches nothing else so the
-            // list keeps rendering normally underneath the one spinner'd row.
-            return { ...state, pendingDeletion: action.value };
+        case 'setPendingItemAction':
+            // Pure marker for the in-flight row action (delete / checkout);
+            // touches nothing else so the list keeps rendering normally
+            // underneath the one spinner'd row.
+            return { ...state, pendingItemAction: action.value };
         case 'toggleFilterMode':
             return {
                 ...state,
@@ -31018,6 +31021,29 @@ function deleteBranch(git, branch, force = false) {
 function isBranchNotFullyMergedError(message) {
     return /not fully merged/i.test(message || '');
 }
+/**
+ * True when a branch delete was rejected because the branch is checked
+ * out in a worktree. Unlike "not fully merged" there's no force escape
+ * hatch — git refuses `git branch -D` on a worktree-checked-out branch
+ * too — so the UI should surface a clear "free up the worktree first"
+ * message rather than offering a force-delete that would fail the same
+ * way. Matches git's wording: `Cannot delete branch 'x' checked out at
+ * '<path>'` / `used by worktree at '<path>'`.
+ */
+function isBranchCheckedOutElsewhereError(message) {
+    return /checked out at|used by worktree/i.test(message || '');
+}
+/**
+ * Pull the worktree path out of git's "checked out at '<path>'" /
+ * "used by worktree at '<path>'" rejection so the UI can name where the
+ * branch is still in use. Returns undefined when the message doesn't
+ * carry a path (older git phrasings) so callers can fall back to a
+ * generic message.
+ */
+function parseCheckedOutWorktreePath(message) {
+    const match = /(?:checked out at|used by worktree at) '([^']+)'/i.exec(message || '');
+    return match?.[1];
+}
 function fetchRemotes(git) {
     return runAction$5(() => git.raw(['fetch', '--all', '--prune']), 'Fetched all remotes');
 }
@@ -34342,7 +34368,13 @@ function sidebarTabLabel(tab) {
  * Sliding window keeps the cursor in view as the user navigates a long
  * list; truncation hints surface the count of hidden rows.
  */
-function renderSelectableSidebarRows(h, Text, items, selectedIndex, focused, width, theme, toRowText, keyPrefix, visibleCount) {
+function renderSelectableSidebarRows(h, Text, items, selectedIndex, focused, width, theme, toRowText, keyPrefix, visibleCount, 
+// Optional per-row foreground colour (e.g. the current branch in
+// green). Applied only when the row is NOT the active selection —
+// the selection's inverse/background styling owns the row's colour in
+// that case, and layering a foreground under `inverse` would swap it
+// into an unexpected background tint.
+rowColor) {
     if (items.length === 0)
         return [];
     const window = getSidebarVisibleWindow(items.length, selectedIndex, visibleCount);
@@ -34359,10 +34391,12 @@ function renderSelectableSidebarRows(h, Text, items, selectedIndex, focused, wid
             break;
         const isSelected = focused && index === selectedIndex;
         const text = toRowText(items[index], index);
+        const color = isSelected ? undefined : rowColor?.(items[index], index);
         elements.push(h(Text, {
             key: `${keyPrefix}-row-${index}`,
             backgroundColor: isSelected && !theme.noColor ? theme.colors.selection : undefined,
             inverse: isSelected,
+            color,
         }, truncateCells(`  ${text}`, width - 4)));
     }
     if (window.truncatedBelow > 0) {
@@ -34429,7 +34463,7 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
     // shows this spinner in place of its leading marker (branches /
     // worktrees) or appended to the row (tags / stashes, which have no
     // leading status icon). `pending` is the single in-flight target.
-    const pending = state.pendingDeletion;
+    const pending = state.pendingItemAction;
     const spin = inlineSpinnerGlyph(spinnerFrame, theme.ascii);
     // Available rows for the active tab's list. The sidebar chrome
     // takes ~10 rows (panel title + spacer + 5 tab headers + 4 inter-tab
@@ -34468,11 +34502,15 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
         return [
             ...headerRows,
             ...renderSelectableSidebarRows(h, Text, sortedBranches, state.selectedBranchIndex, focused, width, theme, (branch) => {
-                const glyph = isPendingDeletion(pending, 'branch', branch.shortName)
+                const glyph = isPendingItemAction(pending, 'branch', branch.shortName)
                     ? spin
                     : branchRowMarker(branch, { ascii: theme.ascii }).glyph;
                 return `${glyph} ${branch.shortName}`;
-            }, 'tab-branches', visibleListCount),
+            }, 'tab-branches', visibleListCount, 
+            // Paint the checked-out branch green so "where am I?" reads at a
+            // glance, matching the green HEAD marker the branches surface
+            // already uses. NO_COLOR themes fall back to the `*` glyph alone.
+            (branch) => (branch.current && !theme.noColor ? theme.colors.success : undefined)),
         ];
     }
     if (tab === 'tags') {
@@ -34487,7 +34525,7 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
             const base = `${truncateCells(tag.name, 16)} ${tag.subject}`;
             // Tags have no leading status icon, so the pending spinner is
             // appended to the row instead of replacing a glyph.
-            return isPendingDeletion(pending, 'tag', tag.name) ? `${base} ${spin}` : base;
+            return isPendingItemAction(pending, 'tag', tag.name) ? `${base} ${spin}` : base;
         }, 'tab-tags', visibleListCount);
     }
     if (tab === 'stashes') {
@@ -34502,7 +34540,7 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
             const base = `@{${index}} ${stash.message || '(no message)'}`;
             // `@{N}` is the stash ref, not a status icon, so append the
             // spinner rather than replacing it.
-            return isPendingDeletion(pending, 'stash', stash.ref) ? `${base} ${spin}` : base;
+            return isPendingItemAction(pending, 'stash', stash.ref) ? `${base} ${spin}` : base;
         }, 'tab-stashes', visibleListCount);
     }
     // worktrees
@@ -34514,7 +34552,7 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
         return [h(Text, { key: 'tab-worktrees-empty', dimColor: true }, '  No linked worktrees')];
     }
     return renderSelectableSidebarRows(h, Text, worktrees, state.selectedWorktreeListIndex, focused, width, theme, (worktree) => {
-        const marker = isPendingDeletion(pending, 'worktree', worktree.path)
+        const marker = isPendingItemAction(pending, 'worktree', worktree.path)
             ? spin
             : worktree.current ? '*' : ' ';
         const wstate = worktree.dirty ? 'dirty' : 'clean';
@@ -34950,7 +34988,7 @@ function renderBranchesSurface(ctx, spinnerFrame = 0) {
                 // While this branch's delete is in flight, its sync-state marker
                 // is replaced by an inline spinner (accent-coloured) so the row
                 // reads as "deleting" until it vanishes on refresh.
-                const deleting = isPendingDeletion(state.pendingDeletion, 'branch', branch.shortName);
+                const deleting = isPendingItemAction(state.pendingItemAction, 'branch', branch.shortName);
                 const glyph = deleting ? inlineSpinnerGlyph(spinnerFrame, theme.ascii) : marker.glyph;
                 const glyphColor = deleting
                     ? (theme.noColor ? undefined : theme.colors.accent)
@@ -34973,11 +35011,16 @@ function renderBranchesSurface(ctx, spinnerFrame = 0) {
                 const truncated = truncateCells(fullText, Math.max(20, width - 4));
                 // If truncation chopped into the timestamp/divergence portion,
                 // fall back to a single Text to keep the visible width honest.
+                // The checked-out branch is painted green (matching its green
+                // HEAD marker) so "where am I?" reads at a glance. NO_COLOR
+                // themes fall back to the `*` glyph alone.
+                const currentColor = branch.current && !theme.noColor ? theme.colors.success : undefined;
                 if (truncated !== fullText) {
                     return h(Text, {
                         key: `branch-${index}`,
                         bold: isSelected,
                         dimColor: lineDim,
+                        color: currentColor,
                     }, truncated);
                 }
                 return h(Text, {
@@ -34992,7 +35035,12 @@ function renderBranchesSurface(ctx, spinnerFrame = 0) {
                 // no-upstream kinds return undefined from
                 // `getBranchRowMarkerColor`, so those markers inherit the
                 // row's dim and read as quiet chrome.
-                h(Text, { color: glyphColor, dimColor: glyphColor ? false : undefined }, glyph), trailingName, h(Text, { dimColor: true }, timestampPadded), trailingDivergence);
+                h(Text, { color: glyphColor, dimColor: glyphColor ? false : undefined }, glyph), 
+                // Name span: green for the current branch (dimColor:false keeps
+                // it bright), otherwise it inherits the row's normal styling.
+                currentColor
+                    ? h(Text, { color: currentColor, dimColor: false }, trailingName)
+                    : 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.
@@ -38791,6 +38839,15 @@ function renderReflogSurface(ctx) {
  * Extracted from `src/commands/log/inkRuntime.ts` as part of phase 5a.1
  * of #890. No behavior change.
  */
+const GAP = 2; // cells between columns
+/** Truncate to `w` cells, then pad to `w` (left = padEnd, right = padStart). */
+function cell(value, w, align = 'left') {
+    const t = truncateCells(value, w);
+    // padStart/padEnd count code units; refs / ages / counts / branch
+    // names are ASCII in practice, matching the branches surface's
+    // padEnd-based column alignment.
+    return align === 'right' ? t.padStart(w) : t.padEnd(w);
+}
 function renderStashSurface(ctx, spinnerFrame = 0) {
     const { h, components, state, context, contextStatus, bodyRows, width, theme } = ctx;
     const { Box, Text } = components;
@@ -38801,7 +38858,9 @@ function renderStashSurface(ctx, spinnerFrame = 0) {
         ? allStashes.filter((stash) => matchesPromotedFilter([stash.ref, stash.message], state.filter))
         : allStashes;
     const selected = Math.max(0, Math.min(state.selectedStashIndex, Math.max(0, stashes.length - 1)));
-    const listRows = Math.max(4, bodyRows - 4);
+    // One extra row reserved (vs the other surfaces' `- 4`) for the column
+    // header row below.
+    const listRows = Math.max(4, bodyRows - 5);
     const startIndex = Math.max(0, selected - Math.floor(listRows / 2));
     const visible = stashes.slice(startIndex, startIndex + listRows);
     const filterLabel = state.filter ? ` | filter: ${state.filter}` : '';
@@ -38811,10 +38870,67 @@ function renderStashSurface(ctx, spinnerFrame = 0) {
     const emptyLabel = formatLogInkStashEmpty({ filter: state.filter });
     const loadingLabel = formatLogInkLoading({ resource: 'stashes' });
     const now = getRenderNow();
-    // Available width for a row: box width minus the 2-cell horizontal
-    // padding. Truncate to it (with a small floor) instead of a magic 140
-    // so the richer meta degrades gracefully on narrow terminals.
-    const rowWidth = Math.max(20, width - 2);
+    // Usable interior width: panel width minus the border (2) and the
+    // paddingX:1 (2). The previous `width - 2` under-counted the border
+    // and made every near-full row overflow by 2 cells and wrap — the
+    // single biggest readability hit in the old list.
+    const contentWidth = Math.max(20, width - 4);
+    const ageOf = (s) => formatCompactRelativeDate(s.date, now);
+    // Column widths derived from the visible window (#833 pattern) so rows
+    // align without re-measuring the whole list. Each column is at least
+    // as wide as its header label so the header never truncates ("age",
+    // "branch", "files"); age tops out at 5 ("today" is the longest value
+    // formatCompactRelativeDate emits).
+    const refCol = visible.length
+        ? Math.min(11, Math.max(3, ...visible.map((s) => cellWidth(s.ref))))
+        : 9;
+    const ageCol = visible.length
+        ? Math.min(5, Math.max(3, ...visible.map((s) => cellWidth(ageOf(s)))))
+        : 3;
+    const branchColMax = visible.length
+        ? Math.max(0, ...visible.map((s) => cellWidth(s.branch || '')))
+        : 0;
+    const filesCol = visible.length
+        ? Math.max(5, ...visible.map((s) => String(s.files.length).length))
+        : 5;
+    // Responsive degradation. Keep ref + message always; when the message
+    // floor is threatened, shed columns the preview pane already shows —
+    // branch first, then age, then the file count — before squeezing the
+    // message.
+    // Widen to fit the "branch" header when any stash carries a branch;
+    // stays 0 (column dropped) when none do.
+    let branchCol = branchColMax > 0 ? Math.min(18, Math.max(6, branchColMax)) : 0;
+    let showAge = true;
+    let showFiles = true;
+    const fixedWidth = () => 2 + refCol +
+        (showAge ? GAP + ageCol : 0) +
+        (branchCol > 0 ? GAP + branchCol : 0) +
+        (showFiles ? GAP + filesCol : 0) +
+        GAP; // gap before the message column
+    let messageWidth = contentWidth - fixedWidth();
+    if (messageWidth < 24 && branchCol > 0) {
+        branchCol = 0;
+        messageWidth = contentWidth - fixedWidth();
+    }
+    if (messageWidth < 16 && showAge) {
+        showAge = false;
+        messageWidth = contentWidth - fixedWidth();
+    }
+    if (messageWidth < 12 && showFiles) {
+        showFiles = false;
+        messageWidth = contentWidth - fixedWidth();
+    }
+    messageWidth = Math.max(8, messageWidth);
+    // Column header. Right-aligned labels over the right-aligned numeric
+    // columns (age, files) so header and data share an edge.
+    let headerText = `  ${cell('ref', refCol)}`;
+    if (showAge)
+        headerText += `${' '.repeat(GAP)}${cell('age', ageCol, 'right')}`;
+    if (branchCol > 0)
+        headerText += `${' '.repeat(GAP)}${cell('branch', branchCol)}`;
+    if (showFiles)
+        headerText += `${' '.repeat(GAP)}${cell('files', filesCol, 'right')}`;
+    headerText += `${' '.repeat(GAP)}message`;
     const lines = loading
         ? [h(Text, { key: 'stash-loading', dimColor: true }, loadingLabel)]
         : stashes.length === 0
@@ -38823,32 +38939,22 @@ function renderStashSurface(ctx, spinnerFrame = 0) {
                 const index = startIndex + offset;
                 const isSelected = index === selected;
                 const cursor = isSelected ? '>' : ' ';
-                // Surface the metadata the StashEntry already carries — origin
-                // branch, file count, and relative age — between the ref and the
-                // message, so the list answers "which stash is this?" without an
-                // Enter→diff round trip.
-                const age = formatCompactRelativeDate(stash.date, now);
-                const fileCount = stash.files.length;
-                const meta = [
-                    stash.branch ? `on ${stash.branch}` : '',
-                    fileCount > 0 ? `${fileCount} file${fileCount === 1 ? '' : 's'}` : '',
-                    age,
-                ].filter(Boolean).join(' · ');
-                const rowText = meta
-                    ? `${cursor} ${stash.ref.padEnd(11)} ${meta}  ${stash.message}`
-                    : `${cursor} ${stash.ref.padEnd(11)} ${stash.message}`;
+                const deleting = isPendingItemAction(state.pendingItemAction, 'stash', stash.ref);
                 // The `stash@{N}` ref is an identifier, not a status icon, so a
                 // delete-in-flight appends an accent spinner at the row's end
-                // (2 cells reserved from the width budget).
-                const deleting = isPendingDeletion(state.pendingDeletion, 'stash', stash.ref);
+                // (2 cells reserved from the message budget).
                 const spinnerSpan = deleting
                     ? h(Text, { color: theme.noColor ? undefined : theme.colors.accent, dimColor: false }, ` ${inlineSpinnerGlyph(spinnerFrame, theme.ascii)}`)
                     : null;
+                const message = truncateCells(stash.message, messageWidth - (deleting ? 2 : 0));
+                // ref + message read as primary; age / branch / file-count are
+                // dim metadata (kept dim even on the bold selected row so the
+                // message stays the focal point).
                 return h(Text, {
                     key: `stash-${index}`,
                     bold: isSelected,
                     dimColor: !isSelected,
-                }, truncateCells(rowText, rowWidth - (deleting ? 2 : 0)), spinnerSpan);
+                }, `${cursor} `, cell(stash.ref, refCol), showAge ? h(Text, { dimColor: true }, `${' '.repeat(GAP)}${cell(ageOf(stash), ageCol, 'right')}`) : null, branchCol > 0 ? h(Text, { dimColor: true }, `${' '.repeat(GAP)}${cell(stash.branch || '', branchCol)}`) : null, showFiles ? h(Text, { dimColor: true }, `${' '.repeat(GAP)}${cell(String(stash.files.length), filesCol, 'right')}`) : null, `${' '.repeat(GAP)}${message}`, spinnerSpan);
             });
     const stashHasMoreAbove = startIndex > 0 && stashes.length > 0;
     const stashHasMoreBelow = startIndex + listRows < stashes.length;
@@ -38859,7 +38965,11 @@ function renderStashSurface(ctx, spinnerFrame = 0) {
         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), ...(stashHasMoreAbove
+    }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Stash', focused)), h(Text, { dimColor: true }, headerRight)), ...renderPromotedFilterAffordance(h, Text, state, theme), 
+    // Column header — only when there are rows to label.
+    ...(!loading && stashes.length > 0
+        ? [h(Text, { key: 'stash-col-header', dimColor: true }, truncateCells(headerText, contentWidth))]
+        : []), ...(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`)]
@@ -39240,7 +39350,7 @@ function renderTagsSurface(ctx, spinnerFrame = 0) {
                 // Tags have no leading status icon, so a delete-in-flight appends
                 // an accent spinner at the row's end. Reserve its 2 cells from the
                 // truncation budget so it never pushes the row past the panel.
-                const deleting = isPendingDeletion(state.pendingDeletion, 'tag', tag.name);
+                const deleting = isPendingItemAction(state.pendingItemAction, 'tag', tag.name);
                 const spinnerSpan = deleting
                     ? h(Text, { color: theme.noColor ? undefined : theme.colors.accent, dimColor: false }, ` ${inlineSpinnerGlyph(spinnerFrame, theme.ascii)}`)
                     : null;
@@ -39322,7 +39432,7 @@ function renderWorktreesSurface(ctx, spinnerFrame = 0) {
                 const index = startIndex + offset;
                 const isSelected = index === selected;
                 const cursor = isSelected ? '>' : ' ';
-                const marker = isPendingDeletion(state.pendingDeletion, 'worktree', entry.path)
+                const marker = isPendingItemAction(state.pendingItemAction, 'worktree', entry.path)
                     ? inlineSpinnerGlyph(spinnerFrame, theme.ascii)
                     : entry.current ? '*' : ' ';
                 const branchLabel = entry.branch ? entry.branch : entry.head || '<detached>';
@@ -40791,15 +40901,28 @@ const REMOTE_OP_LOADERS = {
  * Returns `undefined` for non-delete workflows (and when nothing is
  * selected), which the runner treats as "no pending marker".
  */
-function resolvePendingDeletion(id, state, context) {
+function resolvePendingItemAction(id, state, context) {
     const { filter } = state;
+    // Checking out a branch gets the same inline spinner on its row as a
+    // delete does — the action just runs `git checkout` instead of
+    // `git branch -d`. Resolved the same way as the delete branch case
+    // (and identically to the checkout-branch handler) so the spinner
+    // lands on exactly the row the user pressed enter on.
+    if (id === 'checkout-branch') {
+        const all = sortBranches(context.branches?.localBranches || [], state.branchSort);
+        const visible = filter
+            ? all.filter((b) => matchesPromotedFilter([b.shortName, b.upstream || ''], filter))
+            : all;
+        const branch = visible[Math.min(state.selectedBranchIndex, visible.length - 1)];
+        return branch ? { kind: 'branch', id: branch.shortName, action: 'checkout' } : undefined;
+    }
     if (id === 'delete-branch' || id === 'force-delete-branch') {
         const all = sortBranches(context.branches?.localBranches || [], state.branchSort);
         const visible = filter
             ? all.filter((b) => matchesPromotedFilter([b.shortName, b.upstream || ''], filter))
             : all;
         const branch = visible[Math.min(state.selectedBranchIndex, visible.length - 1)];
-        return branch ? { kind: 'branch', id: branch.shortName } : undefined;
+        return branch ? { kind: 'branch', id: branch.shortName, action: 'delete' } : undefined;
     }
     if (id === 'delete-tag') {
         const all = sortTags(context.tags?.tags || [], state.tagSort);
@@ -40807,7 +40930,7 @@ function resolvePendingDeletion(id, state, context) {
             ? all.filter((t) => matchesPromotedFilter([t.name, t.subject], filter))
             : all;
         const tag = visible[Math.min(state.selectedTagIndex, visible.length - 1)];
-        return tag ? { kind: 'tag', id: tag.name } : undefined;
+        return tag ? { kind: 'tag', id: tag.name, action: 'delete' } : undefined;
     }
     if (id === 'drop-stash') {
         const all = context.stashes?.stashes || [];
@@ -40815,7 +40938,7 @@ function resolvePendingDeletion(id, state, context) {
             ? all.filter((s) => matchesPromotedFilter([s.ref, s.message], filter))
             : all;
         const stash = visible[Math.min(state.selectedStashIndex, visible.length - 1)];
-        return stash ? { kind: 'stash', id: stash.ref } : undefined;
+        return stash ? { kind: 'stash', id: stash.ref, action: 'delete' } : undefined;
     }
     if (id === 'remove-worktree') {
         const all = context.worktreeList?.worktrees || [];
@@ -40825,7 +40948,7 @@ function resolvePendingDeletion(id, state, context) {
         const wt = visible.length
             ? visible[Math.min(state.selectedWorktreeListIndex, visible.length - 1)]
             : all[Math.min(state.selectedWorktreeListIndex, Math.max(0, all.length - 1))];
-        return wt ? { kind: 'worktree', id: wt.path } : undefined;
+        return wt ? { kind: 'worktree', id: wt.path, action: 'delete' } : undefined;
     }
     return undefined;
 }
@@ -41146,9 +41269,10 @@ function LogInkApp(deps) {
         state.commitCompose.loading ||
         Boolean(state.remoteOp) ||
         Boolean(state.statusLoading) ||
-        // Keep the shared spinner ticking while a list-item delete is in
-        // flight so its inline pending glyph animates instead of freezing.
-        Boolean(state.pendingDeletion);
+        // Keep the shared spinner ticking while a list-item action (delete
+        // or checkout) is in flight so its inline pending glyph animates
+        // instead of freezing.
+        Boolean(state.pendingItemAction);
     React.useEffect(() => {
         if (!anyLoading) {
             // Reset to 0 so the next loading state starts from a known
@@ -44088,14 +44212,15 @@ function LogInkApp(deps) {
         if (remoteOp) {
             dispatch({ type: 'setRemoteOp', value: remoteOp });
         }
-        // Mark the cursored row as deleting so it shows an inline pending
-        // spinner while the git call runs. Cleared in `finally` after the
-        // refresh, so a successful delete hands straight off to the row
-        // vanishing, and a failed one (e.g. an unmerged branch) restores
-        // the row's normal icon alongside the error status.
-        const pendingDeletion = resolvePendingDeletion(id, state, context);
-        if (pendingDeletion) {
-            dispatch({ type: 'setPendingDeletion', value: pendingDeletion });
+        // Mark the cursored row as busy so it shows an inline pending
+        // spinner while the git call runs (delete or checkout). Cleared in
+        // `finally` after the refresh, so a successful delete hands straight
+        // off to the row vanishing, a checkout to the sidebar repainting
+        // with the new current branch, and a failure (e.g. an unmerged
+        // branch) restores the row's normal icon alongside the error status.
+        const pendingItemAction = resolvePendingItemAction(id, state, context);
+        if (pendingItemAction) {
+            dispatch({ type: 'setPendingItemAction', value: pendingItemAction });
         }
         try {
             const result = await handler();
@@ -44108,6 +44233,24 @@ function LogInkApp(deps) {
             if (id === 'delete-branch' && !result?.ok && isBranchNotFullyMergedError(result?.message)) {
                 dispatch({ type: 'setPendingConfirmation', value: 'force-delete-branch' });
             }
+            // A branch checked out in a worktree can't be deleted — and unlike
+            // the unmerged case, `git branch -D` won't force it either, so we
+            // don't offer a confirmation. Replace git's raw rejection with a
+            // clear "free up the worktree first" message that names where the
+            // branch is still in use.
+            if ((id === 'delete-branch' || id === 'force-delete-branch') &&
+                !result?.ok &&
+                isBranchCheckedOutElsewhereError(result?.message)) {
+                const worktreePath = parseCheckedOutWorktreePath(result?.message);
+                const branchName = pendingItemAction?.id;
+                dispatch({
+                    type: 'setStatus',
+                    value: worktreePath
+                        ? `Can't delete ${branchName ? `'${branchName}'` : 'branch'} — checked out in worktree ${worktreePath}. Switch that worktree off the branch or remove it first.`
+                        : `Can't delete ${branchName ? `'${branchName}'` : 'branch'} — it's checked out in another worktree. Switch that worktree off the branch or remove it first.`,
+                    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
@@ -44143,15 +44286,18 @@ function LogInkApp(deps) {
             if (result?.ok && historyMutatingIds.has(id)) {
                 await refreshHistoryRows();
             }
-            // Checkout-branch is the one workflow where we want a *visible*
-            // refresh so the user sees the branches sidebar repaint with the
-            // new current branch (per #806 follow-up). Snap the cursor to
-            // position 0 first so when the refresh completes and the new
-            // current branch lands at the top (per #809's pin-current rule),
-            // the cursor is already there waiting.
+            // Checkout-branch snaps the cursor to position 0 first so when the
+            // refresh completes and the new current branch lands at the top
+            // (per #809's pin-current rule), the cursor is already there
+            // waiting. The refresh is *silent*: the loud refresh used to blank
+            // every branch name behind a "loading branches…" placeholder (#806),
+            // but the in-flight row now carries its own inline pending spinner
+            // (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) {
                 dispatch({ type: 'resetBranchSelection' });
-                await refreshContext();
+                await refreshContext({ silent: true });
             }
             else {
                 // Silent refresh so the deleted item disappears from the list
@@ -44206,11 +44352,11 @@ function LogInkApp(deps) {
             if (remoteOp) {
                 dispatch({ type: 'setRemoteOp', value: undefined });
             }
-            // Same guarantee for the per-row delete spinner: clear it whether
-            // the delete succeeded, failed, or the refresh threw, so no row is
-            // left spinning forever.
-            if (pendingDeletion) {
-                dispatch({ type: 'setPendingDeletion', value: undefined });
+            // Same guarantee for the per-row pending spinner (delete or
+            // checkout): clear it whether the action succeeded, failed, or the
+            // refresh threw, so no row is left spinning forever.
+            if (pendingItemAction) {
+                dispatch({ type: 'setPendingItemAction', value: undefined });
             }
         }
     }, [context, dispatch, git, refreshContext, refreshHistoryRows, refreshWorktreeContext,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-coco",
-  "version": "0.62.1",
+  "version": "0.62.3",
   "description": "zero-effort git commits with coco.",
   "author": "gfargo <ghfargo@gmail.com>",
   "license": "MIT",