@fresh-editor/fresh-editor 0.2.23 → 0.2.25

package/plugins/audit_mode.ts

@@ -9,6 +9,14 @@
 const editor = getEditor();
 
 import { createVirtualBufferFactory } from "./lib/virtual-buffer-factory.ts";
+import {
+  type GitCommit,
+  buildCommitDetailEntries,
+  buildCommitLogEntries,
+  buildDetailPlaceholderEntries,
+  fetchCommitShow,
+  fetchGitLog,
+} from "./lib/git_history.ts";
 const VirtualBufferFactory = createVirtualBufferFactory(editor);
 
 
@@ -69,37 +77,121 @@ interface FileEntry {
  * know between events (selected file, focused panel, hunk header rows for
  * `n`/`p` jumps).
  */
+/**
+ * Why the file list is empty. `null` means `state.files` has entries; the
+ * other two distinguish "cwd is not a git repo" from "repo is clean" so the
+ * panels can show a specific message instead of rendering byte-identically.
+ */
+type EmptyStateReason = 'not_git' | 'clean' | null;
+
+/**
+ * Which slice of history the current review-diff session is inspecting.
+ *
+ * - `'worktree'`: the default mode — what `git status` reports right now.
+ *   No single SHA fingerprints this mode (the working tree is volatile), so
+ *   comments are keyed only by repo root and restored on a best-effort basis
+ *   using `file`/`old_line`/`new_line`/`line_content`.
+ * - `'range'`: reviewing a static slice (single commit or `A..B` range).
+ *   The diff is stable, so comments restore 1:1.
+ */
+type ReviewMode = 'worktree' | 'range';
+
+interface ReviewRange {
+  /** `git diff <from>` left-hand-side. */
+  from: string;
+  /** `git diff ... <to>` right-hand-side. */
+  to: string;
+  /** Human-readable label for status bar / layout name. */
+  label: string;
+}
+
 interface ReviewState {
   hunks: Hunk[];
   comments: ReviewComment[];
   note: string;
   reviewBufferId: number | null;
-  // New magit-style state
+  /** Review slice: working tree vs. static commit / range. */
+  mode: ReviewMode;
+  /** Populated when `mode === 'range'`. */
+  range: ReviewRange | null;
+  /** Absolute path to the git repo root — stable key for persistence. */
+  repoRoot: string;
+  /**
+   * Persistence key within the repo's review dir:
+   *   `worktree`            — `mode === 'worktree'`
+   *   `range-<from>__<to>`  — `mode === 'range'`
+   * Filename-safe characters only (see `sanitizeKeySegment`).
+   */
+  reviewKey: string;
+  // Files with changes (used for section grouping + headers in the
+  // unified stream). Order matches the order they appear in the diff.
   files: FileEntry[];
-  selectedIndex: number;
+  emptyState: EmptyStateReason;
   viewportWidth: number;
   viewportHeight: number;
-  focusPanel: 'files' | 'diff';
+  focusPanel: 'diff' | 'comments';
   groupId: number | null;
   panelBuffers: Record<string, number>;
-  // Caches populated each time the diff panel is rebuilt — used by `n`/`p`
-  // hunk navigation, to translate diff-panel row numbers into byte positions
-  // for `setBufferCursor`, and to draw the cursor-line highlight overlay.
-  // The array has length `(rowCount + 1)`: index `i` is the byte offset of
-  // row `i + 1`, and the final entry is the total buffer length (sentinel
-  // for the end of the last row).
-  hunkHeaderRows: number[];        // 1-indexed row numbers in the diff panel
-  diffLineByteOffsets: number[];
-  diffCursorRow: number;           // 1-indexed, last known cursor row in diff panel
-  /** Cache of pre-built diff-panel entries keyed by `${file}\0${gitStatus}`,
-   *  populated lazily by buildDiffPanelEntries. Cleared on refreshMagitData. */
-  diffCache: Record<string, CachedDiff>;
-}
-
-interface CachedDiff {
-  entries: TextPropertyEntry[];
-  hunkHeaderRows: number[];
+  // Caches populated each time the unified diff stream is rebuilt —
+  // used by `n`/`p` hunk navigation, to translate row numbers into byte
+  // positions for `setBufferCursor`, and to draw the cursor-line
+  // highlight overlay. `diffLineByteOffsets` has length `(rowCount + 1)`:
+  // index `i` is the byte offset of row `i + 1`, and the final entry is
+  // the total buffer length.
+  hunkHeaderRows: number[];        // 1-indexed row numbers in the unified buffer
   diffLineByteOffsets: number[];
+  diffCursorRow: number;           // 1-indexed, last known cursor row in diff buffer
+  // Maps file key (`${path}\0${category}`) -> 1-indexed row of the
+  // file-header row in the unified stream. Used by mouse/collapse/sticky.
+  fileHeaderRows: Record<string, number>;
+  // Files that are currently collapsed (`${path}\0${category}` keys).
+  // Persists across refreshes within a session; cleared on start_review_diff.
+  collapsedFiles: Set<string>;
+  // Sections (categories) that are currently collapsed. Same persistence
+  // rules as `collapsedFiles`.
+  collapsedSections: Set<string>;
+  // Hunks that are currently collapsed (`hunk.id` keys). When collapsed,
+  // only the hunk header row is emitted; the +/-/context lines are
+  // skipped. Same persistence rules as collapsedFiles.
+  collapsedHunks: Set<string>;
+  // Maps hunk-id -> 1-indexed row of its hunk-header row in the diff
+  // stream. Used by mouse + Tab to identify the nearest hunk.
+  hunkRowByHunkId: Record<string, number>;
+  // Maps comment-id -> 1-indexed row of the *diff line* the comment is
+  // attached to (not the comment-display row itself). Lets the comments
+  // panel jump the cursor straight to the source line.
+  diffLineRowByCommentId: Record<string, number>;
+  // Maps 1-indexed row -> the entry's properties. Lets handlers look up
+  // type / hunkId / fileKey / etc. by cursor row directly, bypassing
+  // editor.getTextPropertiesAtCursor (which can return the previous
+  // row's props when the cursor sits at a row-boundary byte).
+  entryPropsByRow: Record<number, Record<string, unknown>>;
+  // Byte ranges of collapsible bodies, captured at build time. Tab /
+  // mouse / z a / z r register these as host folds (see applyFolds)
+  // — no buffer rebuild on collapse / expand.
+  sectionBodyRange: Record<string, { start: number; end: number }>;
+  fileBodyRange: Record<string, { start: number; end: number }>;
+  hunkBodyRange: Record<string, { start: number; end: number }>;
+  // Maps a category name (`'staged'` etc.) -> 1-indexed row of its
+  // section-header row in the unified stream. Used by Tab toggle.
+  sectionHeaderRows: Record<string, number>;
+  // Maps a 1-indexed row in the comments panel -> comment id
+  commentsByRow: Record<number, string>;
+  // Current selection in the comments panel (1-indexed row, 0 means none)
+  commentsSelectedRow: number;
+  // Comment-id the diff cursor is sitting on / attached to. Drives the
+  // `>` follow-cursor marker in the comments panel.
+  commentsHighlightId: string | null;
+  // Sticky header current content (for Step 4)
+  stickyCurrentFile: string | null;
+  // Last known top-visible row in the diff viewport (1-indexed for
+  // consistency with hunkHeaderRows, even though the host event delivers
+  // 0-indexed). Updated from viewport_changed and cursor_moved.
+  diffViewportTopRow: number;
+  // Visual line-selection state. Active iff non-null. start and end are
+  // 1-indexed rows in the unified stream; hunkId pins the selection to
+  // a single hunk (selections that cross hunks are rejected).
+  lineSelection: { startRow: number; endRow: number; hunkId: string } | null;
 }
 
 const state: ReviewState = {
@@ -107,19 +199,42 @@ const state: ReviewState = {
   comments: [],
   note: '',
   reviewBufferId: null,
+  mode: 'worktree',
+  range: null,
+  repoRoot: '',
+  reviewKey: 'worktree',
   files: [],
-  selectedIndex: 0,
+  emptyState: null,
   viewportWidth: 80,
   viewportHeight: 24,
-  focusPanel: 'files',
+  focusPanel: 'diff',
   groupId: null,
   panelBuffers: {},
   hunkHeaderRows: [],
   diffLineByteOffsets: [],
   diffCursorRow: 1,
-  diffCache: {},
+  fileHeaderRows: {},
+  collapsedFiles: new Set(),
+  collapsedSections: new Set(),
+  collapsedHunks: new Set(),
+  hunkRowByHunkId: {},
+  diffLineRowByCommentId: {},
+  entryPropsByRow: {},
+  sectionBodyRange: {},
+  fileBodyRange: {},
+  hunkBodyRange: {},
+  sectionHeaderRows: {},
+  commentsByRow: {},
+  commentsSelectedRow: 0,
+  commentsHighlightId: null,
+  stickyCurrentFile: null,
+  diffViewportTopRow: 0,
+  lineSelection: null,
 };
 
+function fileKey(f: FileEntry): string { return `${f.path}\0${f.category}`; }
+function fileKeyOf(path: string, category: string): string { return `${path}\0${category}`; }
+
 // Theme colour for the synthetic "cursor line" highlight in the panel
 // buffers. Reintroduced after the per-line bg overlay was deleted from the
 // builders — `applyCursorLineOverlay` writes it on every cursor_moved event.
@@ -140,6 +255,42 @@ const STYLE_REMOVE_TEXT: OverlayColorSpec = "diagnostic.error_fg";
 
 const STYLE_SECTION_HEADER: OverlayColorSpec = "syntax.type";
 const STYLE_COMMENT: OverlayColorSpec = "diagnostic.warning_fg";
+// Subtle bg for file/section header rows. Uses `editor.current_line_bg`
+// which is reliably a notch lighter than editor bg in every theme
+// (line_number_bg matches editor bg in Dracula and would render
+// invisibly; status_bar_bg is the toolbar accent and is hot pink in
+// Dracula). selection_bg is reserved for the cursor-line overlay so
+// using it here would blend the two highlights.
+const STYLE_FILE_HEADER_BG: OverlayColorSpec = "editor.current_line_bg";
+const STYLE_HUNK_HEADER_BG: OverlayColorSpec = "editor.current_line_bg";
+// File-header foreground: brightest reliable foreground in any theme.
+// `editor.fg` is white-ish on dark themes and black-ish on light, so it
+// always reads as the most prominent text color. Bolded for extra weight.
+const STYLE_FILE_HEADER_FG: OverlayColorSpec = "editor.fg";
+// "Inverse" pair — swap of editor.bg/fg. Used for full-line-wide section
+// dividers (STAGED / UNSTAGED / UNTRACKED) and the Comments panel
+// header. Reads as an inverted band in every theme: dark text on light
+// bg in dark themes, light text on dark bg in light themes.
+const STYLE_INVERSE_FG: OverlayColorSpec = "editor.bg";
+const STYLE_INVERSE_BG: OverlayColorSpec = "editor.fg";
+// Dim foreground for the per-row old/new line-number gutter. Same key
+// the editor uses for its own gutter — already chosen per-theme to be
+// readable but visibly subordinate to content fg.
+const STYLE_LINE_NUM_FG: OverlayColorSpec = "editor.line_number_fg";
+
+// Width of each line-number column. 4 chars fits up to 9999 lines —
+// past that we just let the number overflow rather than expanding the
+// gutter (extremely rare in review-diff context).
+const LINE_NUM_W = 4;
+
+/** Format the per-row "OLD  NEW " prefix (with trailing space). Either
+ *  side passes `undefined` for blank — removed lines blank the new
+ *  column, added lines blank the old column. */
+function lineNumPrefix(oldNum: number | undefined, newNum: number | undefined): string {
+    const o = oldNum !== undefined ? String(oldNum).padStart(LINE_NUM_W) : ' '.repeat(LINE_NUM_W);
+    const n = newNum !== undefined ? String(newNum).padStart(LINE_NUM_W) : ' '.repeat(LINE_NUM_W);
+    return ` ${o} ${n} `;
+}
 
 
 /**
@@ -158,6 +309,152 @@ function getByteLength(str: string): number {
     return s;
 }
 
+// --- Persistence ---
+//
+// Review comments for a given repo are persisted under:
+//
+//     <data_dir>/audit/<sanitized-repo-root>/<review-key>.json
+//
+// Where:
+//   - `<data_dir>` is the host's `DirectoryContext::data_dir` (exposed via
+//     the `getDataDir()` API added for this feature).
+//   - `<review-key>` captures the *kind* of review — not every git state is
+//     a fingerprint:
+//       - `worktree` for `start_review_diff` (working tree review). There
+//         is no single fingerprint for the working tree so we just reuse a
+//         single slot per repo; line-content + line-number matching on
+//         restore prunes comments that no longer apply.
+//       - `range-<from>__<to>` for `start_review_range` (commit / branch
+//         review). The range is stable, so comments survive re-opening.
+//
+// Design notes / alternatives that were considered:
+//   - Keying worktree comments by the index or HEAD SHA: rejected — the
+//     working tree is volatile so the key would change constantly and you
+//     couldn't get your comments back after a single edit.
+//   - Storing under `.review/` in the working tree: rejected — that bakes
+//     the reviewer's state into the repo, which leaks into `git status`.
+//   - One big JSON with all review keys per repo: rejected — concurrent
+//     edits across review windows could clobber each other. Per-key files
+//     keep each review's writes independent.
+
+interface PersistedReview {
+    version: number;
+    mode: ReviewMode;
+    range: ReviewRange | null;
+    note: string;
+    comments: ReviewComment[];
+    updated_at: string;
+}
+
+const REVIEW_STORAGE_VERSION = 1;
+
+/**
+ * Make a string safe for use as a filename / directory name on all host
+ * OSes. Forbidden characters (`/`, `\`, `:`, etc.) collapse to `_`; long
+ * tails hash-truncate so path length stays sane.
+ */
+function sanitizeKeySegment(raw: string): string {
+    const replaced = raw.replace(/[^A-Za-z0-9._-]+/g, '_');
+    if (replaced.length <= 120) return replaced;
+    // Cheap 32-bit FNV-1a so different long segments don't alias after
+    // truncation.
+    let h = 0x811c9dc5 >>> 0;
+    for (let i = 0; i < raw.length; i++) {
+        h ^= raw.charCodeAt(i);
+        h = Math.imul(h, 0x01000193) >>> 0;
+    }
+    return replaced.slice(0, 100) + '__' + h.toString(16);
+}
+
+/**
+ * Build the review-key portion of the storage filename (without the
+ * `.json` extension) for the current mode / range.
+ */
+function buildReviewKey(mode: ReviewMode, range: ReviewRange | null): string {
+    if (mode === 'range' && range) {
+        return `range-${sanitizeKeySegment(range.from)}__${sanitizeKeySegment(range.to)}`;
+    }
+    return 'worktree';
+}
+
+/** Directory that stores all review files for a given repo. */
+function reviewStorageDirFor(repoRoot: string): string | null {
+    try {
+        const dataDir = (editor as any).getDataDir?.() as string | undefined;
+        if (!dataDir) return null;
+        return editor.pathJoin(dataDir, "audit", sanitizeKeySegment(repoRoot));
+    } catch {
+        return null;
+    }
+}
+
+/** Absolute path of the JSON file backing a review key. */
+function reviewStoragePathFor(repoRoot: string, reviewKey: string): string | null {
+    const dir = reviewStorageDirFor(repoRoot);
+    if (!dir) return null;
+    return editor.pathJoin(dir, `${reviewKey}.json`);
+}
+
+/**
+ * Resolve the git top-level for `editor.getCwd()`. Returns `''` when the
+ * cwd isn't inside a repo — callers then skip persistence.
+ */
+async function detectRepoRoot(): Promise<string> {
+    try {
+        const result = await editor.spawnProcess("git", ["rev-parse", "--show-toplevel"]);
+        if (result.exit_code === 0) {
+            return result.stdout.trim();
+        }
+    } catch {
+        // fall through
+    }
+    return '';
+}
+
+/**
+ * Persist the current `state.comments` / `state.note` to disk. Best-effort:
+ * filesystem errors never surface to the user — the UI is the source of
+ * truth during the session and writes are just a cache for restore.
+ */
+function persistReview(): void {
+    if (!state.repoRoot) return;
+    const path = reviewStoragePathFor(state.repoRoot, state.reviewKey);
+    if (!path) return;
+    const dir = reviewStorageDirFor(state.repoRoot);
+    if (dir) {
+        try { editor.createDir(dir); } catch {}
+    }
+    const payload: PersistedReview = {
+        version: REVIEW_STORAGE_VERSION,
+        mode: state.mode,
+        range: state.range,
+        note: state.note,
+        comments: state.comments,
+        updated_at: new Date().toISOString(),
+    };
+    try {
+        editor.writeFile(path, JSON.stringify(payload, null, 2));
+    } catch {}
+}
+
+/** Read back a persisted review (if any). Returns null on any failure. */
+function loadPersistedReview(repoRoot: string, reviewKey: string): PersistedReview | null {
+    if (!repoRoot) return null;
+    const path = reviewStoragePathFor(repoRoot, reviewKey);
+    if (!path) return null;
+    if (!editor.fileExists(path)) return null;
+    try {
+        const raw = editor.readFile(path);
+        if (!raw) return null;
+        const parsed = JSON.parse(raw) as PersistedReview;
+        if (!parsed || typeof parsed !== 'object') return null;
+        if (!Array.isArray(parsed.comments)) return null;
+        return parsed;
+    } catch {
+        return null;
+    }
+}
+
 // --- Diff Logic ---
 
 interface DiffPart {
@@ -322,11 +619,28 @@ function parseGitStatusPorcelain(raw: string): FileEntry[] {
 
 /**
  * Single source of truth for changed files using `git status --porcelain -z`.
+ *
+ * `emptyReason` distinguishes the two no-content cases so the UI can explain
+ * itself instead of rendering a blank pane:
+ *   - `'not_git'`: `git status` failed (no repo at cwd).
+ *   - `'clean'`: `git status` succeeded but returned no entries.
+ *   - `null`: files were found; render them normally.
  */
-async function getGitStatus(): Promise<FileEntry[]> {
+interface GitStatusResult {
+    files: FileEntry[];
+    emptyReason: EmptyStateReason;
+}
+
+async function getGitStatus(): Promise<GitStatusResult> {
     const result = await editor.spawnProcess("git", ["status", "--porcelain", "-z"]);
-    if (result.exit_code !== 0) return [];
-    return parseGitStatusPorcelain(result.stdout);
+    if (result.exit_code !== 0) {
+        return { files: [], emptyReason: 'not_git' };
+    }
+    const files = parseGitStatusPorcelain(result.stdout);
+    return {
+        files,
+        emptyReason: files.length === 0 ? 'clean' : null,
+    };
 }
 
 /**
@@ -400,7 +714,10 @@ interface ListLine {
 
 interface DiffLine {
     text: string;
-    type: 'hunk-header' | 'add' | 'remove' | 'context' | 'empty' | 'comment';
+    type: 'hunk-header' | 'add' | 'remove' | 'context' | 'empty' | 'comment' | 'file-header' | 'section-header';
+    filePath?: string;   // for file-header rows
+    fileKey?: string;    // for file-header rows
+    fileIndex?: number;  // for file-header rows
     style?: Partial<OverlayOptions>;
     inlineOverlays?: InlineOverlay[];
     // Line metadata for comment attachment
@@ -413,67 +730,19 @@ interface DiffLine {
     commentId?: string;
 }
 
-/**
- * Build the file list lines for the left panel.
- * Returns section headers (not selectable) and file entries.
- */
-function buildFileListLines(leftWidth?: number): ListLine[] {
-    const lines: ListLine[] = [];
-    let lastCategory: string | undefined;
-
-    for (let i = 0; i < state.files.length; i++) {
-        const f = state.files[i];
-        // Section headers
-        if (f.category !== lastCategory) {
-            lastCategory = f.category;
-            let label = '';
-            if (f.category === 'staged')    label = editor.t("section.staged") || "Staged";
-            else if (f.category === 'unstaged') label = editor.t("section.unstaged") || "Changes";
-            else if (f.category === 'untracked') label = editor.t("section.untracked") || "Untracked";
-            lines.push({
-                text: `▸ ${label}`,
-                type: 'section-header',
-                style: { fg: STYLE_SECTION_HEADER, bold: true },
-            });
-        }
-
-        // Status icon + selection prefix.
-        const statusIcon = f.status === '?' ? 'A' : f.status;
-        const prefix = i === state.selectedIndex ? '>' : ' ';
-        const filename = f.origPath ? `${f.origPath} → ${f.path}` : f.path;
-        lines.push({
-            text: `${prefix}${statusIcon}  ${filename}`,
-            type: 'file',
-            fileIndex: i,
-        });
-    }
-
-    // Show session note at the bottom of the file list, word-wrapped
-    if (state.note) {
-        lines.push({ text: '', type: 'section-header' }); // blank separator
-        lines.push({
-            text: `▸ Note`,
-            type: 'section-header',
-            style: { fg: STYLE_COMMENT, bold: true },
-        });
-        // Wrap note text to fit left panel (minus 3 for "  " prefix + padding)
-        const wrapWidth = Math.max(20, (leftWidth || 40) - 3);
-        const words = state.note.split(' ');
-        let line = '';
-        for (const word of words) {
-            if (line && (line.length + 1 + word.length) > wrapWidth) {
-                lines.push({ text: `  ${line}`, type: 'section-header', style: { fg: STYLE_COMMENT, italic: true } });
-                line = word;
-            } else {
-                line = line ? `${line} ${word}` : word;
+/** Compute +N / -M line counts for a file. */
+function fileChangeCounts(file: FileEntry): { added: number; removed: number } {
+    let added = 0;
+    let removed = 0;
+    for (const h of state.hunks) {
+        if (h.file === file.path && h.gitStatus === file.category) {
+            for (const line of h.lines) {
+                if (line[0] === '+') added++;
+                else if (line[0] === '-') removed++;
             }
         }
-        if (line) {
-            lines.push({ text: `  ${line}`, type: 'section-header', style: { fg: STYLE_COMMENT, italic: true } });
-        }
     }
-
-    return lines;
+    return { added, removed };
 }
 
 /**
@@ -491,6 +760,9 @@ function pushLineComments(
             (c.line_type === 'context' && c.new_line === newLine)
         )
     );
+    // Indent the comment so its `»` glyph aligns with the diff content
+    // column (just past the OLD/NEW number gutter and the +/- indicator).
+    const commentIndent = ' '.repeat(LINE_NUM_W + 1 + LINE_NUM_W + 1 + 1 + 1);
     for (const comment of lineComments) {
         const lineRef = comment.line_type === 'add'
             ? `+${comment.new_line}`
@@ -498,7 +770,7 @@ function pushLineComments(
             ? `-${comment.old_line}`
             : `${comment.new_line}`;
         lines.push({
-            text: `  \u00bb [${lineRef}] ${comment.text}`,
+            text: `${commentIndent}\u00bb [${lineRef}] ${comment.text}`,
             type: 'comment',
             commentId: comment.id,
             style: { fg: STYLE_COMMENT, italic: true },
@@ -507,62 +779,139 @@ function pushLineComments(
 }
 
 /**
- * Build the diff lines for the right panel based on currently selected file.
+ * Build the diff lines for the unified stream.
+ * Emits one file-header row per file, followed by its hunks inline.
+ * When the file is collapsed, only the header is emitted.
  */
-function buildDiffLines(rightWidth: number): DiffLine[] {
+function buildDiffLines(_rightWidth: number): DiffLine[] {
     const lines: DiffLine[] = [];
-    if (state.files.length === 0) return lines;
+    if (state.files.length === 0) {
+        if (state.emptyState === 'not_git') {
+            lines.push({
+                text: editor.t("status.not_git_repo") || "Not a git repository",
+                type: 'empty',
+                style: { fg: STYLE_SECTION_HEADER, italic: true },
+            });
+        } else if (state.emptyState === 'clean') {
+            lines.push({
+                text: editor.t("panel.no_changes") || "No changes to review.",
+                type: 'empty',
+                style: { fg: STYLE_SECTION_HEADER, italic: true },
+            });
+        }
+        return lines;
+    }
 
-    const selectedFile = state.files[state.selectedIndex];
-    if (!selectedFile) return lines;
+    let lastCategory: string | undefined;
+    for (let fi = 0; fi < state.files.length; fi++) {
+        const file = state.files[fi];
+
+        // Section header — full-line-wide INVERSE band, uppercase, bold.
+        // The strong inverse coloring (editor.bg as fg / editor.fg as bg)
+        // makes the band read as a hard divider between Staged /
+        // Unstaged / Untracked sections regardless of theme.
+        if (file.category !== lastCategory) {
+            lastCategory = file.category;
+            let label: string = file.category;
+            // Range mode reuses the `unstaged` bucket for every hunk as
+            // an impl shortcut — surface the range label so the user
+            // isn't told their commit review is "Unstaged".
+            if (state.mode === 'range' && state.range) {
+                label = state.range.label;
+            } else if (file.category === 'staged') label = editor.t("section.staged") || "Staged";
+            else if (file.category === 'unstaged') label = editor.t("section.unstaged") || "Unstaged";
+            else if (file.category === 'untracked') label = editor.t("section.untracked") || "Untracked";
+            const sectionCount = state.files.filter(f => f.category === file.category).length;
+            // Always render expanded triangle (▾). Collapse state is
+            // shown by overlaying a `▸` replacement-conceal on the
+            // triangle byte range — the buffer text never changes, so
+            // toggling collapse never has to rebuild.
+            // Range labels (e.g. `main..HEAD`) carry case already — don't
+            // mangle them with the section uppercase; worktree category
+            // names are lowercase words and need the uppercase.
+            const displayLabel = state.mode === 'range' ? label : label.toUpperCase();
+            lines.push({
+                text: ` ▾ ${displayLabel}  (${sectionCount})`,
+                type: 'section-header',
+                file: file.category, // store category in 'file' field for reuse
+                filePath: file.category,
+                style: {
+                    fg: STYLE_INVERSE_FG,
+                    bg: STYLE_INVERSE_BG,
+                    bold: true,
+                    extendToLineEnd: true,
+                },
+            });
+        }
 
-    // Find hunks matching the selected file and category
-    const fileHunks = state.hunks.filter(
-        h => h.file === selectedFile.path && h.gitStatus === selectedFile.category
-    );
+        // File header — always emit the expanded triangle; conceal
+        // overlays handle the collapsed view.
+        const counts = fileChangeCounts(file);
+        const key = fileKey(file);
+        const filename = file.origPath ? `${file.origPath} → ${file.path}` : file.path;
+        const headerText = ` ▾ ${filename}   +${counts.added} / -${counts.removed}`;
+        lines.push({
+            text: headerText,
+            type: 'file-header',
+            file: file.path,
+            filePath: file.path,
+            fileKey: key,
+            fileIndex: fi,
+            style: {
+                fg: STYLE_FILE_HEADER_FG,
+                bg: STYLE_FILE_HEADER_BG,
+                bold: true,
+                extendToLineEnd: true,
+            },
+        });
 
-    if (fileHunks.length === 0) {
-        if (selectedFile.status === 'R' && selectedFile.origPath) {
-            lines.push({ text: `Renamed from ${selectedFile.origPath}`, type: 'empty', style: { fg: STYLE_SECTION_HEADER } });
-        } else if (selectedFile.status === 'D') {
-            lines.push({ text: "(file deleted)", type: 'empty' });
-        } else if (selectedFile.status === 'T') {
-            lines.push({ text: "(type change: file ↔ symlink)", type: 'empty', style: { fg: STYLE_SECTION_HEADER } });
-        } else if (selectedFile.status === '?' && selectedFile.path.endsWith('/')) {
-            lines.push({ text: "(untracked directory)", type: 'empty' });
-        } else {
-            lines.push({ text: "(no diff available)", type: 'empty' });
+        // Find hunks for this file
+        const fileHunks = state.hunks.filter(
+            h => h.file === file.path && h.gitStatus === file.category
+        );
+
+        if (fileHunks.length === 0) {
+            if (file.status === 'R' && file.origPath) {
+                lines.push({ text: `  Renamed from ${file.origPath}`, type: 'empty', style: { fg: STYLE_SECTION_HEADER } });
+            } else if (file.status === 'D') {
+                lines.push({ text: "  (file deleted)", type: 'empty' });
+            } else if (file.status === 'T') {
+                lines.push({ text: "  (type change: file ↔ symlink)", type: 'empty', style: { fg: STYLE_SECTION_HEADER } });
+            } else if (file.status === '?' && file.path.endsWith('/')) {
+                lines.push({ text: "  (untracked directory)", type: 'empty' });
+            } else {
+                lines.push({ text: "  (no diff available)", type: 'empty' });
+            }
+            lines.push({ text: '', type: 'empty' });
+            continue;
         }
-        return lines;
-    }
 
-    for (const hunk of fileHunks) {
-        // Hunk header with review status indicator
-        const header = hunk.contextHeader
+        for (const hunk of fileHunks) {
+        // Hunk header — always emit expanded triangle; collapse
+        // overlays a `▸` replacement-conceal.
+        const headerInner = hunk.contextHeader
             ? `@@ ${hunk.contextHeader} @@`
             : `@@ -${hunk.oldRange.start} +${hunk.range.start} @@`;
+        const header = ` ▾ ${headerInner}`;
 
         lines.push({
             text: header,
             type: 'hunk-header',
             hunkId: hunk.id,
             file: hunk.file,
-            style: { fg: STYLE_HUNK_HEADER, bold: true },
+            style: {
+                fg: STYLE_HUNK_HEADER,
+                bg: STYLE_HUNK_HEADER_BG,
+                bold: true,
+                extendToLineEnd: true,
+            },
         });
 
-        // Render hunk-level comments (those with no line_type) right
-        // after the hunk header so they are visible in the diff view.
-        const hunkComments = state.comments.filter(c =>
-            c.hunk_id === hunk.id && !c.line_type
-        );
-        for (const comment of hunkComments) {
-            lines.push({
-                text: `  \u00bb [hunk] ${comment.text}`,
-                type: 'comment',
-                commentId: comment.id,
-                style: { fg: STYLE_COMMENT, italic: true },
-            });
-        }
+        // (Body always emitted — collapse is handled by overlay
+        // conceals on the body's byte range.)
+
+        // (Comments are line-based — they appear under their attached
+        // diff line via pushLineComments below, never as hunk-level.)
 
         // Track actual file line numbers as we iterate
         let oldLineNum = hunk.oldRange.start;
@@ -584,9 +933,14 @@ function buildDiffLines(rightWidth: number): DiffLine[] {
                 const newContent = nextLine.substring(1);
                 const parts = diffStrings(oldContent, newContent);
 
-                // Build inline overlays for removed line
-                const removeOverlays: InlineOverlay[] = [];
-                let rOffset = getByteLength(line[0]); // skip prefix
+                // Removed-side line: " OLD       -content"
+                const removePrefix = lineNumPrefix(curOldLine, undefined);
+                const removeText = removePrefix + line;
+                const removePrefixLen = getByteLength(removePrefix);
+                const removeOverlays: InlineOverlay[] = [
+                    { start: 0, end: removePrefixLen, style: { fg: STYLE_LINE_NUM_FG } },
+                ];
+                let rOffset = removePrefixLen + getByteLength(line[0]); // skip diff prefix
                 for (const part of parts) {
                     const pLen = getByteLength(part.text);
                     if (part.type === 'removed') {
@@ -595,19 +949,24 @@ function buildDiffLines(rightWidth: number): DiffLine[] {
                     if (part.type !== 'added') rOffset += pLen;
                 }
                 lines.push({
-                    text: line, type: 'remove',
+                    text: removeText, type: 'remove',
                     style: { bg: STYLE_REMOVE_BG, extendToLineEnd: true },
                     hunkId: hunk.id, file: hunk.file,
                     lineType: 'remove', oldLine: curOldLine, newLine: undefined, lineContent: line,
-                    inlineOverlays: removeOverlays.length > 0 ? removeOverlays : undefined,
+                    inlineOverlays: removeOverlays,
                 });
                 // Inline comments for the removed line
                 pushLineComments(lines, hunk, 'remove', curOldLine, undefined);
                 oldLineNum++;
 
-                // Build inline overlays for added line
-                const addOverlays: InlineOverlay[] = [];
-                let aOffset = getByteLength(nextLine[0]);
+                // Added-side line: "      NEW +content"
+                const addPrefix = lineNumPrefix(undefined, newLineNum);
+                const addText = addPrefix + nextLine;
+                const addPrefixLen = getByteLength(addPrefix);
+                const addOverlays: InlineOverlay[] = [
+                    { start: 0, end: addPrefixLen, style: { fg: STYLE_LINE_NUM_FG } },
+                ];
+                let aOffset = addPrefixLen + getByteLength(nextLine[0]);
                 for (const part of parts) {
                     const pLen = getByteLength(part.text);
                     if (part.type === 'added') {
@@ -616,11 +975,11 @@ function buildDiffLines(rightWidth: number): DiffLine[] {
                     if (part.type !== 'removed') aOffset += pLen;
                 }
                 lines.push({
-                    text: nextLine, type: 'add',
+                    text: addText, type: 'add',
                     style: { bg: STYLE_ADD_BG, extendToLineEnd: true },
                     hunkId: hunk.id, file: hunk.file,
                     lineType: 'add', oldLine: undefined, newLine: newLineNum, lineContent: nextLine,
-                    inlineOverlays: addOverlays.length > 0 ? addOverlays : undefined,
+                    inlineOverlays: addOverlays,
                 });
                 pushLineComments(lines, hunk, 'add', undefined, newLineNum);
                 newLineNum++;
@@ -628,27 +987,37 @@ function buildDiffLines(rightWidth: number): DiffLine[] {
                 continue;
             }
 
+            const numPrefix = lineNumPrefix(curOldLine, curNewLine);
+            const decoratedText = numPrefix + line;
+            const numPrefixLen = getByteLength(numPrefix);
+            const dimNumOverlay: InlineOverlay = {
+                start: 0, end: numPrefixLen, style: { fg: STYLE_LINE_NUM_FG },
+            };
+
             if (prefix === '+') {
                 lines.push({
-                    text: line, type: 'add',
+                    text: decoratedText, type: 'add',
                     style: { bg: STYLE_ADD_BG, extendToLineEnd: true },
                     hunkId: hunk.id, file: hunk.file,
                     lineType, oldLine: curOldLine, newLine: curNewLine, lineContent: line,
+                    inlineOverlays: [dimNumOverlay],
                 });
                 newLineNum++;
             } else if (prefix === '-') {
                 lines.push({
-                    text: line, type: 'remove',
+                    text: decoratedText, type: 'remove',
                     style: { bg: STYLE_REMOVE_BG, extendToLineEnd: true },
                     hunkId: hunk.id, file: hunk.file,
                     lineType, oldLine: curOldLine, newLine: curNewLine, lineContent: line,
+                    inlineOverlays: [dimNumOverlay],
                 });
                 oldLineNum++;
             } else {
                 lines.push({
-                    text: line, type: 'context',
+                    text: decoratedText, type: 'context',
                     hunkId: hunk.id, file: hunk.file,
                     lineType, oldLine: curOldLine, newLine: curNewLine, lineContent: line,
+                    inlineOverlays: [dimNumOverlay],
                 });
                 oldLineNum++;
                 newLineNum++;
@@ -657,6 +1026,10 @@ function buildDiffLines(rightWidth: number): DiffLine[] {
             // Render inline comments attached to this line
             pushLineComments(lines, hunk, lineType, curOldLine, curNewLine);
         }
+        }
+
+        // Blank separator between files
+        lines.push({ text: '', type: 'empty' });
     }
 
     return lines;
@@ -671,10 +1044,15 @@ function buildDiffLines(rightWidth: number): DiffLine[] {
  */
 
 // Theme colors for toolbar key hints
-const STYLE_KEY_FG: OverlayColorSpec = "syntax.keyword";
-const STYLE_KEY_BG: OverlayColorSpec = "editor.selection_bg";
+// Toolbar styling — explicitly NOT using `ui.status_bar_bg` because that
+// key is a saturated accent in some themes (Dracula's hot pink). Instead
+// we paint the toolbar with `editor.bg` so it visually matches the
+// editor content and keys/labels get reliable contrast against it.
+//   * Keys: `editor.fg` + bold (white-bold on dark, etc.).
+//   * Labels: `editor.line_number_fg` (dim foreground in every theme).
+const STYLE_KEY_FG: OverlayColorSpec = "editor.fg";
 const STYLE_HINT_FG: OverlayColorSpec = "editor.line_number_fg";
-const STYLE_TOOLBAR_BG: OverlayColorSpec = "ui.status_bar_bg";
+const STYLE_TOOLBAR_BG: OverlayColorSpec = "editor.bg";
 const STYLE_TOOLBAR_SEP: OverlayColorSpec = "ui.split_separator_fg";
 
 interface HintItem {
@@ -686,24 +1064,7 @@ interface HintItem {
  * Build a styled toolbar entry with highlighted key hints.
  * Keys get bold + keyword color; labels get dim text; groups separated by │.
  */
-function buildToolbar(W: number): TextPropertyEntry {
-    // Items within each group are ordered by importance so that when the
-    // viewport is narrow, the most useful hints get full labels while
-    // less discoverable ones are truncated to key-only or dropped.
-    const groups: HintItem[][] = state.focusPanel === 'files'
-        ? [
-            [{ key: "s", label: "Stage" }, { key: "u", label: "Unstage" }, { key: "d", label: "Discard" }],
-            [{ key: "c", label: "Comment" }, { key: "N", label: "Note" }, { key: "x", label: "Del" }],
-            [{ key: "e", label: "Export" }, { key: "q", label: "Close" }, { key: "↵", label: "Open" }, { key: "Tab", label: "Switch" }, { key: "r", label: "Refresh" }],
-          ]
-        : [
-            [{ key: "s", label: "Stage" }, { key: "u", label: "Unstage" }, { key: "d", label: "Discard" }],
-            [{ key: "c", label: "Comment" }, { key: "N", label: "Note" }, { key: "x", label: "Del" }],
-            [{ key: "n", label: "Next" }, { key: "p", label: "Prev" }, { key: "e", label: "Export" }, { key: "q", label: "Close" }, { key: "Tab", label: "Switch" }],
-          ];
-
-    // Build text and collect overlay ranges, gracefully dropping labels
-    // when the viewport is too narrow to fit everything.
+function buildToolbarRow(W: number, groups: HintItem[][]): TextPropertyEntry {
     const overlays: InlineOverlay[] = [];
     let text = " ";
     let bytePos = getByteLength(" ");
@@ -720,15 +1081,21 @@ function buildToolbar(W: number): TextPropertyEntry {
         for (let h = 0; h < groups[g].length && !done; h++) {
             const item = groups[g][h];
             const gap = h > 0 ? "  " : "";
-            const fullLen = gap.length + item.key.length + 1 + item.label.length;
-            const keyOnlyLen = gap.length + item.key.length;
+            // Bracket-style key hint: "[key] label" — the brackets make
+            // the keys legible without a saturated bg, which works in
+            // every theme (no Dracula hot-pink toolbar problem). When
+            // the key itself is `[` or `]`, drop the brackets so we
+            // don't render `[[]` / `[]]`.
+            const isBracket = item.key === '[' || item.key === ']';
+            const keyDisplay = isBracket ? item.key : `[${item.key}]`;
+            const fullLen = gap.length + keyDisplay.length + 1 + item.label.length;
+            const keyOnlyLen = gap.length + keyDisplay.length;
 
             if (text.length + fullLen <= W) {
-                // Full item: gap + key + " " + label
                 if (gap) { text += gap; bytePos += getByteLength(gap); }
-                const keyLen = getByteLength(item.key);
-                overlays.push({ start: bytePos, end: bytePos + keyLen, style: { fg: STYLE_KEY_FG, bg: STYLE_KEY_BG, bold: true } });
-                text += item.key;
+                const keyLen = getByteLength(keyDisplay);
+                overlays.push({ start: bytePos, end: bytePos + keyLen, style: { fg: STYLE_KEY_FG, bold: true } });
+                text += keyDisplay;
                 bytePos += keyLen;
                 const labelText = " " + item.label;
                 const labelLen = getByteLength(labelText);
@@ -736,11 +1103,10 @@ function buildToolbar(W: number): TextPropertyEntry {
                 text += labelText;
                 bytePos += labelLen;
             } else if (text.length + keyOnlyLen <= W) {
-                // Key only (no label) when space is tight
                 if (gap) { text += gap; bytePos += getByteLength(gap); }
-                const keyLen = getByteLength(item.key);
-                overlays.push({ start: bytePos, end: bytePos + keyLen, style: { fg: STYLE_KEY_FG, bg: STYLE_KEY_BG, bold: true } });
-                text += item.key;
+                const keyLen = getByteLength(keyDisplay);
+                overlays.push({ start: bytePos, end: bytePos + keyLen, style: { fg: STYLE_KEY_FG, bold: true } });
+                text += keyDisplay;
                 bytePos += keyLen;
             } else {
                 done = true;
@@ -757,75 +1123,82 @@ function buildToolbar(W: number): TextPropertyEntry {
     };
 }
 
-// --- Buffer Group panel content builders ---
-
-function buildToolbarPanelEntries(): TextPropertyEntry[] {
-    // Reuse buildToolbar — returns one entry with the full toolbar line
-    return [buildToolbar(state.viewportWidth)];
+/**
+ * Build the (two-row) toolbar with all review-diff shortcuts.
+ * Row 1 — navigation; row 2 — actions. Identical regardless of which
+ * panel currently has focus (no more files-pane vs diff-pane variants).
+ */
+function buildToolbar(W: number): TextPropertyEntry[] {
+    // In range mode, stage / unstage / discard are meaningless (there is
+    // no working tree to mutate), so hide them from the hint bar to keep
+    // the toolbar honest. The key-bindings themselves are harmless if
+    // pressed — `review_stage_scope` no-ops on range-mode hunks because
+    // their gitStatus is 'unstaged' and the git commands it invokes
+    // target the working tree, which isn't what the user intended. The
+    // toolbar is the user-facing surface, so pruning here is the
+    // cheapest honest thing to do.
+    const inRange = state.mode === 'range';
+    const row1: HintItem[][] = [
+        [{ key: "n", label: "next hunk" }, { key: "p", label: "prev hunk" },
+         { key: "]", label: "next cmt" }, { key: "[", label: "prev cmt" }],
+        inRange
+            ? [{ key: "v", label: "select" }, { key: "c", label: "comment" }]
+            : [{ key: "s", label: "stage" }, { key: "u", label: "unstage" }, { key: "d", label: "discard" },
+               { key: "v", label: "select" }, { key: "c", label: "comment" }],
+    ];
+    const row2: HintItem[][] = [
+        [{ key: "Tab", label: "fold" }, { key: "z a", label: "fold all" }, { key: "z r", label: "unfold all" }],
+        inRange
+            ? [{ key: "Enter", label: "jump" }, { key: "e", label: "export" }, { key: "q", label: "close" }]
+            : [{ key: "S U D", label: "file-level" }, { key: "Enter", label: "jump" },
+               { key: "e", label: "export" }, { key: "q", label: "close" }],
+    ];
+    return [buildToolbarRow(W, row1), buildToolbarRow(W, row2)];
 }
 
-function buildFilesPanelEntries(): TextPropertyEntry[] {
-    const entries: TextPropertyEntry[] = [];
-    const leftWidth = Math.max(28, Math.floor(state.viewportWidth * 0.3));
-
-    // Header row: "GIT STATUS" — emphasized when the files panel has focus.
-    const focusLeft = state.focusPanel === 'files';
-    const headerStyle: Partial<OverlayOptions> = focusLeft
-        ? { fg: STYLE_HEADER, bold: true, underline: true }
-        : { fg: STYLE_DIVIDER };
-    entries.push({
-        text: " GIT STATUS\n",
-        style: headerStyle,
-        properties: { type: "header" },
-    });
+// --- Buffer Group panel content builders ---
 
-    const lines = buildFileListLines(leftWidth);
-    for (const line of lines) {
-        // Selection is plugin-managed: draw a bg highlight on the row whose
-        // fileIndex matches state.selectedIndex. The native cursor is hidden
-        // for the files panel (show_cursors stays false).
-        const isSelected = line.type === 'file' && line.fileIndex === state.selectedIndex;
-        const baseStyle = line.style;
-        const style: Partial<OverlayOptions> | undefined = isSelected
-            ? { ...(baseStyle || {}), bg: STYLE_SELECTED_BG, bold: true, extendToLineEnd: true }
-            : baseStyle;
-        entries.push({
-            text: (line.text || "") + "\n",
-            style,
-            inlineOverlays: line.inlineOverlays,
-            properties: { type: line.type, fileIndex: line.fileIndex },
-        });
-    }
-    return entries;
+function buildToolbarPanelEntries(): TextPropertyEntry[] {
+    // Two-row toolbar: navigation hints on row 1, actions on row 2.
+    return buildToolbar(state.viewportWidth);
 }
 
 /**
- * Build (or fetch from cache) the diff-panel entries for the currently
- * selected file. The cache is keyed by `${file}\0${gitStatus}` and is cleared
- * in `refreshMagitData`. As a side effect, populates `state.hunkHeaderRows`
- * and `state.diffLineByteOffsets` for the cached entry — these back `n`/`p`
- * hunk navigation and the cursor-line overlay.
+ * Build the unified-diff stream entries. Emits one row per file header
+ * followed by all of that file's hunks inline, plus inline comments and
+ * a blank separator between files. As a side effect, populates
+ * `state.hunkHeaderRows`, `state.diffLineByteOffsets`, and
+ * `state.fileHeaderRows` so the rest of the plugin can map cursor rows
+ * back to hunks/files.
  */
 function buildDiffPanelEntries(): TextPropertyEntry[] {
-    const selectedFile = state.files[state.selectedIndex];
-    const cacheKey = selectedFile
-        ? `${selectedFile.path}\0${selectedFile.category}`
-        : "\0";
-    const cached = state.diffCache[cacheKey];
-    if (cached) {
-        state.hunkHeaderRows = cached.hunkHeaderRows;
-        state.diffLineByteOffsets = cached.diffLineByteOffsets;
-        return cached.entries;
-    }
-
     const entries: TextPropertyEntry[] = [];
-    const leftWidth = Math.max(28, Math.floor(state.viewportWidth * 0.3));
-    const rightWidth = state.viewportWidth - leftWidth - 1;
 
     const hunkHeaderRows: number[] = [];
     const diffLineByteOffsets: number[] = [];
+    const fileHeaderRows: Record<string, number> = {};
+    const sectionHeaderRows: Record<string, number> = {};
+    const hunkRowByHunkId: Record<string, number> = {};
+    const diffLineRowByCommentId: Record<string, number> = {};
+    const entryPropsByRow: Record<number, Record<string, unknown>> = {};
+    // Byte ranges of collapsible bodies, captured in this same single
+    // pass so collapse later just registers a host fold (no rebuild).
+    // The "body" of an entity is the byte range from the byte after
+    // its header's newline up to the byte before the next header that
+    // ends it.
+    const sectionBodyRange: Record<string, { start: number; end: number }> = {};
+    const fileBodyRange: Record<string, { start: number; end: number }> = {};
+    const hunkBodyRange: Record<string, { start: number; end: number }> = {};
+    let curSection: string | null = null;
+    let curFile: string | null = null;
+    let curHunk: string | null = null;
+    let sectionBodyStart = 0;
+    let fileBodyStart = 0;
+    let hunkBodyStart = 0;
+
     let runningByte = 0;
     let row = 0; // 0-indexed counter; row + 1 is the 1-indexed line number
+    let lastDiffLineRow = 0; // 1-indexed row of the most recent +/-/context line
 
     const pushEntry = (entry: TextPropertyEntry) => {
         diffLineByteOffsets.push(runningByte);
@@ -834,23 +1207,8 @@ function buildDiffPanelEntries(): TextPropertyEntry[] {
         row++;
     };
 
-    // Header row: "DIFF FOR <file>". Always rendered as focused (the panel
-    // is the only place this header appears) so the cached entries can be
-    // reused regardless of which panel currently has focus.
-    const rightHeader = selectedFile
-        ? ` DIFF FOR ${selectedFile.path}`
-        : " DIFF";
-    pushEntry({
-        text: rightHeader + "\n",
-        style: { fg: STYLE_HEADER, bold: true, underline: true },
-        properties: { type: "header" },
-    });
-
-    const lines = buildDiffLines(rightWidth);
+    const lines = buildDiffLines(state.viewportWidth);
     for (const line of lines) {
-        // Embed the full DiffLine metadata as text properties so action
-        // handlers (`s`, `u`, `d`, `c`, `x`) can read it back via
-        // getTextPropertiesAtCursor without re-walking state.hunks.
         const props: Record<string, unknown> = { type: line.type };
         if (line.hunkId !== undefined) props.hunkId = line.hunkId;
         if (line.file !== undefined) props.file = line.file;
@@ -859,26 +1217,179 @@ function buildDiffPanelEntries(): TextPropertyEntry[] {
         if (line.newLine !== undefined) props.newLine = line.newLine;
         if (line.lineContent !== undefined) props.lineContent = line.lineContent;
         if (line.commentId !== undefined) props.commentId = line.commentId;
+        if (line.filePath !== undefined) props.filePath = line.filePath;
+        if (line.fileKey !== undefined) props.fileKey = line.fileKey;
+        if (line.fileIndex !== undefined) props.fileIndex = line.fileIndex;
+
+        const entryStart = runningByte;
+
+        // Header bookkeeping — close any in-progress body for the
+        // entities about to be replaced, then open a new body range.
+        if (line.type === 'section-header' && line.filePath) {
+            if (curHunk) hunkBodyRange[curHunk] = { start: hunkBodyStart, end: entryStart };
+            if (curFile) fileBodyRange[curFile] = { start: fileBodyStart, end: entryStart };
+            if (curSection) sectionBodyRange[curSection] = { start: sectionBodyStart, end: entryStart };
+            curSection = line.filePath;
+            curFile = null;
+            curHunk = null;
+        }
+        if (line.type === 'file-header' && line.fileKey) {
+            if (curHunk) hunkBodyRange[curHunk] = { start: hunkBodyStart, end: entryStart };
+            if (curFile) fileBodyRange[curFile] = { start: fileBodyStart, end: entryStart };
+            curFile = line.fileKey;
+            curHunk = null;
+        }
+        if (line.type === 'hunk-header' && line.hunkId) {
+            if (curHunk) hunkBodyRange[curHunk] = { start: hunkBodyStart, end: entryStart };
+            curHunk = line.hunkId;
+        }
 
         if (line.type === 'hunk-header') {
-            // 1-indexed row of this hunk header in the diff buffer.
             hunkHeaderRows.push(row + 1);
+            if (line.hunkId) hunkRowByHunkId[line.hunkId] = row + 1;
+        }
+        if (line.type === 'file-header' && line.fileKey) {
+            fileHeaderRows[line.fileKey] = row + 1;
+        }
+        if (line.type === 'section-header' && line.filePath) {
+            sectionHeaderRows[line.filePath] = row + 1;
+        }
+        if (line.type === 'add' || line.type === 'remove' || line.type === 'context') {
+            lastDiffLineRow = row + 1;
+        }
+        if (line.type === 'comment' && line.commentId) {
+            diffLineRowByCommentId[line.commentId] = lastDiffLineRow || (row + 1);
         }
 
+        entryPropsByRow[row + 1] = props;
+
         pushEntry({
             text: (line.text || "") + "\n",
             style: line.style,
             inlineOverlays: line.inlineOverlays,
             properties: props,
         });
+
+        // After the header is pushed, runningByte points to the first
+        // byte of the body that follows.
+        if (line.type === 'section-header') sectionBodyStart = runningByte;
+        if (line.type === 'file-header') fileBodyStart = runningByte;
+        if (line.type === 'hunk-header') hunkBodyStart = runningByte;
     }
 
-    // Sentinel: total buffer length, used as the end of the last row.
+    // Close trailing bodies.
+    if (curHunk) hunkBodyRange[curHunk] = { start: hunkBodyStart, end: runningByte };
+    if (curFile) fileBodyRange[curFile] = { start: fileBodyStart, end: runningByte };
+    if (curSection) sectionBodyRange[curSection] = { start: sectionBodyStart, end: runningByte };
+
     diffLineByteOffsets.push(runningByte);
 
-    state.diffCache[cacheKey] = { entries, hunkHeaderRows, diffLineByteOffsets };
     state.hunkHeaderRows = hunkHeaderRows;
     state.diffLineByteOffsets = diffLineByteOffsets;
+    state.fileHeaderRows = fileHeaderRows;
+    state.sectionHeaderRows = sectionHeaderRows;
+    state.hunkRowByHunkId = hunkRowByHunkId;
+    state.diffLineRowByCommentId = diffLineRowByCommentId;
+    state.entryPropsByRow = entryPropsByRow;
+    state.sectionBodyRange = sectionBodyRange;
+    state.fileBodyRange = fileBodyRange;
+    state.hunkBodyRange = hunkBodyRange;
+    return entries;
+}
+
+/**
+ * Build the comments navigation panel. Flat list of comments in the
+ * order they appear in the unified diff stream. Each row reads
+ *   "path:line  snippet"
+ * truncated to fit the panel width. Empty state shows a dim "No comments
+ * yet." line. Read-only in this step (interaction lands in Step 5/6).
+ */
+function buildCommentsPanelEntries(): TextPropertyEntry[] {
+    const entries: TextPropertyEntry[] = [];
+    state.commentsByRow = {};
+
+    const headerLabel = (editor.t("panel.comments") || "Comments").toUpperCase();
+    entries.push({
+        text: ` ${headerLabel}\n`,
+        style: {
+            fg: STYLE_INVERSE_FG,
+            bg: STYLE_INVERSE_BG,
+            bold: true,
+            extendToLineEnd: true,
+        },
+        properties: { type: "header" },
+    });
+
+    if (state.comments.length === 0) {
+        entries.push({
+            text: ` ${editor.t("panel.no_comments") || "No comments yet."}\n`,
+            style: { fg: STYLE_SECTION_HEADER, italic: true },
+            properties: { type: "empty" },
+        });
+        return entries;
+    }
+
+    // Order comments by their position in the unified stream. We approximate
+    // by sorting by (file index, line number, removed/added preference).
+    const fileIndex = (file: string, category: string | undefined): number => {
+        for (let i = 0; i < state.files.length; i++) {
+            const f = state.files[i];
+            if (f.path === file) return i;
+        }
+        return Number.MAX_SAFE_INTEGER;
+    };
+
+    const sortedComments = [...state.comments].sort((a, b) => {
+        // Look up via hunk's file
+        const hunkA = state.hunks.find(h => h.id === a.hunk_id);
+        const hunkB = state.hunks.find(h => h.id === b.hunk_id);
+        const fa = fileIndex(a.file, hunkA?.gitStatus);
+        const fb = fileIndex(b.file, hunkB?.gitStatus);
+        if (fa !== fb) return fa - fb;
+        const la = a.new_line ?? a.old_line ?? 0;
+        const lb = b.new_line ?? b.old_line ?? 0;
+        return la - lb;
+    });
+
+    let rowIdx = 1; // header is row 0 (0-indexed); comments start at row 1
+    for (const c of sortedComments) {
+        rowIdx++;
+        const lineRef = c.new_line ?? c.old_line ?? 0;
+        const path = c.file.split('/').pop() || c.file;
+        const snippet = c.text.replace(/\s+/g, ' ').trim();
+        // Leading marker: ">" when this comment is the diff cursor's
+        // current target (cursor is on the comment row itself, or on
+        // the line the comment is attached to). Otherwise a space.
+        const marker = c.id === state.commentsHighlightId ? '>' : ' ';
+        const text = `${marker} ${path}:${lineRef}  ${snippet}`;
+
+        // Truncate to fit panel width (estimate).
+        const panelWidth = Math.max(20, Math.floor(state.viewportWidth * 0.25) - 2);
+        const display = text.length > panelWidth ? text.slice(0, panelWidth - 1) + '…' : text;
+
+        const isSelected = rowIdx === state.commentsSelectedRow && state.focusPanel === 'comments';
+        const isCursorMarked = c.id === state.commentsHighlightId;
+        const style: Partial<OverlayOptions> | undefined = isSelected
+            ? { bg: STYLE_SELECTED_BG, bold: true, extendToLineEnd: true }
+            : isCursorMarked
+                ? { bold: true }
+                : undefined;
+
+        // Color the path:line prefix in keyword color (skip the marker).
+        const prefixLen = getByteLength(`${marker} ${path}:${lineRef}`);
+        const inlineOverlays: InlineOverlay[] = [
+            { start: 2, end: prefixLen, style: { fg: STYLE_KEY_FG } },
+        ];
+
+        state.commentsByRow[rowIdx] = c.id;
+        entries.push({
+            text: display + "\n",
+            style,
+            inlineOverlays,
+            properties: { type: "comment-nav", commentId: c.id, file: c.file, line: lineRef },
+        });
+    }
+
     return entries;
 }
 
@@ -891,21 +1402,320 @@ function updateMagitDisplay(): void {
     refreshViewportDimensions();
     if (state.groupId === null) return;
     editor.setPanelContent(state.groupId, "toolbar", buildToolbarPanelEntries());
-    editor.setPanelContent(state.groupId, "files", buildFilesPanelEntries());
     editor.setPanelContent(state.groupId, "diff", buildDiffPanelEntries());
-    // setPanelContent wipes the buffer's overlays — re-paint the diff
-    // cursor-line highlight (the files panel doesn't have one; selection
-    // there is rendered as part of the entry style).
+    editor.setPanelContent(state.groupId, "comments", buildCommentsPanelEntries());
+    refreshStickyHeader(0);
+    applyFolds();
     applyCursorLineOverlay('diff');
 }
 
 /**
- * Rebuild only the diff panel. Called when the selected file changes.
+ * Apply collapse state via the host's folding infrastructure. Folds
+ * are designed exactly for "header line stays visible, body lines
+ * skipped by the renderer". A fold range covers `[bodyStart, bodyEnd)`
+ * — the line containing `bodyStart - 1` (the header) stays visible,
+ * everything inside the range gets elided. The host renders its own
+ * "..." indicator on the collapsed header line, which is sufficient
+ * visual feedback (no need for a triangle swap).
+ *
+ * Toggling collapse on a 5000-line diff is now O(collapsed_set_size)
+ * `addFold` calls. `clearFolds` drops the entire set in one host call
+ * so re-applying after a state change is also cheap.
  */
-function refreshDiffPanelOnly(): void {
+function applyFolds(): void {
     if (state.groupId === null) return;
-    editor.setPanelContent(state.groupId, "diff", buildDiffPanelEntries());
-    applyCursorLineOverlay('diff');
+    const diffId = state.panelBuffers["diff"];
+    if (diffId === undefined) return;
+    editor.clearFolds(diffId);
+    for (const cat of state.collapsedSections) {
+        const body = state.sectionBodyRange[cat];
+        if (body && body.end > body.start) editor.addFold(diffId, body.start, body.end);
+    }
+    for (const key of state.collapsedFiles) {
+        const body = state.fileBodyRange[key];
+        if (body && body.end > body.start) editor.addFold(diffId, body.start, body.end);
+    }
+    for (const id of state.collapsedHunks) {
+        const body = state.hunkBodyRange[id];
+        if (body && body.end > body.start) editor.addFold(diffId, body.start, body.end);
+    }
+}
+
+/**
+ * Render the sticky panel for `topVisibleRow` (0-indexed line at the top
+ * of the diff viewport). Shows the file whose header row is the largest
+ * ≤ topVisibleRow, with its category as a dim prefix. Falls back to a
+ * neutral summary when nothing is above the cursor.
+ */
+function refreshStickyHeader(topVisibleRow: number): void {
+    if (state.groupId === null) return;
+    const stickyId = state.panelBuffers["sticky"];
+    if (stickyId === undefined) return;
+
+    const W = state.viewportWidth;
+    let text: string;
+    let style: Partial<OverlayOptions> = { fg: STYLE_HEADER, bold: true };
+
+    // topVisibleRow is 0-indexed; fileHeaderRows are 1-indexed.
+    const top1 = topVisibleRow + 1;
+    let bestFile: FileEntry | null = null;
+    let bestRow = 0;
+    for (const f of state.files) {
+        const row = state.fileHeaderRows[fileKey(f)];
+        if (row !== undefined && row <= top1 && row > bestRow) {
+            bestRow = row;
+            bestFile = f;
+        }
+    }
+
+    if (!bestFile) {
+        if (state.files.length === 0) {
+            text = ` ${editor.t("status.review_empty") || "Review Diff"}`;
+        } else {
+            const totals = state.files.reduce(
+                (acc, f) => {
+                    const c = fileChangeCounts(f);
+                    acc.added += c.added;
+                    acc.removed += c.removed;
+                    return acc;
+                },
+                { added: 0, removed: 0 }
+            );
+            const rangeSuffix = state.mode === 'range' && state.range
+                ? ` (${state.range.label})`
+                : '';
+            text = ` Review Diff${rangeSuffix} — ${state.files.length} files, +${totals.added} / -${totals.removed}`;
+            style = { fg: STYLE_SECTION_HEADER, italic: true };
+        }
+    } else {
+        const counts = fileChangeCounts(bestFile);
+        let section: string = bestFile.category;
+        // In range mode every hunk is bucketed as 'unstaged' as an impl
+        // detail; "UNSTAGED" would be misleading, so display the range
+        // label instead.
+        if (state.mode === 'range' && state.range) {
+            section = state.range.label;
+        } else if (bestFile.category === 'staged') section = (editor.t("section.staged") || "Staged").toUpperCase();
+        else if (bestFile.category === 'unstaged') section = (editor.t("section.unstaged") || "Changes").toUpperCase();
+        else if (bestFile.category === 'untracked') section = (editor.t("section.untracked") || "Untracked").toUpperCase();
+        const filename = bestFile.origPath ? `${bestFile.origPath} → ${bestFile.path}` : bestFile.path;
+        text = ` ${section} · ${filename}   +${counts.added} / -${counts.removed}`;
+    }
+
+    const padded = (text.length > W ? text.slice(0, W) : text).padEnd(W) + "\n";
+    editor.setPanelContent(state.groupId, "sticky", [{
+        text: padded,
+        // Same band-bg as file/section headers — keeps the sticky visually
+        // tied to the headers it summarizes and avoids the toolbar's
+        // status_bar_bg, which is a saturated accent in some themes
+        // (Dracula's is hot pink — clashes badly with the diff content).
+        style: { ...style, bg: STYLE_FILE_HEADER_BG, extendToLineEnd: true },
+        properties: { type: "sticky-header" },
+    }]);
+}
+
+/**
+ * Helper: jump the diff cursor to the file's first hunk (or its file
+ * header if it has no hunks). Auto-expands the file if collapsed.
+ */
+function jumpToFile(file: FileEntry): void {
+    const key = fileKey(file);
+    if (state.collapsedFiles.has(key)) {
+        state.collapsedFiles.delete(key);
+        updateMagitDisplay();
+    }
+    // Prefer first hunk row; fall back to the file-header row.
+    const fileIdx = state.files.indexOf(file);
+    if (fileIdx >= 0) {
+        // Compute visible hunk index of the first hunk for this file.
+        let visibleIdx = 0;
+        let foundGlobal = -1;
+        for (let i = 0; i < state.hunks.length; i++) {
+            const h = state.hunks[i];
+            const hKey = fileKeyOf(h.file, h.gitStatus || 'unstaged');
+            if (state.collapsedFiles.has(hKey)) continue;
+            if (h.file === file.path && h.gitStatus === file.category) {
+                foundGlobal = i;
+                break;
+            }
+            visibleIdx++;
+        }
+        if (foundGlobal >= 0) {
+            const row = state.hunkHeaderRows[visibleIdx];
+            if (row !== undefined) { jumpDiffCursorToRow(row); return; }
+        }
+    }
+    const headerRow = state.fileHeaderRows[key];
+    if (headerRow !== undefined) jumpDiffCursorToRow(headerRow);
+}
+
+/**
+ * Mouse click handler. Routes clicks to the appropriate behavior:
+ *   * Diff buffer file-header row → toggle that file's collapse state.
+ *   * Sticky panel → jump to the currently-pinned file's first hunk.
+ *   * Comments panel row → jump diff cursor to that comment's location
+ *     (auto-expanding the file when collapsed) and select the row.
+ */
+function on_review_mouse_click(data: {
+    column: number; row: number; button: string; modifiers: string;
+    content_x: number; content_y: number;
+    buffer_id: number | null; buffer_row: number | null; buffer_col: number | null;
+}): void {
+    if (state.groupId === null) return;
+    if (data.buffer_id === null || data.buffer_row === null) return;
+
+    const diffId = state.panelBuffers["diff"];
+    const stickyId = state.panelBuffers["sticky"];
+    const commentsId = state.panelBuffers["comments"];
+
+    // Click in the diff buffer: section headers and file headers are
+    // both interactive — clicking either toggles its fold state.
+    if (data.buffer_id === diffId) {
+        const targetRow1 = data.buffer_row + 1;
+        // Section header click: toggle the whole category.
+        for (const cat of Object.keys(state.sectionHeaderRows)) {
+            if (state.sectionHeaderRows[cat] === targetRow1) {
+                if (state.collapsedSections.has(cat)) state.collapsedSections.delete(cat);
+                else state.collapsedSections.add(cat);
+                applyFolds();
+                const sectionRow = state.sectionHeaderRows[cat];
+                if (sectionRow !== undefined) jumpDiffCursorToRow(sectionRow);
+                return;
+            }
+        }
+        // File header click: toggle the single file.
+        for (const f of state.files) {
+            if (state.fileHeaderRows[fileKey(f)] === targetRow1) {
+                const key = fileKey(f);
+                if (state.collapsedFiles.has(key)) state.collapsedFiles.delete(key);
+                else state.collapsedFiles.add(key);
+                applyFolds();
+                const headerRow = state.fileHeaderRows[key];
+                if (headerRow !== undefined) jumpDiffCursorToRow(headerRow);
+                return;
+            }
+        }
+        // Hunk header click: toggle the single hunk.
+        for (const hunkId of Object.keys(state.hunkRowByHunkId)) {
+            if (state.hunkRowByHunkId[hunkId] === targetRow1) {
+                if (state.collapsedHunks.has(hunkId)) state.collapsedHunks.delete(hunkId);
+                else state.collapsedHunks.add(hunkId);
+                applyFolds();
+                const hunkRow = state.hunkRowByHunkId[hunkId];
+                if (hunkRow !== undefined) jumpDiffCursorToRow(hunkRow);
+                return;
+            }
+        }
+        return;
+    }
+
+    // Click on the sticky pinned-header: jump to the pinned file's first hunk.
+    if (data.buffer_id === stickyId) {
+        // Re-derive the pinned file from current viewport top.
+        const top1 = state.diffCursorRow; // approximation; sticky tracks topmost visible
+        let bestFile: FileEntry | null = null;
+        let bestRow = 0;
+        for (const f of state.files) {
+            const row = state.fileHeaderRows[fileKey(f)];
+            if (row !== undefined && row <= top1 && row > bestRow) {
+                bestRow = row;
+                bestFile = f;
+            }
+        }
+        if (bestFile) jumpToFile(bestFile);
+        return;
+    }
+
+    // Click in the comments panel: jump to the comment's location and
+    // hand focus to the diff so the user can immediately keep navigating.
+    if (data.buffer_id === commentsId) {
+        const targetRow1 = data.buffer_row + 1;
+        const commentId = state.commentsByRow[targetRow1];
+        if (commentId) {
+            state.commentsSelectedRow = targetRow1;
+            jumpToComment(commentId);
+            editor.focusBufferGroupPanel(state.groupId, "diff");
+            editor.setPanelContent(state.groupId, "comments", buildCommentsPanelEntries());
+        }
+        return;
+    }
+}
+registerHandler("on_review_mouse_click", on_review_mouse_click);
+
+/**
+ * Jump the diff cursor to the line associated with a comment, auto-
+ * expanding the comment's file if it is currently collapsed.
+ */
+function jumpToComment(commentId: string): void {
+    const comment = state.comments.find(c => c.id === commentId);
+    if (!comment) return;
+    const hunk = state.hunks.find(h => h.id === comment.hunk_id);
+    if (!hunk) return;
+    // Auto-expand whatever's between the cursor and this comment.
+    let needRebuild = false;
+    if (hunk.gitStatus && state.collapsedSections.has(hunk.gitStatus)) {
+        state.collapsedSections.delete(hunk.gitStatus);
+        needRebuild = true;
+    }
+    const file = state.files.find(f => f.path === hunk.file && f.category === hunk.gitStatus);
+    if (file) {
+        const key = fileKey(file);
+        if (state.collapsedFiles.has(key)) {
+            state.collapsedFiles.delete(key);
+            needRebuild = true;
+        }
+    }
+    if (state.collapsedHunks.has(hunk.id)) {
+        state.collapsedHunks.delete(hunk.id);
+        needRebuild = true;
+    }
+    if (needRebuild) updateMagitDisplay();
+    // Pin this comment as the highlighted one BEFORE jumping. Any
+    // subsequent cursor_moved event that re-derives the highlight
+    // will recompute the same id; doing it eagerly avoids a flicker
+    // (and works even when the cursor lands on a row whose props
+    // don't directly carry a comment id).
+    const prevHighlight = state.commentsHighlightId;
+    state.commentsHighlightId = commentId;
+    if (state.groupId !== null && prevHighlight !== commentId) {
+        editor.setPanelContent(state.groupId, "comments", buildCommentsPanelEntries());
+    }
+    // Prefer the diff line the comment is anchored to (line-based);
+    // fall back to the hunk header if the lookup hasn't seen the
+    // comment yet (race / first render).
+    const lineRow = state.diffLineRowByCommentId[commentId];
+    if (lineRow !== undefined) { jumpDiffCursorToRow(lineRow); return; }
+    const hunkRow = state.hunkRowByHunkId[hunk.id];
+    if (hunkRow !== undefined) jumpDiffCursorToRow(hunkRow);
+}
+
+function on_review_viewport_changed(data: { split_id: number; buffer_id: number; top_byte: number; top_line: number | null; width: number; height: number }): void {
+    if (state.groupId === null) return;
+    if (data.buffer_id !== state.panelBuffers["diff"]) return;
+    // Prefer top_line when the host provides it. Virtual buffers may not
+    // have line metadata, in which case top_line is null — fall back to
+    // converting top_byte using our own row-byte index.
+    const topRow = data.top_line ?? rowFromByte(data.top_byte);
+    state.diffViewportTopRow = topRow;
+    refreshStickyHeader(topRow);
+}
+registerHandler("on_review_viewport_changed", on_review_viewport_changed);
+
+/**
+ * Binary-search `state.diffLineByteOffsets` for the 0-indexed row
+ * whose byte offset is the largest one ≤ topByte.
+ */
+function rowFromByte(topByte: number): number {
+    const offs = state.diffLineByteOffsets;
+    if (offs.length === 0) return 0;
+    let lo = 0;
+    let hi = offs.length - 1;
+    while (lo < hi) {
+        const mid = (lo + hi + 1) >> 1;
+        if (offs[mid] <= topByte) lo = mid;
+        else hi = mid - 1;
+    }
+    return lo;
 }
 
 /**
@@ -935,120 +1745,486 @@ function applyCursorLineOverlay(panel: 'diff'): void {
 function review_refresh() { refreshMagitData(); }
 registerHandler("review_refresh", review_refresh);
 
-// --- Focus and cursor-driven navigation ---
-//
-// Cursor keys (j/k/Up/Down/PageUp/PageDown/Home/End) are bound to plugin
-// handlers that branch on which panel is focused:
+// --- Cursor-driven navigation ---
 //
-//   * Files panel: selection is plugin-managed (`state.selectedIndex` with
-//     a `>` prefix + bg highlight). The handler updates the index, repaints
-//     the files panel, and swaps the diff panel content from cache. The
-//     native cursor stays hidden in the files panel.
-//
-//   * Diff panel: motion is delegated to the editor's built-in actions
-//     (`move_up`, `move_down`, etc.) via `executeAction`. The cursor moves
-//     natively, the editor handles viewport scrolling, and `cursor_moved`
-//     fires so the cursor-line overlay follows along.
+// In the unified-stream layout the diff panel owns the editor's native
+// cursor; j/k/Up/Down/PageUp/PageDown/Home/End delegate directly to the
+// editor's built-in motion actions via `executeAction`. The plugin only
+// observes `cursor_moved` events to repaint the cursor-line overlay and
+// keep `state.diffCursorRow` in sync.
+
+/**
+ * Derive the "current file" (FileEntry) from the cursor row in the unified
+ * diff stream — the file whose header row is the largest one ≤ the cursor
+ * row. Returns null if no file header is at or above the cursor (cursor
+ * sits in the empty preamble or there are no files).
+ */
+function currentFileFromCursor(): FileEntry | null {
+    let bestFile: FileEntry | null = null;
+    let bestRow = 0;
+    for (const f of state.files) {
+        const row = state.fileHeaderRows[fileKey(f)];
+        if (row !== undefined && row <= state.diffCursorRow && row > bestRow) {
+            bestRow = row;
+            bestFile = f;
+        }
+    }
+    return bestFile;
+}
+
+/** Look up the entry's properties for the cursor's current row. Uses
+ *  the per-row props map populated during build, which is exact —
+ *  unlike `editor.getTextPropertiesAtCursor`, which can return the
+ *  previous row's properties when the cursor sits at a row boundary. */
+function propsAtCursorRow(): Record<string, unknown> | null {
+    return state.entryPropsByRow[state.diffCursorRow] || null;
+}
 
-function isFilesFocused(): boolean {
-    return state.focusPanel === 'files';
+function sectionUnderCursor(): string | null {
+    const props = propsAtCursorRow();
+    if (!props || props["type"] !== 'section-header') return null;
+    const filePath = props["filePath"];
+    return typeof filePath === 'string' ? filePath : null;
 }
 
-function refreshFilesPanelOnly(): void {
+/**
+ * Tab dispatches to the *nearest ancestor* of the cursor's row:
+ *   * Section header → toggle the section.
+ *   * File header   → toggle the file.
+ *   * Anywhere inside a hunk (header, body, inline comment) → toggle
+ *     the hunk.
+ *   * Blank line above any file header (i.e. cursor inside a file's
+ *     diff before its first hunk) → toggle that file.
+ *   * Cursor in the comments panel → swap focus back to the diff.
+ */
+function review_toggle_file_collapse() {
     if (state.groupId === null) return;
-    editor.setPanelContent(state.groupId, "files", buildFilesPanelEntries());
+    if (state.focusPanel === 'comments') {
+        editor.focusBufferGroupPanel(state.groupId, "diff");
+        return;
+    }
+    if (state.files.length === 0) return;
+
+    // Section header → toggle whole section.
+    const section = sectionUnderCursor();
+    if (section) {
+        if (state.collapsedSections.has(section)) state.collapsedSections.delete(section);
+        else state.collapsedSections.add(section);
+        applyFolds();
+        const sectionRow = state.sectionHeaderRows[section];
+        if (sectionRow !== undefined) jumpDiffCursorToRow(sectionRow);
+        return;
+    }
+
+    // File header → toggle whole file.
+    const headerFile = fileHeaderUnderCursor();
+    if (headerFile) {
+        const key = fileKey(headerFile);
+        if (state.collapsedFiles.has(key)) state.collapsedFiles.delete(key);
+        else state.collapsedFiles.add(key);
+        applyFolds();
+        const headerRow = state.fileHeaderRows[key];
+        if (headerRow !== undefined) jumpDiffCursorToRow(headerRow);
+        return;
+    }
+
+    // Hunk (header / body / inline comment) → toggle that hunk.
+    const hunk = getHunkAtDiffCursor();
+    if (hunk) {
+        if (state.collapsedHunks.has(hunk.id)) state.collapsedHunks.delete(hunk.id);
+        else state.collapsedHunks.add(hunk.id);
+        applyFolds();
+        const hunkRow = state.hunkRowByHunkId[hunk.id];
+        if (hunkRow !== undefined) jumpDiffCursorToRow(hunkRow);
+        return;
+    }
+
+    // Fall back to the parent file if cursor is in a no-man's-land (e.g.
+    // blank separator after the last hunk of a file).
+    const fallbackFile = currentFileFromCursor();
+    if (!fallbackFile) return;
+    const key = fileKey(fallbackFile);
+    if (state.collapsedFiles.has(key)) state.collapsedFiles.delete(key);
+    else state.collapsedFiles.add(key);
+    applyFolds();
+    const headerRow = state.fileHeaderRows[key];
+    if (headerRow !== undefined) jumpDiffCursorToRow(headerRow);
+}
+registerHandler("review_toggle_file_collapse", review_toggle_file_collapse);
+
+/**
+ * Order comments the same way the comments panel does — by file order
+ * in the unified stream, then by line number. Keeping the ordering
+ * here in sync with `buildCommentsPanelEntries` is important so that
+ * keyboard navigation lands on the same row the user sees.
+ *
+ * Builds an O(F) path -> index map once per call instead of doing a
+ * linear scan of state.files for every comment in the sort comparator.
+ */
+function commentsInPanelOrder(): ReviewComment[] {
+    const fileIdx: Record<string, number> = {};
+    for (let i = 0; i < state.files.length; i++) fileIdx[state.files[i].path] = i;
+    return [...state.comments].sort((a, b) => {
+        const fa = fileIdx[a.file] ?? Number.MAX_SAFE_INTEGER;
+        const fb = fileIdx[b.file] ?? Number.MAX_SAFE_INTEGER;
+        if (fa !== fb) return fa - fb;
+        return (a.new_line ?? a.old_line ?? 0) - (b.new_line ?? b.old_line ?? 0);
+    });
 }
 
-function selectFile(newIndex: number) {
-    if (newIndex < 0 || newIndex >= state.files.length) return;
-    if (newIndex === state.selectedIndex) return;
-    state.selectedIndex = newIndex;
-    state.diffCursorRow = 1; // diff panel cursor returns to the top of the new file
-    refreshFilesPanelOnly();
-    refreshDiffPanelOnly();
+function selectAndJumpToComment(c: ReviewComment) {
+    if (state.groupId === null) return;
+    jumpToComment(c.id);
+    // Find the comment's row in the panel (header is row 1, comments start at 2).
+    const sorted = commentsInPanelOrder();
+    const idx = sorted.findIndex(x => x.id === c.id);
+    if (idx >= 0) {
+        state.commentsSelectedRow = idx + 2;
+        editor.setPanelContent(state.groupId, "comments", buildCommentsPanelEntries());
+    }
 }
 
-function review_nav_up() {
-    if (isFilesFocused()) {
-        selectFile(state.selectedIndex - 1);
-    } else {
-        editor.executeAction("move_up");
+function review_next_comment() {
+    if (state.comments.length === 0) {
+        editor.setStatus(editor.t("status.no_comments") || "No comments");
+        return;
     }
+    const sorted = commentsInPanelOrder();
+    // Determine the comment-id currently under the diff cursor (if any).
+    const currentRow = state.commentsSelectedRow;
+    const currentIdx = currentRow >= 2 ? currentRow - 2 : -1;
+    const nextIdx = Math.min(sorted.length - 1, currentIdx + 1);
+    if (nextIdx === currentIdx && currentIdx >= 0) return;
+    selectAndJumpToComment(sorted[nextIdx >= 0 ? nextIdx : 0]);
 }
-registerHandler("review_nav_up", review_nav_up);
+registerHandler("review_next_comment", review_next_comment);
 
-function review_nav_down() {
-    if (isFilesFocused()) {
-        selectFile(state.selectedIndex + 1);
-    } else {
-        editor.executeAction("move_down");
+function review_prev_comment() {
+    if (state.comments.length === 0) {
+        editor.setStatus(editor.t("status.no_comments") || "No comments");
+        return;
     }
+    const sorted = commentsInPanelOrder();
+    const currentRow = state.commentsSelectedRow;
+    const currentIdx = currentRow >= 2 ? currentRow - 2 : sorted.length;
+    const prevIdx = Math.max(0, currentIdx - 1);
+    selectAndJumpToComment(sorted[prevIdx]);
 }
-registerHandler("review_nav_down", review_nav_down);
+registerHandler("review_prev_comment", review_prev_comment);
 
-function review_page_up() {
-    if (isFilesFocused()) {
-        const step = Math.max(1, state.viewportHeight - 2);
-        selectFile(Math.max(0, state.selectedIndex - step));
-    } else {
-        editor.executeAction("move_page_up");
+/**
+ * Focus the comments panel. Uses native focus-swap so the buffer's
+ * native cursor takes the keystrokes (j/k/Enter handled by the
+ * comments-mode keybindings).
+ */
+function review_focus_comments() {
+    if (state.groupId === null) return;
+    editor.focusBufferGroupPanel(state.groupId, "comments");
+    // Ensure the selection highlight shows immediately.
+    if (state.commentsSelectedRow < 2 && state.comments.length > 0) {
+        state.commentsSelectedRow = 2;
     }
+    editor.setPanelContent(state.groupId, "comments", buildCommentsPanelEntries());
 }
-registerHandler("review_page_up", review_page_up);
+registerHandler("review_focus_comments", review_focus_comments);
 
-function review_page_down() {
-    if (isFilesFocused()) {
-        const step = Math.max(1, state.viewportHeight - 2);
-        selectFile(Math.min(state.files.length - 1, state.selectedIndex + step));
-    } else {
-        editor.executeAction("move_page_down");
+/**
+ * Activate the currently-selected comment in the comments panel:
+ * jump the diff cursor to it (auto-expanding the file if collapsed).
+ */
+function review_open_selected_comment() {
+    if (state.commentsSelectedRow < 2) return;
+    const commentId = state.commentsByRow[state.commentsSelectedRow];
+    if (!commentId) return;
+    jumpToComment(commentId);
+}
+registerHandler("review_open_selected_comment", review_open_selected_comment);
+
+function review_comments_select_next() {
+    if (state.groupId === null) return;
+    if (state.comments.length === 0) return;
+    const total = state.comments.length;
+    const currentIdx = Math.max(0, state.commentsSelectedRow - 2);
+    const nextIdx = Math.min(total - 1, currentIdx + 1);
+    state.commentsSelectedRow = nextIdx + 2;
+    editor.setPanelContent(state.groupId, "comments", buildCommentsPanelEntries());
+}
+registerHandler("review_comments_select_next", review_comments_select_next);
+
+function review_enter_dispatch() {
+    if (state.focusPanel === 'comments') {
+        review_open_selected_comment();
+        return;
+    }
+    const props = propsAtCursorRow();
+    if (!props) return;
+    const t = props["type"];
+    // On a file or section header, Enter doubles as Tab: toggle the
+    // header's collapse state. Matches the intuition that a header is a
+    // disclosure widget — pressing the primary key on it should expand
+    // or fold the thing it owns, not drill down.
+    if (t === 'file-header' || t === 'section-header') {
+        review_toggle_file_collapse();
+        return;
+    }
+    // Inside a file's diff content, drill down to side-by-side view.
+    // Blank separators and comment rows are quietly ignored to avoid
+    // drilling into whatever file the cursor happens to be adjacent to.
+    if (t === 'add' || t === 'remove' || t === 'context' || t === 'hunk-header') {
+        review_drill_down();
     }
 }
-registerHandler("review_page_down", review_page_down);
+registerHandler("review_enter_dispatch", review_enter_dispatch);
 
-function review_nav_home() {
-    if (isFilesFocused()) {
-        selectFile(0);
-    } else {
-        editor.executeAction("move_document_start");
+function review_comments_select_prev() {
+    if (state.groupId === null) return;
+    if (state.comments.length === 0) return;
+    const currentIdx = Math.max(0, state.commentsSelectedRow - 2);
+    const prevIdx = Math.max(0, currentIdx - 1);
+    state.commentsSelectedRow = prevIdx + 2;
+    editor.setPanelContent(state.groupId, "comments", buildCommentsPanelEntries());
+}
+registerHandler("review_comments_select_prev", review_comments_select_prev);
+
+/**
+ * Visual line-selection mode. Activates a multi-row selection rooted
+ * at the cursor's hunk; j/k extend it; Esc cancels. The selection is
+ * rendered as an inverted background overlay across the selected rows.
+ */
+function review_visual_start() {
+    if (state.groupId === null) return;
+    const props = propsAtCursorRow();
+    if (!props) return;
+    const hunkId = props["hunkId"];
+    const lineType = props["lineType"];
+    if (typeof hunkId !== 'string' || (lineType !== 'add' && lineType !== 'remove' && lineType !== 'context')) {
+        editor.setStatus(editor.t("status.visual_no_diff_line") || "Visual selection requires a diff line");
+        return;
     }
+    state.lineSelection = {
+        startRow: state.diffCursorRow,
+        endRow: state.diffCursorRow,
+        hunkId,
+    };
+    paintLineSelectionOverlay();
+    editor.setStatus(editor.t("status.visual_started") || "Visual: j/k extend, s/u/d apply, Esc cancel");
 }
-registerHandler("review_nav_home", review_nav_home);
+registerHandler("review_visual_start", review_visual_start);
 
-function review_nav_end() {
-    if (isFilesFocused()) {
-        selectFile(state.files.length - 1);
-    } else {
-        editor.executeAction("move_document_end");
+function review_visual_cancel() {
+    state.lineSelection = null;
+    if (state.groupId !== null) {
+        const diffId = state.panelBuffers["diff"];
+        if (diffId !== undefined) editor.clearNamespace(diffId, "review-line-selection");
     }
+    applyCursorLineOverlay('diff');
 }
-registerHandler("review_nav_end", review_nav_end);
+registerHandler("review_visual_cancel", review_visual_cancel);
+
+const LINE_SELECTION_NS = "review-line-selection";
 
-function review_toggle_focus() {
+function paintLineSelectionOverlay() {
     if (state.groupId === null) return;
-    const newPanel: 'files' | 'diff' = state.focusPanel === 'files' ? 'diff' : 'files';
-    state.focusPanel = newPanel;
-    editor.focusBufferGroupPanel(state.groupId, newPanel);
-    // Refresh the toolbar so its hint set matches the new focus.
-    editor.setPanelContent(state.groupId, "toolbar", buildToolbarPanelEntries());
+    const diffId = state.panelBuffers["diff"];
+    if (diffId === undefined) return;
+    editor.clearNamespace(diffId, LINE_SELECTION_NS);
+    if (!state.lineSelection) return;
+    const { startRow, endRow } = state.lineSelection;
+    const lo = Math.min(startRow, endRow);
+    const hi = Math.max(startRow, endRow);
+    for (let r = lo; r <= hi; r++) {
+        const idx = r - 1;
+        if (idx < 0 || idx + 1 >= state.diffLineByteOffsets.length) continue;
+        const start = state.diffLineByteOffsets[idx];
+        const end = state.diffLineByteOffsets[idx + 1];
+        if (end <= start) continue;
+        editor.addOverlay(diffId, LINE_SELECTION_NS, start, end, {
+            bg: STYLE_SELECTED_BG,
+            extendToLineEnd: true,
+        });
+    }
 }
-registerHandler("review_toggle_focus", review_toggle_focus);
+
+/**
+ * Translate the active line-selection's (startRow, endRow) into a
+ * lineRange (inclusive 0-indexed indices into `hunk.lines`) by walking
+ * the rows of the unified stream that belong to the selection's hunk.
+ *
+ * Returns `null` if the selection crosses out of its hunk (which can't
+ * happen given how j/k extend, but defensively guarded), or the hunk
+ * can't be found, or the selection contains only context lines (which
+ * makes stage/unstage a no-op).
+ */
+function selectionLineRange(): { hunk: Hunk; range: { start: number; end: number } } | null {
+    if (!state.lineSelection) return null;
+    const sel = state.lineSelection;
+    const hunk = state.hunks.find(h => h.id === sel.hunkId);
+    if (!hunk) return null;
+    // Find the row of this hunk's header in the unified stream.
+    const hunkIdx = state.hunks.indexOf(hunk);
+    let visibleIdx = 0;
+    for (let i = 0; i < hunkIdx; i++) {
+        const h = state.hunks[i];
+        if (state.collapsedFiles.has(fileKeyOf(h.file, h.gitStatus || 'unstaged'))) continue;
+        visibleIdx++;
+    }
+    const headerRow = state.hunkHeaderRows[visibleIdx];
+    if (headerRow === undefined) return null;
+
+    const lo = Math.min(sel.startRow, sel.endRow);
+    const hi = Math.max(sel.startRow, sel.endRow);
+    const startInHunk = lo - headerRow - 1; // -1 because the header row itself is not in hunk.lines
+    const endInHunk = hi - headerRow - 1;
+    if (startInHunk < 0 || endInHunk >= hunk.lines.length) return null;
+
+    // Reject context-only selections.
+    let hasChange = false;
+    for (let i = startInHunk; i <= endInHunk; i++) {
+        const ch = hunk.lines[i][0];
+        if (ch === '+' || ch === '-') { hasChange = true; break; }
+    }
+    if (!hasChange) return null;
+
+    return { hunk, range: { start: startInHunk, end: endInHunk } };
+}
+
+async function applyLineSelection(action: 'stage' | 'unstage' | 'discard') {
+    const sel = selectionLineRange();
+    if (!sel) {
+        editor.setStatus(editor.t("status.visual_invalid") || "Selection has no add/remove lines or crosses hunk boundary");
+        return;
+    }
+    const { hunk, range } = sel;
+    const patch = buildHunkPatch(hunk.file, hunk, range);
+    let flags: string[];
+    if (action === 'stage') flags = ["--cached", "--unidiff-zero"];
+    else if (action === 'unstage') flags = ["--cached", "--reverse", "--unidiff-zero"];
+    else flags = ["--reverse", "--unidiff-zero"];
+
+    rememberPendingHunkAnchor(hunk.id);
+    const ok = await applyHunkPatch(patch, flags);
+    if (!ok) return;
+    review_visual_cancel();
+    editor.setStatus(editor.t(`status.lines_${action}d`) || `Lines ${action}d`);
+    await refreshMagitData();
+}
+
+function review_collapse_all() {
+    // Remember which file the cursor is in so we can land on its
+    // header row after every file collapses.
+    const cur = currentFileFromCursor();
+    state.collapsedFiles = new Set(state.files.map(fileKey));
+    applyFolds();
+    if (cur) {
+        const headerRow = state.fileHeaderRows[fileKey(cur)];
+        if (headerRow !== undefined) jumpDiffCursorToRow(headerRow);
+    }
+}
+registerHandler("review_collapse_all", review_collapse_all);
+
+function review_expand_all() {
+    // Same intuition for unfold-all: keep the cursor on the file it was
+    // in (rows shift as collapsed files/hunks re-emit their content).
+    const cur = currentFileFromCursor();
+    state.collapsedFiles.clear();
+    state.collapsedSections.clear();
+    state.collapsedHunks.clear();
+    applyFolds();
+    if (cur) {
+        const headerRow = state.fileHeaderRows[fileKey(cur)];
+        if (headerRow !== undefined) jumpDiffCursorToRow(headerRow);
+    }
+}
+registerHandler("review_expand_all", review_expand_all);
+
+function review_nav_up() {
+    if (state.focusPanel === 'comments') { review_comments_select_prev(); return; }
+    editor.executeAction("move_up");
+    if (state.lineSelection) {
+        // executeAction has already moved the cursor; sync the selection.
+        // Ensure we don't extend out of the hunk.
+        const newRow = Math.max(1, state.lineSelection.endRow - 1);
+        state.lineSelection.endRow = newRow;
+        paintLineSelectionOverlay();
+    }
+}
+registerHandler("review_nav_up", review_nav_up);
+
+function review_nav_down() {
+    if (state.focusPanel === 'comments') { review_comments_select_next(); return; }
+    editor.executeAction("move_down");
+    if (state.lineSelection) {
+        state.lineSelection.endRow = state.lineSelection.endRow + 1;
+        paintLineSelectionOverlay();
+    }
+}
+registerHandler("review_nav_down", review_nav_down);
+
+function review_page_up() { editor.executeAction("move_page_up"); }
+registerHandler("review_page_up", review_page_up);
+
+function review_page_down() { editor.executeAction("move_page_down"); }
+registerHandler("review_page_down", review_page_down);
+// Home / End intentionally NOT overridden — the editor's native
+// "move to start/end of line" is exactly what we want here. Mapping
+// them to move_document_start/end (as the old layout did when Home/
+// End served as files-pane shortcuts) made them useless on a unified
+// stream.
 
 // --- Real git stage/unstage/discard actions (Step 4) ---
 
 /**
  * Build a minimal unified diff patch for a single hunk.
+ *
+ * When `lineRange` is provided, only the +/- lines whose indices fall
+ * inside the inclusive range are kept; +/- lines outside the range are
+ * converted to context lines so that the patch still applies cleanly
+ * to the file. Context lines are always preserved.
  */
-function buildHunkPatch(filePath: string, hunk: Hunk): string {
-    const oldCount = hunk.lines.filter(l => l[0] === '-' || l[0] === ' ').length;
-    const newCount = hunk.lines.filter(l => l[0] === '+' || l[0] === ' ').length;
+function buildHunkPatch(filePath: string, hunk: Hunk, lineRange?: { start: number; end: number }): string {
+    const filtered: string[] = [];
+    let oldCount = 0;
+    let newCount = 0;
+
+    for (let i = 0; i < hunk.lines.length; i++) {
+        const line = hunk.lines[i];
+        const ch = line[0];
+        const inRange = !lineRange || (i >= lineRange.start && i <= lineRange.end);
+        if (ch === '+') {
+            if (inRange) {
+                filtered.push(line);
+                newCount++;
+            } else {
+                // An out-of-range '+' line means: this addition isn't being
+                // applied, so it shouldn't appear in either side. Drop it
+                // entirely (don't convert to context — there's nothing to
+                // match in the source file).
+            }
+        } else if (ch === '-') {
+            if (inRange) {
+                filtered.push(line);
+                oldCount++;
+            } else {
+                // An out-of-range '-' line: this deletion isn't applied,
+                // so the line still exists on both sides — render as context.
+                filtered.push(' ' + line.substring(1));
+                oldCount++;
+                newCount++;
+            }
+        } else {
+            filtered.push(line);
+            oldCount++;
+            newCount++;
+        }
+    }
+
     const header = `@@ -${hunk.oldRange.start},${oldCount} +${hunk.range.start},${newCount} @@`;
     return [
         `diff --git a/${filePath} b/${filePath}`,
         `--- a/${filePath}`,
         `+++ b/${filePath}`,
         header,
-        ...hunk.lines,
+        ...filtered,
         ''
     ].join('\n');
 }
@@ -1095,73 +2271,170 @@ function readPropsAtCursor(panel: 'files' | 'diff'): Record<string, unknown> | n
  * something useful.
  */
 function getHunkAtDiffCursor(): Hunk | null {
-    const props = readPropsAtCursor('diff');
+    const props = propsAtCursorRow();
     const hunkId = props ? props["hunkId"] : undefined;
     if (typeof hunkId === 'string') {
         const found = state.hunks.find(h => h.id === hunkId);
         if (found) return found;
     }
-    // Fallback: first hunk for the currently-selected file.
-    const selectedFile = state.files[state.selectedIndex];
-    if (!selectedFile) return null;
+    // Fallback: first hunk for the file under the cursor (if any).
+    const cur = currentFileFromCursor();
+    if (!cur) return null;
     return state.hunks.find(
-        h => h.file === selectedFile.path && h.gitStatus === selectedFile.category
+        h => h.file === cur.path && h.gitStatus === cur.category
     ) || null;
 }
 
-async function review_stage_file() {
+/**
+ * Determine if the cursor is on a file-header row. Returns the FileEntry
+ * if so, otherwise null.
+ *
+ * Looks up by `fileKey` (path + category) — looking up by `path` alone
+ * is wrong when the same file appears in both Staged and Unstaged: the
+ * `state.files.find(... === path)` would always return the first
+ * matching entry (typically the staged one), so Tab on the unstaged
+ * file header would silently act on the staged file instead.
+ */
+function fileHeaderUnderCursor(): FileEntry | null {
+    const props = propsAtCursorRow();
+    if (!props || props["type"] !== 'file-header') return null;
+    const key = props["fileKey"];
+    if (typeof key !== 'string') return null;
+    return state.files.find(f => fileKey(f) === key) || null;
+}
+
+/**
+ * Stage at the appropriate scope based on cursor context:
+ *   * file header  → stage the whole file
+ *   * hunk         → stage just that hunk
+ */
+async function review_stage_scope() {
     if (state.files.length === 0) return;
-    if (state.focusPanel === 'diff') {
-        // Hunk-level staging
-        const hunk = getHunkAtDiffCursor();
-        if (!hunk || !hunk.file) return;
-        if (hunk.gitStatus === 'untracked') {
-            await editor.spawnProcess("git", ["add", "--", hunk.file]);
-        } else {
-            const patch = buildHunkPatch(hunk.file, hunk);
-            const ok = await applyHunkPatch(patch, ["--cached"]);
-            if (!ok) return;
-        }
-        editor.setStatus(editor.t("status.hunk_staged") || "Hunk staged");
-        await refreshMagitData();
+    if (state.lineSelection) { await applyLineSelection('stage'); return; }
+    const headerFile = fileHeaderUnderCursor();
+    if (headerFile) {
+        await stageFileEntry(headerFile);
         return;
     }
-    const f = state.files[state.selectedIndex];
+    await stageHunk(getHunkAtDiffCursor());
+}
+registerHandler("review_stage_scope", review_stage_scope);
+
+async function review_unstage_scope() {
+    if (state.files.length === 0) return;
+    if (state.lineSelection) { await applyLineSelection('unstage'); return; }
+    const headerFile = fileHeaderUnderCursor();
+    if (headerFile) {
+        await unstageFileEntry(headerFile);
+        return;
+    }
+    await unstageHunk(getHunkAtDiffCursor());
+}
+registerHandler("review_unstage_scope", review_unstage_scope);
+
+/**
+ * Always-file-level staging (S / U). Acts on the file the cursor is
+ * currently inside, regardless of whether it's on a header or a hunk.
+ */
+async function review_stage_file() {
+    if (state.files.length === 0) return;
+    const f = fileHeaderUnderCursor() ?? currentFileFromCursor();
     if (!f) return;
-    await editor.spawnProcess("git", ["add", "--", f.path]);
-    await refreshMagitData();
+    await stageFileEntry(f);
 }
 registerHandler("review_stage_file", review_stage_file);
 
 async function review_unstage_file() {
     if (state.files.length === 0) return;
-    if (state.focusPanel === 'diff') {
-        // Hunk-level unstaging
-        const hunk = getHunkAtDiffCursor();
-        if (!hunk || !hunk.file || hunk.gitStatus !== 'staged') {
-            editor.setStatus("Can only unstage staged hunks");
-            return;
-        }
+    const f = fileHeaderUnderCursor() ?? currentFileFromCursor();
+    if (!f) return;
+    await unstageFileEntry(f);
+}
+registerHandler("review_unstage_file", review_unstage_file);
+
+async function stageFileEntry(f: FileEntry) {
+    rememberPendingHunkAnchor(null);
+    await editor.spawnProcess("git", ["add", "--", f.path]);
+    await refreshMagitData();
+}
+
+async function unstageFileEntry(f: FileEntry) {
+    rememberPendingHunkAnchor(null);
+    await editor.spawnProcess("git", ["reset", "HEAD", "--", f.path]);
+    await refreshMagitData();
+}
+
+async function stageHunk(hunk: Hunk | null) {
+    if (!hunk || !hunk.file) return;
+    rememberPendingHunkAnchor(hunk.id);
+    if (hunk.gitStatus === 'untracked') {
+        await editor.spawnProcess("git", ["add", "--", hunk.file]);
+    } else {
         const patch = buildHunkPatch(hunk.file, hunk);
-        const ok = await applyHunkPatch(patch, ["--cached", "--reverse"]);
+        const ok = await applyHunkPatch(patch, ["--cached"]);
         if (!ok) return;
-        editor.setStatus(editor.t("status.hunk_unstaged") || "Hunk unstaged");
-        await refreshMagitData();
+    }
+    editor.setStatus(editor.t("status.hunk_staged") || "Hunk staged");
+    await refreshMagitData();
+}
+
+async function unstageHunk(hunk: Hunk | null) {
+    if (!hunk || !hunk.file || hunk.gitStatus !== 'staged') {
+        editor.setStatus("Can only unstage staged hunks");
         return;
     }
-    const f = state.files[state.selectedIndex];
-    if (!f) return;
-    await editor.spawnProcess("git", ["reset", "HEAD", "--", f.path]);
+    rememberPendingHunkAnchor(hunk.id);
+    const patch = buildHunkPatch(hunk.file, hunk);
+    const ok = await applyHunkPatch(patch, ["--cached", "--reverse"]);
+    if (!ok) return;
+    editor.setStatus(editor.t("status.hunk_unstaged") || "Hunk unstaged");
     await refreshMagitData();
 }
-registerHandler("review_unstage_file", review_unstage_file);
+
+/**
+ * Cursor continuity: remember the hunk-id we just acted on so that
+ * after the rebuild we can land the cursor back on the same hunk
+ * (which may have moved between sections), or on the nearest survivor.
+ */
+let pendingHunkAnchor: { hunkId: string | null; section: string | null; row: number } | null = null;
+function rememberPendingHunkAnchor(hunkId: string | null) {
+    const cur = getHunkAtDiffCursor();
+    pendingHunkAnchor = {
+        hunkId,
+        section: cur?.gitStatus ?? null,
+        row: state.diffCursorRow,
+    };
+}
+
+let pendingDiscardFile: FileEntry | null = null;
+
+/** Always-file-level discard (D). Acts on the file the cursor is in. */
+function review_discard_file_only() {
+    if (state.files.length === 0) return;
+    const f = fileHeaderUnderCursor() ?? currentFileFromCursor();
+    if (!f) return;
+    pendingDiscardFile = f;
+    rememberPendingHunkAnchor(null);
+    const action = f.category === 'untracked' ? "Delete" : "Discard changes in";
+    editor.startPrompt(`${action} "${f.path}"? This cannot be undone.`, "review-discard-confirm");
+    const suggestions: PromptSuggestion[] = [
+        { text: `${action} file`, description: "Permanently lose changes", value: "discard" },
+        { text: "Cancel", description: "Keep the file as-is", value: "cancel" },
+    ];
+    editor.setPromptSuggestions(suggestions);
+}
+registerHandler("review_discard_file_only", review_discard_file_only);
 
 function review_discard_file() {
     if (state.files.length === 0) return;
-    if (state.focusPanel === 'diff') {
-        // Hunk-level discard — show confirmation
+    if (state.lineSelection) { void applyLineSelection('discard'); return; }
+    const headerFile = fileHeaderUnderCursor();
+    const f = headerFile ?? currentFileFromCursor();
+    if (!headerFile) {
+        // No file-header under cursor → hunk-level discard
         const hunk = getHunkAtDiffCursor();
         if (!hunk || !hunk.file) return;
+        rememberPendingHunkAnchor(hunk.id);
         editor.startPrompt(
             editor.t("prompt.discard_hunk", { file: hunk.file }) ||
             `Discard this hunk in "${hunk.file}"? This cannot be undone.`,
@@ -1174,10 +2447,11 @@ function review_discard_file() {
         editor.setPromptSuggestions(suggestions);
         return;
     }
-    const f = state.files[state.selectedIndex];
     if (!f) return;
 
     // Show confirmation prompt — discard is destructive and irreversible
+    pendingDiscardFile = f;
+    rememberPendingHunkAnchor(null);
     const action = f.category === 'untracked' ? "Delete" : "Discard changes in";
     editor.startPrompt(`${action} "${f.path}"? This cannot be undone.`, "review-discard-confirm");
     const suggestions: PromptSuggestion[] = [
@@ -1213,7 +2487,7 @@ async function on_review_discard_confirm(args: { prompt_type: string; input: str
 
     const response = args.input.trim().toLowerCase();
     if (response === "discard" || args.selected_index === 0) {
-        const f = state.files[state.selectedIndex];
+        const f = pendingDiscardFile;
         if (f) {
             if (f.category === 'untracked') {
                 await editor.spawnProcess("rm", ["--", f.path]);
@@ -1226,6 +2500,7 @@ async function on_review_discard_confirm(args: { prompt_type: string; input: str
     } else {
         editor.setStatus("Discard cancelled");
     }
+    pendingDiscardFile = null;
     return false;
 }
 registerHandler("on_review_discard_confirm", on_review_discard_confirm);
@@ -1234,16 +2509,51 @@ registerHandler("on_review_discard_confirm", on_review_discard_confirm);
  * Refresh file list and diffs using the new git status approach, then re-render.
  */
 async function refreshMagitData() {
-    const files = await getGitStatus();
-    state.files = files;
-    state.hunks = await fetchDiffsForFiles(files);
-    // Clamp selectedIndex
-    if (state.selectedIndex >= state.files.length) {
-        state.selectedIndex = Math.max(0, state.files.length - 1);
+    if (state.mode === 'range' && state.range) {
+        const { hunks, files } = await fetchRangeDiff(state.range);
+        state.hunks = hunks;
+        state.files = files;
+        state.emptyState = null;
+    } else {
+        const status = await getGitStatus();
+        state.files = status.files;
+        state.emptyState = status.emptyReason;
+        state.hunks = await fetchDiffsForFiles(status.files);
+    }
+    state.diffCursorRow = 1;
+    updateMagitDisplay();
+    restoreCursorAfterRebuild();
+    updateReviewStatus();
+}
+
+/**
+ * After a rebuild caused by stage/unstage/discard, try to land the cursor
+ * back on the same hunk (now possibly in a different section), or the
+ * nearest survivor in the original section, or the first hunk overall.
+ */
+function restoreCursorAfterRebuild() {
+    const anchor = pendingHunkAnchor;
+    pendingHunkAnchor = null;
+    if (!anchor) return;
+    if (anchor.hunkId) {
+        // Find the hunk by id in the new state.
+        const found = state.hunks.findIndex(h => h.id === anchor.hunkId);
+        if (found >= 0) {
+            // Compute its visible row (auto-expanding if needed).
+            jumpToGlobalHunk(found);
+            return;
+        }
     }
-    state.diffCursorRow = 1;
-    state.diffCache = {}; // git state may have changed — invalidate cached diffs
-    updateMagitDisplay();
+    // Hunk vanished — fall back to the next hunk in the same section,
+    // else the previous one, else the first hunk overall.
+    if (anchor.section) {
+        const idx = state.hunks.findIndex(h => h.gitStatus === anchor.section);
+        if (idx >= 0) {
+            jumpToGlobalHunk(idx);
+            return;
+        }
+    }
+    if (state.hunks.length > 0) jumpToGlobalHunk(0);
 }
 
 // --- Resize handler ---
@@ -1267,8 +2577,6 @@ function refreshViewportDimensions(): boolean {
 function onReviewDiffResize(_data: { width: number; height: number }): void {
     if (state.reviewBufferId === null) return;
     refreshViewportDimensions();
-    // Invalidate cached diff entries — they were built for the old viewport width
-    state.diffCache = {};
     updateMagitDisplay();
 }
 registerHandler("onReviewDiffResize", onReviewDiffResize);
@@ -1546,15 +2854,15 @@ function generateDiffPaneContent(
         // Line number color
         highlights.push({
             range: [currentByte + 2, currentByte + 6],
-            fg: [120, 120, 120]  // Gray line numbers
+            fg: "editor.line_number_fg",
         });
 
         if (isFiller) {
             // Filler styling - extend to full line width
             highlights.push({
                 range: [currentByte + prefixLen, currentByte + lineLen - 1],
-                fg: [60, 60, 60],
-                bg: [30, 30, 30],
+                fg: "editor.line_number_fg",
+                bg: "editor.line_number_bg",
                 extend_to_line_end: true
             });
         } else if (line.changeType === 'added' && side === 'new') {
@@ -1563,7 +2871,7 @@ function generateDiffPaneContent(
             highlights.push({
                 range: [currentByte + prefixLen, currentByte + lineLen - 1],
                 fg: STYLE_ADD_TEXT,
-                bg: [30, 50, 30],
+                bg: STYLE_ADD_BG,
                 extend_to_line_end: true
             });
         } else if (line.changeType === 'removed' && side === 'old') {
@@ -1572,7 +2880,7 @@ function generateDiffPaneContent(
             highlights.push({
                 range: [currentByte + prefixLen, currentByte + lineLen - 1],
                 fg: STYLE_REMOVE_TEXT,
-                bg: [50, 30, 30],
+                bg: STYLE_REMOVE_BG,
                 extend_to_line_end: true
             });
         } else if (line.changeType === 'modified') {
@@ -1661,9 +2969,9 @@ interface CompositeDiffState {
 let activeCompositeDiffState: CompositeDiffState | null = null;
 
 async function review_drill_down() {
-    // Use selected file from magit state instead of cursor properties
+    // Use the file under the cursor (the file whose section the cursor is in)
     if (state.files.length === 0) return;
-    const selectedFile = state.files[state.selectedIndex];
+    const selectedFile = currentFileFromCursor();
     if (!selectedFile) return;
 
     // Create a minimal hunk-like reference for the rest of the function
@@ -1848,58 +3156,121 @@ function jumpDiffCursorToRow(row: number): void {
     const idx = row - 1;
     if (idx < 0 || idx >= state.diffLineByteOffsets.length) return;
 
-    if (state.focusPanel === 'diff') {
-        // When the diff panel is focused, use executeAction so that the
-        // normal cursor event flow fires and the status bar line number
-        // updates correctly. This is O(delta) but necessary because
-        // setBufferCursor doesn't trigger line-index refresh in the
-        // virtual buffer's piece tree.
-        const delta = row - state.diffCursorRow;
-        const action = delta > 0 ? "move_down" : "move_up";
-        for (let i = 0, n = Math.abs(delta); i < n; i++) editor.executeAction(action);
-    } else {
-        // When unfocused, setBufferCursor is safe since the cursor
-        // position isn't displayed in the status bar.
-        const byteOffset = state.diffLineByteOffsets[idx];
-        editor.setBufferCursor(diffId, byteOffset);
-        editor.scrollBufferToLine(diffId, idx);
-    }
+    // Set the cursor by absolute byte offset + scroll the viewport.
+    // Trust setBufferCursor — the previous N × executeAction("move_down")
+    // walk was O(target_row) round-trips into the editor and made
+    // collapsing big diffs visibly slow (thousands of round trips just
+    // to land the cursor on a header).
+    const byteOffset = state.diffLineByteOffsets[idx];
+    editor.setBufferCursor(diffId, byteOffset);
+    editor.scrollBufferToLine(diffId, idx);
     state.diffCursorRow = row;
     applyCursorLineOverlay('diff');
+    refreshStickyHeader(idx);
+    updateReviewStatus();
+}
+
+/**
+ * Compute the 1-indexed global hunk number that corresponds to the current
+ * diff-panel cursor row. Returns null when no hunk is "current".
+ */
+function currentGlobalHunkIndex(): number | null {
+    if (state.hunkHeaderRows.length === 0) return null;
+    let within = -1;
+    for (let i = 0; i < state.hunkHeaderRows.length; i++) {
+        if (state.hunkHeaderRows[i] <= state.diffCursorRow) within = i;
+        else break;
+    }
+    if (within < 0) return null;
+    return within + 1;
+}
+
+/**
+ * Refresh the status-bar summary for review-diff mode. Shows "Hunk N of M"
+ * when a current hunk is known, falls back to the bare hunk count otherwise.
+ */
+function updateReviewStatus(): void {
+    if (state.groupId === null) return;
+    const total = state.hunkHeaderRows.length;
+    const current = currentGlobalHunkIndex();
+    if (current !== null) {
+        editor.setStatus(editor.t("status.review_summary_indexed", {
+            current: String(current),
+            count: String(total),
+        }));
+    } else {
+        editor.setStatus(editor.t("status.review_summary", { count: String(total) }));
+    }
+}
+
+/**
+ * Find the global index in `state.hunks` of the hunk currently visible
+ * at the cursor row, scanning the *visible* hunks (i.e. hunks whose
+ * file is not collapsed). Returns -1 if no hunk is at or before cursor.
+ */
+function visibleHunkIndexAtCursor(): number {
+    let visibleIdx = -1;
+    for (let i = 0; i < state.hunkHeaderRows.length; i++) {
+        if (state.hunkHeaderRows[i] <= state.diffCursorRow) visibleIdx = i;
+        else break;
+    }
+    if (visibleIdx < 0) return -1;
+    // Map back to the global state.hunks index.
+    let visited = 0;
+    for (let i = 0; i < state.hunks.length; i++) {
+        const h = state.hunks[i];
+        if (state.collapsedFiles.has(fileKeyOf(h.file, h.gitStatus || 'unstaged'))) continue;
+        if (visited === visibleIdx) return i;
+        visited++;
+    }
+    return -1;
+}
+
+function jumpToGlobalHunk(globalIdx: number) {
+    if (globalIdx < 0 || globalIdx >= state.hunks.length) return;
+    const target = state.hunks[globalIdx];
+    const targetFileKey = fileKeyOf(target.file, target.gitStatus || 'unstaged');
+    let needRebuild = false;
+    // Auto-expand the section, file, AND hunk containing the target so
+    // n/p never silently lands on an invisible row.
+    if (target.gitStatus && state.collapsedSections.has(target.gitStatus)) {
+        state.collapsedSections.delete(target.gitStatus);
+        needRebuild = true;
+    }
+    if (state.collapsedFiles.has(targetFileKey)) {
+        state.collapsedFiles.delete(targetFileKey);
+        needRebuild = true;
+    }
+    if (state.collapsedHunks.has(target.id)) {
+        state.collapsedHunks.delete(target.id);
+        needRebuild = true;
+    }
+    if (needRebuild) updateMagitDisplay();
+    // Look up the target hunk's row directly — much simpler than counting.
+    const row = state.hunkRowByHunkId[target.id];
+    if (row !== undefined) jumpDiffCursorToRow(row);
 }
 
 function review_next_hunk() {
-    // Magit review-mode diff panel: jump to the next hunk header row.
-    if (state.groupId !== null && state.focusPanel === 'diff') {
-        for (const row of state.hunkHeaderRows) {
-            if (row > state.diffCursorRow) {
-                jumpDiffCursorToRow(row);
-                return;
-            }
-        }
+    if (state.groupId === null) return;
+    if (state.hunks.length === 0) return;
+    const cur = visibleHunkIndexAtCursor();
+    // Find next hunk in global order — auto-expanding its file if needed.
+    if (cur < 0) {
+        jumpToGlobalHunk(0);
         return;
     }
-    // Composite diff-view hunk navigation is handled by the Action system
-    // (CompositeNextHunk) via CompositeBuffer context keybindings, so no
-    // plugin fallback is needed here.
+    if (cur + 1 >= state.hunks.length) return;
+    jumpToGlobalHunk(cur + 1);
 }
 registerHandler("review_next_hunk", review_next_hunk);
 
 function review_prev_hunk() {
-    // Magit review-mode diff panel: jump to the previous hunk header row.
-    if (state.groupId !== null && state.focusPanel === 'diff') {
-        for (let i = state.hunkHeaderRows.length - 1; i >= 0; i--) {
-            const row = state.hunkHeaderRows[i];
-            if (row < state.diffCursorRow) {
-                jumpDiffCursorToRow(row);
-                return;
-            }
-        }
-        return;
-    }
-    // Composite diff-view hunk navigation is handled by the Action system
-    // (CompositePrevHunk) via CompositeBuffer context keybindings, so no
-    // plugin fallback is needed here.
+    if (state.groupId === null) return;
+    if (state.hunks.length === 0) return;
+    const cur = visibleHunkIndexAtCursor();
+    if (cur <= 0) return;
+    jumpToGlobalHunk(cur - 1);
 }
 registerHandler("review_prev_hunk", review_prev_hunk);
 
@@ -1919,16 +3290,7 @@ editor.defineMode("diff-view", [
 
 function getCurrentHunkId(): string | null {
     if (state.files.length === 0) return null;
-    if (state.focusPanel === 'diff') {
-        const hunk = getHunkAtDiffCursor();
-        return hunk?.id || null;
-    }
-    // File panel: return first hunk for selected file
-    const selectedFile = state.files[state.selectedIndex];
-    if (!selectedFile) return null;
-    const hunk = state.hunks.find(
-        h => h.file === selectedFile.path && h.gitStatus === selectedFile.category
-    );
+    const hunk = getHunkAtDiffCursor();
     return hunk?.id || null;
 }
 
@@ -1943,28 +3305,24 @@ interface PendingCommentInfo {
     lineContent?: string;
 }
 
+/**
+ * Get the line under the cursor for comment attachment. Returns null
+ * unless the cursor is on a real diff line (`add` / `remove` / `context`)
+ * — comments are always line-based, never hunk-level.
+ */
 function getCurrentLineInfo(): PendingCommentInfo | null {
     if (state.files.length === 0) return null;
-    const selectedFile = state.files[state.selectedIndex];
-    if (!selectedFile) return null;
-
-    const props = readPropsAtCursor('diff');
-    const hunkId = props ? props["hunkId"] : undefined;
-    if (typeof hunkId !== 'string') {
-        // Fallback: first hunk for the selected file.
-        const hunk = state.hunks.find(
-            h => h.file === selectedFile.path && h.gitStatus === selectedFile.category
-        );
-        if (!hunk) return null;
-        return { hunkId: hunk.id, file: hunk.file };
-    }
-
-    const file = typeof props!["file"] === 'string' ? props!["file"] as string : selectedFile.path;
-    const lineType = props!["lineType"] as ('add' | 'remove' | 'context' | undefined);
-    const oldLine = typeof props!["oldLine"] === 'number' ? props!["oldLine"] as number : undefined;
-    const newLine = typeof props!["newLine"] === 'number' ? props!["newLine"] as number : undefined;
-    const lineContent = typeof props!["lineContent"] === 'string' ? props!["lineContent"] as string : undefined;
-    return { hunkId, file, lineType, oldLine, newLine, lineContent };
+    const props = propsAtCursorRow();
+    if (!props) return null;
+    const hunkId = props["hunkId"];
+    const lineType = props["lineType"];
+    if (typeof hunkId !== 'string') return null;
+    if (lineType !== 'add' && lineType !== 'remove' && lineType !== 'context') return null;
+    const file = typeof props["file"] === 'string' ? props["file"] as string : '';
+    const oldLine = typeof props["oldLine"] === 'number' ? props["oldLine"] as number : undefined;
+    const newLine = typeof props["newLine"] === 'number' ? props["newLine"] as number : undefined;
+    const lineContent = typeof props["lineContent"] === 'string' ? props["lineContent"] as string : undefined;
+    return { hunkId, file, lineType: lineType as 'add' | 'remove' | 'context', oldLine, newLine, lineContent };
 }
 
 // Pending prompt state for event-based prompt handling
@@ -1976,7 +3334,7 @@ let editingCommentId: string | null = null; // non-null when editing an existing
  * comment display line itself or on the diff line it's attached to.
  */
 function findCommentAtCursor(): ReviewComment | null {
-    const props = readPropsAtCursor('diff');
+    const props = propsAtCursorRow();
     if (!props) return null;
 
     // Cursor sits directly on a comment display line.
@@ -2002,19 +3360,51 @@ function findCommentAtCursor(): ReviewComment | null {
 }
 
 async function review_add_comment() {
+    // If the cursor is sitting on an existing comment row, edit it
+    // directly — `c` doubles as "edit this comment" so the user
+    // doesn't have to first move back to the diff line.
+    const props = propsAtCursorRow();
+    if (props && props["type"] === 'comment' && typeof props["commentId"] === 'string') {
+        const existing = state.comments.find(c => c.id === props["commentId"]);
+        if (existing) {
+            editingCommentId = existing.id;
+            pendingCommentInfo = {
+                hunkId: existing.hunk_id,
+                file: existing.file,
+                lineType: existing.line_type,
+                oldLine: existing.old_line,
+                newLine: existing.new_line,
+                lineContent: existing.line_content,
+            };
+            const lineRef =
+                existing.line_type === 'add' && existing.new_line ? `+${existing.new_line}`
+                : existing.line_type === 'remove' && existing.old_line ? `-${existing.old_line}`
+                : existing.new_line ? `L${existing.new_line}`
+                : existing.old_line ? `L${existing.old_line}` : 'line';
+            const label =
+                editor.t("prompt.edit_comment", { line: lineRef }) ||
+                `Edit comment on ${lineRef}: `;
+            editor.startPromptWithInitial(label, "review-comment", existing.text);
+            return;
+        }
+    }
+
     const info = getCurrentLineInfo();
     if (!info) {
-        editor.setStatus(editor.t("status.no_hunk_selected"));
+        editor.setStatus(
+            editor.t("status.comment_needs_line") ||
+                "Position cursor on a diff line to add a comment"
+        );
         return;
     }
 
-    // Check for existing comment to edit
+    // Check for existing comment on this diff line to edit
     const existing = findCommentAtCursor();
 
     pendingCommentInfo = info;
     editingCommentId = existing?.id || null;
 
-    let lineRef = 'hunk';
+    let lineRef = 'line';
     if (info.lineType === 'add' && info.newLine) {
         lineRef = `+${info.newLine}`;
     } else if (info.lineType === 'remove' && info.oldLine) {
@@ -2040,28 +3430,7 @@ registerHandler("review_add_comment", review_add_comment);
 let pendingDeleteCommentId: string | null = null;
 
 async function review_delete_comment() {
-    let target: ReviewComment | null = null;
-
-    if (state.focusPanel === 'diff') {
-        target = findCommentAtCursor();
-    } else {
-        // File panel: target the last note
-        const notes = state.comments.filter(c => c.hunk_id === '__overall__');
-        if (notes.length > 0) target = notes[notes.length - 1];
-    }
-
-    // File panel: delete note
-    if (!target && state.focusPanel === 'files' && state.note) {
-        pendingDeleteCommentId = '__note__';
-        const preview = state.note.length > 40 ? state.note.substring(0, 37) + '...' : state.note;
-        editor.startPrompt(`Delete note "${preview}"?`, "review-delete-comment-confirm");
-        const suggestions: PromptSuggestion[] = [
-            { text: "Delete", description: "Remove this note", value: "delete" },
-            { text: "Cancel", description: "Keep the note", value: "cancel" },
-        ];
-        editor.setPromptSuggestions(suggestions);
-        return;
-    }
+    const target: ReviewComment | null = findCommentAtCursor();
 
     if (!target) {
         editor.setStatus("No comment to delete");
@@ -2088,7 +3457,7 @@ function on_review_delete_comment_confirm(args: { prompt_type: string; input: st
         } else {
             state.comments = state.comments.filter(c => c.id !== pendingDeleteCommentId);
         }
-        state.diffCache = {}; // comment changed
+        persistReview();
         updateMagitDisplay();
         editor.setStatus("Deleted");
     } else {
@@ -2105,6 +3474,13 @@ function on_review_prompt_confirm(args: { prompt_type: string; input: string }):
         return true;
     }
 
+    // Remember the cursor row from before the rebuild so we can put the
+    // user back where they were. Inserting a comment row shifts later
+    // rows down by one, but the line the user was on keeps its row
+    // number — so saving the row pre-rebuild and restoring it after
+    // lands the cursor on the same diff line.
+    const cursorRowBeforeRebuild = state.diffCursorRow;
+
     if (editingCommentId) {
         // Edit mode: update existing comment (empty text keeps the comment unchanged)
         if (args.input && args.input.trim()) {
@@ -2112,8 +3488,9 @@ function on_review_prompt_confirm(args: { prompt_type: string; input: string }):
             if (existing) {
                 existing.text = args.input.trim();
                 existing.timestamp = new Date().toISOString();
-                state.diffCache = {}; // comment changed
+                persistReview();
                 updateMagitDisplay();
+                jumpDiffCursorToRow(cursorRowBeforeRebuild);
                 editor.setStatus("Comment updated");
             }
         } else {
@@ -2138,8 +3515,9 @@ function on_review_prompt_confirm(args: { prompt_type: string; input: string }):
             line_type: pendingCommentInfo.lineType
         };
         state.comments.push(comment);
-        state.diffCache = {}; // comment changed — invalidate cached diff entries
+        persistReview();
         updateMagitDisplay();
+        jumpDiffCursorToRow(cursorRowBeforeRebuild);
         let lineRef = 'hunk';
         if (comment.line_type === 'add' && comment.new_line) {
             lineRef = `line +${comment.new_line}`;
@@ -2189,6 +3567,7 @@ function on_review_edit_note_confirm(args: { prompt_type: string; input: string
     if (args.prompt_type !== "review-edit-note") return true;
     if (args.input && args.input.trim()) {
         state.note = args.input.trim();
+        persistReview();
         updateMagitDisplay();
         editor.setStatus(state.note ? "Note saved" : "Note cleared");
     } else {
@@ -2285,73 +3664,143 @@ async function review_export_json() {
 }
 registerHandler("review_export_json", review_export_json);
 
-async function start_review_diff() {
-    editor.setStatus(editor.t("status.generating"));
-    editor.setContext("review-mode", true);
-
-    // Get viewport size
-    const viewport = editor.getViewport();
-    if (viewport) {
-        state.viewportWidth = viewport.width;
-        state.viewportHeight = viewport.height;
-    }
-
-    // Fetch data using new git status approach
-    state.files = await getGitStatus();
-    state.hunks = await fetchDiffsForFiles(state.files);
-    state.comments = [];
-    state.note = '';
-    state.selectedIndex = 0;
+/**
+ * Reset the slice of `state` that tracks per-session cursor / fold / row
+ * indices. Keeps `state.comments` and `state.note` untouched so the
+ * caller can populate them (either freshly, or from disk).
+ */
+function resetPerSessionState(): void {
     state.diffCursorRow = 1;
     state.hunkHeaderRows = [];
     state.diffLineByteOffsets = [];
-    state.focusPanel = 'files';
+    state.fileHeaderRows = {};
+    state.collapsedFiles = new Set();
+    state.collapsedSections = new Set();
+    state.collapsedHunks = new Set();
+    state.commentsByRow = {};
+    state.commentsSelectedRow = 0;
+    state.focusPanel = 'diff';
+    state.commentsHighlightId = null;
+    state.stickyCurrentFile = null;
+    state.lineSelection = null;
+}
 
-    // Create buffer group with layout:
-    // vertical: [toolbar(fixed 1), horizontal: [files, diff]]
-    const layout = JSON.stringify({
+const REVIEW_LAYOUT = JSON.stringify({
+    type: "split",
+    direction: "v",
+    ratio: 0.05,
+    first: { type: "fixed", id: "toolbar", height: 2 },
+    second: {
         type: "split",
-        direction: "v",
-        ratio: 0.05,
-        first: { type: "fixed", id: "toolbar", height: 1 },
-        second: {
+        direction: "h",
+        ratio: 0.75,
+        first: {
             type: "split",
-            direction: "h",
-            ratio: 0.3,
-            first: { type: "scrollable", id: "files" },
+            direction: "v",
+            ratio: 0.05,
+            first: { type: "fixed", id: "sticky", height: 1 },
             second: { type: "scrollable", id: "diff" },
         },
-    });
+        second: { type: "scrollable", id: "comments" },
+    },
+});
 
-    const groupResult = await editor.createBufferGroup("*Review Diff*", "review-mode", layout);
+/**
+ * Create the review-diff buffer group (toolbar / sticky / diff / comments)
+ * and wire up the standard review-mode event listeners. Returns true if
+ * the panels were created, false on failure.
+ */
+async function openReviewPanels(groupName: string): Promise<boolean> {
+    const viewport = editor.getViewport();
+    if (viewport) {
+        state.viewportWidth = viewport.width;
+        state.viewportHeight = viewport.height;
+    }
+    editor.setContext("review-mode", true);
+    const groupResult = await editor.createBufferGroup(groupName, "review-mode", REVIEW_LAYOUT);
     state.groupId = groupResult.groupId;
     state.panelBuffers = groupResult.panels;
-    state.reviewBufferId = groupResult.panels["files"];
-
-    // Diff panel uses the editor's native cursor for scrolling. Buffer-group
-    // panels default to `show_cursors = false`, which also blocks all native
-    // movement actions in `action_to_events`, so flip the flag for the diff
-    // panel only. The files panel keeps its hidden cursor — selection there
-    // is plugin-managed (state.selectedIndex with a `>` prefix + bg highlight),
-    // and j/k/Up/Down are dispatched through the `review_nav_*` handlers.
+    state.reviewBufferId = groupResult.panels["diff"];
+
     if (state.panelBuffers["diff"] !== undefined) {
         (editor as any).setBufferShowCursors(state.panelBuffers["diff"], true);
     }
 
-    // Set initial content for all panels
     updateMagitDisplay();
 
-    // Ensure the files panel has focus (moves focus away from File Explorer
-    // if it was open, so review-mode keybindings work immediately)
-    editor.focusBufferGroupPanel(state.groupId, "files");
+    editor.focusBufferGroupPanel(state.groupId, "diff");
 
-    // Register resize handler
     editor.on("resize", "onReviewDiffResize");
-
-    editor.setStatus(editor.t("status.review_summary", { count: String(state.hunks.length) }));
+    updateReviewStatus();
     editor.on("buffer_activated", "on_review_buffer_activated");
     editor.on("buffer_closed", "on_review_buffer_closed");
     editor.on("cursor_moved", "on_review_cursor_moved");
+    editor.on("viewport_changed", "on_review_viewport_changed");
+    editor.on("mouse_click", "on_review_mouse_click");
+    return true;
+}
+
+/**
+ * Drop any comments whose anchor lines can no longer be found in the
+ * current hunks. Applied on restore so stale worktree-mode comments from
+ * a long-since-rewritten file don't pile up. For range mode this is a
+ * no-op because comments should always match.
+ */
+function pruneOrphanComments(comments: ReviewComment[], hunks: Hunk[]): ReviewComment[] {
+    const byHunk = new Map<string, Hunk>();
+    for (const h of hunks) byHunk.set(h.id, h);
+    const fileSet = new Set(hunks.map(h => h.file));
+    return comments.filter(c => {
+        // Keep comments whose hunk still exists or whose file is still
+        // part of the diff and whose anchor line is present in some hunk.
+        if (byHunk.has(c.hunk_id)) return true;
+        if (!fileSet.has(c.file)) return false;
+        const fileHunks = hunks.filter(h => h.file === c.file);
+        for (const h of fileHunks) {
+            const lt = c.line_type;
+            if (!lt) continue;
+            let oldN = h.oldRange.start - 1;
+            let newN = h.range.start - 1;
+            for (const raw of h.lines) {
+                if (raw.startsWith('+')) {
+                    newN++;
+                    if (lt === 'add' && c.new_line === newN) return true;
+                } else if (raw.startsWith('-')) {
+                    oldN++;
+                    if (lt === 'remove' && c.old_line === oldN) return true;
+                } else {
+                    oldN++; newN++;
+                    if (lt === 'context' && c.new_line === newN) return true;
+                }
+            }
+        }
+        return false;
+    });
+}
+
+async function start_review_diff() {
+    editor.setStatus(editor.t("status.generating"));
+
+    // Fetch data using the git status approach.
+    const status = await getGitStatus();
+    state.files = status.files;
+    state.emptyState = status.emptyReason;
+    state.hunks = await fetchDiffsForFiles(status.files);
+
+    // Persistence setup: worktree mode keyed by repo root.
+    state.mode = 'worktree';
+    state.range = null;
+    state.repoRoot = await detectRepoRoot();
+    state.reviewKey = buildReviewKey(state.mode, state.range);
+
+    // Restore persisted comments (if any). We drop orphans so the UI
+    // doesn't display comments that no longer point at visible lines.
+    const loaded = loadPersistedReview(state.repoRoot, state.reviewKey);
+    state.comments = loaded ? pruneOrphanComments(loaded.comments, state.hunks) : [];
+    state.note = loaded?.note ?? '';
+
+    resetPerSessionState();
+    await openReviewPanels("*Review Diff*");
 }
 registerHandler("start_review_diff", start_review_diff);
 
@@ -2367,10 +3816,200 @@ function stop_review_diff() {
     editor.off("buffer_activated", "on_review_buffer_activated");
     editor.off("buffer_closed", "on_review_buffer_closed");
     editor.off("cursor_moved", "on_review_cursor_moved");
+    editor.off("viewport_changed", "on_review_viewport_changed");
+    editor.off("mouse_click", "on_review_mouse_click");
     editor.setStatus(editor.t("status.stopped"));
 }
 registerHandler("stop_review_diff", stop_review_diff);
 
+// =============================================================================
+// Range / commit review (Task 2)
+// =============================================================================
+//
+// `start_review_diff` reviews the working tree. `start_review_range` reviews
+// a flattened diff between two git refs — the user types:
+//
+//     HEAD~3..HEAD     (a span of commits)
+//     main..HEAD       (a whole branch)
+//     <sha>            (a single commit — rewritten to `<sha>^..<sha>`)
+//
+// Alternatives considered for the picker UI:
+//   - A dedicated two-panel picker (from / to). Clean but adds a big new
+//     UI surface for a small benefit.
+//   - The existing `start_review_branch` commit list (inline, Enter-to-
+//     select). Rejected because that view is commit-by-commit and we
+//     specifically want a *flattened* diff for batch commenting.
+//   - Single prompt with a small suggestion list. Chosen — matches the
+//     tone of the existing `start_review_branch` prompt and lets power
+//     users type arbitrary revspecs without a multi-step UI.
+
+/**
+ * Parse a range string typed into the picker. Accepts:
+ *   `A..B`, `A...B` — two-dot / three-dot ranges.
+ *   `<ref>`         — single commit, rewritten to `<ref>^..<ref>`.
+ *
+ * Returns `null` on invalid input (empty string).
+ */
+function parseRangeInput(input: string): ReviewRange | null {
+    const raw = input.trim();
+    if (!raw) return null;
+    const threeDot = raw.indexOf("...");
+    if (threeDot > 0) {
+        const from = raw.slice(0, threeDot).trim();
+        const to = raw.slice(threeDot + 3).trim();
+        if (!from || !to) return null;
+        return { from, to, label: `${from}...${to}` };
+    }
+    const twoDot = raw.indexOf("..");
+    if (twoDot > 0) {
+        const from = raw.slice(0, twoDot).trim();
+        const to = raw.slice(twoDot + 2).trim();
+        if (!from || !to) return null;
+        return { from, to, label: `${from}..${to}` };
+    }
+    // Single ref -> single-commit review.
+    return { from: `${raw}^`, to: raw, label: raw };
+}
+
+/**
+ * Fetch a flattened unified diff for the given range and convert it to
+ * the same Hunk + FileEntry shape the worktree path produces. All hunks
+ * are assigned `gitStatus: 'unstaged'` so the existing section grouping
+ * still works; untracked / staged categories are meaningless here.
+ */
+async function fetchRangeDiff(range: ReviewRange): Promise<{ hunks: Hunk[]; files: FileEntry[] }> {
+    const result = await editor.spawnProcess("git", [
+        "diff", "--unified=3", `${range.from}..${range.to}`,
+    ]);
+    if (result.exit_code !== 0) {
+        return { hunks: [], files: [] };
+    }
+    const hunks = parseDiffOutput(result.stdout, 'unstaged');
+    // Rewrite hunk ids so they include the range — avoids id collisions
+    // when a user opens multiple range reviews in the same session.
+    for (const h of hunks) {
+        h.id = `${range.label}|${h.file}:${h.range.start}`;
+    }
+    // Derive a FileEntry list from the hunks, preserving first-seen order.
+    const seen = new Set<string>();
+    const files: FileEntry[] = [];
+    for (const h of hunks) {
+        if (!seen.has(h.file)) {
+            seen.add(h.file);
+            files.push({ path: h.file, status: 'M', category: 'unstaged' });
+        }
+    }
+    return { hunks, files };
+}
+
+/**
+ * Build a short list of revspec suggestions to prefill the picker. Falls
+ * back gracefully if any of the helper git calls fail — the prompt still
+ * accepts arbitrary input.
+ */
+async function buildRangeSuggestions(): Promise<PromptSuggestion[]> {
+    const suggestions: PromptSuggestion[] = [];
+    // HEAD last commit.
+    suggestions.push({ text: "HEAD", description: "Review last commit", value: "HEAD" });
+    // Current-branch-vs-main style ranges.
+    const tryRange = async (base: string) => {
+        const exists = await editor.spawnProcess("git", ["rev-parse", "--verify", base]);
+        if (exists.exit_code === 0) {
+            suggestions.push({
+                text: `${base}..HEAD`,
+                description: `Review all commits on current branch vs ${base}`,
+                value: `${base}..HEAD`,
+            });
+        }
+    };
+    await tryRange("main");
+    await tryRange("master");
+    // Recent commits for one-off review.
+    try {
+        const log = await editor.spawnProcess("git", [
+            "log", "-n", "5", "--pretty=format:%h %s",
+        ]);
+        if (log.exit_code === 0) {
+            for (const line of log.stdout.split('\n')) {
+                const m = line.match(/^([0-9a-f]+)\s+(.*)$/);
+                if (m) {
+                    suggestions.push({
+                        text: m[1],
+                        description: `Review commit: ${m[2]}`,
+                        value: m[1],
+                    });
+                }
+            }
+        }
+    } catch {}
+    return suggestions;
+}
+
+async function start_review_range(): Promise<void> {
+    // If a review is already open, swap it out rather than stacking two.
+    if (state.groupId !== null) {
+        stop_review_diff();
+    }
+
+    const suggestions = await buildRangeSuggestions();
+    const label = editor.t("prompt.review_range") || "Review range (A..B or commit):";
+    editor.startPromptWithInitial(label, "review-range", "HEAD");
+    if (suggestions.length > 0) {
+        editor.setPromptSuggestions(suggestions);
+    }
+}
+registerHandler("start_review_range", start_review_range);
+
+function on_review_range_confirm(args: { prompt_type: string; input: string }): boolean {
+    if (args.prompt_type !== "review-range") return true;
+    const range = parseRangeInput(args.input);
+    if (!range) {
+        editor.setStatus(editor.t("status.cancelled") || "Cancelled");
+        return true;
+    }
+    // Kick off the async bootstrap; the prompt is already dismissed so we
+    // can return immediately.
+    bootstrapRangeReview(range);
+    return true;
+}
+registerHandler("on_review_range_confirm", on_review_range_confirm);
+editor.on("prompt_confirmed", "on_review_range_confirm");
+
+async function bootstrapRangeReview(range: ReviewRange): Promise<void> {
+    editor.setStatus(editor.t("status.generating") || "Generating diff…");
+    const { hunks, files } = await fetchRangeDiff(range);
+    if (hunks.length === 0) {
+        editor.setStatus(
+            editor.t("status.review_range_empty", { range: range.label }) ||
+                `No changes in ${range.label}`,
+        );
+        return;
+    }
+    state.mode = 'range';
+    state.range = range;
+    state.hunks = hunks;
+    state.files = files;
+    state.emptyState = null;
+    state.repoRoot = await detectRepoRoot();
+    state.reviewKey = buildReviewKey(state.mode, state.range);
+
+    // Load persisted comments for this exact range — the diff is static
+    // so they always line up.
+    const loaded = loadPersistedReview(state.repoRoot, state.reviewKey);
+    state.comments = loaded ? loaded.comments : [];
+    state.note = loaded?.note ?? '';
+
+    resetPerSessionState();
+    await openReviewPanels(`*Review ${range.label}*`);
+}
+
+editor.registerCommand(
+    "%cmd.review_range",
+    "%cmd.review_range_desc",
+    "start_review_range",
+    null,
+);
+
 
 /**
  * React to a buffer becoming active. Used here purely to track which review
@@ -2384,23 +4023,57 @@ registerHandler("stop_review_diff", stop_review_diff);
  */
 function on_review_buffer_activated(data: { buffer_id: number }): void {
     if (state.groupId === null) return;
-    const filesId = state.panelBuffers["files"];
     const diffId = state.panelBuffers["diff"];
-    let newPanel: 'files' | 'diff' | null = null;
-    if (data.buffer_id === filesId) newPanel = 'files';
-    else if (data.buffer_id === diffId) newPanel = 'diff';
+    const commentsId = state.panelBuffers["comments"];
+    let newPanel: 'diff' | 'comments' | null = null;
+    if (data.buffer_id === diffId) newPanel = 'diff';
+    else if (data.buffer_id === commentsId) newPanel = 'comments';
     if (newPanel === null || newPanel === state.focusPanel) return;
     state.focusPanel = newPanel;
-    editor.setPanelContent(state.groupId, "toolbar", buildToolbarPanelEntries());
+    // Re-render the comments panel so the selection highlight follows focus.
+    editor.setPanelContent(state.groupId, "comments", buildCommentsPanelEntries());
 }
 registerHandler("on_review_buffer_activated", on_review_buffer_activated);
 
 /**
- * React to native cursor movement inside the diff panel — the only panel
- * that has a visible native cursor. The handler keeps `state.diffCursorRow`
- * in sync (used by `n`/`p` hunk navigation) and re-paints the cursor-line
- * highlight overlay.
+ * React to native cursor movement inside review panels.
+ *
+ * Diff panel: keeps `state.diffCursorRow` in sync and re-paints the
+ * cursor-line highlight overlay.
+ *
+ * Files panel: when the cursor moves (e.g. via mouse click), read the
+ * `fileIndex` text property at the new position and select that file.
+ * This makes click-to-select work even though the files panel hides its
+ * native cursor (`show_cursors = false` blocks keyboard-driven movement
+ * but mouse clicks still move the cursor).
+ */
+/**
+ * Determine the "current comment" — the one the diff cursor is sitting
+ * on (a comment-display row) or attached to (a +/-/context line).
+ * Returns null if the cursor is not associated with any comment.
  */
+function currentCommentIdAtCursor(): string | null {
+    const props = propsAtCursorRow();
+    if (!props) return null;
+    if (props["type"] === 'comment' && typeof props["commentId"] === 'string') {
+        return props["commentId"] as string;
+    }
+    const hunkId = props["hunkId"];
+    const lineType = props["lineType"];
+    if (typeof hunkId !== 'string') return null;
+    if (lineType !== 'add' && lineType !== 'remove' && lineType !== 'context') return null;
+    const oldLine = typeof props["oldLine"] === 'number' ? (props["oldLine"] as number) : undefined;
+    const newLine = typeof props["newLine"] === 'number' ? (props["newLine"] as number) : undefined;
+    const found = state.comments.find(c =>
+        c.hunk_id === hunkId && (
+            (c.line_type === 'add' && c.new_line === newLine) ||
+            (c.line_type === 'remove' && c.old_line === oldLine) ||
+            (c.line_type === 'context' && c.new_line === newLine)
+        )
+    );
+    return found ? found.id : null;
+}
+
 function on_review_cursor_moved(data: {
     buffer_id: number;
     cursor_id: number;
@@ -2410,9 +4083,28 @@ function on_review_cursor_moved(data: {
     text_properties: Array<Record<string, unknown>>;
 }): void {
     if (state.groupId === null) return;
-    if (data.buffer_id !== state.panelBuffers["diff"]) return;
-    state.diffCursorRow = data.line;
-    applyCursorLineOverlay('diff');
+
+    // Diff panel: track cursor row + repaint the cursor-line overlay.
+    if (data.buffer_id === state.panelBuffers["diff"]) {
+        const prevHighlight = state.commentsHighlightId;
+        state.diffCursorRow = data.line;
+        applyCursorLineOverlay('diff');
+        // Use the cursor row as a sticky-header anchor too — viewport_changed
+        // doesn't always fire reliably for plugin-managed virtual buffers
+        // (top_line can be null). Tracking the cursor row gives a snappy
+        // "what file am I in" indicator regardless.
+        refreshStickyHeader(Math.max(0, data.line - 1));
+        updateReviewStatus();
+        // Re-render the comments panel only when the highlighted comment
+        // actually changes — avoids re-emitting the panel on every
+        // cursor tick.
+        const newHighlight = currentCommentIdAtCursor();
+        if (newHighlight !== prevHighlight) {
+            state.commentsHighlightId = newHighlight;
+            editor.setPanelContent(state.groupId, "comments", buildCommentsPanelEntries());
+        }
+        return;
+    }
 }
 registerHandler("on_review_cursor_moved", on_review_cursor_moved);
 
@@ -2663,8 +4355,314 @@ async function side_by_side_diff_current_file() {
 }
 registerHandler("side_by_side_diff_current_file", side_by_side_diff_current_file);
 
+// =============================================================================
+// Review PR Branch
+//
+// A companion view to `start_review_diff` for reviewing the full set of
+// commits on a PR branch (rather than just the working-tree changes). It
+// opens a buffer group with the commit history on the left (rendered by
+// the shared `lib/git_history.ts` helpers the git_log plugin uses) and a
+// live-updating `git show` of the selected commit on the right. This reuses
+// the same rendering pipeline so both plugins stay visually consistent and
+// respect theme keys in one place.
+// =============================================================================
+
+interface ReviewBranchState {
+    isOpen: boolean;
+    groupId: number | null;
+    logBufferId: number | null;
+    detailBufferId: number | null;
+    commits: GitCommit[];
+    selectedIndex: number;
+    baseRef: string;
+    detailCache: { hash: string; output: string } | null;
+    pendingDetailId: number;
+    /** Byte offset of each row in the log panel; final entry = buffer length. */
+    logRowByteOffsets: number[];
+}
+
+const branchState: ReviewBranchState = {
+    isOpen: false,
+    groupId: null,
+    logBufferId: null,
+    detailBufferId: null,
+    commits: [],
+    selectedIndex: 0,
+    baseRef: "main",
+    detailCache: null,
+    pendingDetailId: 0,
+    logRowByteOffsets: [],
+};
+
+// UTF-8 byte length helper, local copy so audit_mode doesn't pull in the one
+// from git_history (keeps the import list tiny).
+function branchUtf8Len(s: string): number {
+    let b = 0;
+    for (let i = 0; i < s.length; i++) {
+        const c = s.charCodeAt(i);
+        if (c <= 0x7f) b += 1;
+        else if (c <= 0x7ff) b += 2;
+        else if (c >= 0xd800 && c <= 0xdfff) { b += 4; i++; }
+        else b += 3;
+    }
+    return b;
+}
+
+function branchRowFromByte(bytePos: number): number {
+    const offs = branchState.logRowByteOffsets;
+    if (offs.length === 0) return 0;
+    let lo = 0;
+    let hi = offs.length - 1;
+    while (lo < hi) {
+        const mid = (lo + hi + 1) >> 1;
+        if (offs[mid] <= bytePos) lo = mid;
+        else hi = mid - 1;
+    }
+    return lo;
+}
+
+function branchIndexFromCursor(bytePos: number): number {
+    const row = branchRowFromByte(bytePos);
+    const idx = row - 1; // row 0 is the header
+    if (idx < 0) return 0;
+    if (idx >= branchState.commits.length) return branchState.commits.length - 1;
+    return idx;
+}
+
+function branchRenderLog(): void {
+    if (branchState.groupId === null) return;
+    const rawHeader = editor.t("panel.review_branch_header", { base: branchState.baseRef });
+    const header = (rawHeader && !rawHeader.startsWith("panel.")) ? rawHeader : `Commits (${branchState.baseRef}..HEAD)`;
+    const rawFooter = editor.t("panel.review_branch_footer");
+    const footer = (rawFooter && !rawFooter.startsWith("panel.")) ? rawFooter : "j/k: navigate · Enter: focus detail · r: refresh · q: close";
+    const entries = buildCommitLogEntries(branchState.commits, {
+        selectedIndex: branchState.selectedIndex,
+        header,
+        footer,
+        propertyType: "branch-commit",
+    });
+    const offsets: number[] = [];
+    let running = 0;
+    for (const e of entries) {
+        offsets.push(running);
+        running += branchUtf8Len(e.text);
+    }
+    offsets.push(running);
+    branchState.logRowByteOffsets = offsets;
+    editor.setPanelContent(branchState.groupId, "log", entries);
+}
+
+function branchByteOffsetOfFirstCommit(): number {
+    return branchState.logRowByteOffsets.length > 1 ? branchState.logRowByteOffsets[1] : 0;
+}
+
+async function branchRefreshDetail(): Promise<void> {
+    if (branchState.groupId === null) return;
+    if (branchState.commits.length === 0) {
+        const msg = editor.t("status.review_branch_empty") || "No commits in the selected range.";
+        editor.setPanelContent(
+            branchState.groupId,
+            "detail",
+            buildDetailPlaceholderEntries(msg),
+        );
+        return;
+    }
+    const idx = Math.max(0, Math.min(branchState.selectedIndex, branchState.commits.length - 1));
+    const commit = branchState.commits[idx];
+    if (!commit) return;
+
+    if (branchState.detailCache && branchState.detailCache.hash === commit.hash) {
+        const entries = buildCommitDetailEntries(commit, branchState.detailCache.output, {});
+        editor.setPanelContent(branchState.groupId, "detail", entries);
+        return;
+    }
+    const myId = ++branchState.pendingDetailId;
+    editor.setPanelContent(
+        branchState.groupId,
+        "detail",
+        buildDetailPlaceholderEntries(
+            editor.t("status.loading_commit", { hash: commit.shortHash }) || `Loading ${commit.shortHash}…`,
+        ),
+    );
+    const output = await fetchCommitShow(editor, commit.hash);
+    if (myId !== branchState.pendingDetailId) return;
+    if (branchState.groupId === null) return;
+    branchState.detailCache = { hash: commit.hash, output };
+    editor.setPanelContent(
+        branchState.groupId,
+        "detail",
+        buildCommitDetailEntries(commit, output, {}),
+    );
+}
+
+async function start_review_branch(): Promise<void> {
+    if (branchState.isOpen) {
+        editor.setStatus(editor.t("status.already_open") || "Review branch already open");
+        return;
+    }
+    // Prompt for the base ref so the user can review any PR, not just
+    // one branched off main.
+    const input = await editor.prompt(
+        editor.t("prompt.branch_base") || "Base ref (default: main):",
+        branchState.baseRef,
+    );
+    if (input === null) {
+        editor.setStatus(editor.t("status.cancelled") || "Cancelled");
+        return;
+    }
+    const base = input.trim() || "main";
+    branchState.baseRef = base;
+
+    editor.setStatus(editor.t("status.loading") || "Loading commits…");
+    branchState.commits = await fetchGitLog(editor, { range: `${base}..HEAD`, maxCommits: 500 });
+    if (branchState.commits.length === 0) {
+        editor.setStatus(
+            editor.t("status.review_branch_empty", { base }) ||
+                `No commits in ${base}..HEAD — nothing to review.`,
+        );
+        return;
+    }
+
+    const layout = JSON.stringify({
+        type: "split",
+        direction: "h",
+        ratio: 0.4,
+        first: { type: "scrollable", id: "log" },
+        second: { type: "scrollable", id: "detail" },
+    });
+    // `createBufferGroup` is a runtime-only binding (not in the generated
+    // EditorAPI type); cast to `any` so the type-checker doesn't complain.
+    const group = await (editor as any).createBufferGroup(
+        `*Review Branch ${base}..HEAD*`,
+        "review-branch",
+        layout,
+    );
+    branchState.groupId = group.groupId as number;
+    branchState.logBufferId = (group.panels["log"] as number | undefined) ?? null;
+    branchState.detailBufferId = (group.panels["detail"] as number | undefined) ?? null;
+    branchState.selectedIndex = 0;
+    branchState.detailCache = null;
+    branchState.isOpen = true;
+
+    if (branchState.logBufferId !== null) {
+        editor.setBufferShowCursors(branchState.logBufferId, true);
+    }
+    if (branchState.detailBufferId !== null) {
+        editor.setBufferShowCursors(branchState.detailBufferId, true);
+    }
+
+    branchRenderLog();
+    if (branchState.logBufferId !== null && branchState.commits.length > 0) {
+        editor.setBufferCursor(branchState.logBufferId, branchByteOffsetOfFirstCommit());
+    }
+    await branchRefreshDetail();
+
+    if (branchState.groupId !== null) {
+        editor.focusBufferGroupPanel(branchState.groupId, "log");
+    }
+    editor.on("cursor_moved", "on_review_branch_cursor_moved");
+
+    editor.setStatus(
+        editor.t("status.review_branch_ready", {
+            count: String(branchState.commits.length),
+            base,
+        }) || `Reviewing ${branchState.commits.length} commits in ${base}..HEAD`,
+    );
+}
+registerHandler("start_review_branch", start_review_branch);
+
+function stop_review_branch(): void {
+    if (!branchState.isOpen) return;
+    if (branchState.groupId !== null) editor.closeBufferGroup(branchState.groupId);
+    editor.off("cursor_moved", "on_review_branch_cursor_moved");
+    branchState.isOpen = false;
+    branchState.groupId = null;
+    branchState.logBufferId = null;
+    branchState.detailBufferId = null;
+    branchState.commits = [];
+    branchState.selectedIndex = 0;
+    branchState.detailCache = null;
+    editor.setStatus(editor.t("status.closed") || "Review branch closed");
+}
+registerHandler("stop_review_branch", stop_review_branch);
+
+async function review_branch_refresh(): Promise<void> {
+    if (!branchState.isOpen) return;
+    const base = branchState.baseRef;
+    branchState.commits = await fetchGitLog(editor, { range: `${base}..HEAD`, maxCommits: 500 });
+    branchState.detailCache = null;
+    if (branchState.selectedIndex >= branchState.commits.length) {
+        branchState.selectedIndex = Math.max(0, branchState.commits.length - 1);
+    }
+    branchRenderLog();
+    await branchRefreshDetail();
+}
+registerHandler("review_branch_refresh", review_branch_refresh);
+
+/** Enter: focus the detail panel (so the user can scroll/click within it). */
+function review_branch_enter(): void {
+    if (branchState.groupId === null) return;
+    editor.focusBufferGroupPanel(branchState.groupId, "detail");
+}
+registerHandler("review_branch_enter", review_branch_enter);
+
+/** q/Escape: focus-back from detail, or close when already on log. */
+function review_branch_close_or_back(): void {
+    if (branchState.groupId === null) return;
+    const active = editor.getActiveBufferId();
+    if (branchState.detailBufferId !== null && active === branchState.detailBufferId) {
+        editor.focusBufferGroupPanel(branchState.groupId, "log");
+        return;
+    }
+    stop_review_branch();
+}
+registerHandler("review_branch_close_or_back", review_branch_close_or_back);
+
+function on_review_branch_cursor_moved(data: {
+    buffer_id: number;
+    cursor_id: number;
+    old_position: number;
+    new_position: number;
+}): void {
+    if (!branchState.isOpen) return;
+    if (data.buffer_id !== branchState.logBufferId) return;
+    const idx = branchIndexFromCursor(data.new_position);
+    if (idx === branchState.selectedIndex) return;
+    branchState.selectedIndex = idx;
+    branchRenderLog();
+    branchRefreshDetail();
+}
+registerHandler("on_review_branch_cursor_moved", on_review_branch_cursor_moved);
+
+editor.defineMode(
+    "review-branch",
+    [
+        // Mode bindings replace globals, so we re-bind the editor's built-in
+        // motion actions here explicitly — without this, j/k and Up/Down
+        // do nothing in the commit list.
+        ["Up", "move_up"],
+        ["Down", "move_down"],
+        ["k", "move_up"],
+        ["j", "move_down"],
+        ["PageUp", "page_up"],
+        ["PageDown", "page_down"],
+        ["Home", "move_line_start"],
+        ["End", "move_line_end"],
+        // Enter: focus the right-hand detail panel.
+        ["Return", "review_branch_enter"],
+        ["Tab", "review_branch_enter"],
+        ["r", "review_branch_refresh"],
+        ["q", "review_branch_close_or_back"],
+        ["Escape", "review_branch_close_or_back"],
+    ],
+    true,
+);
+
 // Register Modes and Commands
 editor.registerCommand("%cmd.review_diff", "%cmd.review_diff_desc", "start_review_diff", null);
+editor.registerCommand("%cmd.review_branch", "%cmd.review_branch_desc", "start_review_branch", null);
+editor.registerCommand("%cmd.stop_review_branch", "%cmd.stop_review_branch_desc", "stop_review_branch", "review-branch");
+editor.registerCommand("%cmd.refresh_review_branch", "%cmd.refresh_review_branch_desc", "review_branch_refresh", "review-branch");
 editor.registerCommand("%cmd.stop_review_diff", "%cmd.stop_review_diff_desc", "stop_review_diff", "review-mode");
 editor.registerCommand("%cmd.refresh_review_diff", "%cmd.refresh_review_diff_desc", "review_refresh", "review-mode");
 editor.registerCommand("%cmd.side_by_side_diff", "%cmd.side_by_side_diff_desc", "side_by_side_diff_current_file", null);
@@ -2709,23 +4707,42 @@ registerHandler("on_buffer_closed", on_buffer_closed);
 editor.on("buffer_closed", "on_buffer_closed");
 
 editor.defineMode("review-mode", [
-    // Cursor motion goes through plugin handlers that branch on focus —
-    // files panel updates `state.selectedIndex` (plugin-managed selection
-    // with the `>` prefix + bg highlight); diff panel delegates to native
-    // editor motion via executeAction so scrolling stays fast.
+    // Native cursor motion in the unified diff stream.
     ["Up", "review_nav_up"], ["Down", "review_nav_down"],
     ["k", "review_nav_up"], ["j", "review_nav_down"],
     ["PageUp", "review_page_up"], ["PageDown", "review_page_down"],
-    ["Home", "review_nav_home"], ["End", "review_nav_end"],
-    // Focus toggle between panels
-    ["Tab", "review_toggle_focus"],
-    // Hunk navigation (diff panel) — jumps the native cursor between hunks.
+    // Home / End — match the editor's normal-mode defaults so users
+    // get the same start-of-line / end-of-line behavior they're used
+    // to. Mode bindings replace globals, so we must bind these
+    // explicitly even though the actions are built-in.
+    ["Home", "move_line_start"], ["End", "move_line_end"],
+    // Hunk navigation across the unified stream.
     ["n", "review_next_hunk"], ["p", "review_prev_hunk"],
-    // Drill-down
-    ["Enter", "review_drill_down"],
-    // Git actions (context-sensitive: file-level or hunk-level based on focus)
-    ["s", "review_stage_file"], ["u", "review_unstage_file"],
+    // Per-file collapse: Tab toggles the file under the cursor;
+    // `z a` collapses every file; `z r` reveals (expands) every file.
+    ["Tab", "review_toggle_file_collapse"],
+    ["z a", "review_collapse_all"],
+    ["z r", "review_expand_all"],
+    // Visual line-selection mode for line-level stage/unstage/discard.
+    ["v", "review_visual_start"],
+    ["Esc", "review_visual_cancel"],
+    // Drill-down to side-by-side view of the file under the cursor —
+    // unless focus is in the comments panel, in which case Enter opens
+    // the selected comment.
+    ["Enter", "review_enter_dispatch"],
+    // Comments-nav: cycle through comments, jump diff cursor, expand
+    // the file if needed. Works regardless of which panel has focus.
+    ["]", "review_next_comment"],
+    ["[", "review_prev_comment"],
+    // Focus the comments panel (use j/k/Enter inside).
+    ["`", "review_focus_comments"],
+    // Stage/unstage/discard — context-sensitive. s/u/d act on the file
+    // (when cursor is on a file header) or the hunk under the cursor.
+    // Capital S/U/D always act on the enclosing file.
+    ["s", "review_stage_scope"], ["u", "review_unstage_scope"],
     ["d", "review_discard_file"],
+    ["S", "review_stage_file"], ["U", "review_unstage_file"],
+    ["D", "review_discard_file_only"],
     ["r", "review_refresh"],
     // Comments
     ["c", "review_add_comment"],