git-coco 0.61.0 → 0.62.1

package/dist/index.esm.mjs

@@ -61,7 +61,7 @@ import { pathToFileURL } from 'url';
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.61.0";
+const BUILD_VERSION = "0.62.1";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -22433,6 +22433,18 @@ function getLogInkWorkflowActions() {
             kind: 'destructive',
             requiresConfirmation: true,
         },
+        {
+            // No key binding — this is raised by the runtime as a second
+            // confirmation when a safe `delete-branch` (`git branch -d`) is
+            // rejected for an unmerged branch. Reachable from the `:` palette
+            // too, as an explicit force-delete that still gates on y-confirm.
+            id: 'force-delete-branch',
+            key: '',
+            label: 'Force-delete branch',
+            description: 'Force-delete the selected branch even if it is not fully merged (git branch -D).',
+            kind: 'destructive',
+            requiresConfirmation: true,
+        },
         {
             id: 'delete-tag',
             key: 'T',
@@ -25149,6 +25161,15 @@ function formatSortIndicator(mode, options = {}) {
     return `${options.ascii ? 'v' : '▼'} ${mode}`;
 }
 
+/**
+ * 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.
+ */
+function isPendingDeletion(pending, kind, id) {
+    return pending?.kind === kind && pending.id === id;
+}
 const DEFAULT_CHANGELOG_VIEW_STATE = {
     status: 'idle',
     scrollOffset: 0,
@@ -26354,6 +26375,10 @@ 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 'toggleFilterMode':
             return {
                 ...state,
@@ -29978,6 +30003,24 @@ const SPINNER_TICK_MS = 80;
 function pickSpinnerFrame(tick) {
     return SPINNER_FRAMES[Math.max(0, tick) % SPINNER_FRAMES.length];
 }
+/**
+ * ASCII-safe spinner frames for `NO_COLOR` / ASCII terminals where the
+ * braille dots either don't render or look like noise. The four-frame
+ * `|/-\` cycle is the classic terminal spinner and reads as motion in
+ * any encoding.
+ */
+const ASCII_SPINNER_FRAMES = ['|', '/', '-', '\\'];
+/**
+ * Inline per-item pending glyph — used in place of (or appended to) a
+ * list row's status icon while that row's mutation (a delete) is in
+ * flight. Braille spinner normally; the ASCII cycle under `ascii`
+ * themes so the indicator survives `NO_COLOR` / dumb terminals.
+ */
+function inlineSpinnerGlyph(tick, ascii) {
+    return ascii
+        ? ASCII_SPINNER_FRAMES[Math.max(0, tick) % ASCII_SPINNER_FRAMES.length]
+        : pickSpinnerFrame(tick);
+}
 
 /**
  * Build the initial `LogInkContextStatus` for a freshly-created frame
@@ -30932,7 +30975,7 @@ function createBranch(git, branchName, startPoint) {
 function renameBranch(git, oldName, newName) {
     return runAction$5(() => git.raw(['branch', '-m', oldName, newName]), `Renamed ${oldName} to ${newName}`);
 }
-function deleteBranch(git, branch) {
+function deleteBranch(git, branch, force = false) {
     if (branch.type !== 'local') {
         return Promise.resolve({
             ok: false,
@@ -30945,7 +30988,18 @@ function deleteBranch(git, branch) {
             message: 'Cannot delete the current branch.',
         });
     }
-    return runAction$5(() => git.raw(['branch', '-d', branch.shortName]), `Deleted branch ${branch.shortName}`);
+    // `-d` is the safe delete (refuses unmerged branches); `-D` forces it.
+    // The TUI starts with `-d` and only escalates to `-D` after the user
+    // confirms a second time on the "not fully merged" error.
+    return runAction$5(() => git.raw(['branch', force ? '-D' : '-d', branch.shortName]), force ? `Force-deleted branch ${branch.shortName}` : `Deleted branch ${branch.shortName}`);
+}
+/**
+ * True when a failed `git branch -d` was rejected specifically because the
+ * branch isn't fully merged (the one case worth offering a force-delete
+ * for). Matches git's wording across versions ("not fully merged").
+ */
+function isBranchNotFullyMergedError(message) {
+    return /not fully merged/i.test(message || '');
 }
 function fetchRemotes(git) {
     return runAction$5(() => git.raw(['fetch', '--all', '--prune']), 'Fetched all remotes');
@@ -34353,7 +34407,13 @@ function renderActiveStatusTabContent(h, Text, context, contextStatus, width, th
  * rows so they read as the same severity scale used in the main status
  * surface; every other tab falls through to selectable rows.
  */
-function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus, width, bodyRows, theme) {
+function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus, width, bodyRows, theme, spinnerFrame) {
+    // Inline pending-delete glyph: while a row's delete is in flight it
+    // 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 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
     // spacers); the branches tab eats 3 more for its summary header
@@ -34390,7 +34450,12 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
         ];
         return [
             ...headerRows,
-            ...renderSelectableSidebarRows(h, Text, sortedBranches, state.selectedBranchIndex, focused, width, theme, (branch) => `${branchRowMarker(branch, { ascii: theme.ascii }).glyph} ${branch.shortName}`, 'tab-branches', visibleListCount),
+            ...renderSelectableSidebarRows(h, Text, sortedBranches, state.selectedBranchIndex, focused, width, theme, (branch) => {
+                const glyph = isPendingDeletion(pending, 'branch', branch.shortName)
+                    ? spin
+                    : branchRowMarker(branch, { ascii: theme.ascii }).glyph;
+                return `${glyph} ${branch.shortName}`;
+            }, 'tab-branches', visibleListCount),
         ];
     }
     if (tab === 'tags') {
@@ -34401,7 +34466,12 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
         if (tags.length === 0) {
             return [h(Text, { key: 'tab-tags-empty', dimColor: true }, '  No tags found')];
         }
-        return renderSelectableSidebarRows(h, Text, tags, state.selectedTagIndex, focused, width, theme, (tag) => `${truncateCells(tag.name, 16)} ${tag.subject}`, 'tab-tags', visibleListCount);
+        return renderSelectableSidebarRows(h, Text, tags, state.selectedTagIndex, focused, width, theme, (tag) => {
+            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;
+        }, 'tab-tags', visibleListCount);
     }
     if (tab === 'stashes') {
         if (isLogInkContextKeyLoading(contextStatus, 'stashes')) {
@@ -34411,7 +34481,12 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
         if (stashes.length === 0) {
             return [h(Text, { key: 'tab-stashes-empty', dimColor: true }, '  No stashes found')];
         }
-        return renderSelectableSidebarRows(h, Text, stashes, state.selectedStashIndex, focused, width, theme, (stash, index) => `@{${index}} ${stash.message || '(no message)'}`, 'tab-stashes', visibleListCount);
+        return renderSelectableSidebarRows(h, Text, stashes, state.selectedStashIndex, focused, width, theme, (stash, index) => {
+            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;
+        }, 'tab-stashes', visibleListCount);
     }
     // worktrees
     if (isLogInkContextKeyLoading(contextStatus, 'worktreeList')) {
@@ -34422,12 +34497,14 @@ 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 = worktree.current ? '*' : ' ';
+        const marker = isPendingDeletion(pending, 'worktree', worktree.path)
+            ? spin
+            : worktree.current ? '*' : ' ';
         const wstate = worktree.dirty ? 'dirty' : 'clean';
         return `${marker} ${worktree.branch || worktree.path} ${wstate}`;
     }, 'tab-worktrees', visibleListCount);
 }
-function renderSidebar$1(h, components, state, context, contextStatus, width, bodyRows, theme) {
+function renderSidebar$1(h, components, state, context, contextStatus, width, bodyRows, theme, spinnerFrame = 0) {
     const { Box, Text } = components;
     const focused = state.focus === 'sidebar';
     const tabs = getLogInkSidebarTabs();
@@ -34463,7 +34540,7 @@ function renderSidebar$1(h, components, state, context, contextStatus, width, bo
             inverse: headerSelected,
         }, headerText));
         if (isActive) {
-            blocks.push(...renderActiveSidebarContent(h, Text, tab, state, context, contextStatus, width, bodyRows, theme));
+            blocks.push(...renderActiveSidebarContent(h, Text, tab, state, context, contextStatus, width, bodyRows, theme, spinnerFrame));
         }
         return blocks;
     });
@@ -34814,7 +34891,7 @@ function formatLogInkGitHubNoRemote({ resource, }) {
  * Extracted from `src/commands/log/inkRuntime.ts` as part of phase 5a.2
  * of #890. No behavior change.
  */
-function renderBranchesSurface(ctx) {
+function renderBranchesSurface(ctx, spinnerFrame = 0) {
     const { h, components, state, context, contextStatus, bodyRows, width, theme } = ctx;
     const { Box, Text } = components;
     const focused = state.focus === 'commits';
@@ -34853,7 +34930,14 @@ function renderBranchesSurface(ctx) {
                 const isSelected = index === selected;
                 const cursor = isSelected ? '>' : ' ';
                 const marker = branchRowMarker(branch, { ascii: theme.ascii });
-                const markerColor = getBranchRowMarkerColor(marker.kind, theme);
+                // 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 glyph = deleting ? inlineSpinnerGlyph(spinnerFrame, theme.ascii) : marker.glyph;
+                const glyphColor = deleting
+                    ? (theme.noColor ? undefined : theme.colors.accent)
+                    : getBranchRowMarkerColor(marker.kind, theme);
                 const divergence = formatBranchDivergence(branch, { ascii: theme.ascii });
                 const lastTouched = formatBranchLastTouched(branch.date, getRenderNow());
                 // Split the row into spans so the timestamp stays dim even on the
@@ -34868,7 +34952,7 @@ function renderBranchesSurface(ctx) {
                 // Truncate the assembled line to the actual panel width so a
                 // narrow inspector / sidebar focus doesn't push branch rows
                 // onto a second visual line (#830).
-                const fullText = `${cursorAndPad}${marker.glyph}${trailingName}${timestampPadded}${trailingDivergence}`;
+                const fullText = `${cursorAndPad}${glyph}${trailingName}${timestampPadded}${trailingDivergence}`;
                 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.
@@ -34891,7 +34975,7 @@ function renderBranchesSurface(ctx) {
                 // no-upstream kinds return undefined from
                 // `getBranchRowMarkerColor`, so those markers inherit the
                 // row's dim and read as quiet chrome.
-                h(Text, { color: markerColor, dimColor: markerColor ? false : undefined }, marker.glyph), trailingName, h(Text, { dimColor: true }, timestampPadded), trailingDivergence);
+                h(Text, { color: glyphColor, dimColor: glyphColor ? false : undefined }, glyph), trailingName, h(Text, { dimColor: true }, timestampPadded), trailingDivergence);
             });
     // Scroll indicators — same "N more above/below" pattern as the
     // sidebar and help overlay so the user knows the list continues.
@@ -37513,9 +37597,13 @@ function renderConfirmationPanel(h, components, state, width, theme, focused) {
         ? '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.'
-            : action?.kind === 'ai'
-                ? `AI action requires confirmation. Estimated ${action.estimatedTokens || '<unknown>'} tokens.`
-                : 'Destructive Git action requires confirmation.';
+            // 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,
@@ -38686,7 +38774,7 @@ function renderReflogSurface(ctx) {
  * Extracted from `src/commands/log/inkRuntime.ts` as part of phase 5a.1
  * of #890. No behavior change.
  */
-function renderStashSurface(ctx) {
+function renderStashSurface(ctx, spinnerFrame = 0) {
     const { h, components, state, context, contextStatus, bodyRows, width, theme } = ctx;
     const { Box, Text } = components;
     const focused = state.focus === 'commits';
@@ -38732,11 +38820,18 @@ function renderStashSurface(ctx) {
                 const rowText = meta
                     ? `${cursor} ${stash.ref.padEnd(11)} ${meta}  ${stash.message}`
                     : `${cursor} ${stash.ref.padEnd(11)} ${stash.message}`;
+                // 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);
+                const spinnerSpan = deleting
+                    ? h(Text, { color: theme.noColor ? undefined : theme.colors.accent, dimColor: false }, ` ${inlineSpinnerGlyph(spinnerFrame, theme.ascii)}`)
+                    : null;
                 return h(Text, {
                     key: `stash-${index}`,
                     bold: isSelected,
                     dimColor: !isSelected,
-                }, truncateCells(rowText, rowWidth));
+                }, truncateCells(rowText, rowWidth - (deleting ? 2 : 0)), spinnerSpan);
             });
     const stashHasMoreAbove = startIndex > 0 && stashes.length > 0;
     const stashHasMoreBelow = startIndex + listRows < stashes.length;
@@ -39084,7 +39179,7 @@ function formatHyperlink(text, url, env = process.env) {
  * Extracted from `src/commands/log/inkRuntime.ts` as part of phase 5a.2
  * of #890. No behavior change.
  */
-function renderTagsSurface(ctx) {
+function renderTagsSurface(ctx, spinnerFrame = 0) {
     const { h, components, state, context, contextStatus, bodyRows, width, theme } = ctx;
     const { Box, Text } = components;
     const focused = state.focus === 'commits';
@@ -39125,13 +39220,20 @@ function renderTagsSurface(ctx) {
                 // intact.
                 const url = buildRefUrl(context.provider?.repository, tag.name);
                 const namePadded = truncateCells(tag.name, tagNameColWidth).padEnd(tagNameColWidth);
-                const lineText = truncateCells(`${cursor} ${namePadded} ${tag.subject}`, Math.max(20, width - 4));
+                // 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 spinnerSpan = deleting
+                    ? h(Text, { color: theme.noColor ? undefined : theme.colors.accent, dimColor: false }, ` ${inlineSpinnerGlyph(spinnerFrame, theme.ascii)}`)
+                    : null;
+                const lineText = truncateCells(`${cursor} ${namePadded} ${tag.subject}`, Math.max(20, width - 4 - (deleting ? 2 : 0)));
                 if (!url || lineText.indexOf(namePadded) < 0) {
                     return h(Text, {
                         key: `tag-${index}`,
                         bold: isSelected,
                         dimColor: !isSelected,
-                    }, lineText);
+                    }, lineText, spinnerSpan);
                 }
                 const linkStart = lineText.indexOf(namePadded);
                 const before = lineText.slice(0, linkStart);
@@ -39140,7 +39242,7 @@ function renderTagsSurface(ctx) {
                     key: `tag-${index}`,
                     bold: isSelected,
                     dimColor: !isSelected,
-                }, before, formatHyperlink(namePadded, url), after);
+                }, before, formatHyperlink(namePadded, url), after, spinnerSpan);
             });
     const tagsHasMoreAbove = startIndex > 0 && tags.length > 0;
     const tagsHasMoreBelow = startIndex + listRows < tags.length;
@@ -39167,7 +39269,7 @@ function renderTagsSurface(ctx) {
  * Extracted from `src/commands/log/inkRuntime.ts` as part of phase 5a.1
  * of #890. No behavior change.
  */
-function renderWorktreesSurface(ctx) {
+function renderWorktreesSurface(ctx, spinnerFrame = 0) {
     const { h, components, state, context, contextStatus, bodyRows, width, theme } = ctx;
     const { Box, Text } = components;
     const focused = state.focus === 'commits';
@@ -39203,7 +39305,9 @@ function renderWorktreesSurface(ctx) {
                 const index = startIndex + offset;
                 const isSelected = index === selected;
                 const cursor = isSelected ? '>' : ' ';
-                const marker = entry.current ? '*' : ' ';
+                const marker = isPendingDeletion(state.pendingDeletion, 'worktree', entry.path)
+                    ? inlineSpinnerGlyph(spinnerFrame, theme.ascii)
+                    : entry.current ? '*' : ' ';
                 const branchLabel = entry.branch ? entry.branch : entry.head || '<detached>';
                 const stateLabel = entry.dirty ? 'dirty' : 'clean';
                 const branchPadded = truncateCells(branchLabel, branchColWidth).padEnd(branchColWidth);
@@ -39273,10 +39377,10 @@ function renderMainPanel(surface, worktreeDiff, worktreeDiffLoading, worktreeHun
         return renderComposeSurface(surface, spinnerFrame);
     }
     if (state.activeView === 'branches') {
-        return renderBranchesSurface(surface);
+        return renderBranchesSurface(surface, spinnerFrame);
     }
     if (state.activeView === 'tags') {
-        return renderTagsSurface(surface);
+        return renderTagsSurface(surface, spinnerFrame);
     }
     if (state.activeView === 'reflog') {
         return renderReflogSurface(surface);
@@ -39285,10 +39389,10 @@ function renderMainPanel(surface, worktreeDiff, worktreeDiffLoading, worktreeHun
         return renderBisectSurface(surface, bisectCandidateDetail, bisectCandidateLoading);
     }
     if (state.activeView === 'stash') {
-        return renderStashSurface(surface);
+        return renderStashSurface(surface, spinnerFrame);
     }
     if (state.activeView === 'worktrees') {
-        return renderWorktreesSurface(surface);
+        return renderWorktreesSurface(surface, spinnerFrame);
     }
     if (state.activeView === 'submodules') {
         return renderSubmodulesSurface(surface);
@@ -40661,6 +40765,53 @@ const REMOTE_OP_LOADERS = {
     'pull-selected-branch': { kind: 'pull', label: 'Pulling branch from remote…' },
     'push-selected-branch': { kind: 'push', label: 'Pushing branch to remote…' },
 };
+/**
+ * Resolve which list row a delete workflow is about to act on, so the
+ * runner can mark it pending (inline spinner) for the duration of the
+ * git call. Mirrors the cursored-target resolution inside each delete
+ * handler exactly — same sort, same promoted-filter, same selection
+ * index — so the spinner lands on the row that actually gets deleted.
+ * Returns `undefined` for non-delete workflows (and when nothing is
+ * selected), which the runner treats as "no pending marker".
+ */
+function resolvePendingDeletion(id, state, context) {
+    const { filter } = state;
+    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;
+    }
+    if (id === 'delete-tag') {
+        const all = sortTags(context.tags?.tags || [], state.tagSort);
+        const visible = filter
+            ? 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;
+    }
+    if (id === 'drop-stash') {
+        const all = context.stashes?.stashes || [];
+        const visible = filter
+            ? 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;
+    }
+    if (id === 'remove-worktree') {
+        const all = context.worktreeList?.worktrees || [];
+        const visible = filter
+            ? all.filter((w) => matchesPromotedFilter([w.path, w.branch || ''], filter))
+            : all;
+        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 undefined;
+}
 function predictNextFilter(action, currentFilter) {
     switch (action.type) {
         case 'appendFilter':
@@ -40977,7 +41128,10 @@ function LogInkApp(deps) {
         state.changelogView.status === 'loading' ||
         state.commitCompose.loading ||
         Boolean(state.remoteOp) ||
-        Boolean(state.statusLoading);
+        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);
     React.useEffect(() => {
         if (!anyLoading) {
             // Reset to 0 so the next loading state starts from a known
@@ -43134,6 +43288,16 @@ function LogInkApp(deps) {
                     return { ok: false, message: 'No branch selected' };
                 return deleteBranch(git, branch);
             },
+            'force-delete-branch': async () => {
+                const all = sortBranches(context.branches?.localBranches || [], state.branchSort);
+                const visible = state.filter
+                    ? all.filter((b) => matchesPromotedFilter([b.shortName, b.upstream || ''], state.filter))
+                    : all;
+                const branch = visible[Math.min(state.selectedBranchIndex, visible.length - 1)];
+                if (!branch)
+                    return { ok: false, message: 'No branch selected' };
+                return deleteBranch(git, branch, true);
+            },
             'delete-tag': async () => {
                 const all = sortTags(context.tags?.tags || [], state.tagSort);
                 const visible = state.filter
@@ -43907,9 +44071,26 @@ 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 });
+        }
         try {
             const result = await handler();
             dispatch({ type: 'setStatus', value: result?.message || 'Workflow action complete' });
+            // A safe `delete-branch` (`git branch -d`) refuses branches that
+            // aren't fully merged. Rather than dead-end on git's raw error, raise
+            // a second y-confirm offering the force-delete (`git branch -D`). The
+            // cursor hasn't moved (the delete failed), so the force handler
+            // re-resolves the same branch.
+            if (id === 'delete-branch' && !result?.ok && isBranchNotFullyMergedError(result?.message)) {
+                dispatch({ type: 'setPendingConfirmation', value: 'force-delete-branch' });
+            }
             // 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
@@ -44008,6 +44189,12 @@ 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 });
+            }
         }
     }, [context, dispatch, git, refreshContext, refreshHistoryRows, refreshWorktreeContext,
         state.branchSort, state.filter, state.selectedBranchIndex,
@@ -44867,7 +45054,7 @@ function LogInkApp(deps) {
     // Panel renderers are thunks so single-pane mode can build only the
     // visible pane — the main-panel render in particular is expensive, so
     // we don't want to invoke the two hidden ones just to drop them.
-    const sidebarPanel = () => renderSidebar$1(h, { Box, Text }, state, context, contextStatus, layout.sidebarWidth, layout.bodyRows, theme);
+    const sidebarPanel = () => renderSidebar$1(h, { Box, Text }, state, context, contextStatus, layout.sidebarWidth, layout.bodyRows, theme, spinnerFrame);
     const mainSurface = {
         h,
         components: { Box, Text },
@@ -45178,12 +45365,23 @@ function createLogArgvFromUiArgv(argv) {
         // starting state. `coco ui --no-all` opts back to
         // current-branch-only.
         //
+        // `?? true` re-asserts that default for the synthetic-argv path:
+        // bare `coco` routes through defaultRouteHandler → buildSyntheticArgv,
+        // which bypasses yargs and so never applies the `default: true` from
+        // ui/config.ts — leaving `argv.all` undefined (#1169). Without the
+        // fallback the workstation booted in compact (`--first-parent
+        // --no-merges`) mode: fewer commits, branches "ahead" of HEAD hidden,
+        // and cursoring/checking-out a branch whose tip wasn't in the compact
+        // window triggered an anchored-context append that looped the graph
+        // back to the initial commit. Explicit `--no-all` (argv.all === false)
+        // is preserved because `false ?? true === false`.
+        //
         // Note: passing `--branch foo` does NOT automatically scope away
         // from --all. If the user wants strictly that branch, they pass
         // `coco ui --branch foo --no-all`. We considered the implicit
         // scope-narrowing but it surprises users who pass `--branch` as
         // a "highlight this branch in the all-refs view" hint.
-        all: argv.all,
+        all: argv.all ?? true,
         branch: argv.branch,
         format: 'table',
         interactive: true,
@@ -50197,6 +50395,11 @@ async function probeIsGitRepo() {
  * `InitArgv`, `UiArgv`, `WorkspaceArgv`) so we can't just spread the
  * raw default argv — we have to project the shared fields and let
  * the handler fill in command-specific defaults.
+ *
+ * Exported for testing: this is the path bare `coco` takes to the
+ * workstation, and it intentionally does NOT set `all` — yargs's
+ * `default: true` for `coco ui` never runs here, so the ui→log argv
+ * mapping has to re-assert that default (#1169).
  */
 function buildSyntheticArgv(argv) {
     return {

package/dist/index.js

@@ -78,7 +78,7 @@ var readline__namespace = /*#__PURE__*/_interopNamespaceDefault(readline);
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.61.0";
+const BUILD_VERSION = "0.62.1";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -22450,6 +22450,18 @@ function getLogInkWorkflowActions() {
             kind: 'destructive',
             requiresConfirmation: true,
         },
+        {
+            // No key binding — this is raised by the runtime as a second
+            // confirmation when a safe `delete-branch` (`git branch -d`) is
+            // rejected for an unmerged branch. Reachable from the `:` palette
+            // too, as an explicit force-delete that still gates on y-confirm.
+            id: 'force-delete-branch',
+            key: '',
+            label: 'Force-delete branch',
+            description: 'Force-delete the selected branch even if it is not fully merged (git branch -D).',
+            kind: 'destructive',
+            requiresConfirmation: true,
+        },
         {
             id: 'delete-tag',
             key: 'T',
@@ -25166,6 +25178,15 @@ function formatSortIndicator(mode, options = {}) {
     return `${options.ascii ? 'v' : '▼'} ${mode}`;
 }
 
+/**
+ * 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.
+ */
+function isPendingDeletion(pending, kind, id) {
+    return pending?.kind === kind && pending.id === id;
+}
 const DEFAULT_CHANGELOG_VIEW_STATE = {
     status: 'idle',
     scrollOffset: 0,
@@ -26371,6 +26392,10 @@ 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 'toggleFilterMode':
             return {
                 ...state,
@@ -29995,6 +30020,24 @@ const SPINNER_TICK_MS = 80;
 function pickSpinnerFrame(tick) {
     return SPINNER_FRAMES[Math.max(0, tick) % SPINNER_FRAMES.length];
 }
+/**
+ * ASCII-safe spinner frames for `NO_COLOR` / ASCII terminals where the
+ * braille dots either don't render or look like noise. The four-frame
+ * `|/-\` cycle is the classic terminal spinner and reads as motion in
+ * any encoding.
+ */
+const ASCII_SPINNER_FRAMES = ['|', '/', '-', '\\'];
+/**
+ * Inline per-item pending glyph — used in place of (or appended to) a
+ * list row's status icon while that row's mutation (a delete) is in
+ * flight. Braille spinner normally; the ASCII cycle under `ascii`
+ * themes so the indicator survives `NO_COLOR` / dumb terminals.
+ */
+function inlineSpinnerGlyph(tick, ascii) {
+    return ascii
+        ? ASCII_SPINNER_FRAMES[Math.max(0, tick) % ASCII_SPINNER_FRAMES.length]
+        : pickSpinnerFrame(tick);
+}
 
 /**
  * Build the initial `LogInkContextStatus` for a freshly-created frame
@@ -30949,7 +30992,7 @@ function createBranch(git, branchName, startPoint) {
 function renameBranch(git, oldName, newName) {
     return runAction$5(() => git.raw(['branch', '-m', oldName, newName]), `Renamed ${oldName} to ${newName}`);
 }
-function deleteBranch(git, branch) {
+function deleteBranch(git, branch, force = false) {
     if (branch.type !== 'local') {
         return Promise.resolve({
             ok: false,
@@ -30962,7 +31005,18 @@ function deleteBranch(git, branch) {
             message: 'Cannot delete the current branch.',
         });
     }
-    return runAction$5(() => git.raw(['branch', '-d', branch.shortName]), `Deleted branch ${branch.shortName}`);
+    // `-d` is the safe delete (refuses unmerged branches); `-D` forces it.
+    // The TUI starts with `-d` and only escalates to `-D` after the user
+    // confirms a second time on the "not fully merged" error.
+    return runAction$5(() => git.raw(['branch', force ? '-D' : '-d', branch.shortName]), force ? `Force-deleted branch ${branch.shortName}` : `Deleted branch ${branch.shortName}`);
+}
+/**
+ * True when a failed `git branch -d` was rejected specifically because the
+ * branch isn't fully merged (the one case worth offering a force-delete
+ * for). Matches git's wording across versions ("not fully merged").
+ */
+function isBranchNotFullyMergedError(message) {
+    return /not fully merged/i.test(message || '');
 }
 function fetchRemotes(git) {
     return runAction$5(() => git.raw(['fetch', '--all', '--prune']), 'Fetched all remotes');
@@ -34370,7 +34424,13 @@ function renderActiveStatusTabContent(h, Text, context, contextStatus, width, th
  * rows so they read as the same severity scale used in the main status
  * surface; every other tab falls through to selectable rows.
  */
-function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus, width, bodyRows, theme) {
+function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus, width, bodyRows, theme, spinnerFrame) {
+    // Inline pending-delete glyph: while a row's delete is in flight it
+    // 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 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
     // spacers); the branches tab eats 3 more for its summary header
@@ -34407,7 +34467,12 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
         ];
         return [
             ...headerRows,
-            ...renderSelectableSidebarRows(h, Text, sortedBranches, state.selectedBranchIndex, focused, width, theme, (branch) => `${branchRowMarker(branch, { ascii: theme.ascii }).glyph} ${branch.shortName}`, 'tab-branches', visibleListCount),
+            ...renderSelectableSidebarRows(h, Text, sortedBranches, state.selectedBranchIndex, focused, width, theme, (branch) => {
+                const glyph = isPendingDeletion(pending, 'branch', branch.shortName)
+                    ? spin
+                    : branchRowMarker(branch, { ascii: theme.ascii }).glyph;
+                return `${glyph} ${branch.shortName}`;
+            }, 'tab-branches', visibleListCount),
         ];
     }
     if (tab === 'tags') {
@@ -34418,7 +34483,12 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
         if (tags.length === 0) {
             return [h(Text, { key: 'tab-tags-empty', dimColor: true }, '  No tags found')];
         }
-        return renderSelectableSidebarRows(h, Text, tags, state.selectedTagIndex, focused, width, theme, (tag) => `${truncateCells(tag.name, 16)} ${tag.subject}`, 'tab-tags', visibleListCount);
+        return renderSelectableSidebarRows(h, Text, tags, state.selectedTagIndex, focused, width, theme, (tag) => {
+            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;
+        }, 'tab-tags', visibleListCount);
     }
     if (tab === 'stashes') {
         if (isLogInkContextKeyLoading(contextStatus, 'stashes')) {
@@ -34428,7 +34498,12 @@ function renderActiveSidebarContent(h, Text, tab, state, context, contextStatus,
         if (stashes.length === 0) {
             return [h(Text, { key: 'tab-stashes-empty', dimColor: true }, '  No stashes found')];
         }
-        return renderSelectableSidebarRows(h, Text, stashes, state.selectedStashIndex, focused, width, theme, (stash, index) => `@{${index}} ${stash.message || '(no message)'}`, 'tab-stashes', visibleListCount);
+        return renderSelectableSidebarRows(h, Text, stashes, state.selectedStashIndex, focused, width, theme, (stash, index) => {
+            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;
+        }, 'tab-stashes', visibleListCount);
     }
     // worktrees
     if (isLogInkContextKeyLoading(contextStatus, 'worktreeList')) {
@@ -34439,12 +34514,14 @@ 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 = worktree.current ? '*' : ' ';
+        const marker = isPendingDeletion(pending, 'worktree', worktree.path)
+            ? spin
+            : worktree.current ? '*' : ' ';
         const wstate = worktree.dirty ? 'dirty' : 'clean';
         return `${marker} ${worktree.branch || worktree.path} ${wstate}`;
     }, 'tab-worktrees', visibleListCount);
 }
-function renderSidebar$1(h, components, state, context, contextStatus, width, bodyRows, theme) {
+function renderSidebar$1(h, components, state, context, contextStatus, width, bodyRows, theme, spinnerFrame = 0) {
     const { Box, Text } = components;
     const focused = state.focus === 'sidebar';
     const tabs = getLogInkSidebarTabs();
@@ -34480,7 +34557,7 @@ function renderSidebar$1(h, components, state, context, contextStatus, width, bo
             inverse: headerSelected,
         }, headerText));
         if (isActive) {
-            blocks.push(...renderActiveSidebarContent(h, Text, tab, state, context, contextStatus, width, bodyRows, theme));
+            blocks.push(...renderActiveSidebarContent(h, Text, tab, state, context, contextStatus, width, bodyRows, theme, spinnerFrame));
         }
         return blocks;
     });
@@ -34831,7 +34908,7 @@ function formatLogInkGitHubNoRemote({ resource, }) {
  * Extracted from `src/commands/log/inkRuntime.ts` as part of phase 5a.2
  * of #890. No behavior change.
  */
-function renderBranchesSurface(ctx) {
+function renderBranchesSurface(ctx, spinnerFrame = 0) {
     const { h, components, state, context, contextStatus, bodyRows, width, theme } = ctx;
     const { Box, Text } = components;
     const focused = state.focus === 'commits';
@@ -34870,7 +34947,14 @@ function renderBranchesSurface(ctx) {
                 const isSelected = index === selected;
                 const cursor = isSelected ? '>' : ' ';
                 const marker = branchRowMarker(branch, { ascii: theme.ascii });
-                const markerColor = getBranchRowMarkerColor(marker.kind, theme);
+                // 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 glyph = deleting ? inlineSpinnerGlyph(spinnerFrame, theme.ascii) : marker.glyph;
+                const glyphColor = deleting
+                    ? (theme.noColor ? undefined : theme.colors.accent)
+                    : getBranchRowMarkerColor(marker.kind, theme);
                 const divergence = formatBranchDivergence(branch, { ascii: theme.ascii });
                 const lastTouched = formatBranchLastTouched(branch.date, getRenderNow());
                 // Split the row into spans so the timestamp stays dim even on the
@@ -34885,7 +34969,7 @@ function renderBranchesSurface(ctx) {
                 // Truncate the assembled line to the actual panel width so a
                 // narrow inspector / sidebar focus doesn't push branch rows
                 // onto a second visual line (#830).
-                const fullText = `${cursorAndPad}${marker.glyph}${trailingName}${timestampPadded}${trailingDivergence}`;
+                const fullText = `${cursorAndPad}${glyph}${trailingName}${timestampPadded}${trailingDivergence}`;
                 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.
@@ -34908,7 +34992,7 @@ function renderBranchesSurface(ctx) {
                 // no-upstream kinds return undefined from
                 // `getBranchRowMarkerColor`, so those markers inherit the
                 // row's dim and read as quiet chrome.
-                h(Text, { color: markerColor, dimColor: markerColor ? false : undefined }, marker.glyph), trailingName, h(Text, { dimColor: true }, timestampPadded), trailingDivergence);
+                h(Text, { color: glyphColor, dimColor: glyphColor ? false : undefined }, glyph), trailingName, h(Text, { dimColor: true }, timestampPadded), trailingDivergence);
             });
     // Scroll indicators — same "N more above/below" pattern as the
     // sidebar and help overlay so the user knows the list continues.
@@ -37530,9 +37614,13 @@ function renderConfirmationPanel(h, components, state, width, theme, focused) {
         ? '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.'
-            : action?.kind === 'ai'
-                ? `AI action requires confirmation. Estimated ${action.estimatedTokens || '<unknown>'} tokens.`
-                : 'Destructive Git action requires confirmation.';
+            // 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,
@@ -38703,7 +38791,7 @@ function renderReflogSurface(ctx) {
  * Extracted from `src/commands/log/inkRuntime.ts` as part of phase 5a.1
  * of #890. No behavior change.
  */
-function renderStashSurface(ctx) {
+function renderStashSurface(ctx, spinnerFrame = 0) {
     const { h, components, state, context, contextStatus, bodyRows, width, theme } = ctx;
     const { Box, Text } = components;
     const focused = state.focus === 'commits';
@@ -38749,11 +38837,18 @@ function renderStashSurface(ctx) {
                 const rowText = meta
                     ? `${cursor} ${stash.ref.padEnd(11)} ${meta}  ${stash.message}`
                     : `${cursor} ${stash.ref.padEnd(11)} ${stash.message}`;
+                // 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);
+                const spinnerSpan = deleting
+                    ? h(Text, { color: theme.noColor ? undefined : theme.colors.accent, dimColor: false }, ` ${inlineSpinnerGlyph(spinnerFrame, theme.ascii)}`)
+                    : null;
                 return h(Text, {
                     key: `stash-${index}`,
                     bold: isSelected,
                     dimColor: !isSelected,
-                }, truncateCells(rowText, rowWidth));
+                }, truncateCells(rowText, rowWidth - (deleting ? 2 : 0)), spinnerSpan);
             });
     const stashHasMoreAbove = startIndex > 0 && stashes.length > 0;
     const stashHasMoreBelow = startIndex + listRows < stashes.length;
@@ -39101,7 +39196,7 @@ function formatHyperlink(text, url, env = process.env) {
  * Extracted from `src/commands/log/inkRuntime.ts` as part of phase 5a.2
  * of #890. No behavior change.
  */
-function renderTagsSurface(ctx) {
+function renderTagsSurface(ctx, spinnerFrame = 0) {
     const { h, components, state, context, contextStatus, bodyRows, width, theme } = ctx;
     const { Box, Text } = components;
     const focused = state.focus === 'commits';
@@ -39142,13 +39237,20 @@ function renderTagsSurface(ctx) {
                 // intact.
                 const url = buildRefUrl(context.provider?.repository, tag.name);
                 const namePadded = truncateCells(tag.name, tagNameColWidth).padEnd(tagNameColWidth);
-                const lineText = truncateCells(`${cursor} ${namePadded} ${tag.subject}`, Math.max(20, width - 4));
+                // 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 spinnerSpan = deleting
+                    ? h(Text, { color: theme.noColor ? undefined : theme.colors.accent, dimColor: false }, ` ${inlineSpinnerGlyph(spinnerFrame, theme.ascii)}`)
+                    : null;
+                const lineText = truncateCells(`${cursor} ${namePadded} ${tag.subject}`, Math.max(20, width - 4 - (deleting ? 2 : 0)));
                 if (!url || lineText.indexOf(namePadded) < 0) {
                     return h(Text, {
                         key: `tag-${index}`,
                         bold: isSelected,
                         dimColor: !isSelected,
-                    }, lineText);
+                    }, lineText, spinnerSpan);
                 }
                 const linkStart = lineText.indexOf(namePadded);
                 const before = lineText.slice(0, linkStart);
@@ -39157,7 +39259,7 @@ function renderTagsSurface(ctx) {
                     key: `tag-${index}`,
                     bold: isSelected,
                     dimColor: !isSelected,
-                }, before, formatHyperlink(namePadded, url), after);
+                }, before, formatHyperlink(namePadded, url), after, spinnerSpan);
             });
     const tagsHasMoreAbove = startIndex > 0 && tags.length > 0;
     const tagsHasMoreBelow = startIndex + listRows < tags.length;
@@ -39184,7 +39286,7 @@ function renderTagsSurface(ctx) {
  * Extracted from `src/commands/log/inkRuntime.ts` as part of phase 5a.1
  * of #890. No behavior change.
  */
-function renderWorktreesSurface(ctx) {
+function renderWorktreesSurface(ctx, spinnerFrame = 0) {
     const { h, components, state, context, contextStatus, bodyRows, width, theme } = ctx;
     const { Box, Text } = components;
     const focused = state.focus === 'commits';
@@ -39220,7 +39322,9 @@ function renderWorktreesSurface(ctx) {
                 const index = startIndex + offset;
                 const isSelected = index === selected;
                 const cursor = isSelected ? '>' : ' ';
-                const marker = entry.current ? '*' : ' ';
+                const marker = isPendingDeletion(state.pendingDeletion, 'worktree', entry.path)
+                    ? inlineSpinnerGlyph(spinnerFrame, theme.ascii)
+                    : entry.current ? '*' : ' ';
                 const branchLabel = entry.branch ? entry.branch : entry.head || '<detached>';
                 const stateLabel = entry.dirty ? 'dirty' : 'clean';
                 const branchPadded = truncateCells(branchLabel, branchColWidth).padEnd(branchColWidth);
@@ -39290,10 +39394,10 @@ function renderMainPanel(surface, worktreeDiff, worktreeDiffLoading, worktreeHun
         return renderComposeSurface(surface, spinnerFrame);
     }
     if (state.activeView === 'branches') {
-        return renderBranchesSurface(surface);
+        return renderBranchesSurface(surface, spinnerFrame);
     }
     if (state.activeView === 'tags') {
-        return renderTagsSurface(surface);
+        return renderTagsSurface(surface, spinnerFrame);
     }
     if (state.activeView === 'reflog') {
         return renderReflogSurface(surface);
@@ -39302,10 +39406,10 @@ function renderMainPanel(surface, worktreeDiff, worktreeDiffLoading, worktreeHun
         return renderBisectSurface(surface, bisectCandidateDetail, bisectCandidateLoading);
     }
     if (state.activeView === 'stash') {
-        return renderStashSurface(surface);
+        return renderStashSurface(surface, spinnerFrame);
     }
     if (state.activeView === 'worktrees') {
-        return renderWorktreesSurface(surface);
+        return renderWorktreesSurface(surface, spinnerFrame);
     }
     if (state.activeView === 'submodules') {
         return renderSubmodulesSurface(surface);
@@ -40678,6 +40782,53 @@ const REMOTE_OP_LOADERS = {
     'pull-selected-branch': { kind: 'pull', label: 'Pulling branch from remote…' },
     'push-selected-branch': { kind: 'push', label: 'Pushing branch to remote…' },
 };
+/**
+ * Resolve which list row a delete workflow is about to act on, so the
+ * runner can mark it pending (inline spinner) for the duration of the
+ * git call. Mirrors the cursored-target resolution inside each delete
+ * handler exactly — same sort, same promoted-filter, same selection
+ * index — so the spinner lands on the row that actually gets deleted.
+ * Returns `undefined` for non-delete workflows (and when nothing is
+ * selected), which the runner treats as "no pending marker".
+ */
+function resolvePendingDeletion(id, state, context) {
+    const { filter } = state;
+    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;
+    }
+    if (id === 'delete-tag') {
+        const all = sortTags(context.tags?.tags || [], state.tagSort);
+        const visible = filter
+            ? 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;
+    }
+    if (id === 'drop-stash') {
+        const all = context.stashes?.stashes || [];
+        const visible = filter
+            ? 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;
+    }
+    if (id === 'remove-worktree') {
+        const all = context.worktreeList?.worktrees || [];
+        const visible = filter
+            ? all.filter((w) => matchesPromotedFilter([w.path, w.branch || ''], filter))
+            : all;
+        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 undefined;
+}
 function predictNextFilter(action, currentFilter) {
     switch (action.type) {
         case 'appendFilter':
@@ -40994,7 +41145,10 @@ function LogInkApp(deps) {
         state.changelogView.status === 'loading' ||
         state.commitCompose.loading ||
         Boolean(state.remoteOp) ||
-        Boolean(state.statusLoading);
+        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);
     React.useEffect(() => {
         if (!anyLoading) {
             // Reset to 0 so the next loading state starts from a known
@@ -43151,6 +43305,16 @@ function LogInkApp(deps) {
                     return { ok: false, message: 'No branch selected' };
                 return deleteBranch(git, branch);
             },
+            'force-delete-branch': async () => {
+                const all = sortBranches(context.branches?.localBranches || [], state.branchSort);
+                const visible = state.filter
+                    ? all.filter((b) => matchesPromotedFilter([b.shortName, b.upstream || ''], state.filter))
+                    : all;
+                const branch = visible[Math.min(state.selectedBranchIndex, visible.length - 1)];
+                if (!branch)
+                    return { ok: false, message: 'No branch selected' };
+                return deleteBranch(git, branch, true);
+            },
             'delete-tag': async () => {
                 const all = sortTags(context.tags?.tags || [], state.tagSort);
                 const visible = state.filter
@@ -43924,9 +44088,26 @@ 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 });
+        }
         try {
             const result = await handler();
             dispatch({ type: 'setStatus', value: result?.message || 'Workflow action complete' });
+            // A safe `delete-branch` (`git branch -d`) refuses branches that
+            // aren't fully merged. Rather than dead-end on git's raw error, raise
+            // a second y-confirm offering the force-delete (`git branch -D`). The
+            // cursor hasn't moved (the delete failed), so the force handler
+            // re-resolves the same branch.
+            if (id === 'delete-branch' && !result?.ok && isBranchNotFullyMergedError(result?.message)) {
+                dispatch({ type: 'setPendingConfirmation', value: 'force-delete-branch' });
+            }
             // 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
@@ -44025,6 +44206,12 @@ 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 });
+            }
         }
     }, [context, dispatch, git, refreshContext, refreshHistoryRows, refreshWorktreeContext,
         state.branchSort, state.filter, state.selectedBranchIndex,
@@ -44884,7 +45071,7 @@ function LogInkApp(deps) {
     // Panel renderers are thunks so single-pane mode can build only the
     // visible pane — the main-panel render in particular is expensive, so
     // we don't want to invoke the two hidden ones just to drop them.
-    const sidebarPanel = () => renderSidebar$1(h, { Box, Text }, state, context, contextStatus, layout.sidebarWidth, layout.bodyRows, theme);
+    const sidebarPanel = () => renderSidebar$1(h, { Box, Text }, state, context, contextStatus, layout.sidebarWidth, layout.bodyRows, theme, spinnerFrame);
     const mainSurface = {
         h,
         components: { Box, Text },
@@ -45195,12 +45382,23 @@ function createLogArgvFromUiArgv(argv) {
         // starting state. `coco ui --no-all` opts back to
         // current-branch-only.
         //
+        // `?? true` re-asserts that default for the synthetic-argv path:
+        // bare `coco` routes through defaultRouteHandler → buildSyntheticArgv,
+        // which bypasses yargs and so never applies the `default: true` from
+        // ui/config.ts — leaving `argv.all` undefined (#1169). Without the
+        // fallback the workstation booted in compact (`--first-parent
+        // --no-merges`) mode: fewer commits, branches "ahead" of HEAD hidden,
+        // and cursoring/checking-out a branch whose tip wasn't in the compact
+        // window triggered an anchored-context append that looped the graph
+        // back to the initial commit. Explicit `--no-all` (argv.all === false)
+        // is preserved because `false ?? true === false`.
+        //
         // Note: passing `--branch foo` does NOT automatically scope away
         // from --all. If the user wants strictly that branch, they pass
         // `coco ui --branch foo --no-all`. We considered the implicit
         // scope-narrowing but it surprises users who pass `--branch` as
         // a "highlight this branch in the all-refs view" hint.
-        all: argv.all,
+        all: argv.all ?? true,
         branch: argv.branch,
         format: 'table',
         interactive: true,
@@ -50214,6 +50412,11 @@ async function probeIsGitRepo() {
  * `InitArgv`, `UiArgv`, `WorkspaceArgv`) so we can't just spread the
  * raw default argv — we have to project the shared fields and let
  * the handler fill in command-specific defaults.
+ *
+ * Exported for testing: this is the path bare `coco` takes to the
+ * workstation, and it intentionally does NOT set `all` — yargs's
+ * `default: true` for `coco ui` never runs here, so the ui→log argv
+ * mapping has to re-assert that default (#1169).
  */
 function buildSyntheticArgv(argv) {
     return {

package/package.json

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