git-coco 0.62.2 → 0.62.4

package/dist/index.esm.mjs

@@ -61,7 +61,7 @@ import { pathToFileURL } from 'url';
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.62.2";
+const BUILD_VERSION = "0.62.4";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -26368,6 +26368,8 @@ function applyLogInkAction(state, action) {
                 pendingMutationConfirmation: action.value ? undefined : state.pendingMutationConfirmation,
                 pendingKey: undefined,
             };
+        case 'setWorktreeCheckoutConflict':
+            return { ...state, worktreeCheckoutConflict: action.value, pendingKey: undefined };
         case 'setPendingMutationConfirmation':
             return {
                 ...state,
@@ -27740,7 +27742,45 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
         return [];
     }
     if (state.pendingConfirmationId) {
+        // Worktree-conflict removal options (#1175): alongside the y-switch,
+        // `r` removes the conflicting worktree and checks the branch out
+        // here, `x` removes the worktree AND deletes the branch. Both defer
+        // to the runtime (it owns the git ops + the conflict context); the
+        // runtime clears the conflict state once it resolves.
+        if (state.pendingConfirmationId === 'switch-to-conflicting-worktree' && state.worktreeCheckoutConflict) {
+            if (inputValue === 'r') {
+                return [
+                    { type: 'runWorkflowAction', id: 'conflict-remove-worktree-checkout' },
+                    action({ type: 'setPendingConfirmation', value: undefined }),
+                ];
+            }
+            if (inputValue === 'x') {
+                return [
+                    { type: 'runWorkflowAction', id: 'conflict-remove-worktree-branch' },
+                    action({ type: 'setPendingConfirmation', value: undefined }),
+                ];
+            }
+        }
         if (inputValue === 'y') {
+            // Worktree-conflict switch (#1175): the branch is already checked
+            // out elsewhere, so "switch" just opens that worktree as a nested
+            // repo frame (same mechanism as drilling into a submodule) — no
+            // git mutation, hence handled here rather than via the runtime.
+            if (state.pendingConfirmationId === 'switch-to-conflicting-worktree') {
+                const conflict = state.worktreeCheckoutConflict;
+                if (conflict) {
+                    return [
+                        action({ type: 'pushRepoFrame', label: conflict.branch, workdir: conflict.worktreePath }),
+                        action({ type: 'setStatus', value: `Switched to worktree ${conflict.worktreePath} (${conflict.branch})` }),
+                        action({ type: 'setPendingConfirmation', value: undefined }),
+                        action({ type: 'setWorktreeCheckoutConflict', value: undefined }),
+                    ];
+                }
+                return [
+                    action({ type: 'setPendingConfirmation', value: undefined }),
+                    action({ type: 'setWorktreeCheckoutConflict', value: undefined }),
+                ];
+            }
             const workflowAction = getLogInkWorkflowActionById(state.pendingConfirmationId);
             if (workflowAction?.id === 'ai-commit-summary') {
                 return [
@@ -27766,6 +27806,11 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
         if (inputValue === 'n' || key.escape) {
             return [
                 action({ type: 'setPendingConfirmation', value: undefined }),
+                // Drop any worktree-conflict context so the prompt doesn't
+                // linger after the user declines to switch.
+                ...(state.worktreeCheckoutConflict
+                    ? [action({ type: 'setWorktreeCheckoutConflict', value: undefined })]
+                    : []),
                 action({ type: 'setStatus', value: 'workflow action cancelled' }),
             ];
         }
@@ -34351,7 +34396,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);
@@ -34368,10 +34419,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) {
@@ -34481,7 +34534,11 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
                     ? 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') {
@@ -34982,11 +35039,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, {
@@ -35001,7 +35063,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.
@@ -37618,25 +37685,36 @@ function renderConfirmationPanel(h, components, state, width, theme, focused) {
             : state.pendingMutationConfirmation === 'discard-draft'
                 ? 'Quit and discard the in-progress commit draft'
                 : undefined;
-    const label = action?.label || mutationLabel || 'Workflow action';
+    // Worktree-conflict switch (#1175): a checkout was rejected because
+    // the branch is checked out elsewhere — name the branch + worktree so
+    // the prompt explains what "y" does (jump into that worktree).
+    const conflict = state.worktreeCheckoutConflict;
+    const isWorktreeConflict = state.pendingConfirmationId === 'switch-to-conflicting-worktree';
+    const label = isWorktreeConflict && conflict
+        ? `Switch to the worktree where '${conflict.branch}' is checked out?`
+        : action?.label || mutationLabel || 'Workflow action';
     const warning = state.pendingMutationConfirmation === 'discard-draft'
         ? 'You have an unsaved commit draft. Press y to discard it and quit.'
         : state.pendingMutationConfirmation
             ? 'This discards local changes and cannot be undone by Coco.'
-            // Second-stage confirm raised when a safe delete hit an unmerged
-            // branch — name the reason so the force isn't a blind "y again".
-            : state.pendingConfirmationId === 'force-delete-branch'
-                ? 'Not fully merged. Force-delete (git branch -D) is irreversible.'
-                : action?.kind === 'ai'
-                    ? `AI action requires confirmation. Estimated ${action.estimatedTokens || '<unknown>'} tokens.`
-                    : 'Destructive Git action requires confirmation.';
+            : isWorktreeConflict && conflict
+                ? `'${conflict.branch}' is checked out at ${conflict.worktreePath}.${conflict.dirty ? ' That worktree has uncommitted changes — removal will be refused until it is clean or stashed.' : ''}`
+                // Second-stage confirm raised when a safe delete hit an unmerged
+                // branch — name the reason so the force isn't a blind "y again".
+                : state.pendingConfirmationId === 'force-delete-branch'
+                    ? 'Not fully merged. Force-delete (git branch -D) is irreversible.'
+                    : action?.kind === 'ai'
+                        ? `AI action requires confirmation. Estimated ${action.estimatedTokens || '<unknown>'} tokens.`
+                        : 'Destructive Git action requires confirmation.';
     return h(Box, {
         borderColor: focusBorderColor(theme, focused),
         borderStyle: theme.borderStyle,
         flexDirection: 'column',
         width,
         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.'));
+    }, 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, truncateCells(isWorktreeConflict
+        ? 'y switch · r remove worktree & check out here · x remove worktree & delete branch · n/Esc cancel'
+        : 'Press y to confirm or n/Esc to cancel.', width - 4)));
 }
 /**
  * First-launch onboarding overlay (P1.3). Shown once per machine, gated
@@ -38800,6 +38878,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;
@@ -38810,7 +38897,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}` : '';
@@ -38820,10 +38909,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
@@ -38832,32 +38978,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 = isPendingItemAction(state.pendingItemAction, '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;
@@ -38868,7 +39004,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`)]
@@ -43688,6 +43828,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) {
@@ -44150,6 +44326,30 @@ 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
+            // y-confirm offering to switch into that worktree — the branch IS
+            // checked out, just elsewhere (#1175).
+            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);
+                    dispatch({
+                        type: 'setWorktreeCheckoutConflict',
+                        value: { branch: branchName, worktreePath, dirty: worktree?.dirty ?? false },
+                    });
+                    dispatch({ type: 'setPendingConfirmation', value: 'switch-to-conflicting-worktree' });
+                }
+                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
@@ -44159,6 +44359,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
@@ -44194,7 +44398,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 });
             }
@@ -44261,7 +44465,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

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.2";
+const BUILD_VERSION = "0.62.4";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -26385,6 +26385,8 @@ function applyLogInkAction(state, action) {
                 pendingMutationConfirmation: action.value ? undefined : state.pendingMutationConfirmation,
                 pendingKey: undefined,
             };
+        case 'setWorktreeCheckoutConflict':
+            return { ...state, worktreeCheckoutConflict: action.value, pendingKey: undefined };
         case 'setPendingMutationConfirmation':
             return {
                 ...state,
@@ -27757,7 +27759,45 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
         return [];
     }
     if (state.pendingConfirmationId) {
+        // Worktree-conflict removal options (#1175): alongside the y-switch,
+        // `r` removes the conflicting worktree and checks the branch out
+        // here, `x` removes the worktree AND deletes the branch. Both defer
+        // to the runtime (it owns the git ops + the conflict context); the
+        // runtime clears the conflict state once it resolves.
+        if (state.pendingConfirmationId === 'switch-to-conflicting-worktree' && state.worktreeCheckoutConflict) {
+            if (inputValue === 'r') {
+                return [
+                    { type: 'runWorkflowAction', id: 'conflict-remove-worktree-checkout' },
+                    action({ type: 'setPendingConfirmation', value: undefined }),
+                ];
+            }
+            if (inputValue === 'x') {
+                return [
+                    { type: 'runWorkflowAction', id: 'conflict-remove-worktree-branch' },
+                    action({ type: 'setPendingConfirmation', value: undefined }),
+                ];
+            }
+        }
         if (inputValue === 'y') {
+            // Worktree-conflict switch (#1175): the branch is already checked
+            // out elsewhere, so "switch" just opens that worktree as a nested
+            // repo frame (same mechanism as drilling into a submodule) — no
+            // git mutation, hence handled here rather than via the runtime.
+            if (state.pendingConfirmationId === 'switch-to-conflicting-worktree') {
+                const conflict = state.worktreeCheckoutConflict;
+                if (conflict) {
+                    return [
+                        action({ type: 'pushRepoFrame', label: conflict.branch, workdir: conflict.worktreePath }),
+                        action({ type: 'setStatus', value: `Switched to worktree ${conflict.worktreePath} (${conflict.branch})` }),
+                        action({ type: 'setPendingConfirmation', value: undefined }),
+                        action({ type: 'setWorktreeCheckoutConflict', value: undefined }),
+                    ];
+                }
+                return [
+                    action({ type: 'setPendingConfirmation', value: undefined }),
+                    action({ type: 'setWorktreeCheckoutConflict', value: undefined }),
+                ];
+            }
             const workflowAction = getLogInkWorkflowActionById(state.pendingConfirmationId);
             if (workflowAction?.id === 'ai-commit-summary') {
                 return [
@@ -27783,6 +27823,11 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
         if (inputValue === 'n' || key.escape) {
             return [
                 action({ type: 'setPendingConfirmation', value: undefined }),
+                // Drop any worktree-conflict context so the prompt doesn't
+                // linger after the user declines to switch.
+                ...(state.worktreeCheckoutConflict
+                    ? [action({ type: 'setWorktreeCheckoutConflict', value: undefined })]
+                    : []),
                 action({ type: 'setStatus', value: 'workflow action cancelled' }),
             ];
         }
@@ -34368,7 +34413,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);
@@ -34385,10 +34436,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) {
@@ -34498,7 +34551,11 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
                     ? 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') {
@@ -34999,11 +35056,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, {
@@ -35018,7 +35080,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.
@@ -37635,25 +37702,36 @@ function renderConfirmationPanel(h, components, state, width, theme, focused) {
             : state.pendingMutationConfirmation === 'discard-draft'
                 ? 'Quit and discard the in-progress commit draft'
                 : undefined;
-    const label = action?.label || mutationLabel || 'Workflow action';
+    // Worktree-conflict switch (#1175): a checkout was rejected because
+    // the branch is checked out elsewhere — name the branch + worktree so
+    // the prompt explains what "y" does (jump into that worktree).
+    const conflict = state.worktreeCheckoutConflict;
+    const isWorktreeConflict = state.pendingConfirmationId === 'switch-to-conflicting-worktree';
+    const label = isWorktreeConflict && conflict
+        ? `Switch to the worktree where '${conflict.branch}' is checked out?`
+        : action?.label || mutationLabel || 'Workflow action';
     const warning = state.pendingMutationConfirmation === 'discard-draft'
         ? 'You have an unsaved commit draft. Press y to discard it and quit.'
         : state.pendingMutationConfirmation
             ? 'This discards local changes and cannot be undone by Coco.'
-            // Second-stage confirm raised when a safe delete hit an unmerged
-            // branch — name the reason so the force isn't a blind "y again".
-            : state.pendingConfirmationId === 'force-delete-branch'
-                ? 'Not fully merged. Force-delete (git branch -D) is irreversible.'
-                : action?.kind === 'ai'
-                    ? `AI action requires confirmation. Estimated ${action.estimatedTokens || '<unknown>'} tokens.`
-                    : 'Destructive Git action requires confirmation.';
+            : isWorktreeConflict && conflict
+                ? `'${conflict.branch}' is checked out at ${conflict.worktreePath}.${conflict.dirty ? ' That worktree has uncommitted changes — removal will be refused until it is clean or stashed.' : ''}`
+                // Second-stage confirm raised when a safe delete hit an unmerged
+                // branch — name the reason so the force isn't a blind "y again".
+                : state.pendingConfirmationId === 'force-delete-branch'
+                    ? 'Not fully merged. Force-delete (git branch -D) is irreversible.'
+                    : action?.kind === 'ai'
+                        ? `AI action requires confirmation. Estimated ${action.estimatedTokens || '<unknown>'} tokens.`
+                        : 'Destructive Git action requires confirmation.';
     return h(Box, {
         borderColor: focusBorderColor(theme, focused),
         borderStyle: theme.borderStyle,
         flexDirection: 'column',
         width,
         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.'));
+    }, 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, truncateCells(isWorktreeConflict
+        ? 'y switch · r remove worktree & check out here · x remove worktree & delete branch · n/Esc cancel'
+        : 'Press y to confirm or n/Esc to cancel.', width - 4)));
 }
 /**
  * First-launch onboarding overlay (P1.3). Shown once per machine, gated
@@ -38817,6 +38895,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;
@@ -38827,7 +38914,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}` : '';
@@ -38837,10 +38926,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
@@ -38849,32 +38995,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 = isPendingItemAction(state.pendingItemAction, '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;
@@ -38885,7 +39021,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`)]
@@ -43705,6 +43845,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) {
@@ -44167,6 +44343,30 @@ 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
+            // y-confirm offering to switch into that worktree — the branch IS
+            // checked out, just elsewhere (#1175).
+            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);
+                    dispatch({
+                        type: 'setWorktreeCheckoutConflict',
+                        value: { branch: branchName, worktreePath, dirty: worktree?.dirty ?? false },
+                    });
+                    dispatch({ type: 'setPendingConfirmation', value: 'switch-to-conflicting-worktree' });
+                }
+                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
@@ -44176,6 +44376,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
@@ -44211,7 +44415,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 });
             }
@@ -44278,7 +44482,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

package/package.json

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