diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e85bbb1b..7ae8fd91 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -220,7 +220,12 @@ jobs:
           php artisan key:generate
           touch database/database.sqlite
           php artisan migrate:fresh --force
-          php artisan rfa:benchmark-perf --compare=/tmp/rfa-perf-baseline.json --max-regression=5 --min-absolute-ms=10 --max-memory-regression=10 --min-absolute-memory-mb=3 --max-retained-memory-regression=10 --min-absolute-retained-memory-mb=3
+          # --min-absolute-ms=15: the heaviest scenarios (e.g. review-page-100-files ~180ms)
+          # carry ~5-7ms of run-to-run median variance even on a quiet box, so the
+          # base-snapshot vs head-compare delta swings past 10ms on a contended runner. A
+          # 10ms floor sat inside that noise band and false-failed; 15ms clears it while
+          # still failing on a real regression (>15ms is >8% on the ~180ms scenario).
+          php artisan rfa:benchmark-perf --compare=/tmp/rfa-perf-baseline.json --max-regression=5 --min-absolute-ms=15 --max-memory-regression=10 --min-absolute-memory-mb=3 --max-retained-memory-regression=10 --min-absolute-retained-memory-mb=3
       - if: github.event_name != 'pull_request'
         name: Report benchmark on main
         run: php artisan rfa:benchmark-perf
diff --git a/config/theme.php b/config/theme.php
index 4d23f545..99429226 100644
--- a/config/theme.php
+++ b/config/theme.php
@@ -42,19 +42,22 @@
     // Full color values - no opacity modifier needed
     'raw' => [
         'light' => [
-            'add-bg' => 'rgba(22,163,74,0.08)',
-            'add-line' => 'rgba(22,163,74,0.25)',
-            'del-bg' => 'rgba(220,38,38,0.08)',
-            'del-line' => 'rgba(220,38,38,0.25)',
+            // Row fills stay light so syntax highlighting reads through; the
+            // change-marker stripe (add-line/del-line) carries the signal at a
+            // confident alpha so adds/dels segment pre-attentively.
+            'add-bg' => 'rgba(22,163,74,0.10)',
+            'add-line' => 'rgba(22,163,74,0.60)',
+            'del-bg' => 'rgba(220,38,38,0.10)',
+            'del-line' => 'rgba(220,38,38,0.60)',
             'hunk-bg' => 'rgba(9,9,11,0.03)',
             'hover-bg' => 'rgba(9,9,11,0.04)',
             'selected-bg' => 'rgba(9,9,11,0.08)',
         ],
         'dark' => [
-            'add-bg' => 'rgba(74,222,128,0.10)',
-            'add-line' => 'rgba(74,222,128,0.30)',
-            'del-bg' => 'rgba(248,113,113,0.10)',
-            'del-line' => 'rgba(248,113,113,0.30)',
+            'add-bg' => 'rgba(74,222,128,0.12)',
+            'add-line' => 'rgba(74,222,128,0.65)',
+            'del-bg' => 'rgba(248,113,113,0.12)',
+            'del-line' => 'rgba(248,113,113,0.65)',
             'hunk-bg' => 'rgba(250,250,250,0.04)',
             'hover-bg' => 'rgba(250,250,250,0.05)',
             'selected-bg' => 'rgba(250,250,250,0.10)',
diff --git a/public/js/diff-file.js b/public/js/diff-file.js
index f4294691..920e1055 100644
--- a/public/js/diff-file.js
+++ b/public/js/diff-file.js
@@ -44,6 +44,40 @@
         return lines.length ? lines.join('\n').trimEnd() : null;
     }
 
+    // The expander to refocus after a gap expand re-renders, keyed by hunk index.
+    // A keyboard-activated expander loses focus when its node is replaced by the
+    // post-expand morph; this hands focus to the expander that now occupies the
+    // same gap. Returns null when the gap fully closed (the "all N hidden lines"
+    // target) — nothing remains to focus there, so focus is left to fall back.
+    function expanderToRefocus(root, gapKey) {
+        if (!root || gapKey === null || gapKey === undefined || gapKey === '') {
+            return null;
+        }
+        return root.querySelector(`[data-expand-gap="${gapKey}"]`);
+    }
+
+    function createLinePoint(lineNumber, side) {
+        if (lineNumber == null || (side !== 'left' && side !== 'right')) return null;
+        const line = Number(lineNumber);
+        if (!Number.isFinite(line)) return null;
+
+        return { line, side };
+    }
+
+    function areLinePointsEqual(first, second) {
+        if (first == null || second == null) return first === second;
+
+        return first.line === second.line && first.side === second.side;
+    }
+
+    function rowContainsLinePoint(rowSide, oldLineNumber, newLineNumber, point) {
+        if (point == null) return false;
+        if (point.side === 'left') return oldLineNumber === point.line && (rowSide === 'left' || rowSide === 'context');
+        if (point.side === 'right') return newLineNumber === point.line && (rowSide === 'right' || rowSide === 'context');
+
+        return false;
+    }
+
     function createDiffFile({ fileId, filePath, oldPath = null, status = 'modified', isReviewed, singleFile = false }) {
         const pending = window.__rfaPendingExpandFiles;
         const wantsExpand = pending && pending.has(fileId);
@@ -60,8 +94,10 @@
             formLine: null,
             formEndLine: null,
             formSide: 'right',
+            formStartPoint: null,
+            formEndPoint: null,
             formBody: '',
-            lastClickedLine: null,
+            lastClickedPoint: null,
             showForm: false,
             editingCommentId: null,
             escHint: false,
@@ -70,7 +106,7 @@
 
             // Line-drag state
             isDragging: false,
-            dragStartLine: null,
+            dragStartPoint: null,
             dragSide: null,
 
             // Markdown heading fold state (id -> true when collapsed)
@@ -87,6 +123,37 @@
                 });
             },
 
+            // Hunk index of a keyboard-activated gap expander, remembered so focus
+            // can return to that gap after the expand re-render replaces the
+            // activated node. Null for mouse clicks (focus shouldn't jump) and for
+            // the master "full file" expander (no gap remains to focus).
+            _refocusExpandKey: null,
+            _onDiffActionCompleted: null,
+
+            armExpandRefocus(event, gapKey) {
+                // Keyboard activation of a <button> fires a click with detail 0;
+                // mouse clicks report detail >= 1. Only keyboard users lose their
+                // place on the re-render, so only they get focus restored.
+                this._refocusExpandKey = (event && event.detail === 0 && gapKey != null) ? gapKey : null;
+            },
+
+            restoreExpandFocus(action) {
+                if (action !== 'expandGap' && action !== 'expandContext') {
+                    return;
+                }
+                const gapKey = this._refocusExpandKey;
+                this._refocusExpandKey = null;
+                if (gapKey == null) {
+                    return;
+                }
+                this.$nextTick(() => {
+                    const target = expanderToRefocus(this.$root, gapKey);
+                    if (target) {
+                        target.focus();
+                    }
+                });
+            },
+
             isLineFolded(ancestors) {
                 if (!ancestors || ancestors.length === 0) return false;
                 for (let i = 0; i < ancestors.length; i++) {
@@ -96,7 +163,9 @@
             },
 
             onLineContextmenu(event, lineNum, side) {
+                const commentSide = side === 'old' ? 'left' : 'right';
                 const inSelection = this.formLine !== null
+                    && this.formSide === commentSide
                     && lineNum >= this.formLine
                     && lineNum <= (this.formEndLine ?? this.formLine);
                 this.$dispatch('open-remote-menu', {
@@ -147,10 +216,12 @@
             handleLineMousedown(lineNum, side, event) {
                 this.autoExpandedForComment = false;
                 if (event.button !== 0) return;
-                if (event.shiftKey && this.lastClickedLine !== null) {
-                    this.formLine = Math.min(this.lastClickedLine, lineNum);
-                    this.formEndLine = Math.max(this.lastClickedLine, lineNum);
-                    this.formSide = side;
+
+                const clickedPoint = createLinePoint(lineNum, side);
+                if (clickedPoint == null) return;
+
+                if (event.shiftKey && this.lastClickedPoint?.side === clickedPoint.side) {
+                    this.setLineSelection(this.lastClickedPoint, clickedPoint);
                     this.showForm = true;
                     this.focusCommentInput();
                     return;
@@ -159,9 +230,8 @@
                 if (
                     this.showForm
                     && !this.editingCommentId
-                    && this.formSide === side
-                    && this.formLine === lineNum
-                    && this.formEndLine === lineNum
+                    && areLinePointsEqual(this.formStartPoint, clickedPoint)
+                    && areLinePointsEqual(this.formEndPoint, clickedPoint)
                     && this.formBody.trim() === ''
                 ) {
                     this.cancelForm();
@@ -175,11 +245,9 @@
                     return;
                 }
                 this.isDragging = true;
-                this.dragStartLine = lineNum;
+                this.dragStartPoint = clickedPoint;
                 this.dragSide = side;
-                this.formLine = lineNum;
-                this.formEndLine = lineNum;
-                this.formSide = side;
+                this.setLineSelection(clickedPoint, clickedPoint);
                 this.showForm = false;
 
                 this._cachedFileHeader = this.$el.querySelector('[data-testid="file-header"]');
@@ -208,10 +276,10 @@
 
             onDragOver(newLineNum, oldLineNum) {
                 if (!this.isDragging) return;
-                let lineNum = this.dragSide === 'left' ? oldLineNum : newLineNum;
-                if (lineNum === null) return;
-                this.formLine = Math.min(this.dragStartLine, lineNum);
-                this.formEndLine = Math.max(this.dragStartLine, lineNum);
+                const lineNum = this.dragSide === 'left' ? oldLineNum : newLineNum;
+                const point = createLinePoint(lineNum, this.dragSide);
+                if (point === null || this.dragStartPoint === null) return;
+                this.setLineSelection(this.dragStartPoint, point);
             },
 
             endDrag() {
@@ -219,7 +287,7 @@
                 this.stopDragTracking();
                 this._cachedFileHeader = null;
                 this.showForm = true;
-                this.lastClickedLine = this.formEndLine;
+                this.lastClickedPoint = this.formEndPoint ? { ...this.formEndPoint } : null;
                 this.focusCommentInput();
             },
 
@@ -227,8 +295,7 @@
                 this.stopDragTracking();
                 this.showForm = false;
                 this.formBody = '';
-                this.formLine = null;
-                this.formEndLine = null;
+                this.clearLineSelection();
                 this.escHint = false;
                 if (this.escTimer) { clearTimeout(this.escTimer); this.escTimer = null; }
                 this.editingCommentId = null;
@@ -250,12 +317,32 @@
                     this._onDragWindowBlur = null;
                 }
                 this.isDragging = false;
+                this.dragStartPoint = null;
+            },
+
+            init() {
+                // expandGap/expandContext dispatch rfa:diff-action-completed after
+                // their re-render. We attach imperatively rather than via @-binding
+                // because the colon in the event name is awkward in Alpine's @
+                // syntax — same reason runtime-diagnostics.js listens this way.
+                this._onDiffActionCompleted = (event) => {
+                    const detail = event.detail || {};
+                    if (String(detail.fileId) !== String(this.fileId)) {
+                        return;
+                    }
+                    this.restoreExpandFocus(detail.action);
+                };
+                window.addEventListener('rfa:diff-action-completed', this._onDiffActionCompleted);
             },
 
             destroy() {
                 this.stopDragTracking();
                 if (this.escTimer) { clearTimeout(this.escTimer); this.escTimer = null; }
                 this.escHint = false;
+                if (this._onDiffActionCompleted) {
+                    window.removeEventListener('rfa:diff-action-completed', this._onDiffActionCompleted);
+                    this._onDiffActionCompleted = null;
+                }
             },
 
             handleEscape() {
@@ -278,17 +365,22 @@
 
             editComment(comment) {
                 this.formBody = comment.body;
-                this.formLine = comment.startLine;
-                this.formEndLine = comment.endLine;
                 this.formSide = comment.side;
+                if (comment.side === 'file') {
+                    this.clearLineSelection();
+                } else {
+                    this.setLineSelection(
+                        createLinePoint(comment.startLine, comment.side),
+                        createLinePoint(comment.endLine ?? comment.startLine, comment.side)
+                    );
+                }
                 this.editingCommentId = comment.id;
                 this.showForm = true;
                 this.focusCommentInput();
             },
 
             openFileComment() {
-                this.formLine = null;
-                this.formEndLine = null;
+                this.clearLineSelection();
                 this.formSide = 'file';
                 this.showForm = true;
 
@@ -322,6 +414,31 @@
                 return extractLineSnippet({ root, side, startLine, endLine });
             },
 
+            setLineSelection(startPoint, endPoint = startPoint) {
+                if (startPoint == null) {
+                    this.clearLineSelection();
+                    return;
+                }
+
+                const rangeEndPoint = endPoint?.side === startPoint.side ? endPoint : startPoint;
+                const [start, end] = startPoint.line <= rangeEndPoint.line
+                    ? [startPoint, rangeEndPoint]
+                    : [rangeEndPoint, startPoint];
+
+                this.formStartPoint = { ...start };
+                this.formEndPoint = { ...end };
+                this.formSide = start.side;
+                this.formLine = start.line;
+                this.formEndLine = end.line;
+            },
+
+            clearLineSelection() {
+                this.formStartPoint = null;
+                this.formEndPoint = null;
+                this.formLine = null;
+                this.formEndLine = null;
+            },
+
             _ensureScrollLoop() {
                 if (this._scrollRafId) return;
                 this._scrollLastTime = null;
@@ -382,10 +499,10 @@
                 const lineNum = this.dragSide === 'left'
                     ? (row.dataset.lineOld ? parseInt(row.dataset.lineOld) : null)
                     : (row.dataset.lineNew ? parseInt(row.dataset.lineNew) : null);
-                if (lineNum === null) return;
+                const point = createLinePoint(lineNum, this.dragSide);
+                if (point === null || this.dragStartPoint === null) return;
 
-                this.formLine = Math.min(this.dragStartLine, lineNum);
-                this.formEndLine = Math.max(this.dragStartLine, lineNum);
+                this.setLineSelection(this.dragStartPoint, point);
             },
 
             isLineInSelection(lineNum) {
@@ -394,16 +511,20 @@
                 return lineNum >= this.formLine && lineNum <= (this.formEndLine ?? this.formLine);
             },
 
-            // In split mode, remove and add rows live side-by-side and their
-            // line numbers can overlap; only highlight the side that owns the
-            // current selection. Context rows span both sides, so they match
-            // whichever side the drag started on.
-            isLineSideInSelection(lineNum, side) {
-                if (lineNum === null) return false;
-                if (side !== 'context' && this.formSide !== side) return false;
+            isRowInSelection(rowSide, oldLineNum, newLineNum) {
+                if (this.formSide === 'file') return false;
+                if (!this.showForm && !this.isDragging) return false;
+
+                const lineNum = this.formSide === 'left' ? oldLineNum : newLineNum;
                 return this.isLineInSelection(lineNum);
             },
 
+            shouldShowLineCommentForm(rowSide, oldLineNum, newLineNum) {
+                if (!this.showForm || this.formSide === 'file') return false;
+
+                return rowContainsLinePoint(rowSide, oldLineNum, newLineNum, this.formEndPoint);
+            },
+
             onReviewedChange() {
                 this.collapsed = this.reviewed;
                 this.$dispatch('file-reviewed-changed', { id: this.fileId, reviewed: this.reviewed });
@@ -427,5 +548,15 @@
         }
     }
 
-    return { getScrollSpeed, extractLineSnippet, createDiffFile, install, autoInstall };
+    return {
+        getScrollSpeed,
+        extractLineSnippet,
+        expanderToRefocus,
+        createLinePoint,
+        areLinePointsEqual,
+        rowContainsLinePoint,
+        createDiffFile,
+        install,
+        autoInstall,
+    };
 });
diff --git a/resources/css/app.css b/resources/css/app.css
index 4cd82cc3..09f94df3 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -35,6 +35,25 @@
     --tracking-brutal-tight: -0.06em;
 }
 
+/* Map Flux's accent token (used by variant="primary", checkboxes, focus rings)
+   onto the app's monochrome `gh-accent` so Flux components stay on-brand
+   (near-black in light, near-white in dark) instead of Flux's stock indigo.
+   Custom properties resolve at use-time, so referencing --gh-* (defined in the
+   layout's inline style) here is safe regardless of stylesheet order. */
+:root {
+    --color-accent: rgb(var(--gh-accent));
+    --color-accent-content: rgb(var(--gh-accent));
+    --color-accent-foreground: rgb(var(--gh-bg));
+}
+
+/* Bring Flux toasts onto the app surface so they match the hand-built
+   undo-toast (radius/shadow already align). Targets the toast dialog body;
+   higher specificity than Flux's bg-white/zinc utilities, loaded after them. */
+[data-flux-toast-dialog] > div {
+    background-color: rgb(var(--gh-surface));
+    border-color: rgb(var(--gh-border));
+}
+
 * {
     scrollbar-width: thin;
     scrollbar-color: gray transparent;
@@ -57,3 +76,25 @@
     0%   { transform: translateX(-100%); }
     100% { transform: translateX(250%); }
 }
+
+/* Inline/file comment form reveal. The form is mounted via x-if (a single
+   instance, kept off-DOM until opened — see public/js/diff-file.js), so it
+   can't use an Alpine enter-transition. On mount it unfolds with a height
+   collapse (grid-template-rows 0fr -> 1fr) plus a fade, pushing the rows below
+   down instead of popping in. Open-only: x-if removes the node on close. The
+   global reduced-motion rule above neutralizes the duration. */
+@keyframes rfa-comment-open {
+    from { grid-template-rows: 0fr; opacity: 0; }
+    to   { grid-template-rows: 1fr; opacity: 1; }
+}
+.comment-open {
+    display: grid;
+    grid-template-columns: minmax(0, 1fr);
+    grid-template-rows: 1fr;
+    animation: rfa-comment-open 150ms cubic-bezier(0.4, 0, 0.2, 1);
+}
+.comment-open > * {
+    min-width: 0;
+    min-height: 0;
+    overflow: hidden;
+}
diff --git a/resources/views/components/comment-display.blade.php b/resources/views/components/comment-display.blade.php
index 2e2cbe82..eeb01c1b 100644
--- a/resources/views/components/comment-display.blade.php
+++ b/resources/views/components/comment-display.blade.php
@@ -51,7 +51,7 @@ class="hover:!text-gh-accent"
                     size="xs"
                     aria-label="Delete comment"
                     x-on:click.stop="$wire.dispatch('delete-comment', { commentId: '{{ $comment['id'] }}' })"
-                    class="hover:!text-red-400"
+                    class="hover:!text-gh-red"
                 />
             </flux:tooltip>
         </div>
diff --git a/resources/views/components/comment-form.blade.php b/resources/views/components/comment-form.blade.php
index 4c3ac5b5..91578424 100644
--- a/resources/views/components/comment-form.blade.php
+++ b/resources/views/components/comment-form.blade.php
@@ -16,6 +16,6 @@ class="font-mono text-xs"
     <div x-show="escHint" x-cloak class="text-xs text-gh-muted mt-1" data-testid="esc-hint">Press Esc again to save as draft</div>
     <div class="flex justify-end gap-2 mt-2">
         <flux:button variant="ghost" size="sm" x-on:click="cancelForm()">Cancel</flux:button>
-        <flux:button variant="primary" size="sm" color="green" x-on:click="{{ $save }}()" x-bind:disabled="!formBody.trim()">Save</flux:button>
+        <flux:button variant="primary" size="sm" x-on:click="{{ $save }}()" x-bind:disabled="!formBody.trim()">Save</flux:button>
     </div>
 </flux:card>
diff --git a/resources/views/components/diff-skeleton.blade.php b/resources/views/components/diff-skeleton.blade.php
new file mode 100644
index 00000000..8a636fd4
--- /dev/null
+++ b/resources/views/components/diff-skeleton.blade.php
@@ -0,0 +1,21 @@
+{{--
+    Content-shaped placeholder for a diff file while its hunks load — a few
+    line-number + content bars in the diff's own rhythm, so the layout doesn't
+    jump when the real diff arrives. `animate-pulse` is collapsed by the global
+    reduce-motion rule. Decorative, so aria-hidden.
+--}}
+@props(['rows' => 7])
+
+@php
+    // Varied bar widths read as code rather than a flat block.
+    $widths = [86, 58, 72, 44, 90, 64, 50, 78, 38, 68];
+@endphp
+
+<div class="px-4 py-3 motion-safe:animate-pulse" aria-hidden="true">
+    @for($i = 0; $i < $rows; $i++)
+        <div class="flex items-center gap-3 py-1">
+            <div class="h-3 w-6 rounded-sm bg-gh-border/60 shrink-0"></div>
+            <div class="h-3 rounded-sm bg-gh-border/40" style="width: {{ $widths[$i % count($widths)] }}%"></div>
+        </div>
+    @endfor
+</div>
diff --git a/resources/views/components/diff/expand-button.blade.php b/resources/views/components/diff/expand-button.blade.php
new file mode 100644
index 00000000..5490c2b6
--- /dev/null
+++ b/resources/views/components/diff/expand-button.blade.php
@@ -0,0 +1,28 @@
+{{--
+    A clickable target inside <x-diff.expand-control>. Centralizes the expand
+    button's wire contract so each call site names its Livewire `action` exactly
+    once — it drives wire:click, wire:target, and the markDiffActionStart timing
+    mark, and flips the shell's shared `loading` Alpine flag on click. The
+    gh-link affordance styling is the base; callers merge per-button classes
+    (chip padding, tabular-nums) via the class attribute.
+
+    `gapKey` (the hunk index, set by gap expanders) tags the button with
+    data-expand-gap and arms keyboard-only focus restoration: when the
+    post-expand re-render replaces this node, focus returns to the expander that
+    now sits at the same gap instead of dropping to <body>. Mouse clicks don't
+    arm it, and the master "full file" expander leaves it null (no gap remains).
+--}}
+@props([
+    'action',
+    'args' => '',
+    'gapKey' => null,
+])
+
+<button
+    wire:click="{{ $action }}({{ $args }})"
+    wire:loading.attr="disabled"
+    wire:target="{{ $action }}"
+    @if($gapKey !== null) data-expand-gap="{{ $gapKey }}" @endif
+    @click="loading = true; markDiffActionStart('{{ $action }}'); armExpandRefocus($event, @js($gapKey))"
+    {{ $attributes->class('text-gh-link hover:text-gh-text transition-colors disabled:opacity-50') }}
+>{{ $slot }}</button>
diff --git a/resources/views/components/diff/expand-control.blade.php b/resources/views/components/diff/expand-control.blade.php
new file mode 100644
index 00000000..7c0b68e4
--- /dev/null
+++ b/resources/views/components/diff/expand-control.blade.php
@@ -0,0 +1,57 @@
+{{--
+    Unified chrome for every collapsed-content affordance in a diff: the
+    "show full file" master expander, per-gap tiered expanders, the trailing
+    gap, and the (non-expandable) section-context label.
+
+    Coherence contract: the verb ("Show") is rendered here, once, as a muted
+    lead-in — never inside a button. Everything blue (gh-link) is clickable and
+    lives in the slot: "full file", "8 hidden lines", the "15 · 50 · 100" chips.
+    So every expander reads `↕ Show <blue target>` with identical styling.
+
+    Expandable bands carry the `expand-all` (↕) icon, a dashed top/bottom rule
+    (dashed = collapsed content lives here), and own a shared `loading` Alpine
+    flag so any button in the slot can swap the row to a spinner with
+    `@click="loading = true"`. The flag clears itself when the diff action
+    settles (`rfa:diff-action-completed`) rather than relying on the post-expand
+    morph to replace this row — so the spinner can't get stuck when expandGap
+    early-returns on a no-op (diff changed underneath, nothing to morph). The
+    section-context label passes `:icon="false"` (and `align="start"`) — no
+    affordance, no verb, no rule, just the context.
+--}}
+@props([
+    'icon' => 'expand-all',
+    'align' => 'center',
+])
+
+@php
+    $hasIcon = $icon !== false && $icon !== null;
+@endphp
+
+<div
+    {{ $attributes->class([
+        'diff-fullspan bg-gh-hunk-bg px-4 py-1.5 text-xs font-mono flex items-center gap-2',
+        'border-y border-dashed border-gh-border/20' => $hasIcon,
+        'justify-center select-none' => $align === 'center',
+        'justify-start' => $align === 'start',
+    ]) }}
+    @if($hasIcon)
+        x-data="{ loading: false }"
+        {{-- Scope the clear to THIS file: the event is a global window dispatch, so
+             without the fileId guard a sibling file's expand completing would clear
+             this row's in-flight spinner. String() both sides — the dispatch casts
+             fileId to string while the Alpine fileId may be numeric (see diff-file.js). --}}
+        @rfa:diff-action-completed.window="if (String($event.detail.fileId) === String(fileId)) loading = false"
+    @endif
+>
+    @if($hasIcon)
+        <flux:icon :icon="$icon" variant="outline" class="!size-3.5 shrink-0 text-gh-muted/50" x-show="!loading" />
+        <span x-show="!loading" class="inline-flex min-w-0 items-center gap-2">
+            <span class="text-gh-muted/60">Show</span>
+            {{ $slot }}
+        </span>
+        <flux:icon icon="arrow-path" variant="outline" class="!size-3.5 shrink-0 animate-spin text-gh-muted" x-show="loading" x-cloak />
+        <span x-show="loading" x-cloak class="text-gh-muted">Loading…</span>
+    @else
+        {{ $slot }}
+    @endif
+</div>
diff --git a/resources/views/components/diff/file-header.blade.php b/resources/views/components/diff/file-header.blade.php
index 25b322b4..4f8c282c 100644
--- a/resources/views/components/diff/file-header.blade.php
+++ b/resources/views/components/diff/file-header.blade.php
@@ -44,7 +44,7 @@ class="text-sm"
     </div>
 
     <div class="flex items-center gap-2 text-xs shrink-0 font-mono">
-        <div class="flex items-center gap-0.5 opacity-30 group-hover:opacity-100 transition-opacity">
+        <div class="flex items-center gap-0.5 opacity-60 group-hover:opacity-100 transition-opacity">
             <x-copy-paths-button
                 mode="single"
                 size="sm"
@@ -55,7 +55,7 @@ class="text-sm"
 
             @if($showContentCopy)
                 <flux:dropdown position="bottom" align="end">
-                    <flux:button icon="ellipsis-vertical" icon:variant="outline" variant="ghost" size="sm" aria-label="Copy content" />
+                    <flux:button icon="clipboard-document" icon:variant="outline" variant="ghost" size="sm" tooltip="Copy content" aria-label="Copy content" />
                     <flux:menu>
                         <flux:menu.item icon="code-bracket" icon:variant="outline" @click="$wire.copyContent('diff')">
                             Copy diff
diff --git a/resources/views/components/diff/hunk.blade.php b/resources/views/components/diff/hunk.blade.php
index 9b5643ff..ee777c96 100644
--- a/resources/views/components/diff/hunk.blade.php
+++ b/resources/views/components/diff/hunk.blade.php
@@ -9,21 +9,20 @@
 {{-- Each hunk is its own subgrid so split-mode `grid-auto-flow: dense` pairs
      remove+add only within this hunk — never across hunk boundaries. --}}
 <div class="diff-hunk">
-    {{-- Gap with expand controls (or hunk header when no preceding gap). --}}
+    {{-- Gap with expand controls (or hunk section-context label when no preceding gap). --}}
     @if($hunkIndex > 0 || $hunk['newStart'] > 1)
-        <div class="diff-fullspan bg-gh-hunk-bg py-1.5 text-center text-xs border-y border-dashed border-gh-border/20">
-            @php
-                $hiddenCount = $hunkIndex > 0
-                    ? $hunk['newStart'] - ($prevHunk['newStart'] + $prevHunk['newCount'])
-                    : $hunk['newStart'] - 1;
-            @endphp
+        @php
+            $hiddenCount = $hunkIndex > 0
+                ? $hunk['newStart'] - ($prevHunk['newStart'] + $prevHunk['newCount'])
+                : $hunk['newStart'] - 1;
+        @endphp
+        <x-diff.expand-control wire:key="expand-gap-{{ $hunkIndex }}-{{ $hiddenCount }}">
             <x-tiered-expand-gap :hunk-index="$hunkIndex" :hidden-count="$hiddenCount" />
-        </div>
+        </x-diff.expand-control>
     @elseif($hunk['header'] !== '')
-        <div class="diff-fullspan bg-gh-hunk-bg px-4 py-1 text-gh-muted text-xs">
-            @@ -{{ $hunk['oldStart'] }} +{{ $hunk['newStart'] }} @@
-            <span class="text-gh-muted/60">{{ $hunk['header'] }}</span>
-        </div>
+        <x-diff.expand-control :icon="false" align="start">
+            <span class="text-gh-muted/70">{{ $hunk['header'] }}</span>
+        </x-diff.expand-control>
     @endif
 
     @foreach($hunk['lines'] as $line)
diff --git a/resources/views/components/diff/line.blade.php b/resources/views/components/diff/line.blade.php
index 5244c4f9..d6e367b2 100644
--- a/resources/views/components/diff/line.blade.php
+++ b/resources/views/components/diff/line.blade.php
@@ -1,6 +1,6 @@
-{{-- Parent Alpine scope contract: isLineInSelection(), onDragOver(), handleLineMousedown(),
+{{-- Parent Alpine scope contract: isRowInSelection(), onDragOver(), handleLineMousedown(),
      onLineContextmenu(), toggleHeadingFold(), foldedHeadings, isLineFolded(),
-     showForm, formEndLine, formSide, editingCommentId. --}}
+     shouldShowLineCommentForm(), editingCommentId. --}}
 @props([
     'line',
     'hasRemote' => false,
@@ -41,7 +41,7 @@
 <div
     class="diff-line"
     data-type="{{ $type->value }}"
-    :class="isLineSideInSelection({{ $lineNum ?? 'null' }}, @js($lineSide)) ? 'line-selected' : ''"
+    :class="isRowInSelection(@js($lineSide), {{ $oldNum ?? 'null' }}, {{ $newNum ?? 'null' }}) ? 'line-selected' : ''"
     @mouseenter="onDragOver({{ $newNum ?? 'null' }}, {{ $oldNum ?? 'null' }})"
     @if($hasRemote && $lineNum !== null) @contextmenu.prevent="onLineContextmenu($event, {{ $lineNum }}, '{{ $lineSide === 'left' ? 'old' : 'new' }}')" @endif
     @if($newNum) data-line-new="{{ $newNum }}" @endif
@@ -75,8 +75,8 @@ class="inline-flex align-middle -my-0.5 mr-1 size-4 items-center justify-center
 </div>
 
 @if($lineNum !== null)
-    <template x-if="showForm && formEndLine === {{ $lineNum }} && formSide !== 'file' && (@js($lineSide) === 'context' || formSide === @js($lineSide))">
-        <div class="diff-fullspan" @if($ancestorJs) x-show="!isLineFolded({{ $ancestorJs }})" @endif>
+    <template x-if="shouldShowLineCommentForm(@js($lineSide), {{ $oldNum ?? 'null' }}, {{ $newNum ?? 'null' }})">
+        <div class="diff-fullspan comment-open" @if($ancestorJs) x-show="!isLineFolded({{ $ancestorJs }})" @endif>
             <x-comment-form save="submitComment" placeholder="Write a comment..." border-class="border-y" />
         </div>
     </template>
diff --git a/resources/views/components/divergence/marker.blade.php b/resources/views/components/divergence/marker.blade.php
new file mode 100644
index 00000000..6ffdd50b
--- /dev/null
+++ b/resources/views/components/divergence/marker.blade.php
@@ -0,0 +1,91 @@
+{{--
+    Branch-divergence marker for the header branch control.
+
+    Renders a small dot on the branch pill when the repo's checked-out HEAD has
+    drifted from the review target, with a popover offering the choice. Replaces
+    the old full-width warning band so the canvas stays calm — the signal lives
+    where its cause does. Only shows for the quiet, recoverable states
+    (Diverged / Detached); MissingTarget is a blocking bar (<x-divergence.missing-bar>).
+
+    Buttons call ReviewPage actions directly (this is rendered inside its DOM).
+--}}
+@props(['state', 'context' => []])
+
+@php
+    $isDiverged = $state === \App\Enums\DivergenceState::Diverged;
+    $isDetached = $state === \App\Enums\DivergenceState::Detached;
+@endphp
+
+@if($isDiverged || $isDetached)
+    @php
+        $target = $context['target'] ?? '';
+        $currentBranch = $context['currentBranch'] ?? null;
+        $shortSha = $context['shortSha'] ?? '';
+        $commentCount = (int) ($context['commentCount'] ?? 0);
+
+        // Literal class strings so Tailwind's source scan keeps them in the build.
+        $dotClasses = $isDiverged ? 'bg-gh-attention ring-gh-attention/30' : 'bg-gh-link ring-gh-link/30';
+        $testid = $isDiverged ? 'divergence-banner-diverged' : 'divergence-banner-detached';
+    @endphp
+
+    <div x-data="{ open: false }" class="relative inline-flex -ml-0.5" data-testid="{{ $testid }}">
+        <button
+            type="button"
+            @click="open = ! open"
+            @keydown.escape.window="open = false"
+            :aria-expanded="open"
+            aria-label="{{ $isDiverged ? 'Checkout moved off the review branch — show options' : 'Repo detached from the review branch — show options' }}"
+            class="inline-flex items-center justify-center size-6 rounded-md hover:bg-gh-border/40 transition-colors"
+        >
+            <span class="relative inline-flex h-2 w-2 rounded-full ring-2 {{ $dotClasses }}"></span>
+        </button>
+
+        <div
+            x-show="open"
+            x-cloak
+            @click.outside="open = false"
+            x-transition:enter="transition ease-out duration-150"
+            x-transition:enter-start="opacity-0 -translate-y-1 scale-95"
+            x-transition:enter-end="opacity-100 translate-y-0 scale-100"
+            x-transition:leave="transition ease-out duration-100"
+            x-transition:leave-start="opacity-100 translate-y-0 scale-100"
+            x-transition:leave-end="opacity-0 -translate-y-1 scale-95"
+            role="dialog"
+            class="absolute left-0 top-full mt-2 z-50 w-[320px] origin-top-left rounded-xl border border-gh-border bg-gh-bg shadow-xl shadow-black/10 overflow-hidden"
+        >
+            <div class="px-4 pt-3.5 pb-3 space-y-2.5">
+                <div class="flex items-center gap-2">
+                    <span class="inline-flex h-2 w-2 rounded-full {{ $dotClasses }}"></span>
+                    <span class="font-display font-semibold tracking-brutal">{{ $isDiverged ? 'Your checkout moved' : 'Repo is detached' }}</span>
+                </div>
+
+                @if($isDiverged)
+                    <p class="text-xs text-gh-muted leading-relaxed">
+                        Repo is on <span class="font-mono text-gh-text">{{ $currentBranch }}</span>.
+                        RFA is still showing your review of <span class="font-mono text-gh-text">{{ $target }}</span>.
+                    </p>
+                    @if($commentCount > 0)
+                        <p class="text-xs text-gh-muted">
+                            <span class="text-gh-text font-medium tabular-nums">{{ $commentCount }}</span>
+                            {{ \Illuminate\Support\Str::plural('comment', $commentCount) }} on <span class="font-mono">{{ $target }}</span>
+                        </p>
+                    @endif
+                @else
+                    <p class="text-xs text-gh-muted leading-relaxed">
+                        Repo is detached at <span class="font-mono text-gh-text">{{ $shortSha }}</span>.
+                        RFA is still showing your review of <span class="font-mono text-gh-text">{{ $target }}</span>.
+                    </p>
+                @endif
+            </div>
+
+            <div class="flex items-center justify-end gap-1 px-3 py-2.5 border-t border-gh-border bg-gh-surface/50">
+                @if($isDiverged)
+                    <button type="button" wire:click="keepReviewing" @click="open = false" class="text-xs font-medium text-gh-muted hover:text-gh-text px-2.5 py-1.5 rounded-md transition-colors">Keep reviewing</button>
+                    <button type="button" wire:click="switchReviewToHead" @click="open = false" class="text-xs font-medium font-display rounded-md px-3 py-1.5 bg-gh-accent text-gh-bg hover:opacity-90 transition-opacity">Switch review here</button>
+                @else
+                    <button type="button" wire:click="dismissDetachedBanner" @click="open = false" class="text-xs font-medium text-gh-muted hover:text-gh-text px-2.5 py-1.5 rounded-md transition-colors">Dismiss</button>
+                @endif
+            </div>
+        </div>
+    </div>
+@endif
diff --git a/resources/views/components/divergence/missing-bar.blade.php b/resources/views/components/divergence/missing-bar.blade.php
new file mode 100644
index 00000000..c4c0fdda
--- /dev/null
+++ b/resources/views/components/divergence/missing-bar.blade.php
@@ -0,0 +1,38 @@
+{{--
+    Branch-divergence "missing target" bar.
+
+    The one genuinely blocking divergence state: the branch being reviewed no
+    longer exists (deleted / renamed / mid-rebase). Unlike Diverged/Detached
+    (quiet header marker), this stays a full-width bar — but on-brand (house
+    pattern from update-banner, gh-* tokens) rather than a stock-Flux callout,
+    and now dismissible. Buttons call ReviewPage actions directly.
+--}}
+@props(['state', 'context' => []])
+
+@if($state === \App\Enums\DivergenceState::MissingTarget)
+    @php
+        $target = $context['target'] ?? '';
+        $currentBranch = $context['currentBranch'] ?? null;
+    @endphp
+
+    <div class="bg-gh-surface border-b border-gh-border px-5 py-2.5" role="alert" aria-live="assertive" data-testid="divergence-banner-missing">
+        <div class="flex items-center gap-3">
+            <flux:icon icon="exclamation-triangle" variant="outline" class="!size-4 shrink-0 text-gh-red" />
+            <div class="min-w-0 flex-1">
+                <p class="font-display font-semibold tracking-brutal text-sm">Review target <span class="font-mono">{{ $target }}</span> no longer exists</p>
+                <p class="text-xs text-gh-muted">
+                    The branch you were reviewing is gone — deleted, renamed, or mid-rebase.
+                    @if($currentBranch)
+                        Repo is now on <span class="font-mono text-gh-text">{{ $currentBranch }}</span>.
+                    @endif
+                </p>
+            </div>
+            <div class="flex items-center gap-1 shrink-0">
+                <button type="button" wire:click="dismissMissingTarget" class="text-xs font-medium text-gh-muted hover:text-gh-text px-2.5 py-1.5 rounded-md transition-colors">Dismiss</button>
+                @if($currentBranch)
+                    <button type="button" wire:click="switchReviewToHead" class="text-xs font-medium font-display rounded-md px-3 py-1.5 bg-gh-accent text-gh-bg hover:opacity-90 transition-opacity">Switch review here</button>
+                @endif
+            </div>
+        </div>
+    </div>
+@endif
diff --git a/resources/views/components/empty-state.blade.php b/resources/views/components/empty-state.blade.php
new file mode 100644
index 00000000..ec42a694
--- /dev/null
+++ b/resources/views/components/empty-state.blade.php
@@ -0,0 +1,40 @@
+{{--
+    Shared full-page empty / zero state — one visual language across the app.
+
+    Renders the rfa wordmark watermark (or a Flux icon), a display heading, a
+    free body slot, and an optional actions row. Pass role / aria-live through
+    as attributes for alert-grade states (e.g. git errors).
+
+    Props:
+      glyph       wordmark text (default "rfa"); set to null to omit
+      glyphClass  color for the wordmark watermark (default muted/20)
+      icon        Flux icon name to use instead of the wordmark
+      size        "lg" (default, ~60vh centered) or "sm" (py-16)
+    Slots: heading, default (body), actions
+--}}
+@props([
+    'glyph' => 'rfa',
+    'glyphClass' => 'text-gh-muted/20',
+    'icon' => null,
+    'size' => 'lg',
+])
+
+<div {{ $attributes->class(['flex items-center justify-center', $size === 'sm' ? 'py-16' : 'h-[60vh]']) }}>
+    <div class="text-center px-6 max-w-md">
+        @if($icon)
+            <flux:icon :icon="$icon" variant="outline" class="!size-10 text-gh-muted/30 mx-auto mb-5" />
+        @elseif($glyph)
+            <p class="rfa-logo text-5xl {{ $glyphClass }} mb-6" aria-hidden="true">{{ $glyph }}</p>
+        @endif
+
+        @isset($heading)
+            <h2 class="font-display font-semibold tracking-brutal text-lg text-gh-text mb-2">{{ $heading }}</h2>
+        @endisset
+
+        {{ $slot }}
+
+        @isset($actions)
+            <div class="flex items-center justify-center gap-2 mt-5">{{ $actions }}</div>
+        @endisset
+    </div>
+</div>
diff --git a/resources/views/components/feedback-submit-bar.blade.php b/resources/views/components/feedback-submit-bar.blade.php
index e8b872b4..454f14ed 100644
--- a/resources/views/components/feedback-submit-bar.blade.php
+++ b/resources/views/components/feedback-submit-bar.blade.php
@@ -68,6 +68,7 @@
     @else
         <div class="px-5 py-3.5 flex items-center gap-4"
             x-data="{
+                armed: false,
                 get commentCount() { return $wire.comments.filter(c => !c.isDraft).length },
                 get draftCount() { return $wire.comments.filter(c => c.isDraft).length },
                 get hasGlobal() { return ($wire.globalComment || '').trim().length > 0 }
@@ -99,14 +100,21 @@ class="font-mono text-xs"
                         <span class="w-px h-4 bg-gh-border"></span>
                     </div>
                 </template>
+                {{-- Drafts won't be included: arm-to-confirm inline (no native confirm() dialog). --}}
                 <flux:button
                     variant="primary"
-                    @click="if (draftCount > 0 && !confirm(`You have ${draftCount} draft comment${draftCount === 1 ? '' : 's'} that won't be included. Submit anyway?`)) return; $wire.{{ $submitAction }}()"
+                    @click="if (draftCount > 0 && !armed) { armed = true; return; } $wire.{{ $submitAction }}()"
+                    @click.outside="armed = false"
+                    {{-- Drop a stale arm if the drafts it was armed against vanish (e.g.
+                         deleted via a skipRender'd action that leaves this x-data intact),
+                         so a later submit can't skip the confirm against a different set. --}}
+                    x-effect="if (draftCount === 0) { armed = false }"
                     wire:loading.attr="disabled"
                     wire:target="{{ $submitAction }}"
                     x-bind:disabled="commentCount === 0 && !hasGlobal"
                 >
-                    {{ $submitLabel }}
+                    <span x-show="!(armed && draftCount > 0)">{{ $submitLabel }}</span>
+                    <span x-show="armed && draftCount > 0" x-cloak x-text="`Submit without ${draftCount} draft${draftCount === 1 ? '' : 's'}?`"></span>
                 </flux:button>
             </div>
         </div>
diff --git a/resources/views/components/file-path.blade.php b/resources/views/components/file-path.blade.php
index f41d1d0c..3ea68f4c 100644
--- a/resources/views/components/file-path.blade.php
+++ b/resources/views/components/file-path.blade.php
@@ -17,11 +17,28 @@
 @props([
     'path',
     'oldPath' => null,
+    // Opt-in: collapse a deep directory to a middle-ellipsis breadcrumb
+    // (app/Domains/BulkOperations/Jobs/ → app/…/Jobs/) so the basename — the
+    // thing being scanned for — survives in narrow lists. Default off; the full
+    // path stays in `title`. Use only where width is genuinely tight (sidebar).
+    'collapse' => false,
 ])
 
 @php
     $pos = strrpos($path, '/');
     [$dir, $base] = $pos === false ? ['', $path] : [substr($path, 0, $pos + 1), substr($path, $pos + 1)];
+
+    if ($collapse && $dir !== '') {
+        // Preserve a leading slash for absolute paths: trimming both ends keeps
+        // the first real segment as $segments[0] (an absolute path would otherwise
+        // explode to a leading '' and collapse to '/…/c/', dropping the root dir).
+        $prefix = str_starts_with($dir, '/') ? '/' : '';
+        $segments = explode('/', trim($dir, '/'));
+        if (count($segments) > 2) {
+            $dir = $prefix.$segments[0].'/…/'.end($segments).'/';
+        }
+    }
+
     $hasOldPath = $oldPath !== null && $oldPath !== '';
     $defaultTitle = $hasOldPath ? $oldPath.' → '.$path : $path;
 @endphp
diff --git a/resources/views/components/mode-toggle.blade.php b/resources/views/components/mode-toggle.blade.php
index c78bc60a..29ebb5e6 100644
--- a/resources/views/components/mode-toggle.blade.php
+++ b/resources/views/components/mode-toggle.blade.php
@@ -14,7 +14,7 @@
     $reviewHref = route('review-page', ['slug' => $projectSlug]);
     $contextHref = route('context-page', ['slug' => $projectSlug]);
 
-    $baseSide = 'group relative inline-flex items-center gap-1.5 px-2.5 py-1 text-xs font-display tracking-tight transition-colors cursor-pointer';
+    $baseSide = 'group relative inline-flex items-center gap-1.5 px-2.5 py-1 text-xs font-display tracking-brutal transition-colors cursor-pointer';
     $activeSide = 'bg-gh-surface text-gh-text ring-1 ring-gh-border';
     $inactiveSide = 'text-gh-muted hover:text-gh-text hover:bg-gh-border/25';
 
diff --git a/resources/views/components/project-list.blade.php b/resources/views/components/project-list.blade.php
index a31d107d..623c60d3 100644
--- a/resources/views/components/project-list.blade.php
+++ b/resources/views/components/project-list.blade.php
@@ -98,7 +98,7 @@
                             'text-gh-link' => $isCurrent,
                         ]) title="{{ $project['name'] }}">{{ $project['name'] }}</span>
                         @if($project['is_worktree'])
-                            <flux:badge size="sm" color="yellow">worktree</flux:badge>
+                            <span class="text-[10px] font-mono text-gh-muted px-1.5 py-0.5 rounded border border-gh-border shrink-0">worktree</span>
                         @endif
                         @if($project['branch'])
                             <span class="text-[11px] font-mono text-gh-muted px-1.5 py-0.5 rounded border border-gh-border shrink-0 truncate max-w-[140px]" title="{{ $project['branch'] }}">{{ $project['branch'] }}</span>
@@ -124,7 +124,7 @@
                             wire:click.stop="removeProject({{ $project['id'] }})"
                             wire:confirm="{{ $confirmMessage }}"
                             @class([
-                                'text-gh-muted hover:text-red-500 transition-opacity',
+                                'text-gh-muted hover:text-gh-red transition-opacity',
                                 'opacity-0 group-hover:opacity-100 focus-visible:opacity-100' => $isPicker,
                                 'opacity-60 hover:opacity-100' => ! $isPicker,
                             ])
diff --git a/resources/views/components/remote-link-menu.blade.php b/resources/views/components/remote-link-menu.blade.php
index cb5eaa5c..b209006b 100644
--- a/resources/views/components/remote-link-menu.blade.php
+++ b/resources/views/components/remote-link-menu.blade.php
@@ -50,7 +50,12 @@
     <div
         x-show="ctxOpen"
         x-cloak
-        x-transition.opacity.duration.75ms
+        x-transition:enter="transition ease-out duration-150"
+        x-transition:enter-start="opacity-0 scale-95"
+        x-transition:enter-end="opacity-100 scale-100"
+        x-transition:leave="transition ease-out duration-100"
+        x-transition:leave-start="opacity-100 scale-100"
+        x-transition:leave-end="opacity-0 scale-95"
         @click.outside="closeCtx()"
         @keydown.escape.window="closeCtx()"
         @click="closeCtx()"
diff --git a/resources/views/components/status-strip.blade.php b/resources/views/components/status-strip.blade.php
index 745ca002..b34d6f59 100644
--- a/resources/views/components/status-strip.blade.php
+++ b/resources/views/components/status-strip.blade.php
@@ -18,7 +18,7 @@
     <span class="text-gh-red">-{{ collect($sourceFiles)->sum('deletions') }}</span>
 
     @if(count($reviewPairs) > 0)
-        <span class="px-1.5 py-px rounded border border-gh-border">{{ count($reviewPairs) }} {{ Str::plural('review', count($reviewPairs)) }}</span>
+        <span class="text-gh-muted">{{ count($reviewPairs) }} {{ Str::plural('review', count($reviewPairs)) }}</span>
     @endif
 
     <div class="ml-auto flex items-center gap-2">
diff --git a/resources/views/components/tiered-expand-gap.blade.php b/resources/views/components/tiered-expand-gap.blade.php
index a204d511..5ddcffe8 100644
--- a/resources/views/components/tiered-expand-gap.blade.php
+++ b/resources/views/components/tiered-expand-gap.blade.php
@@ -1,3 +1,10 @@
+{{--
+    The blue (clickable) targets inside <x-diff.expand-control>: a single
+    "N hidden lines" button for small gaps, or tiered chips (15 · 50 · 100)
+    plus an "all N hidden lines" button for larger ones. The "Show" verb, ↕
+    icon, band chrome, and `loading` flag are owned by the wrapping shell —
+    buttons here just flip `loading = true`.
+--}}
 @props(['hunkIndex', 'hiddenCount'])
 
 @php
@@ -7,48 +14,21 @@
     $applicableTiers = array_values(array_filter([15, 50, 100], fn ($t) => $t < $hiddenCount));
 @endphp
 
-<span wire:key="expand-gap-{{ $hunkIndex }}-{{ $hiddenCount }}" x-data="{ loading: false }">
-    @if(empty($applicableTiers))
-        <button
-            wire:click="expandGap({{ $hunkIndex }})"
-            wire:loading.attr="disabled"
-            wire:target="expandGap"
-            @click="loading = true; markDiffActionStart('expandGap')"
-            x-show="!loading"
-            class="text-gh-link hover:text-gh-text transition-colors inline-flex items-center gap-1.5 disabled:opacity-50"
-        >
-            {{-- Inline ternary instead of Str::plural for the same hot-path reason. --}}
-            Expand {{ $hiddenCount }} hidden {{ $hiddenCount === 1 ? 'line' : 'lines' }}
-        </button>
-    @else
-        <span x-show="!loading" class="inline-flex items-center gap-1.5">
-            <span class="text-gh-muted/60 select-none">Expand</span>
-            <span class="inline-flex items-center">
-                @foreach($applicableTiers as $tier)
-                    @if(!$loop->first)
-                        <span class="text-gh-muted/20 select-none" aria-hidden="true">&middot;</span>
-                    @endif
-                    <button
-                        wire:click="expandGap({{ $hunkIndex }}, {{ $tier }})"
-                        wire:loading.attr="disabled"
-                        wire:target="expandGap"
-                        @click="loading = true; markDiffActionStart('expandGap')"
-                        class="text-gh-link hover:bg-gh-link/10 hover:text-gh-text rounded px-1.5 py-0.5 transition-colors disabled:opacity-50 tabular-nums"
-                    >{{ $tier }}</button>
-                @endforeach
-            </span>
-            {{-- Always plural here: this branch only renders when hiddenCount > 15. --}}
-            <button
-                wire:click="expandGap({{ $hunkIndex }})"
-                wire:loading.attr="disabled"
-                wire:target="expandGap"
-                @click="loading = true; markDiffActionStart('expandGap')"
-                class="text-gh-link hover:bg-gh-link/10 hover:text-gh-text rounded px-1.5 py-0.5 transition-colors disabled:opacity-50 tabular-nums"
-            >{{ $hiddenCount }} <span class="text-gh-muted/60">hidden lines</span></button>
-        </span>
-    @endif
-    <span x-show="loading" x-cloak class="inline-flex items-center gap-1.5 text-gh-muted">
-        <flux:icon icon="arrow-path" variant="outline" class="size-3.5 animate-spin" />
-        Expanding...
+@if(empty($applicableTiers))
+    {{-- Inline ternary instead of Str::plural for the same hot-path reason. --}}
+    <x-diff.expand-button action="expandGap" args="{{ $hunkIndex }}" :gap-key="$hunkIndex" class="tabular-nums">
+        {{ $hiddenCount }} hidden {{ $hiddenCount === 1 ? 'line' : 'lines' }}
+    </x-diff.expand-button>
+@else
+    <span class="inline-flex items-center gap-1">
+        @foreach($applicableTiers as $tier)
+            @if(!$loop->first)
+                <span class="text-gh-muted/20" aria-hidden="true">&middot;</span>
+            @endif
+            <x-diff.expand-button action="expandGap" args="{{ $hunkIndex }}, {{ $tier }}" :gap-key="$hunkIndex" class="hover:bg-gh-link/10 rounded px-1.5 py-0.5 tabular-nums">{{ $tier }}</x-diff.expand-button>
+        @endforeach
     </span>
-</span>
+    {{-- Always plural here: this branch only renders when hiddenCount > 15. The
+         full "N hidden lines" target reads identically to the single-gap button. --}}
+    <x-diff.expand-button action="expandGap" args="{{ $hunkIndex }}" :gap-key="$hunkIndex" class="hover:bg-gh-link/10 rounded px-1.5 py-0.5 tabular-nums">{{ $hiddenCount }} hidden lines</x-diff.expand-button>
+@endif
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 2d2ae844..fbcd320c 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -235,6 +235,12 @@
 >
     {{-- Find-in-page search bar (Cmd/Ctrl+F) --}}
     <div x-data="pageSearch" x-show="open" x-cloak data-search-ignore
+         x-transition:enter="transition ease-out duration-150"
+         x-transition:enter-start="opacity-0 -translate-y-1"
+         x-transition:enter-end="opacity-100 translate-y-0"
+         x-transition:leave="transition ease-out duration-100"
+         x-transition:leave-start="opacity-100 translate-y-0"
+         x-transition:leave-end="opacity-0 -translate-y-1"
          @keydown.window="handleKeydown($event)"
          class="fixed top-2 right-4 z-[9999] flex items-center gap-1.5 bg-gh-surface border border-gh-border rounded-lg shadow-lg px-3 py-1.5">
         <svg class="w-4 h-4 text-gh-muted shrink-0" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2" aria-hidden="true">
@@ -268,6 +274,9 @@ class="text-gh-muted text-xs font-mono tabular-nums shrink-0 min-w-[3rem] text-r
     </div>
 
     <livewire:keepalive />
+    {{-- Single defined home for Flux toasts (bottom-right), clear of the undo-toast
+         and submit bar. Surface styling is brought onto gh-* tokens in app.css. --}}
+    <flux:toast position="bottom end" />
     {{ $slot }}
     <script>
         document.addEventListener('livewire:init', () => {
diff --git a/resources/views/livewire/context-tree.blade.php b/resources/views/livewire/context-tree.blade.php
index f64947c8..679cb12b 100644
--- a/resources/views/livewire/context-tree.blade.php
+++ b/resources/views/livewire/context-tree.blade.php
@@ -93,7 +93,30 @@ public function tree(): array
         };
         $sortChildren($root);
 
-        return $root;
+        // Collapse single-child, file-less folder chains into one breadcrumb row
+        // (app › Console › Commands › Pla › Db  →  app/Console/Commands/Pla/Db),
+        // like VS Code / GitHub, so indentation tracks real branching, not depth.
+        // The root stays the container; only its descendant chains are merged.
+        $compact = function (array $node) use (&$compact): array {
+            foreach ($node['children'] as $key => $child) {
+                $child = $compact($child);
+
+                while (count($child['children']) === 1 && empty($child['files'])) {
+                    $grandchild = reset($child['children']);
+                    $child['name'] = $child['name'].'/'.$grandchild['name'];
+                    $child['path'] = $grandchild['path'];
+                    $child['files'] = $grandchild['files'];
+                    $child['hasContext'] = $grandchild['hasContext'];
+                    $child['children'] = $grandchild['children'];
+                }
+
+                $node['children'][$key] = $child;
+            }
+
+            return $node;
+        };
+
+        return $compact($root);
     }
 };
 
@@ -108,7 +131,6 @@ public function tree(): array
     <flux:select wire:model.live="filterMode" size="sm">
         <flux:select.option value="all">All paths</flux:select.option>
         <flux:select.option value="with-context">With context only</flux:select.option>
-        <flux:select.option value="missing" disabled>Missing only — coming soon</flux:select.option>
     </flux:select>
 
     @if(empty($contextFiles))
diff --git a/resources/views/livewire/partials/context-tree-node.blade.php b/resources/views/livewire/partials/context-tree-node.blade.php
index 360efcd9..f70b77db 100644
--- a/resources/views/livewire/partials/context-tree-node.blade.php
+++ b/resources/views/livewire/partials/context-tree-node.blade.php
@@ -42,7 +42,7 @@ class="w-full text-left flex items-center gap-2 py-1 rounded hover:bg-gh-border/
             <span class="font-mono font-medium text-[10px] shrink-0 {{ $kind->badgeColorClass() }}">{{ $kind->badgeLabel() }}</span>
             <span class="font-mono truncate text-gh-text flex-1 min-w-0">{{ $file['basename'] }}</span>
             @if(! $file['isTracked'])
-                <flux:badge size="sm" color="zinc" inset="top bottom">untracked</flux:badge>
+                <span class="font-mono text-[10px] text-gh-muted/70 shrink-0">untracked</span>
             @endif
             @if($file['isSymlink'])
                 <flux:tooltip content="Symlink → {{ $file['symlinkTarget'] }}">
diff --git a/resources/views/livewire/update-banner.blade.php b/resources/views/livewire/update-banner.blade.php
index 07dfea10..daab90f4 100644
--- a/resources/views/livewire/update-banner.blade.php
+++ b/resources/views/livewire/update-banner.blade.php
@@ -240,7 +240,7 @@ class="bg-gh-surface border-b border-gh-border px-4 py-2 font-mono text-xs text-
             <span>Downloading v{{ $version }}...</span>
             <div class="w-24 h-1 bg-gh-border rounded-full overflow-hidden">
                 <div
-                    class="h-full bg-gh-link rounded-full transition-all duration-500 ease-out"
+                    class="h-full bg-gh-link rounded-full transition-all duration-200 ease-out"
                     style="width: {{ $downloadPercent }}%"
                 ></div>
             </div>
diff --git "a/resources/views/livewire/\342\232\241branch-explorer.blade.php" "b/resources/views/livewire/\342\232\241branch-explorer.blade.php"
index 2f3392c0..5ae0d110 100644
--- "a/resources/views/livewire/\342\232\241branch-explorer.blade.php"
+++ "b/resources/views/livewire/\342\232\241branch-explorer.blade.php"
@@ -181,7 +181,7 @@ class="group inline-flex items-center gap-1.5 px-2 py-1 text-xs font-mono text-g
                     x-bind:aria-expanded="open"
                 >
                     <flux:icon icon="share" variant="outline" class="!size-3 text-gh-muted/70 group-hover:text-gh-text transition-colors" />
-                    <span class="tracking-tight">{{ $currentBranch }}</span>
+                    <span class="tracking-brutal">{{ $currentBranch }}</span>
                 </button>
             </flux:tooltip>
         </div>
diff --git "a/resources/views/livewire/\342\232\241diff-file.blade.php" "b/resources/views/livewire/\342\232\241diff-file.blade.php"
index 96f70e80..b2c1c816 100644
--- "a/resources/views/livewire/\342\232\241diff-file.blade.php"
+++ "b/resources/views/livewire/\342\232\241diff-file.blade.php"
@@ -159,6 +159,11 @@ public function expandContext(): void
     public function expandGap(int $hunkIndex, ?int $lineCount = null): void
     {
         if ($this->diffData === null || empty($this->diffData['hunks'])) {
+            // Diff fell out of cache between render and click: nothing to expand.
+            // Still settle the action so the client clears the optimistic loading
+            // spinner and the paired runtime-diagnostics start mark isn't orphaned.
+            $this->dispatchDiffActionCompleted('expandGap', 0);
+
             return;
         }
 
@@ -176,6 +181,11 @@ public function expandGap(int $hunkIndex, ?int $lineCount = null): void
         );
 
         if (empty($fullDiff['hunks'])) {
+            // The full-context reload found no diff — the file changed underneath
+            // the cached hunks. Same settle contract as the guard above so the
+            // expander's spinner can't get stuck on a no-op that morphs nothing.
+            $this->dispatchDiffActionCompleted('expandGap', $this->durationSince($startedAt));
+
             return;
         }
 
@@ -394,7 +404,9 @@ class="group"
     <div x-show="!collapsed" x-collapse.duration.150ms>
         <div x-ref="fileCommentForm">
             <template x-if="showForm && formSide === 'file'">
-                <x-comment-form save="submitComment" placeholder="File comment..." border-class="border-b" />
+                <div class="comment-open">
+                    <x-comment-form save="submitComment" placeholder="File comment..." border-class="border-b" />
+                </div>
             </template>
             @foreach($fileComments as $comment)
                 @if($comment['side'] === DiffSide::File->value)
@@ -462,7 +474,7 @@ class="group"
             <div class="px-4 py-6 flex items-start justify-center gap-6">
                 @if($hasBeforeImage)
                     <div class="flex flex-col items-center gap-2 {{ $hasAfterImage ? 'max-w-[50%]' : '' }}">
-                        <flux:badge color="red" size="sm">{{ $status === 'deleted' ? 'Deleted' : 'Before' }}</flux:badge>
+                        <span class="font-mono text-[11px] font-medium text-gh-red">{{ $status === 'deleted' ? 'Deleted' : 'Before' }}</span>
                         <div class="border border-gh-border rounded-lg p-1" style="background: repeating-conic-gradient(rgb(128 128 128 / 0.15) 0% 25%, transparent 0% 50%) 50% / 16px 16px;">
                             <img
                                 src="{{ $this->imageUrl($beforeRef, $beforePath) }}"
@@ -476,7 +488,7 @@ class="max-h-96 object-contain"
                 @endif
                 @if($hasAfterImage)
                     <div class="flex flex-col items-center gap-2 {{ $hasBeforeImage ? 'max-w-[50%]' : '' }}">
-                        <flux:badge color="green" size="sm">{{ $status === 'added' ? 'New' : 'After' }}</flux:badge>
+                        <span class="font-mono text-[11px] font-medium text-gh-green">{{ $status === 'added' ? 'New' : 'After' }}</span>
                         <div class="border border-gh-border rounded-lg p-1" style="background: repeating-conic-gradient(rgb(128 128 128 / 0.15) 0% 25%, transparent 0% 50%) 50% / 16px 16px;">
                             <img
                                 src="{{ $this->imageUrl($afterRef, $file['path']) }}"
@@ -492,12 +504,8 @@ class="max-h-96 object-contain"
         @elseif($diffData === null)
             {{-- One spinner for both the pre-request setTimeout window and the
                  in-flight request, so the visual doesn't swap mid-load. --}}
-            <div
-                x-intersect.once="setTimeout(() => { markDiffActionStart('loadFileDiff'); $wire.loadFileDiff(); }, {{ $loadDelay }})"
-                class="px-4 py-8 text-center"
-            >
-                <flux:icon icon="arrow-path" variant="outline" class="animate-spin inline-block text-gh-muted mr-1" />
-                <flux:text variant="subtle" size="sm" inline>Loading diff...</flux:text>
+            <div x-intersect.once="setTimeout(() => { markDiffActionStart('loadFileDiff'); $wire.loadFileDiff(); }, {{ $loadDelay }})">
+                <x-diff-skeleton />
             </div>
         @elseif($diffData['tooLarge'] ?? false)
             <div class="px-4 py-8 text-center">
@@ -506,7 +514,7 @@ class="px-4 py-8 text-center"
             </div>
         @elseif($diffData['error'] ?? false)
             <div class="px-4 py-8 text-center">
-                <flux:icon icon="exclamation-triangle" variant="outline" class="inline-block text-red-400 mr-1" />
+                <flux:icon icon="exclamation-triangle" variant="outline" class="inline-block text-gh-red mr-1" />
                 <flux:text variant="subtle" size="sm" inline>Git error: {{ $diffData['error'] }}</flux:text>
             </div>
         @elseif(empty($diffData['hunks']))
@@ -529,18 +537,9 @@ class="diff-grid font-mono text-xs leading-5"
                 :class="isDragging ? 'select-none' : ''"
             >
                 @if($hasGaps)
-                    <div class="diff-fullspan bg-gh-hunk-bg px-4 py-1 text-center">
-                        <button
-                            wire:click="expandContext"
-                            wire:loading.attr="disabled"
-                            wire:target="expandContext"
-                            @click="markDiffActionStart('expandContext')"
-                            class="text-gh-link text-xs hover:underline inline-flex items-center gap-1 disabled:opacity-50"
-                        >
-                            <flux:icon wire:loading wire:target="expandContext" icon="arrow-path" variant="outline" class="animate-spin" />
-                            Show full file
-                        </button>
-                    </div>
+                    <x-diff.expand-control>
+                        <x-diff.expand-button action="expandContext" aria-label="Show full file">full file</x-diff.expand-button>
+                    </x-diff.expand-control>
                 @endif
 
                 @foreach($hunks as $hunkIndex => $hunk)
@@ -554,9 +553,9 @@ class="text-gh-link text-xs hover:underline inline-flex items-center gap-1 disab
                 @endforeach
 
                 @if($hasTrailingGap)
-                    <div class="diff-fullspan bg-gh-hunk-bg py-1.5 text-center text-xs border-y border-dashed border-gh-border/20">
+                    <x-diff.expand-control wire:key="expand-gap-trailing-{{ count($hunks) }}-{{ $trailingHiddenCount }}">
                         <x-tiered-expand-gap :hunk-index="count($hunks)" :hidden-count="$trailingHiddenCount" />
-                    </div>
+                    </x-diff.expand-control>
                 @endif
             </div>
         @endif
diff --git "a/resources/views/pages/\342\232\241context-page.blade.php" "b/resources/views/pages/\342\232\241context-page.blade.php"
index 29575838..f4981b8e 100644
--- "a/resources/views/pages/\342\232\241context-page.blade.php"
+++ "b/resources/views/pages/\342\232\241context-page.blade.php"
@@ -469,7 +469,7 @@ private function dispatchSidebarSummary(): void
     class="min-h-screen flex flex-col"
 >
     <x-page-header>
-        <div class="flex items-center gap-3 min-w-0">
+        <div class="flex items-center gap-2 min-w-0">
             @native
                 <livewire:project-picker :current-slug="$projectSlug" :project-name="$projectName" mode="context" />
             @else
@@ -515,15 +515,14 @@ class="min-h-screen flex flex-col"
         </x-slot:sidebar>
 
         @if(empty($contextFiles))
-            <div class="flex flex-col items-center justify-center py-24 px-8 text-center gap-3">
-                <flux:icon icon="document-magnifying-glass" variant="outline" class="size-10 text-gh-muted" />
-                <div class="font-display font-bold tracking-brutal text-lg">No context files found</div>
-                <p class="text-sm text-gh-muted max-w-md">
+            <x-empty-state icon="document-magnifying-glass">
+                <x-slot:heading>No context files found</x-slot:heading>
+                <p class="text-sm text-gh-muted leading-relaxed">
                     rfa scans for <code class="font-mono">CLAUDE.md</code> and
                     <code class="font-mono">AGENTS.md</code> across this repo. Drop one in
                     the repo root or any subdirectory and re-scan.
                 </p>
-            </div>
+            </x-empty-state>
         @else
             @foreach($contextFiles as $file)
                 <div id="{{ $file['id'] }}" class="border-b border-gh-border">
diff --git "a/resources/views/pages/\342\232\241review-page.blade.php" "b/resources/views/pages/\342\232\241review-page.blade.php"
index 80b77030..29d2e0f3 100644
--- "a/resources/views/pages/\342\232\241review-page.blade.php"
+++ "b/resources/views/pages/\342\232\241review-page.blade.php"
@@ -60,6 +60,8 @@
     /** Undo-toast `type` for the "marked file as reviewed" action. */
     private const UNDO_TYPE_MARK_REVIEWED = 'mark-reviewed';
 
+    private const UNDO_TYPE_SWITCH_BRANCH = 'switch-branch';
+
     /** @var array<int, array<string, mixed>> */
     public array $files = [];
 
@@ -140,9 +142,13 @@
     /** @var array<string, mixed> */
     public array $divergenceContext = [];
 
-    /** HEAD sha at which the user last dismissed a divergence banner. */
+    /** HEAD sha at which the user last dismissed a divergence banner (detached only). */
     public ?string $dismissedAtHead = null;
 
+    /** Head branch the user last chose to keep reviewing past (diverged / missing-target).
+     *  Suppresses by branch identity, not sha, so committing on that branch doesn't re-nag. */
+    public ?string $dismissedAtBranch = null;
+
     /** Guards `skipRender()` on poll ticks so the initial mount still renders. */
     #[Locked]
     public bool $divergenceChecked = false;
@@ -682,6 +688,12 @@ private function resolveDivergenceState(CurrentHeadResult $head): void
         }
 
         if ($target !== '' && $head->targetExists === false) {
+            if ($this->dismissedAtBranch === $head->branch) {
+                $this->markAligned();
+
+                return;
+            }
+
             $this->divergenceState = DivergenceState::MissingTarget;
             $this->divergenceContext = [
                 'target' => $target,
@@ -699,7 +711,9 @@ private function resolveDivergenceState(CurrentHeadResult $head): void
             return;
         }
 
-        if ($this->dismissedAtHead === $head->sha) {
+        // Suppress by branch identity, not sha: once the user opts to keep reviewing
+        // their target, committing on the diverged branch shouldn't re-nag every commit.
+        if ($this->dismissedAtBranch === $head->branch) {
             $this->markAligned();
 
             return;
@@ -711,6 +725,7 @@ private function resolveDivergenceState(CurrentHeadResult $head): void
             'currentBranch' => $head->branch,
             'currentSha' => $head->sha,
             'shortSha' => substr($head->sha, 0, 7),
+            'commentCount' => $this->persistedCommentCount(),
         ];
     }
 
@@ -722,15 +737,38 @@ public function switchReviewToHead(): void
             return;
         }
 
+        // Capture before autoFollow clears state, so the switch stays undoable.
+        $wasDiverged = $this->divergenceState === DivergenceState::Diverged;
+        $fromBranch = $this->projectBranch;
+
         $this->autoFollowToHead($head->branch);
+
+        // Only offer undo when leaving a real, still-existing target (Diverged).
+        // MissingTarget's old branch is gone — undoing would re-point at nothing.
+        if ($wasDiverged && $fromBranch !== '' && $fromBranch !== $head->branch) {
+            $this->dispatch(
+                'undo-available',
+                type: self::UNDO_TYPE_SWITCH_BRANCH,
+                payload: ['fromBranch' => $fromBranch],
+                message: 'Switched review to '.$head->branch,
+            );
+        }
     }
 
     public function keepReviewing(): void
     {
-        $currentSha = $this->divergenceContext['currentSha'] ?? null;
+        $branch = $this->divergenceContext['currentBranch'] ?? null;
+
+        if (is_string($branch) && $branch !== '') {
+            // Diverged / missing-target: suppress by branch identity.
+            $this->dismissedAtBranch = $branch;
+        } else {
+            // Detached: no branch to key on, so fall back to the sha.
+            $sha = $this->divergenceContext['currentSha'] ?? null;
 
-        if (is_string($currentSha) && $currentSha !== '') {
-            $this->dismissedAtHead = $currentSha;
+            if (is_string($sha) && $sha !== '') {
+                $this->dismissedAtHead = $sha;
+            }
         }
 
         $this->markAligned();
@@ -741,6 +779,28 @@ public function dismissDetachedBanner(): void
         $this->keepReviewing();
     }
 
+    public function dismissMissingTarget(): void
+    {
+        $this->keepReviewing();
+    }
+
+    /** @param array{fromBranch?: string} $payload */
+    public function restoreReviewBranch(array $payload): void
+    {
+        $branch = $payload['fromBranch'] ?? null;
+
+        if (is_string($branch) && $branch !== '') {
+            $this->autoFollowToHead($branch);
+
+            // autoFollowToHead() aligns to the restored target, which is right for
+            // its "follow HEAD" callers — but here HEAD is still on the branch we
+            // switched away from, so the review is diverged again. Recompute now:
+            // the head poller won't re-fire (HEAD's identity hasn't changed) and
+            // would otherwise leave the divergence marker hidden indefinitely.
+            $this->refreshDivergenceState();
+        }
+    }
+
     private function autoFollowToHead(string $newBranch): void
     {
         // Race guard: overlapping polls during a slow rehydrate can re-enter here.
@@ -754,6 +814,7 @@ private function autoFollowToHead(string $newBranch): void
 
         $this->projectBranch = $newBranch;
         $this->dismissedAtHead = null;
+        $this->dismissedAtBranch = null;
         $this->markAligned();
 
         $this->rehydrateForTarget();
@@ -766,10 +827,21 @@ private function markAligned(): void
     }
 
     private function hasPersistedComments(): bool
+    {
+        return $this->persistedCommentQuery()->exists();
+    }
+
+    private function persistedCommentCount(): int
+    {
+        return $this->persistedCommentQuery()->count();
+    }
+
+    /** @return \Illuminate\Database\Eloquent\Builder<\App\Models\Comment> */
+    private function persistedCommentQuery(): \Illuminate\Database\Eloquent\Builder
     {
         $projectId = $this->projectId === 0 ? null : $this->projectId;
 
-        return \App\Models\Comment::forProjectOrRepo($projectId, $this->repoPath)->exists();
+        return \App\Models\Comment::forProjectOrRepo($projectId, $this->repoPath);
     }
 
     // endregion: Branch Divergence
@@ -1011,6 +1083,7 @@ public function undo(string $type, mixed $payload): void
             'delete', 'clear-all' => $this->restoreComments($payload),
             'discard' => $this->restoreDiscardedFile($payload),
             self::UNDO_TYPE_MARK_REVIEWED => $this->unmarkReviewed($payload['filePaths'] ?? []),
+            self::UNDO_TYPE_SWITCH_BRANCH => $this->restoreReviewBranch(is_array($payload) ? $payload : []),
             default => null,
         };
     }
@@ -1523,7 +1596,12 @@ private function loadTrashedFiles(): void
             <div
                 x-show="remoteMenu.open"
                 x-cloak
-                x-transition.opacity.duration.75ms
+                x-transition:enter="transition ease-out duration-150"
+                x-transition:enter-start="opacity-0 scale-95"
+                x-transition:enter-end="opacity-100 scale-100"
+                x-transition:leave="transition ease-in duration-100"
+                x-transition:leave-start="opacity-100 scale-100"
+                x-transition:leave-end="opacity-0 scale-95"
                 @click.outside="closeRemoteMenu()"
                 @keydown.escape.window="closeRemoteMenu()"
                 @click="closeRemoteMenu()"
@@ -1561,7 +1639,7 @@ class="w-full text-left px-3 py-1.5 text-xs font-mono text-gh-text hover:bg-gh-b
                 <livewire:update-banner />
             </x-slot:above>
         @endnative
-            <div class="flex items-center gap-2">
+            <div class="flex items-center gap-2 min-w-0">
                 <div
                     @if($hasRemote)
                         @contextmenu.prevent="$dispatch('open-remote-menu', {
@@ -1618,6 +1696,9 @@ class="inline-flex"
                         :selection-title="$selectionTitle"
                         :default-base-branch="$defaultBaseBranch"
                     />
+                    @if(! $this->isCommitMode())
+                        <x-divergence.marker :state="$divergenceState" :context="$divergenceContext" />
+                    @endif
                 @endif
                 <livewire:comments-drawer :repo-path="$repoPath" :project-id="$projectId ?: null" />
             </div>
@@ -1850,7 +1931,9 @@ class="flex-1"
         </x-slot:below>
     </x-page-header>
 
-    {{-- Branch divergence banner + polling island (working-tree mode only) --}}
+    {{-- Branch divergence: HEAD poller + (missing-target only) blocking bar.
+         Diverged / detached surface as a quiet marker on the branch control in
+         the header (see <x-divergence.marker> above) so the canvas stays calm. --}}
     @if(! $this->isCommitMode())
         <livewire:head-divergence-poller
             wire:key="head-divergence-poller-{{ $projectId }}-{{ $diffFrom }}-{{ $projectBranch }}"
@@ -1858,43 +1941,7 @@ class="flex-1"
             :target="$projectBranch"
         />
 
-        @if($divergenceState === DivergenceState::Diverged)
-            <div class="px-5 py-3 border-b border-gh-border" role="status" aria-live="polite" data-testid="divergence-banner-diverged">
-                <flux:callout icon="arrow-path" variant="warning" inline>
-                    <flux:callout.heading>Repo switched to <span class="font-mono">{{ $divergenceContext['currentBranch'] }}</span></flux:callout.heading>
-                    <flux:callout.text>Still reviewing <span class="font-mono">{{ $divergenceContext['target'] }}</span>.</flux:callout.text>
-                    <x-slot name="actions">
-                        <flux:button size="sm" variant="primary" wire:click="switchReviewToHead">
-                            Switch review to <span class="font-mono ml-1">{{ $divergenceContext['currentBranch'] }}</span>
-                        </flux:button>
-                        <flux:button size="sm" variant="ghost" wire:click="keepReviewing">
-                            Keep reviewing <span class="font-mono ml-1">{{ $divergenceContext['target'] }}</span>
-                        </flux:button>
-                    </x-slot>
-                </flux:callout>
-            </div>
-        @elseif($divergenceState === DivergenceState::Detached)
-            <div class="px-5 py-3 border-b border-gh-border" role="status" aria-live="polite" data-testid="divergence-banner-detached">
-                <flux:callout icon="information-circle" variant="secondary" inline>
-                    <flux:callout.heading>Repo detached at <span class="font-mono">{{ $divergenceContext['shortSha'] }}</span></flux:callout.heading>
-                    <flux:callout.text>Still reviewing <span class="font-mono">{{ $divergenceContext['target'] }}</span>.</flux:callout.text>
-                    <x-slot name="actions">
-                        <flux:button size="sm" variant="ghost" wire:click="dismissDetachedBanner">Dismiss</flux:button>
-                    </x-slot>
-                </flux:callout>
-            </div>
-        @elseif($divergenceState === DivergenceState::MissingTarget)
-            <div class="px-5 py-3 border-b border-gh-border" role="alert" aria-live="assertive" data-testid="divergence-banner-missing">
-                <flux:callout icon="exclamation-triangle" variant="danger" inline>
-                    <flux:callout.heading>Review target <span class="font-mono">{{ $divergenceContext['target'] }}</span> no longer exists</flux:callout.heading>
-                    <x-slot name="actions">
-                        <flux:button size="sm" variant="primary" wire:click="switchReviewToHead">
-                            Switch to <span class="font-mono ml-1">{{ $divergenceContext['currentBranch'] }}</span>
-                        </flux:button>
-                    </x-slot>
-                </flux:callout>
-            </div>
-        @endif
+        <x-divergence.missing-bar :state="$divergenceState" :context="$divergenceContext" />
     @endif
 
     @if($commitInfo)
@@ -1917,7 +1964,7 @@ class="flex-1"
                     </div>
                     @foreach($reviewPairs as $pair)
                         <div class="w-full text-left px-2.5 py-2 rounded text-xs hover:bg-gh-border/30 flex items-center gap-2.5 group transition-colors text-gh-text">
-                            <span class="text-[10px] font-mono font-medium text-purple-500 dark:text-purple-400 shrink-0">R</span>
+                            <span class="text-[10px] font-mono font-medium text-gh-link shrink-0">R</span>
                             <button @click="scrollToFile('{{ $pair['id'] }}')" class="truncate text-left font-mono" title="{{ $pair['basename'] }}">
                                 {{ $pair['displayName'] }}
                             </button>
@@ -1989,12 +2036,14 @@ class="shrink-0 size-3.5 flex items-center justify-center text-gh-green hover:te
                 </template>
                 @foreach($sourceFiles as $file)
                     @php
-                        [$badgeColor, $badgeLabel] = match($file['status']) {
-                            'added' => ['green', 'A'],
-                            'deleted' => ['red', 'D'],
-                            'renamed' => ['yellow', 'R'],
-                            'commented' => ['zinc', 'C'],
-                            default => ['yellow', 'M'],
+                        // Single source of truth: status → [color class, letter]. M and R get
+                        // distinct hues so modified vs renamed are glanceable in the column.
+                        [$badgeClass, $badgeLabel] = match($file['status']) {
+                            'added' => ['text-gh-green', 'A'],
+                            'deleted' => ['text-gh-red', 'D'],
+                            'renamed' => ['text-gh-link', 'R'],
+                            'commented' => ['text-gh-muted', 'C'],
+                            default => ['text-gh-attention', 'M'],
                         };
                         $remoteStatus = ($file['isUntracked'] ?? false) ? 'added' : ($file['status'] ?? 'modified');
                     @endphp
@@ -2012,14 +2061,14 @@ class="shrink-0 size-3.5 flex items-center justify-center text-gh-green hover:te
                                 clientY: $event.clientY,
                             })"
                         @endif
-                        class="w-full text-left px-2.5 py-2 rounded text-xs hover:bg-gh-border/30 flex items-center gap-2.5 group transition-[opacity,colors] duration-150 ease-out"
+                        class="w-full text-left px-2.5 py-2 rounded text-xs hover:bg-gh-border/30 flex items-center gap-2.5 group transition-[opacity,colors] duration-150 ease-out focus-within:outline focus-within:outline-1 focus-within:-outline-offset-1 focus-within:outline-gh-accent"
                         :class="[
-                            activeFile === '{{ $file['id'] }}' ? 'bg-gh-link/10 text-gh-link' : 'text-gh-muted',
+                            activeFile === '{{ $file['id'] }}' ? 'bg-gh-text/10 text-gh-text' : 'text-gh-muted',
                             fileMatchesFilter(@js($file['path']), '{{ $file['id'] }}') ? 'opacity-100' : 'opacity-0',
                         ]"
                     >
                         <button @click="scrollToFile('{{ $file['id'] }}')" class="flex items-center gap-2.5 min-w-0 flex-1">
-                            <span class="font-mono font-medium shrink-0 {{ match($badgeLabel) { 'A' => 'text-gh-green', 'D' => 'text-gh-red', 'C' => 'text-gh-muted', default => 'text-gh-attention' } }}">{{ $badgeLabel }}</span>
+                            <span class="font-mono font-medium shrink-0 {{ $badgeClass }}">{{ $badgeLabel }}</span>
                             @if($file['isSymlink'] ?? false)
                                 <flux:icon icon="link" variant="outline" class="!size-3 text-gh-muted shrink-0" aria-hidden="true" />
                             @endif
@@ -2036,6 +2085,7 @@ class="w-full text-left px-2.5 py-2 rounded text-xs hover:bg-gh-border/30 flex i
                                 :path="$file['path']"
                                 class="text-xs"
                                 :title="$fileTitle"
+                                :collapse="true"
                             />
                         </button>
                         <flux:tooltip>
@@ -2080,6 +2130,11 @@ class="opacity-0 group-hover:opacity-100 transition-opacity text-gh-muted hover:
                         </span>
                     </div>
                 @endforeach
+                {{-- No-match feedback so an active filter never leaves a blank void. --}}
+                <div x-show="fileFilter.trim() !== '' && visibleFileCount === 0" x-cloak
+                     class="px-2.5 py-6 text-center text-xs text-gh-muted font-mono">
+                    No files match “<span class="text-gh-text" x-text="fileFilter"></span>”
+                </div>
                 @if(! empty($trashedFiles))
                     <div class="border-t border-gh-border mt-3 pt-3">
                         <span class="section-label text-gh-muted mb-3 block">Trash</span>
@@ -2108,7 +2163,7 @@ class="opacity-0 group-hover:opacity-100 transition-opacity text-gh-muted hover:
                                 <span class="text-[10px] text-gh-muted tabular-nums" x-text="remaining"></span>
                                 <button @click="$wire.restoreDiscardedFile({{ $trashed['id'] }})" title="Restore"
                                     aria-label="Restore discarded file"
-                                    class="opacity-0 group-hover:opacity-100 transition-opacity text-gh-green hover:text-green-400 shrink-0">
+                                    class="opacity-0 group-hover:opacity-100 transition-opacity text-gh-green hover:text-gh-text shrink-0">
                                     <flux:icon icon="arrow-uturn-left" variant="outline" class="!size-3.5" />
                                 </button>
                                 <x-arm-commit-button
@@ -2125,26 +2180,36 @@ class="opacity-0 group-hover:opacity-100 transition-opacity shrink-0"
         </x-slot:sidebar>
 
             @if($gitError)
-                <div class="flex items-center justify-center h-[60vh]" role="alert" aria-live="assertive">
-                    <div class="text-center max-w-lg">
-                        <p class="rfa-logo text-3xl text-red-400/30 mb-4" aria-hidden="true">!</p>
-                        <h2 class="font-semibold tracking-brutal text-lg mb-2">Git error</h2>
-                        <p class="font-mono text-xs text-gh-muted leading-relaxed">{{ $gitError }}</p>
-                    </div>
-                </div>
+                <x-empty-state glyph="!" glyph-class="text-gh-red/30" role="alert" aria-live="assertive">
+                    <x-slot:heading>Git error</x-slot:heading>
+                    <p class="font-mono text-xs text-gh-muted leading-relaxed">{{ $gitError }}</p>
+                </x-empty-state>
             @elseif(empty($files))
-                <div class="flex items-center justify-center h-[60vh]">
-                    <div class="text-center">
-                        <p class="rfa-logo text-5xl text-gh-muted/20 mb-6" aria-hidden="true">rfa</p>
-                        @if($this->isCommitMode())
-                            <h2 class="font-semibold tracking-brutal text-lg mb-2">No file changes in this commit</h2>
-                            <p class="text-sm text-gh-muted">This commit has no diff (empty or merge commit)</p>
-                        @else
-                            <h2 class="font-semibold tracking-brutal text-lg mb-2">Working tree is clean</h2>
-                            <p class="text-sm text-gh-muted">Edit files to see them here</p>
-                        @endif
-                    </div>
-                </div>
+                @if($this->isCommitMode())
+                    <x-empty-state>
+                        <x-slot:heading>No file changes in this commit</x-slot:heading>
+                        <p class="text-sm text-gh-muted">This commit has no diff (empty or merge commit)</p>
+                    </x-empty-state>
+                @elseif($divergenceState === DivergenceState::Diverged)
+                    {{-- Empty *because* the checkout drifted: tell the one true story instead
+                         of a generic "clean" message disconnected from the divergence marker. --}}
+                    <x-empty-state>
+                        <x-slot:heading>Nothing to review on <span class="font-mono">{{ $divergenceContext['target'] ?? $projectBranch }}</span></x-slot:heading>
+                        <p class="text-sm text-gh-muted leading-relaxed">
+                            Your repo is on <span class="font-mono text-gh-text">{{ $divergenceContext['currentBranch'] ?? '' }}</span> right now.
+                            Switch your review to it, or edit files on <span class="font-mono text-gh-text">{{ $divergenceContext['target'] ?? $projectBranch }}</span> to see changes here.
+                        </p>
+                        <x-slot:actions>
+                            <button type="button" wire:click="switchReviewToHead" class="text-xs font-medium font-display rounded-md px-3.5 py-2 bg-gh-accent text-gh-bg hover:opacity-90 transition-opacity">Switch review here</button>
+                            <button type="button" wire:click="keepReviewing" class="text-xs font-medium text-gh-muted hover:text-gh-text px-3 py-2 transition-colors">Keep reviewing</button>
+                        </x-slot:actions>
+                    </x-empty-state>
+                @else
+                    <x-empty-state>
+                        <x-slot:heading>Working tree is clean</x-slot:heading>
+                        <p class="text-sm text-gh-muted">Edit files to see them here</p>
+                    </x-empty-state>
+                @endif
             @else
                 {{-- Review Pairs (working directory mode only) --}}
                 @if(! $this->isCommitMode())
@@ -2158,7 +2223,7 @@ class="text-gh-muted hover:text-gh-text transition-colors">
                                     <flux:icon icon="chevron-down" variant="outline" x-show="!collapsed" />
                                     <flux:icon icon="chevron-right" variant="outline" x-show="collapsed" x-cloak />
                                 </button>
-                                <span class="text-[10px] font-mono font-medium text-purple-500 dark:text-purple-400 shrink-0">R</span>
+                                <span class="text-[10px] font-mono font-medium text-gh-link shrink-0">R</span>
                                 <span class="font-mono text-sm truncate" title="{{ $pair['displayName'] }}">{{ $pair['displayName'] }}</span>
                                 <span class="text-[10px] font-mono text-gh-muted">.md</span>
                                 <span class="ml-auto">
diff --git "a/resources/views/pages/\342\232\241select-repo-page.blade.php" "b/resources/views/pages/\342\232\241select-repo-page.blade.php"
index e284cf0c..7c41acbd 100644
--- "a/resources/views/pages/\342\232\241select-repo-page.blade.php"
+++ "b/resources/views/pages/\342\232\241select-repo-page.blade.php"
@@ -132,7 +132,7 @@ class="sticky top-0 z-50"
     <main class="flex-1 flex items-center justify-center px-6 py-10">
         @if($totalProjects === 0)
             <div class="text-center">
-                <h1 class="rfa-logo text-7xl text-gh-fg mb-3 tracking-brutal-tight">rfa</h1>
+                <h1 class="rfa-logo text-7xl text-gh-text mb-3 tracking-brutal-tight">rfa</h1>
                 <p class="font-mono text-sm text-gh-muted mb-10">Be in the loop.</p>
                 @native
                     <livewire:add-project-menu variant="expanded" />
diff --git a/tests/Arch/BladeConventionsTest.php b/tests/Arch/BladeConventionsTest.php
index d31dc391..4e85579e 100644
--- a/tests/Arch/BladeConventionsTest.php
+++ b/tests/Arch/BladeConventionsTest.php
@@ -237,3 +237,39 @@ function inlineAlpineObjects(string $content): array
         ->toContain('$this->imageUrl(')
         ->not->toContain('src="/api/image/');
 });
+
+test('blade templates use gh-* tokens, not stock Tailwind palette colors', function () {
+    // The app is monochrome-brutalist: color comes from the gh-* token system
+    // (config/theme.php), never stock Tailwind palette utilities. See resources/CLAUDE.md.
+    $pattern = '/\b(?:text|bg|border|ring|fill|stroke|divide|from|to|via|outline|decoration|shadow|accent|caret)-(?:red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose|slate|gray|zinc|neutral|stone)-(?:50|[1-9]00|950)\b/';
+
+    $violations = [];
+    foreach (bladeFiles() as $file) {
+        $content = file_get_contents($file);
+        if (preg_match_all($pattern, $content, $matches)) {
+            foreach ($matches[0] as $hit) {
+                $violations[] = bladeRelativePath($file).': '.$hit;
+            }
+        }
+    }
+
+    expect($violations)->toBeEmpty();
+});
+
+test('flux components do not use stock palette color props', function () {
+    // Flux color="red|green|…" bypasses the gh-* tokens. Use gh-* utilities, or the
+    // accent token (aliased to gh-accent in app.css) for primary emphasis.
+    $pattern = '/\bcolor="(?:red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose|slate|gray|zinc|neutral|stone)"/';
+
+    $violations = [];
+    foreach (bladeFiles() as $file) {
+        $content = file_get_contents($file);
+        if (preg_match_all($pattern, $content, $matches)) {
+            foreach ($matches[0] as $hit) {
+                $violations[] = bladeRelativePath($file).': '.$hit;
+            }
+        }
+    }
+
+    expect($violations)->toBeEmpty();
+});
diff --git a/tests/Browser/Csrf419RecoveryTest.php b/tests/Browser/Csrf419RecoveryTest.php
index f493f021..4ab2bd87 100644
--- a/tests/Browser/Csrf419RecoveryTest.php
+++ b/tests/Browser/Csrf419RecoveryTest.php
@@ -101,7 +101,18 @@ function readSessionValue($page, string $key, float $timeoutSec = 3.0): ?string
         }
     JS);
 
-    $page->page()->evaluate('() => { Livewire.first().$refresh(); }');
+    // Triggering $refresh fires the faked 419, and session-recovery.js can begin
+    // the silent reload before this evaluate's round-trip resolves — destroying
+    // the execution context mid-call. That navigation is exactly what we assert
+    // ran below, so tolerate the race here the same way the sessionStorage reads
+    // do. Under heavy parallel load the evaluate is slow enough to overlap the
+    // reload; in isolation it resolves first, so this only bites under contention.
+    try {
+        $page->page()->evaluate('() => { Livewire.first().$refresh(); }');
+    } catch (Throwable) {
+        // Reload navigation started mid-evaluate; the beforeunload signal below
+        // is the real proof it ran.
+    }
 
     expect(waitForSessionValue($page, '__csrf419ReloadRan', '1'))->toBe('1');
 
diff --git a/tests/Browser/DraftCommentTest.php b/tests/Browser/DraftCommentTest.php
index bb1e6440..dde510c6 100644
--- a/tests/Browser/DraftCommentTest.php
+++ b/tests/Browser/DraftCommentTest.php
@@ -183,13 +183,21 @@
     $page->page()->getByPlaceholder('Write a comment', false)->press('Escape');
     $page->page()->getByPlaceholder('Write a comment', false)->press('Escape');
 
-    // Wait for the draft to land in both server-rendered HTML *and* the
-    // client-side $wire proxy. The badge shows after the server morph; the
-    // mousedown handler reads $wire.fileComments synchronously to find the
-    // existing draft, so we also need the wire-property sync to have
-    // happened. networkidle covers the Livewire round-trip end-to-end.
+    // The re-open mousedown handler reads $wire.fileComments synchronously to
+    // find the existing draft. The rendered badge can briefly lead that client
+    // snapshot, so poll the Livewire component state directly until the draft is
+    // present before re-clicking — networkidle was an unreliable proxy for this
+    // and produced flakes (the click would open a blank form that the
+    // inputValue poll below can never recover).
     $page->page()->getByTestId('draft-comment')->waitFor();
-    $page->waitForEvent('networkidle');
+    $deadline = microtime(true) + 5.0;
+    do {
+        $synced = $page->script('(() => { try { return [...document.querySelectorAll("[wire\:id]")].some(el => { const c = window.Livewire && window.Livewire.find(el.getAttribute("wire:id")); return c && typeof c.get === "function" && (c.get("fileComments") || []).some(x => x.isDraft); }); } catch (e) { return false; } })()');
+        if ($synced) {
+            break;
+        }
+        usleep(50_000);
+    } while (microtime(true) < $deadline);
 
     // Click same line again
     $lineNum->click();
@@ -257,10 +265,10 @@
     $page->assertButtonDisabled('Submit review');
 });
 
-test('submit with drafts shows confirm dialog', function () {
+test('submit with drafts arms an inline confirm', function () {
     $page = $this->visitAndLoad($this->projectUrl());
 
-    // Create finalized comment
+    // Create finalized comment (this is what enables the submit button)
     $page->page()->getByTestId('diff-line-number')->first()->click();
     $page->page()->getByPlaceholder('Write a comment', false)->fill('Keep me');
     $page->press('Save');
@@ -274,13 +282,11 @@
     // Wait for draft to be saved to Livewire state before submitting
     $page->assertSee('1 draft');
 
-    // Override confirm to capture message and auto-accept
-    $page->script('window.__confirmMsg = null; window.confirm = function(msg) { window.__confirmMsg = msg; return true; }');
-
-    $page->pressAndWaitFor('Submit review', 3);
-
-    $dialogMessage = $page->script('window.__confirmMsg');
-    expect($dialogMessage)->toBeString()->toContain('draft');
+    // Drafts use an inline arm-to-confirm (no native confirm dialog): the first
+    // click warns that the draft will be excluded and waits for a second click.
+    $page->press('Submit review');
+    $page->assertSee('Submit without 1 draft?');
+    $page->assertDontSee('Review submitted');
 });
 
 // -- Persistence --
@@ -317,10 +323,13 @@
     $page->page()->getByPlaceholder('Write a comment', false)->press('Escape');
     $page->page()->getByPlaceholder('Write a comment', false)->press('Escape');
 
-    // Auto-accept confirm dialog for drafts
-    $page->script('window.confirm = function() { return true; }');
+    // Wait for the draft to sync into Livewire state so the first submit click
+    // arms (draftCount > 0) rather than submitting immediately.
+    $page->assertSee('1 draft');
 
-    $page->pressAndWaitFor('Submit review', 3);
+    // Drafts use an inline arm-to-confirm: first click arms, second submits.
+    $page->press('Submit review');
+    $page->pressAndWaitFor('Submit without 1 draft?', 3);
     $page->assertSee('Review submitted');
 
     $rfaDir = $this->testRepoPath.'/.rfa';
@@ -333,10 +342,10 @@
 
 // -- Confirm dialog cancel path --
 
-test('canceling confirm dialog does not submit review', function () {
-    $page = $this->visit($this->projectUrl());
+test('canceling the armed draft submit does not submit review', function () {
+    $page = $this->visitAndLoad($this->projectUrl());
 
-    // Create finalized comment
+    // Create finalized comment (enables submit)
     $page->page()->getByTestId('diff-line-number')->first()->click();
     $page->page()->getByPlaceholder('Write a comment', false)->fill('Stay here');
     $page->press('Save');
@@ -347,11 +356,16 @@
     $page->page()->getByPlaceholder('Write a comment', false)->press('Escape');
     $page->page()->getByPlaceholder('Write a comment', false)->press('Escape');
 
-    // Override confirm to return false (cancel)
-    $page->script('window.confirm = function() { return false; }');
+    $page->assertSee('1 draft');
 
-    $page->page()->getByRole('button', ['name' => 'Submit review'])->click();
+    // Arm the inline confirm, then cancel by clicking outside the submit button
+    // (@click.outside resets `armed`). The review must not submit and the button
+    // reverts to its normal label.
+    $page->press('Submit review');
+    $page->assertSee('Submit without 1 draft?');
+    $page->page()->getByPlaceholder('Overall review comment', false)->click();
 
+    $page->assertSee('Submit review');
     $page->assertDontSee('Review submitted');
     $page->assertSee('Stay here');
 });
diff --git a/tests/Browser/ExpandContextTest.php b/tests/Browser/ExpandContextTest.php
index bdd2aa83..5bb72d6c 100644
--- a/tests/Browser/ExpandContextTest.php
+++ b/tests/Browser/ExpandContextTest.php
@@ -26,12 +26,34 @@
     // Wait for diff to load
     $page->assertSee('changed1');
 
-    $page->page()->locator('button')->filter(['hasText' => 'Show full file'])->first()->click();
+    $page->page()->getByRole('button', ['name' => 'Show full file'])->click();
 
     // After expansion, previously hidden content is visible
     $page->assertSee('line15');
 
     // No more expand buttons
     expect($page->page()->locator('button')->filter(['hasText' => 'hidden lines'])->count())->toBe(0);
-    expect($page->page()->locator('button')->filter(['hasText' => 'Show full file'])->count())->toBe(0);
+    expect($page->page()->getByRole('button', ['name' => 'Show full file'])->count())->toBe(0);
+});
+
+test('keyboard-expanding a gap returns focus to the remaining expander', function () {
+    $page = $this->visit($this->projectUrl());
+
+    // Multi-hunk fixture: a single 22-line gap between the hunks, keyed at hunk
+    // index 1. With >15 hidden it renders the "15" tier chip + an "all" button.
+    $page->assertSee('changed1');
+    $page->page()->locator('[data-expand-gap="1"]')->first()->waitFor();
+
+    // Keyboard-activate the first gap expander (Enter → click with detail 0).
+    $page->page()->locator('[data-expand-gap="1"]')->first()->press('Enter');
+
+    // Partial expand from the top of the gap: 22 − 15 = 7 lines remain, so a
+    // smaller expander stays put at the same gap.
+    $page->assertSee('7 hidden lines');
+
+    // The chip we activated was destroyed by the re-render, so focus landing
+    // back on a gap-1 expander (instead of falling to <body>) proves restoration.
+    // Wait on the :focus selector so it auto-retries — the Livewire morph plus
+    // the post-render refocus tick can lag a slow, parallel CI runner.
+    $page->page()->locator('[data-expand-gap="1"]:focus')->waitFor();
 });
diff --git a/tests/Browser/FileInteractionTest.php b/tests/Browser/FileInteractionTest.php
index 66206096..a72278b7 100644
--- a/tests/Browser/FileInteractionTest.php
+++ b/tests/Browser/FileInteractionTest.php
@@ -201,8 +201,12 @@
     // Click the last sidebar button (utils.php)
     $page->page()->getByRole('button', ['name' => 'utils.php'])->click();
 
-    $activeCount = $page->page()->locator('aside .text-gh-link')->count();
-    expect($activeCount)->toBeGreaterThan(0);
+    // The clicked file gets the active-row highlight (bg-gh-text/10). waitFor
+    // first — the active class lands after the click's Alpine tick, so a bare
+    // synchronous count() races it.
+    $active = $page->page()->locator('aside [class*="bg-gh-text/10"]');
+    $active->first()->waitFor();
+    expect($active->count())->toBeGreaterThan(0);
 });
 
 test('file comment button opens form and save displays comment', function () {
diff --git a/tests/Browser/Helpers/CreatesTestRepo.php b/tests/Browser/Helpers/CreatesTestRepo.php
index 9f843d68..abf9dac9 100644
--- a/tests/Browser/Helpers/CreatesTestRepo.php
+++ b/tests/Browser/Helpers/CreatesTestRepo.php
@@ -138,6 +138,26 @@ protected function setUpAsymmetricMultiHunkTestRepo(): void
         $this->registerTestProject($this->testRepoPath);
     }
 
+    protected function setUpShiftedContextTestRepo(): void
+    {
+        $this->testRepoPath = $this->makeTempRepoPath();
+
+        $lines = array_map(fn (int $line): string => "line{$line}", range(1, 8));
+        File::put($this->testRepoPath.'/shifted.txt', implode("\n", $lines)."\n");
+
+        $this->initTestRepo($this->testRepoPath);
+        $this->commitTestRepo($this->testRepoPath, 'Initial commit');
+
+        $this->assertHeadExists();
+
+        // Delete old line 4 so the later context row has old line 5 and new
+        // line 4. This catches line-only anchoring in split diff comments.
+        array_splice($lines, 3, 1);
+        File::put($this->testRepoPath.'/shifted.txt', implode("\n", $lines)."\n");
+
+        $this->registerTestProject($this->testRepoPath);
+    }
+
     protected function setUpCommitHistoryRepo(): void
     {
         $this->testRepoPath = $this->makeTempRepoPath();
diff --git a/tests/Browser/SelectionBranchSwitchTest.php b/tests/Browser/SelectionBranchSwitchTest.php
index 5c774525..19982615 100644
--- a/tests/Browser/SelectionBranchSwitchTest.php
+++ b/tests/Browser/SelectionBranchSwitchTest.php
@@ -20,6 +20,8 @@
     // clears selection.
     $page->page()->locator('[x-ref="branchList"]')->getByText('feature-x')->click();
 
-    $page->page()->getByText('selected')->waitFor(['state' => 'hidden']);
-    $page->assertDontSee('selected');
+    // Wait on the Clear-selection affordance itself: getByText('selected') is a
+    // substring match that also catches toasts, tripping Playwright strict mode.
+    $page->page()->getByLabel('Clear selection')->waitFor(['state' => 'hidden']);
+    $page->assertDontSee('1 selected');
 });
diff --git a/tests/Browser/SelectionMultiSelectTest.php b/tests/Browser/SelectionMultiSelectTest.php
index c2d43f5b..d3739036 100644
--- a/tests/Browser/SelectionMultiSelectTest.php
+++ b/tests/Browser/SelectionMultiSelectTest.php
@@ -114,5 +114,8 @@ function commitRow(mixed $page, string $message): mixed
 
     $page->page()->getByTitle('Clear selection')->click();
 
-    $page->page()->getByText('selected')->waitFor(['state' => 'hidden']);
+    // Wait on the Clear-selection affordance itself: getByText('selected') is a
+    // substring match that also catches toasts, tripping Playwright strict mode.
+    $page->page()->getByLabel('Clear selection')->waitFor(['state' => 'hidden']);
+    $page->assertDontSee('1 selected');
 });
diff --git a/tests/Browser/SplitDiffViewTest.php b/tests/Browser/SplitDiffViewTest.php
index c49a8af6..34479236 100644
--- a/tests/Browser/SplitDiffViewTest.php
+++ b/tests/Browser/SplitDiffViewTest.php
@@ -87,6 +87,61 @@
     $page->assertSee('split-view comment');
 });
 
+test('clicking the new side of a shifted context line anchors the form to that row', function () {
+    $this->setUpShiftedContextTestRepo();
+
+    $page = $this->visitAndLoad($this->projectUrl());
+    $page->page()->getByLabel('Switch to split view')->click();
+
+    $shiftedFile = $page->page()->locator('.group:has([data-testid="file-header"]:has-text("shifted.txt"))');
+    $shiftedContextRow = $shiftedFile->locator('.diff-line[data-type="context"][data-line-old="5"][data-line-new="4"]');
+    $shiftedContextRow->waitFor();
+
+    $shiftedContextRow->locator('.diff-cell-num-new')->click();
+
+    expect($shiftedFile->getByPlaceholder('Write a comment', false)->count())->toBe(1);
+    // Selection (and therefore the form) is anchored to the clicked row itself.
+    $shiftedFile->locator('.diff-line.line-selected[data-line-old="5"][data-line-new="4"]')->waitFor();
+    expect($shiftedFile->locator('.diff-line.line-selected')->count())->toBe(1);
+});
+
+test('clicking the old side of a shifted context line anchors the form to that row, not its neighbour', function () {
+    // Old line 5 is new line 4 after the deletion. The pre-fix code anchored by
+    // new-number only, so clicking the old-side gutter landed the form on the
+    // *next* row (old 6 / new 5) instead of the row that was clicked.
+    $this->setUpShiftedContextTestRepo();
+
+    $page = $this->visitAndLoad($this->projectUrl());
+    $page->page()->getByLabel('Switch to split view')->click();
+
+    $shiftedFile = $page->page()->locator('.group:has([data-testid="file-header"]:has-text("shifted.txt"))');
+    $shiftedContextRow = $shiftedFile->locator('.diff-line[data-type="context"][data-line-old="5"][data-line-new="4"]');
+    $shiftedContextRow->waitFor();
+
+    $shiftedContextRow->locator('.diff-cell-num-old')->click();
+
+    expect($shiftedFile->getByPlaceholder('Write a comment', false)->count())->toBe(1);
+    $shiftedFile->locator('.diff-line.line-selected[data-line-old="5"][data-line-new="4"]')->waitFor();
+    expect($shiftedFile->locator('.diff-line.line-selected')->count())->toBe(1);
+});
+
+test('clicking a removed line whose old number collides with a shifted new number opens exactly one form', function () {
+    // Old line 4 was deleted; the shifted context row carries new line 4. The
+    // pre-fix code matched both rows by bare line number and opened two forms.
+    $this->setUpShiftedContextTestRepo();
+
+    $page = $this->visitAndLoad($this->projectUrl());
+    $page->page()->getByLabel('Switch to split view')->click();
+
+    $shiftedFile = $page->page()->locator('.group:has([data-testid="file-header"]:has-text("shifted.txt"))');
+    $removedRow = $shiftedFile->locator('.diff-line[data-type="remove"][data-line-old="4"]');
+    $removedRow->waitFor();
+
+    $removedRow->locator('.diff-cell-num-old')->click();
+
+    expect($shiftedFile->getByPlaceholder('Write a comment', false)->count())->toBe(1);
+});
+
 test('split view pairs a remove with its add on the same row', function () {
     // Regression: gutter cells used to consume the empty side of a row in
     // split mode, blocking grid-auto-flow:dense from packing rem+add together.
diff --git a/tests/Feature/View/FilePathComponentTest.php b/tests/Feature/View/FilePathComponentTest.php
index 5b6f5db0..008c27a0 100644
--- a/tests/Feature/View/FilePathComponentTest.php
+++ b/tests/Feature/View/FilePathComponentTest.php
@@ -15,6 +15,33 @@
         ->toContain('text-gh-text');
 });
 
+test('collapse mode middle-ellipsizes a deep directory but keeps the full path in title', function () {
+    $html = Blade::render('<x-file-path path="app/Domains/BulkOperations/Jobs/ImportUsersJob.php" :collapse="true" />');
+
+    expect($html)
+        ->toContain('app/…/Jobs/')                 // directory collapsed to a breadcrumb
+        ->toContain('ImportUsersJob.php')           // basename survives intact
+        ->not->toContain('app/Domains/BulkOperations/Jobs/</span>') // full chain not shown inline
+        ->toContain('title="app/Domains/BulkOperations/Jobs/ImportUsersJob.php"'); // recoverable on hover
+});
+
+test('collapse mode leaves shallow paths untouched', function () {
+    $html = Blade::render('<x-file-path path="app/Foo.php" :collapse="true" />');
+
+    expect($html)->toContain('app/')->toContain('Foo.php')->not->toContain('…');
+});
+
+test('collapse mode preserves the leading slash on absolute paths', function () {
+    $html = Blade::render('<x-file-path path="/Users/me/project/src/Foo.php" :collapse="true" />');
+
+    // The root segment survives — without the leading-slash guard this would
+    // collapse to a degenerate '/…/src/' that drops the meaningful top dir.
+    expect($html)
+        ->toContain('/Users/…/src/')
+        ->toContain('Foo.php')
+        ->toContain('title="/Users/me/project/src/Foo.php"');
+});
+
 test('renders the full path in the title attribute by default', function () {
     $html = Blade::render('<x-file-path path="src/Foo.php" />');
 
diff --git a/tests/Js/diff-file.test.js b/tests/Js/diff-file.test.js
index 9b3bae0a..d407bdc3 100644
--- a/tests/Js/diff-file.test.js
+++ b/tests/Js/diff-file.test.js
@@ -1,7 +1,16 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import diffFile from '../../public/js/diff-file.js';
 
-const { getScrollSpeed, extractLineSnippet, createDiffFile, install } = diffFile;
+const {
+    getScrollSpeed,
+    extractLineSnippet,
+    expanderToRefocus,
+    createLinePoint,
+    areLinePointsEqual,
+    rowContainsLinePoint,
+    createDiffFile,
+    install,
+} = diffFile;
 
 describe('getScrollSpeed', () => {
     // Coherent fixture: viewport 800px tall, sticky header consumes 50px,
@@ -167,6 +176,79 @@ describe('extractLineSnippet', () => {
     });
 });
 
+describe('line comment anchors', () => {
+    it('creates only left and right line points', () => {
+        expect(createLinePoint(12, 'left')).toEqual({ line: 12, side: 'left' });
+        expect(createLinePoint(12, 'right')).toEqual({ line: 12, side: 'right' });
+        expect(createLinePoint(null, 'right')).toBeNull();
+        expect(createLinePoint(12, 'file')).toBeNull();
+    });
+
+    it('compares line points by side and line number', () => {
+        expect(areLinePointsEqual(
+            { line: 12, side: 'right' },
+            { line: 12, side: 'right' },
+        )).toBe(true);
+
+        expect(areLinePointsEqual(
+            { line: 12, side: 'right' },
+            { line: 12, side: 'left' },
+        )).toBe(false);
+    });
+
+    it('matches context rows with side-specific old and new coordinates', () => {
+        const contextOld191New192 = { rowSide: 'context', oldLine: 191, newLine: 192 };
+
+        expect(rowContainsLinePoint(
+            contextOld191New192.rowSide,
+            contextOld191New192.oldLine,
+            contextOld191New192.newLine,
+            { side: 'right', line: 192 },
+        )).toBe(true);
+
+        expect(rowContainsLinePoint(
+            contextOld191New192.rowSide,
+            contextOld191New192.oldLine,
+            contextOld191New192.newLine,
+            { side: 'left', line: 192 },
+        )).toBe(false);
+
+        expect(rowContainsLinePoint(
+            contextOld191New192.rowSide,
+            contextOld191New192.oldLine,
+            contextOld191New192.newLine,
+            { side: 'left', line: 191 },
+        )).toBe(true);
+
+        expect(rowContainsLinePoint(
+            'left',
+            192,
+            null,
+            { side: 'right', line: 192 },
+        )).toBe(false);
+    });
+
+    it('renders the form only on the row containing the selected side coordinate', () => {
+        globalThis.Alpine = { store: () => ({ collapseAll: false }) };
+
+        const component = createDiffFile({
+            fileId: 'file-1',
+            filePath: 'app/Service.php',
+            isReviewed: false,
+        });
+
+        component.setLineSelection({ side: 'right', line: 192 });
+        component.showForm = true;
+
+        expect(component.shouldShowLineCommentForm('context', 191, 192)).toBe(true);
+        expect(component.shouldShowLineCommentForm('left', 192, null)).toBe(false);
+        expect(component.isRowInSelection('context', 191, 192)).toBe(true);
+        expect(component.isRowInSelection('left', 192, null)).toBe(false);
+
+        delete globalThis.Alpine;
+    });
+});
+
 describe('install', () => {
     afterEach(() => {
         delete window.Alpine;
@@ -261,3 +343,127 @@ describe('diff file lifecycle', () => {
         expect(component.escHint).toBe(false);
     });
 });
+
+describe('expand focus restoration', () => {
+    let root;
+
+    beforeEach(() => {
+        globalThis.Alpine = { store: () => ({ collapseAll: false }) };
+        root = document.createElement('div');
+        document.body.appendChild(root);
+    });
+
+    afterEach(() => {
+        root.remove();
+        delete globalThis.Alpine;
+        delete window.__rfaPendingExpandFiles;
+    });
+
+    function makeComponent() {
+        const component = createDiffFile({
+            fileId: 'file-1',
+            filePath: 'resources/views/pages/review-page.blade.php',
+            isReviewed: false,
+        });
+        component.$root = root;
+        component.$nextTick = (fn) => fn();
+        return component;
+    }
+
+    describe('expanderToRefocus', () => {
+        it('returns the first expander still sitting at the gap', () => {
+            root.innerHTML = '<button data-expand-gap="1">15</button><button data-expand-gap="1">7 hidden lines</button>';
+            expect(expanderToRefocus(root, 1)).toBe(root.querySelector('button'));
+        });
+
+        it('returns null when the gap fully closed (no expander left there)', () => {
+            root.innerHTML = '<button data-expand-gap="2">x</button>';
+            expect(expanderToRefocus(root, 1)).toBeNull();
+        });
+
+        it.each([[null], [undefined], ['']])('returns null for a missing gap key (%s)', (key) => {
+            root.innerHTML = '<button data-expand-gap="1">x</button>';
+            expect(expanderToRefocus(root, key)).toBeNull();
+        });
+
+        it('treats gap index 0 as a real key', () => {
+            root.innerHTML = '<button data-expand-gap="0">x</button>';
+            expect(expanderToRefocus(root, 0)).toBe(root.querySelector('button'));
+        });
+
+        it('returns null without a root', () => {
+            expect(expanderToRefocus(null, 1)).toBeNull();
+        });
+    });
+
+    describe('armExpandRefocus', () => {
+        it('arms on keyboard activation (click detail 0) with a gap key', () => {
+            const component = makeComponent();
+            component.armExpandRefocus({ detail: 0 }, 1);
+            expect(component._refocusExpandKey).toBe(1);
+        });
+
+        it('does not arm on mouse activation (click detail >= 1)', () => {
+            const component = makeComponent();
+            component.armExpandRefocus({ detail: 1 }, 1);
+            expect(component._refocusExpandKey).toBeNull();
+        });
+
+        it('does not arm without a gap key (master full-file expander)', () => {
+            const component = makeComponent();
+            component.armExpandRefocus({ detail: 0 }, null);
+            expect(component._refocusExpandKey).toBeNull();
+        });
+    });
+
+    describe('restore on completion', () => {
+        it('returns focus to the remaining expander after a keyboard gap expand', () => {
+            const component = makeComponent();
+            component.init();
+            component.armExpandRefocus({ detail: 0 }, 1);
+
+            // Simulate the post-expand morph leaving a smaller gap at hunk index 1.
+            root.innerHTML = '<button data-expand-gap="1">7 hidden lines</button>';
+            window.dispatchEvent(new window.CustomEvent('rfa:diff-action-completed', {
+                detail: { fileId: 'file-1', action: 'expandGap' },
+            }));
+
+            expect(document.activeElement).toBe(root.querySelector('[data-expand-gap="1"]'));
+            expect(component._refocusExpandKey).toBeNull();
+
+            component.destroy();
+        });
+
+        it('ignores completion events for other files', () => {
+            const component = makeComponent();
+            component.init();
+            component.armExpandRefocus({ detail: 0 }, 1);
+
+            root.innerHTML = '<button data-expand-gap="1">7 hidden lines</button>';
+            window.dispatchEvent(new window.CustomEvent('rfa:diff-action-completed', {
+                detail: { fileId: 'other-file', action: 'expandGap' },
+            }));
+
+            expect(document.activeElement).not.toBe(root.querySelector('[data-expand-gap="1"]'));
+            expect(component._refocusExpandKey).toBe(1);
+
+            component.destroy();
+        });
+
+        it('stops restoring focus after destroy', () => {
+            const component = makeComponent();
+            component.init();
+            component.destroy();
+            component.armExpandRefocus({ detail: 0 }, 1);
+
+            root.innerHTML = '<button data-expand-gap="1">7 hidden lines</button>';
+            window.dispatchEvent(new window.CustomEvent('rfa:diff-action-completed', {
+                detail: { fileId: 'file-1', action: 'expandGap' },
+            }));
+
+            expect(document.activeElement).not.toBe(root.querySelector('[data-expand-gap="1"]'));
+
+            component.destroy();
+        });
+    });
+});
diff --git a/tests/Unit/Livewire/ContextTreeTest.php b/tests/Unit/Livewire/ContextTreeTest.php
index b2fac7e9..a48a40fd 100644
--- a/tests/Unit/Livewire/ContextTreeTest.php
+++ b/tests/Unit/Livewire/ContextTreeTest.php
@@ -23,3 +23,26 @@
 ])
     ->dispatch('context-comment-summary-updated', summary: [])
     ->assertSet('commentSummary', []));
+
+test('single-child folder chains collapse into one breadcrumb row', function () {
+    Livewire::test('context-tree', [
+        'contextFiles' => [
+            ['id' => 'a', 'path' => 'app/Console/Commands/Pla/Db/CLAUDE.md', 'kind' => 'CLAUDE', 'isTracked' => true, 'isSymlink' => false, 'symlinkTarget' => null],
+        ],
+    ])
+        ->assertSeeHtml('app/Console/Commands/Pla/Db')
+        ->assertDontSeeHtml('>Console<')
+        ->assertDontSeeHtml('>Commands<');
+});
+
+test('folders keep separate rows where the tree actually branches', function () {
+    Livewire::test('context-tree', [
+        'contextFiles' => [
+            ['id' => 'a', 'path' => 'app/Domains/Billing/CLAUDE.md', 'kind' => 'CLAUDE', 'isTracked' => true, 'isSymlink' => false, 'symlinkTarget' => null],
+            ['id' => 'b', 'path' => 'app/Domains/Catalog/CLAUDE.md', 'kind' => 'CLAUDE', 'isTracked' => true, 'isSymlink' => false, 'symlinkTarget' => null],
+        ],
+    ])
+        ->assertSeeHtml('app/Domains')
+        ->assertSeeHtml('>Billing<')
+        ->assertSeeHtml('>Catalog<');
+});
diff --git a/tests/Unit/Livewire/DiffFileTest.php b/tests/Unit/Livewire/DiffFileTest.php
index 011c9302..ce233919 100644
--- a/tests/Unit/Livewire/DiffFileTest.php
+++ b/tests/Unit/Livewire/DiffFileTest.php
@@ -355,11 +355,16 @@ function buildContextHunk(int $startLine, int $lineCount = 3): array
 
     $html = mountMultiHunkDiffFile($diffData, $this->file)->html();
 
-    // Should show tiered buttons: "Expand 15  20 hidden lines"
+    // Should show tiered targets: "Show  15 · 20 hidden lines"
     expect($html)->toContain('expandGap(1, 15)')
         ->and($html)->toContain('expandGap(1)')
-        ->and($html)->toContain('20')
-        ->and($html)->toContain('hidden lines');
+        ->and($html)->toContain('20 hidden lines')
+        // Gap expanders carry the hunk-index anchor + keyboard refocus arming so
+        // focus returns to the gap after a partial expand re-render.
+        ->and($html)->toContain('data-expand-gap="1"')
+        ->and($html)->toContain('armExpandRefocus($event, 1)')
+        // The master "full file" expander has no gap to return to: it arms null.
+        ->and($html)->toContain('armExpandRefocus($event, null)');
 });
 
 test('single expand button renders for gap of 15 or fewer lines', function () {
@@ -369,7 +374,8 @@ function buildContextHunk(int $startLine, int $lineCount = 3): array
 
     $html = mountMultiHunkDiffFile($diffData, $this->file)->html();
 
-    expect($html)->toContain('Expand 10 hidden lines')
+    // The "Show" verb lives in the <x-diff.expand-control> shell; the button is the target.
+    expect($html)->toContain('10 hidden lines')
         ->and($html)->not->toContain('expandGap(1, 15)');
 });
 
@@ -381,11 +387,13 @@ function buildContextHunk(int $startLine, int $lineCount = 3): array
 
     $html = mountMultiHunkDiffFile($diffData, $this->file)->html();
 
-    // Should show tiered buttons for leading gap: "Expand 15 · 24 hidden lines"
+    // Should show tiered targets for leading gap: "Show  15 · 24 hidden lines"
     expect($html)->toContain('expandGap(0, 15)')
         ->and($html)->toContain('expandGap(0)')
-        ->and($html)->toContain('24')
-        ->and($html)->toContain('hidden lines');
+        ->and($html)->toContain('24 hidden lines')
+        // Gap index 0 is a real anchor, not a falsy no-op.
+        ->and($html)->toContain('data-expand-gap="0"')
+        ->and($html)->toContain('armExpandRefocus($event, 0)');
 });
 
 test('tiered expand buttons render for trailing gap larger than 15 lines', function () {
@@ -408,7 +416,7 @@ function buildContextHunk(int $startLine, int $lineCount = 3): array
 
     $html = mountMultiHunkDiffFile($diffData, $this->file)->html();
 
-    expect($html)->toContain('Expand 15 hidden lines')
+    expect($html)->toContain('15 hidden lines')
         ->and($html)->not->toContain('expandGap(1, 15)');
 });
 
@@ -432,7 +440,80 @@ function buildContextHunk(int $startLine, int $lineCount = 3): array
 
     $html = mountMultiHunkDiffFile($diffData, $this->file)->html();
 
-    expect($html)->toContain('Expand 1 hidden line')
-        ->and($html)->not->toContain('Expand 1 hidden lines')
+    expect($html)->toContain('1 hidden line')
+        ->and($html)->not->toContain('1 hidden lines')
         ->and($html)->not->toContain('&middot;');
 });
+
+// -- Expand loading spinner settles on no-op early returns --
+
+test('expandGap settles the action when the diff is no longer cached', function () {
+    // Force diffData to hydrate null: the cached diff was evicted between the
+    // render that showed the expander and this click. expandGap hits its first
+    // guard, but must still dispatch so the client clears the optimistic spinner
+    // (and the paired runtime-diagnostics start mark isn't left orphaned).
+    Cache::forget(DiffCacheKey::for(0, $this->file['id']));
+
+    Livewire::test('diff-file', [
+        'file' => $this->file,
+        'repoPath' => '/tmp/test',
+        'projectId' => 0,
+        'fileComments' => [],
+    ])->call('expandGap', 1)
+        ->assertDispatched('rfa:diff-action-completed', action: 'expandGap');
+});
+
+test('expandGap settles the action when the full-context reload finds no diff', function () {
+    // diffData hydrates from the primed cache (has hunks -> first guard passes),
+    // but the full-context reload returns no hunks: the working tree changed under
+    // the cached diff. The keyed row morphs nothing, so expandGap must dispatch
+    // the completion event itself or the spinner stays stuck until a refresh.
+    app()->bind(LoadFileDiffAction::class, fn () => new class
+    {
+        public function handle(string $repoPath, string $path, bool $isUntracked = false, ?string $cacheKey = null, int $contextLines = 3, ?DiffTarget $target = null, ?string $oldPath = null, ?string $externalAbsolutePath = null): array
+        {
+            return $contextLines >= 99999 ? ['hunks' => []] : DiffFixtureFactory::diffData(path: $path);
+        }
+    });
+
+    Livewire::test('diff-file', [
+        'file' => $this->file,
+        'repoPath' => '/tmp/test',
+        'projectId' => 0,
+        'fileComments' => [],
+    ])->call('expandGap', 1)
+        ->assertDispatched('rfa:diff-action-completed', action: 'expandGap');
+});
+
+test('expandGap settles a tiered-chip expand when the reload finds no diff', function () {
+    // The tiered chips call expandGap($hunkIndex, $tier); that partial-expand arg
+    // shape must settle through the same no-op early return as the full "N hidden
+    // lines" button (expandGap($hunkIndex)), or clicking a tier leaves the spinner
+    // stuck. Guards a regression that only settles when $lineCount is null.
+    app()->bind(LoadFileDiffAction::class, fn () => new class
+    {
+        public function handle(string $repoPath, string $path, bool $isUntracked = false, ?string $cacheKey = null, int $contextLines = 3, ?DiffTarget $target = null, ?string $oldPath = null, ?string $externalAbsolutePath = null): array
+        {
+            return $contextLines >= 99999 ? ['hunks' => []] : DiffFixtureFactory::diffData(path: $path);
+        }
+    });
+
+    Livewire::test('diff-file', [
+        'file' => $this->file,
+        'repoPath' => '/tmp/test',
+        'projectId' => 0,
+        'fileComments' => [],
+    ])->call('expandGap', 1, 15)
+        ->assertDispatched('rfa:diff-action-completed', action: 'expandGap');
+});
+
+test('gap expand-control clears its loading spinner when the action completes', function () {
+    $diffData = DiffFixtureFactory::diffData(hunks: 2, path: 'src/Test.php');
+
+    $html = mountMultiHunkDiffFile($diffData, $this->file)->html();
+
+    // The spinner is reset by the completion event rather than the post-expand
+    // morph, so it survives the no-op early-return paths above — and is scoped to
+    // this file's id so a sibling file's expand can't clear it.
+    expect($html)->toContain('@rfa:diff-action-completed.window="if (String($event.detail.fileId) === String(fileId)) loading = false"');
+});
diff --git a/tests/Unit/Livewire/ReviewPageBranchDivergenceTest.php b/tests/Unit/Livewire/ReviewPageBranchDivergenceTest.php
index 882dfdd3..60bc56f0 100644
--- a/tests/Unit/Livewire/ReviewPageBranchDivergenceTest.php
+++ b/tests/Unit/Livewire/ReviewPageBranchDivergenceTest.php
@@ -141,7 +141,9 @@ public function handle(int $projectId, string $repoPath): ?string
     expect($component->get('divergenceState'))->toBe(DivergenceState::Diverged);
     expect($component->get('divergenceContext.target'))->toBe('main');
     expect($component->get('divergenceContext.currentBranch'))->toBe('feature-x');
+    expect($component->get('divergenceContext.commentCount'))->toBe(1);
     expect($component->get('projectBranch'))->toBe('main');
+    $component->assertSeeHtml('data-testid="divergence-banner-diverged"');
 });
 
 test('detached banner shown when HEAD is detached', function () {
@@ -151,6 +153,7 @@ public function handle(int $projectId, string $repoPath): ?string
 
     expect($component->get('divergenceState'))->toBe(DivergenceState::Detached);
     expect($component->get('divergenceContext.shortSha'))->toBe('d'.str_repeat('0', 6));
+    $component->assertSeeHtml('data-testid="divergence-banner-detached"');
 });
 
 test('missing_target banner shown when target branch no longer exists', function () {
@@ -161,9 +164,10 @@ public function handle(int $projectId, string $repoPath): ?string
     expect($component->get('divergenceState'))->toBe(DivergenceState::MissingTarget);
     expect($component->get('divergenceContext.target'))->toBe('main');
     expect($component->get('divergenceContext.currentBranch'))->toBe('feature-x');
+    $component->assertSeeHtml('data-testid="divergence-banner-missing"');
 });
 
-test('keepReviewing suppresses banner until HEAD moves', function () {
+test('keepReviewing suppresses the banner for that branch, even across new commits', function () {
     Comment::create([
         'id' => 'c1',
         'project_id' => $this->project->id,
@@ -180,7 +184,8 @@ public function handle(int $projectId, string $repoPath): ?string
     ]);
 
     $firstSha = 'a'.str_repeat('0', 39);
-    $secondSha = 'b'.str_repeat('0', 39);
+    $sameBranchNewSha = 'a'.str_repeat('9', 39);
+    $otherBranchSha = 'b'.str_repeat('0', 39);
 
     $fake = bindFakeCurrentHeadAction(new CurrentHeadResult(branch: 'feature-x', sha: $firstSha, detached: false, targetExists: true));
 
@@ -189,14 +194,20 @@ public function handle(int $projectId, string $repoPath): ?string
 
     $component->call('keepReviewing');
     expect($component->get('divergenceState'))->toBe(DivergenceState::Aligned);
-    expect($component->get('dismissedAtHead'))->toBe($firstSha);
+    // Suppression keys on the branch identity, not the sha.
+    expect($component->get('dismissedAtBranch'))->toBe('feature-x');
 
-    // Another poll at the same HEAD: banner stays suppressed.
+    // Same HEAD: stays suppressed.
     $component->call('checkHeadDivergence');
     expect($component->get('divergenceState'))->toBe(DivergenceState::Aligned);
 
-    // HEAD moves to a new SHA (still diverged): banner re-appears.
-    $fake->result = new CurrentHeadResult(branch: 'feature-y', sha: $secondSha, detached: false, targetExists: true);
+    // New commit on the SAME branch (sha changes, branch unchanged): still suppressed.
+    $fake->result = new CurrentHeadResult(branch: 'feature-x', sha: $sameBranchNewSha, detached: false, targetExists: true);
+    $component->call('checkHeadDivergence');
+    expect($component->get('divergenceState'))->toBe(DivergenceState::Aligned);
+
+    // HEAD moves to a DIFFERENT branch: banner re-appears.
+    $fake->result = new CurrentHeadResult(branch: 'feature-y', sha: $otherBranchSha, detached: false, targetExists: true);
     $component->call('checkHeadDivergence');
     expect($component->get('divergenceState'))->toBe(DivergenceState::Diverged);
     expect($component->get('divergenceContext.currentBranch'))->toBe('feature-y');
@@ -309,3 +320,61 @@ public function handle(int $projectId, string $repoPath): ?string
 
     expect($component->get('divergenceState'))->toBe(DivergenceState::Aligned);
 });
+
+test('switchReviewToHead is undoable and undo restores the original target', function () {
+    Comment::create([
+        'id' => 'c1',
+        'project_id' => $this->project->id,
+        'repo_path' => $this->project->path,
+        'origin_ref' => 'main',
+        'file_path' => 'src/Foo.php',
+        'side' => 'new',
+        'start_line' => 1,
+        'end_line' => 1,
+        'file_content_hash' => 'mock-hash',
+        'body' => 'hello',
+        'is_draft' => false,
+        'submitted_at' => now(),
+    ]);
+
+    bindFakeCurrentHeadAction(new CurrentHeadResult(branch: 'feature-x', sha: 'c'.str_repeat('0', 39), detached: false, targetExists: true));
+
+    $component = Livewire::test('pages::review-page', ['slug' => 'divergence-test']);
+    expect($component->get('divergenceState'))->toBe(DivergenceState::Diverged);
+
+    $component->call('switchReviewToHead')
+        ->assertDispatched('undo-available', type: 'switch-branch', payload: ['fromBranch' => 'main'], message: 'Switched review to feature-x');
+
+    expect($component->get('projectBranch'))->toBe('feature-x');
+    expect($this->project->fresh()->branch)->toBe('feature-x');
+
+    // Undo re-points the review back to the branch it was on.
+    $component->call('undo', 'switch-branch', ['fromBranch' => 'main']);
+    expect($component->get('projectBranch'))->toBe('main');
+    expect($this->project->fresh()->branch)->toBe('main');
+
+    // HEAD is still on feature-x, so restoring the main target must re-surface
+    // divergence — the head poller won't fire on an unchanged HEAD identity.
+    expect($component->get('divergenceState'))->toBe(DivergenceState::Diverged);
+});
+
+test('dismissMissingTarget suppresses the missing-target banner for that branch', function () {
+    $fake = bindFakeCurrentHeadAction(new CurrentHeadResult(branch: 'feature-x', sha: 'e'.str_repeat('0', 39), detached: false, targetExists: false));
+
+    $component = Livewire::test('pages::review-page', ['slug' => 'divergence-test']);
+    expect($component->get('divergenceState'))->toBe(DivergenceState::MissingTarget);
+
+    $component->call('dismissMissingTarget');
+    expect($component->get('divergenceState'))->toBe(DivergenceState::Aligned);
+    expect($component->get('dismissedAtBranch'))->toBe('feature-x');
+
+    // Same HEAD: stays suppressed.
+    $component->call('checkHeadDivergence');
+    expect($component->get('divergenceState'))->toBe(DivergenceState::Aligned);
+
+    // A different missing-target branch must re-surface the banner: dismissal is
+    // scoped to feature-x, not a global mute.
+    $fake->result = new CurrentHeadResult(branch: 'feature-y', sha: 'f'.str_repeat('0', 39), detached: false, targetExists: false);
+    $component->call('checkHeadDivergence');
+    expect($component->get('divergenceState'))->toBe(DivergenceState::MissingTarget);
+});