@fresh-editor/fresh-editor 0.2.22 → 0.2.23

package/plugins/audit_mode.ts

@@ -3,26 +3,15 @@
 /// <reference path="./lib/virtual-buffer-factory.ts" />
 
 // Review Diff Plugin
-// Provides a unified workflow for reviewing code changes (diffs, conflicts, AI outputs).
-//
-// TODO: This plugin has incomplete/broken functionality:
-// - Uses editor.prompt() which doesn't exist in the API (needs event-based prompt)
-// - Uses VirtualBufferOptions.read_only (should be readOnly)
-// - References stop_review_diff which is undefined
+// Magit-style split-panel UI for reviewing and staging code changes.
+// Left panel: file list (staged/unstaged/untracked). Right panel: diff.
+// Actions: stage/unstage/discard hunks or files, line comments, export.
 const editor = getEditor();
 
 import { createVirtualBufferFactory } from "./lib/virtual-buffer-factory.ts";
 const VirtualBufferFactory = createVirtualBufferFactory(editor);
 
-/**
- * Hunk status for staging
- */
-type HunkStatus = 'pending' | 'staged' | 'discarded';
 
-/**
- * Review status for a hunk
- */
-type ReviewStatus = 'pending' | 'approved' | 'needs_changes' | 'rejected' | 'question';
 
 /**
  * A review comment attached to a specific line in a file
@@ -57,8 +46,6 @@ interface Hunk {
   oldRange: { start: number; end: number };  // old file line range
   type: 'add' | 'remove' | 'modify';
   lines: string[];
-  status: HunkStatus;
-  reviewStatus: ReviewStatus;
   contextHeader: string;
   byteOffset: number; // Position in the virtual buffer
   gitStatus?: 'staged' | 'unstaged' | 'untracked';
@@ -76,38 +63,69 @@ interface FileEntry {
 
 /**
  * Review Session State
+ *
+ * Scrolling and cursor tracking inside the panel buffers is handled by the
+ * editor core natively — this state only mirrors what the plugin needs to
+ * know between events (selected file, focused panel, hunk header rows for
+ * `n`/`p` jumps).
  */
 interface ReviewState {
   hunks: Hunk[];
-  hunkStatus: Record<string, HunkStatus>;
   comments: ReviewComment[];
-  originalRequest?: string;
-  overallFeedback?: string;
+  note: string;
   reviewBufferId: number | null;
   // New magit-style state
   files: FileEntry[];
   selectedIndex: number;
-  fileScrollOffset: number;
-  diffScrollOffset: number;
   viewportWidth: number;
   viewportHeight: number;
   focusPanel: 'files' | 'diff';
+  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[];
+  diffLineByteOffsets: number[];
 }
 
 const state: ReviewState = {
   hunks: [],
-  hunkStatus: {},
   comments: [],
+  note: '',
   reviewBufferId: null,
   files: [],
   selectedIndex: 0,
-  fileScrollOffset: 0,
-  diffScrollOffset: 0,
   viewportWidth: 80,
   viewportHeight: 24,
   focusPanel: 'files',
+  groupId: null,
+  panelBuffers: {},
+  hunkHeaderRows: [],
+  diffLineByteOffsets: [],
+  diffCursorRow: 1,
+  diffCache: {},
 };
 
+// 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.
+const STYLE_SELECTED_BG: OverlayColorSpec = "editor.selection_bg";
+const CURSOR_LINE_NS = "review-cursor-line";
+
 // --- Refresh State ---
 
 // --- Colors & Styles ---
@@ -119,14 +137,10 @@ const STYLE_ADD_BG: OverlayColorSpec = "editor.diff_add_bg";
 const STYLE_REMOVE_BG: OverlayColorSpec = "editor.diff_remove_bg";
 const STYLE_ADD_TEXT: OverlayColorSpec = "diagnostic.info_fg";
 const STYLE_REMOVE_TEXT: OverlayColorSpec = "diagnostic.error_fg";
-const STYLE_STAGED: OverlayColorSpec = "editor.line_number_fg";
-const STYLE_DISCARDED: OverlayColorSpec = "diagnostic.error_fg";
+
 const STYLE_SECTION_HEADER: OverlayColorSpec = "syntax.type";
 const STYLE_COMMENT: OverlayColorSpec = "diagnostic.warning_fg";
-const STYLE_COMMENT_BORDER: OverlayColorSpec = "ui.split_separator_fg";
-const STYLE_APPROVED: OverlayColorSpec = "diagnostic.info_fg";
-const STYLE_REJECTED: OverlayColorSpec = "diagnostic.error_fg";
-const STYLE_QUESTION: OverlayColorSpec = "diagnostic.warning_fg";
+
 
 /**
  * Calculate UTF-8 byte length of a string manually since TextEncoder is not available
@@ -151,46 +165,45 @@ interface DiffPart {
     type: 'added' | 'removed' | 'unchanged';
 }
 
+/**
+ * Inline word-level diff between two changed lines.
+ *
+ * Used to highlight the *changed region* inside a -/+ pair, called once per
+ * adjacent pair while building a file's diff. The previous implementation
+ * was a full O(n*m) LCS that allocated an (n+1)*(m+1) DP table per pair —
+ * fast enough for short lines, but for files with hundreds of long-line
+ * changes (e.g. `audit_mode.ts` itself) it added hundreds of milliseconds
+ * to every diff rebuild and made file-list navigation visibly laggy.
+ *
+ * This O(n+m) scan finds the longest common prefix and suffix and reports
+ * everything in between as the changed region. It misses internal matches
+ * (e.g. it can't tell that "abc-xy-def" → "abc-zw-def" only changed the
+ * middle "xy"), but for inline highlighting that's fine — the human eye is
+ * already drawn to the line as a whole, the highlight just answers "where
+ * inside the line did the change happen?". The cost difference is dramatic:
+ * for two 200-char lines, ~400 char compares vs. ~40 000.
+ */
 function diffStrings(oldStr: string, newStr: string): DiffPart[] {
     const n = oldStr.length;
     const m = newStr.length;
-    const dp: number[][] = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0));
-
-    for (let i = 1; i <= n; i++) {
-        for (let j = 1; j <= m; j++) {
-            if (oldStr[i - 1] === newStr[j - 1]) {
-                dp[i][j] = dp[i - 1][j - 1] + 1;
-            } else {
-                dp[i][j] = Math.max(dp[i - 1][j], dp[i][j - 1]);
-            }
-        }
-    }
-
-    const result: DiffPart[] = [];
-    let i = n, j = m;
-    while (i > 0 || j > 0) {
-        if (i > 0 && j > 0 && oldStr[i - 1] === newStr[j - 1]) {
-            result.unshift({ text: oldStr[i - 1], type: 'unchanged' });
-            i--; j--;
-        } else if (j > 0 && (i === 0 || dp[i][j - 1] >= dp[i - 1][j])) {
-            result.unshift({ text: newStr[j - 1], type: 'added' });
-            j--;
-        } else {
-            result.unshift({ text: oldStr[i - 1], type: 'removed' });
-            i--;
-        }
-    }
-
-    const coalesced: DiffPart[] = [];
-    for (const part of result) {
-        const last = coalesced[coalesced.length - 1];
-        if (last && last.type === part.type) {
-            last.text += part.text;
-        } else {
-            coalesced.push(part);
-        }
-    }
-    return coalesced;
+    let pre = 0;
+    const minLen = Math.min(n, m);
+    while (pre < minLen && oldStr.charCodeAt(pre) === newStr.charCodeAt(pre)) pre++;
+    let suf = 0;
+    while (
+        suf < n - pre &&
+        suf < m - pre &&
+        oldStr.charCodeAt(n - 1 - suf) === newStr.charCodeAt(m - 1 - suf)
+    ) {
+        suf++;
+    }
+
+    const parts: DiffPart[] = [];
+    if (pre > 0) parts.push({ text: oldStr.slice(0, pre), type: 'unchanged' });
+    if (pre < n - suf) parts.push({ text: oldStr.slice(pre, n - suf), type: 'removed' });
+    if (pre < m - suf) parts.push({ text: newStr.slice(pre, m - suf), type: 'added' });
+    if (suf > 0) parts.push({ text: oldStr.slice(n - suf), type: 'unchanged' });
+    return parts;
 }
 
 function parseDiffOutput(stdout: string, gitStatus: 'staged' | 'unstaged' | 'untracked'): Hunk[] {
@@ -220,7 +233,6 @@ function parseDiffOutput(stdout: string, gitStatus: 'staged' | 'unstaged' | 'unt
                     type: 'modify',
                     lines: [],
                     status: 'pending',
-                    reviewStatus: 'pending',
                     contextHeader: match[3]?.trim() || "",
                     byteOffset: 0,
                     gitStatus
@@ -374,7 +386,6 @@ async function fetchDiffsForFiles(files: FileEntry[]): Promise<Hunk[]> {
 
 // --- New magit-style rendering (Step 2 of rewrite) ---
 
-const STYLE_SELECTED_BG: OverlayColorSpec = "editor.selection_bg";
 const STYLE_DIVIDER: OverlayColorSpec = "ui.split_separator_fg";
 const STYLE_FOOTER: OverlayColorSpec = "ui.status_bar_fg";
 const STYLE_HUNK_HEADER: OverlayColorSpec = "syntax.keyword";
@@ -389,16 +400,24 @@ interface ListLine {
 
 interface DiffLine {
     text: string;
-    type: 'hunk-header' | 'add' | 'remove' | 'context' | 'empty';
+    type: 'hunk-header' | 'add' | 'remove' | 'context' | 'empty' | 'comment';
     style?: Partial<OverlayOptions>;
     inlineOverlays?: InlineOverlay[];
+    // Line metadata for comment attachment
+    hunkId?: string;
+    file?: string;
+    lineType?: 'add' | 'remove' | 'context';
+    oldLine?: number;
+    newLine?: number;
+    lineContent?: string;
+    commentId?: string;
 }
 
 /**
  * Build the file list lines for the left panel.
  * Returns section headers (not selectable) and file entries.
  */
-function buildFileListLines(): ListLine[] {
+function buildFileListLines(leftWidth?: number): ListLine[] {
     const lines: ListLine[] = [];
     let lastCategory: string | undefined;
 
@@ -418,7 +437,7 @@ function buildFileListLines(): ListLine[] {
             });
         }
 
-        // Status icon
+        // 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;
@@ -429,9 +448,64 @@ function buildFileListLines(): ListLine[] {
         });
     }
 
+    // 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;
+            }
+        }
+        if (line) {
+            lines.push({ text: `  ${line}`, type: 'section-header', style: { fg: STYLE_COMMENT, italic: true } });
+        }
+    }
+
     return lines;
 }
 
+/**
+ * Push inline comment lines for a given diff line into the lines array.
+ */
+function pushLineComments(
+    lines: DiffLine[], hunk: Hunk,
+    lineType: 'add' | 'remove' | 'context',
+    oldLine: number | undefined, newLine: number | undefined
+) {
+    const lineComments = state.comments.filter(c =>
+        c.hunk_id === hunk.id && (
+            (c.line_type === 'add' && c.new_line === newLine) ||
+            (c.line_type === 'remove' && c.old_line === oldLine) ||
+            (c.line_type === 'context' && c.new_line === newLine)
+        )
+    );
+    for (const comment of lineComments) {
+        const lineRef = comment.line_type === 'add'
+            ? `+${comment.new_line}`
+            : comment.line_type === 'remove'
+            ? `-${comment.old_line}`
+            : `${comment.new_line}`;
+        lines.push({
+            text: `  \u00bb [${lineRef}] ${comment.text}`,
+            type: 'comment',
+            commentId: comment.id,
+            style: { fg: STYLE_COMMENT, italic: true },
+        });
+    }
+}
+
 /**
  * Build the diff lines for the right panel based on currently selected file.
  */
@@ -463,39 +537,125 @@ function buildDiffLines(rightWidth: number): DiffLine[] {
     }
 
     for (const hunk of fileHunks) {
-        // Hunk header
+        // Hunk header with review status indicator
         const header = hunk.contextHeader
             ? `@@ ${hunk.contextHeader} @@`
             : `@@ -${hunk.oldRange.start} +${hunk.range.start} @@`;
+
         lines.push({
             text: header,
             type: 'hunk-header',
+            hunkId: hunk.id,
+            file: hunk.file,
             style: { fg: STYLE_HUNK_HEADER, bold: true },
         });
 
-        // Diff content lines — only set background color so the normal editor
-        // foreground stays readable across all themes. The bg uses theme-aware
-        // diff colors that each theme can customize.
-        for (const line of hunk.lines) {
+        // 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 },
+            });
+        }
+
+        // Track actual file line numbers as we iterate
+        let oldLineNum = hunk.oldRange.start;
+        let newLineNum = hunk.range.start;
+
+        // Diff content lines with word-level highlighting for adjacent -/+ pairs
+        for (let li = 0; li < hunk.lines.length; li++) {
+            const line = hunk.lines[li];
+            const nextLine = hunk.lines[li + 1];
             const prefix = line[0];
+            const lineType: 'add' | 'remove' | 'context' =
+                prefix === '+' ? 'add' : prefix === '-' ? 'remove' : 'context';
+            const curOldLine = lineType !== 'add' ? oldLineNum : undefined;
+            const curNewLine = lineType !== 'remove' ? newLineNum : undefined;
+
+            // Detect adjacent -/+ pair for word-level diff
+            if (prefix === '-' && nextLine && nextLine[0] === '+') {
+                const oldContent = line.substring(1);
+                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
+                for (const part of parts) {
+                    const pLen = getByteLength(part.text);
+                    if (part.type === 'removed') {
+                        removeOverlays.push({ start: rOffset, end: rOffset + pLen, style: { fg: STYLE_REMOVE_TEXT, bg: STYLE_REMOVE_BG, bold: true } });
+                    }
+                    if (part.type !== 'added') rOffset += pLen;
+                }
+                lines.push({
+                    text: line, 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,
+                });
+                // 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]);
+                for (const part of parts) {
+                    const pLen = getByteLength(part.text);
+                    if (part.type === 'added') {
+                        addOverlays.push({ start: aOffset, end: aOffset + pLen, style: { fg: STYLE_ADD_TEXT, bg: STYLE_ADD_BG, bold: true } });
+                    }
+                    if (part.type !== 'removed') aOffset += pLen;
+                }
+                lines.push({
+                    text: nextLine, 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,
+                });
+                pushLineComments(lines, hunk, 'add', undefined, newLineNum);
+                newLineNum++;
+                li++; // skip the + line we already processed
+                continue;
+            }
+
             if (prefix === '+') {
                 lines.push({
-                    text: line,
-                    type: 'add',
+                    text: line, type: 'add',
                     style: { bg: STYLE_ADD_BG, extendToLineEnd: true },
+                    hunkId: hunk.id, file: hunk.file,
+                    lineType, oldLine: curOldLine, newLine: curNewLine, lineContent: line,
                 });
+                newLineNum++;
             } else if (prefix === '-') {
                 lines.push({
-                    text: line,
-                    type: 'remove',
+                    text: line, type: 'remove',
                     style: { bg: STYLE_REMOVE_BG, extendToLineEnd: true },
+                    hunkId: hunk.id, file: hunk.file,
+                    lineType, oldLine: curOldLine, newLine: curNewLine, lineContent: line,
                 });
+                oldLineNum++;
             } else {
                 lines.push({
-                    text: line,
-                    type: 'context',
+                    text: line, type: 'context',
+                    hunkId: hunk.id, file: hunk.file,
+                    lineType, oldLine: curOldLine, newLine: curNewLine, lineContent: line,
                 });
+                oldLineNum++;
+                newLineNum++;
             }
+
+            // Render inline comments attached to this line
+            pushLineComments(lines, hunk, lineType, curOldLine, curNewLine);
         }
     }
 
@@ -509,260 +669,463 @@ function buildDiffLines(rightWidth: number): DiffLine[] {
  *   Row 1:        Header (left: GIT STATUS, right: DIFF FOR <file>)
  *   Rows 2..H-1:  Main content (left file list, │ divider, right diff)
  */
-function buildMagitDisplayEntries(): TextPropertyEntry[] {
-    const entries: TextPropertyEntry[] = [];
-    const H = state.viewportHeight;
-    const W = state.viewportWidth;
-    const leftWidth = Math.max(28, Math.floor(W * 0.3));
-    const rightWidth = W - leftWidth - 1; // 1 for divider
 
-    const allFileLines = buildFileListLines();
-    const diffLines = buildDiffLines(rightWidth);
+// Theme colors for toolbar key hints
+const STYLE_KEY_FG: OverlayColorSpec = "syntax.keyword";
+const STYLE_KEY_BG: OverlayColorSpec = "editor.selection_bg";
+const STYLE_HINT_FG: OverlayColorSpec = "editor.line_number_fg";
+const STYLE_TOOLBAR_BG: OverlayColorSpec = "ui.status_bar_bg";
+const STYLE_TOOLBAR_SEP: OverlayColorSpec = "ui.split_separator_fg";
 
-    const mainRows = H - 2; // rows 2..H-1
+interface HintItem {
+    key: string;
+    label: string;
+}
 
-    // --- File list scrolling ---
-    let selectedLineIdx = -1;
-    for (let i = 0; i < allFileLines.length; i++) {
-        if (allFileLines[i].type === 'file' && allFileLines[i].fileIndex === state.selectedIndex) {
-            selectedLineIdx = i;
-            break;
-        }
-    }
-    if (selectedLineIdx >= 0) {
-        if (selectedLineIdx < state.fileScrollOffset) {
-            state.fileScrollOffset = selectedLineIdx;
+/**
+ * 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.
+    const overlays: InlineOverlay[] = [];
+    let text = " ";
+    let bytePos = getByteLength(" ");
+    let done = false;
+
+    for (let g = 0; g < groups.length && !done; g++) {
+        if (g > 0) {
+            const sep = " │ ";
+            if (text.length + sep.length > W) { done = true; break; }
+            overlays.push({ start: bytePos, end: bytePos + getByteLength(sep), style: { fg: STYLE_TOOLBAR_SEP } });
+            text += sep;
+            bytePos += getByteLength(sep);
         }
-        if (selectedLineIdx >= state.fileScrollOffset + mainRows) {
-            state.fileScrollOffset = selectedLineIdx - mainRows + 1;
+        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;
+
+            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;
+                bytePos += keyLen;
+                const labelText = " " + item.label;
+                const labelLen = getByteLength(labelText);
+                overlays.push({ start: bytePos, end: bytePos + labelLen, style: { fg: STYLE_HINT_FG } });
+                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;
+                bytePos += keyLen;
+            } else {
+                done = true;
+            }
         }
     }
-    const maxFileOffset = Math.max(0, allFileLines.length - mainRows);
-    if (state.fileScrollOffset > maxFileOffset) state.fileScrollOffset = maxFileOffset;
-    if (state.fileScrollOffset < 0) state.fileScrollOffset = 0;
 
-    const visibleFileLines = allFileLines.slice(state.fileScrollOffset, state.fileScrollOffset + mainRows);
+    const padded = text.padEnd(W) + "\n";
+    return {
+        text: padded,
+        properties: { type: "toolbar" },
+        style: { bg: STYLE_TOOLBAR_BG, extendToLineEnd: true },
+        inlineOverlays: overlays,
+    };
+}
+
+// --- Buffer Group panel content builders ---
 
-    // --- Diff scrolling ---
-    const maxDiffOffset = Math.max(0, diffLines.length - mainRows);
-    if (state.diffScrollOffset > maxDiffOffset) state.diffScrollOffset = maxDiffOffset;
-    if (state.diffScrollOffset < 0) state.diffScrollOffset = 0;
+function buildToolbarPanelEntries(): TextPropertyEntry[] {
+    // Reuse buildToolbar — returns one entry with the full toolbar line
+    return [buildToolbar(state.viewportWidth)];
+}
 
-    const visibleDiffLines = diffLines.slice(state.diffScrollOffset, state.diffScrollOffset + mainRows);
+function buildFilesPanelEntries(): TextPropertyEntry[] {
+    const entries: TextPropertyEntry[] = [];
+    const leftWidth = Math.max(28, Math.floor(state.viewportWidth * 0.3));
 
-    // --- Row 0: Toolbar ---
-    const toolbar = " [Tab] Switch Panel  [s] Stage  [u] Unstage  [d] Discard  [Enter] Drill-Down  [r] Refresh";
+    // 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: toolbar.substring(0, W).padEnd(W) + "\n",
-        style: { fg: STYLE_FOOTER, bg: "ui.status_bar_bg" as OverlayColorSpec, extendToLineEnd: true },
-        properties: { type: "toolbar" },
+        text: " GIT STATUS\n",
+        style: headerStyle,
+        properties: { type: "header" },
     });
 
-    // --- Row 1: Header ---
+    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;
+}
+
+/**
+ * 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.
+ */
+function buildDiffPanelEntries(): TextPropertyEntry[] {
     const selectedFile = state.files[state.selectedIndex];
-    const focusLeft = state.focusPanel === 'files';
-    const leftHeader = " GIT STATUS";
+    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[] = [];
+    let runningByte = 0;
+    let row = 0; // 0-indexed counter; row + 1 is the 1-indexed line number
+
+    const pushEntry = (entry: TextPropertyEntry) => {
+        diffLineByteOffsets.push(runningByte);
+        runningByte += getByteLength(entry.text);
+        entries.push(entry);
+        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";
-    const leftHeaderPadded = leftHeader.padEnd(leftWidth).substring(0, leftWidth);
-    const rightHeaderPadded = rightHeader.substring(0, rightWidth);
+    pushEntry({
+        text: rightHeader + "\n",
+        style: { fg: STYLE_HEADER, bold: true, underline: true },
+        properties: { type: "header" },
+    });
 
-    const leftHeaderStyle: Partial<OverlayOptions> = focusLeft
-        ? { fg: STYLE_HEADER, bold: true, underline: true }
-        : { fg: STYLE_DIVIDER };
-    const rightHeaderStyle: Partial<OverlayOptions> = focusLeft
-        ? { fg: STYLE_DIVIDER }
-        : { fg: STYLE_HEADER, bold: true, underline: true };
-
-    entries.push({ text: leftHeaderPadded, style: leftHeaderStyle, properties: { type: "header" } });
-    entries.push({ text: "│", style: { fg: STYLE_DIVIDER }, properties: { type: "divider" } });
-    entries.push({ text: rightHeaderPadded, style: rightHeaderStyle, properties: { type: "header" } });
-    entries.push({ text: "\n", properties: { type: "newline" } });
-
-    // --- Rows 2..H-1: Main content ---
-    for (let i = 0; i < mainRows; i++) {
-        const fileItem = visibleFileLines[i];
-        const diffItem = visibleDiffLines[i];
-
-        // Left panel
-        const leftText = fileItem ? (" " + fileItem.text) : "";
-        const leftPadded = leftText.padEnd(leftWidth).substring(0, leftWidth);
-        const isSelected = fileItem?.type === 'file' && fileItem.fileIndex === state.selectedIndex;
-
-        const leftEntry: TextPropertyEntry = {
-            text: leftPadded,
-            properties: {
-                type: fileItem?.type || "blank",
-                fileIndex: fileItem?.fileIndex,
-            },
-            style: fileItem?.style,
-            inlineOverlays: fileItem?.inlineOverlays,
-        };
-        if (isSelected) {
-            leftEntry.style = { ...(leftEntry.style || {}), bg: STYLE_SELECTED_BG, bold: true };
+    const lines = buildDiffLines(rightWidth);
+    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;
+        if (line.lineType !== undefined) props.lineType = line.lineType;
+        if (line.oldLine !== undefined) props.oldLine = line.oldLine;
+        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.type === 'hunk-header') {
+            // 1-indexed row of this hunk header in the diff buffer.
+            hunkHeaderRows.push(row + 1);
         }
-        entries.push(leftEntry);
-
-        // Divider
-        entries.push({ text: "│", style: { fg: STYLE_DIVIDER }, properties: { type: "divider" } });
-
-        // Right panel — when diff panel is focused, highlight the top line as cursor
-        const rightText = diffItem ? (" " + diffItem.text) : "";
-        const rightTruncated = rightText.substring(0, rightWidth);
-        const isDiffCursorLine = !focusLeft && i === 0 && diffItem != null;
-        const rightStyle = isDiffCursorLine
-            ? { ...(diffItem?.style || {}), bg: STYLE_SELECTED_BG, extendToLineEnd: true }
-            : diffItem?.style;
-        entries.push({
-            text: rightTruncated,
-            properties: { type: diffItem?.type || "blank" },
-            style: rightStyle,
-            inlineOverlays: diffItem?.inlineOverlays,
-        });
 
-        // Newline
-        entries.push({ text: "\n", properties: { type: "newline" } });
+        pushEntry({
+            text: (line.text || "") + "\n",
+            style: line.style,
+            inlineOverlays: line.inlineOverlays,
+            properties: props,
+        });
     }
 
+    // Sentinel: total buffer length, used as the end of the last row.
+    diffLineByteOffsets.push(runningByte);
+
+    state.diffCache[cacheKey] = { entries, hunkHeaderRows, diffLineByteOffsets };
+    state.hunkHeaderRows = hunkHeaderRows;
+    state.diffLineByteOffsets = diffLineByteOffsets;
     return entries;
 }
 
 /**
- * Refresh the display — rebuild entries and set buffer content.
- * Always re-queries viewport dimensions to handle sidebar toggles and splits.
+ * Full refresh — rebuild all three panels. Called on data changes
+ * (refreshMagitData, comment add/edit, note edit, resize). NOT called on
+ * scroll: scrolling is handled natively by the editor in the panel buffers.
  */
 function updateMagitDisplay(): void {
-    if (state.reviewBufferId === null) return;
     refreshViewportDimensions();
-    const entries = buildMagitDisplayEntries();
-    editor.clearNamespace(state.reviewBufferId, "review-diff");
-    editor.setVirtualBufferContent(state.reviewBufferId, entries);
+    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).
+    applyCursorLineOverlay('diff');
+}
+
+/**
+ * Rebuild only the diff panel. Called when the selected file changes.
+ */
+function refreshDiffPanelOnly(): void {
+    if (state.groupId === null) return;
+    editor.setPanelContent(state.groupId, "diff", buildDiffPanelEntries());
+    applyCursorLineOverlay('diff');
+}
+
+/**
+ * Repaint the synthetic "cursor line" highlight in the diff panel.
+ *
+ * The diff panel buffer is created with show_cursors=true so the editor
+ * moves the cursor natively, but a single-line bg overlay on the cursor row
+ * gives a much more visible "you are here" indicator than the bare caret —
+ * which matches the magit-style aesthetic and is what the user expects.
+ */
+function applyCursorLineOverlay(panel: 'diff'): void {
+    const bufId = state.panelBuffers[panel];
+    if (bufId === undefined) return;
+    editor.clearNamespace(bufId, CURSOR_LINE_NS);
+    const offsets = state.diffLineByteOffsets;
+    if (offsets.length < 2) return;
+    const idx = Math.max(0, Math.min(state.diffCursorRow - 1, offsets.length - 2));
+    const start = offsets[idx];
+    const end = offsets[idx + 1];
+    if (end <= start) return;
+    editor.addOverlay(bufId, CURSOR_LINE_NS, start, end, {
+        bg: STYLE_SELECTED_BG,
+        extendToLineEnd: true,
+    });
 }
 
 function review_refresh() { refreshMagitData(); }
 registerHandler("review_refresh", review_refresh);
 
-// --- New magit navigation handlers (Step 3) ---
+// --- 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:
+//
+//   * 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.
+
+function isFilesFocused(): boolean {
+    return state.focusPanel === 'files';
+}
+
+function refreshFilesPanelOnly(): void {
+    if (state.groupId === null) return;
+    editor.setPanelContent(state.groupId, "files", buildFilesPanelEntries());
+}
+
+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 review_nav_up() {
-    if (state.focusPanel === 'files') {
-        if (state.files.length === 0) return;
-        if (state.selectedIndex > 0) {
-            state.selectedIndex--;
-            state.diffScrollOffset = 0;
-            updateMagitDisplay();
-        }
+    if (isFilesFocused()) {
+        selectFile(state.selectedIndex - 1);
     } else {
-        state.diffScrollOffset = Math.max(0, state.diffScrollOffset - 1);
-        updateMagitDisplay();
+        editor.executeAction("move_up");
     }
 }
 registerHandler("review_nav_up", review_nav_up);
 
 function review_nav_down() {
-    if (state.focusPanel === 'files') {
-        if (state.files.length === 0) return;
-        if (state.selectedIndex < state.files.length - 1) {
-            state.selectedIndex++;
-            state.diffScrollOffset = 0;
-            updateMagitDisplay();
-        }
+    if (isFilesFocused()) {
+        selectFile(state.selectedIndex + 1);
     } else {
-        state.diffScrollOffset++;
-        updateMagitDisplay();
+        editor.executeAction("move_down");
     }
 }
 registerHandler("review_nav_down", review_nav_down);
 
 function review_page_up() {
-    const mainRows = state.viewportHeight - 2;
-    if (state.focusPanel === 'files') {
-        if (state.selectedIndex > 0) {
-            state.selectedIndex = Math.max(0, state.selectedIndex - mainRows);
-            state.diffScrollOffset = 0;
-            updateMagitDisplay();
-        }
+    if (isFilesFocused()) {
+        const step = Math.max(1, state.viewportHeight - 2);
+        selectFile(Math.max(0, state.selectedIndex - step));
     } else {
-        state.diffScrollOffset = Math.max(0, state.diffScrollOffset - mainRows);
-        updateMagitDisplay();
+        editor.executeAction("move_page_up");
     }
 }
 registerHandler("review_page_up", review_page_up);
 
 function review_page_down() {
-    const mainRows = state.viewportHeight - 2;
-    if (state.focusPanel === 'files') {
-        if (state.selectedIndex < state.files.length - 1) {
-            state.selectedIndex = Math.min(state.files.length - 1, state.selectedIndex + mainRows);
-            state.diffScrollOffset = 0;
-            updateMagitDisplay();
-        }
+    if (isFilesFocused()) {
+        const step = Math.max(1, state.viewportHeight - 2);
+        selectFile(Math.min(state.files.length - 1, state.selectedIndex + step));
     } else {
-        state.diffScrollOffset += mainRows;
-        updateMagitDisplay();
+        editor.executeAction("move_page_down");
     }
 }
 registerHandler("review_page_down", review_page_down);
 
-function review_toggle_focus() {
-    state.focusPanel = state.focusPanel === 'files' ? 'diff' : 'files';
-    updateMagitDisplay();
-}
-registerHandler("review_toggle_focus", review_toggle_focus);
-
-function review_focus_files() {
-    if (state.focusPanel !== 'files') {
-        state.focusPanel = 'files';
-        updateMagitDisplay();
-    }
-}
-registerHandler("review_focus_files", review_focus_files);
-
-function review_focus_diff() {
-    if (state.focusPanel !== 'diff') {
-        state.focusPanel = 'diff';
-        updateMagitDisplay();
-    }
-}
-registerHandler("review_focus_diff", review_focus_diff);
-
 function review_nav_home() {
-    if (state.focusPanel === 'files') {
-        if (state.files.length === 0) return;
-        state.selectedIndex = 0;
-        state.diffScrollOffset = 0;
-        updateMagitDisplay();
+    if (isFilesFocused()) {
+        selectFile(0);
     } else {
-        state.diffScrollOffset = 0;
-        updateMagitDisplay();
+        editor.executeAction("move_document_start");
     }
 }
 registerHandler("review_nav_home", review_nav_home);
 
 function review_nav_end() {
-    if (state.focusPanel === 'files') {
-        if (state.files.length === 0) return;
-        state.selectedIndex = state.files.length - 1;
-        state.diffScrollOffset = 0;
-        updateMagitDisplay();
+    if (isFilesFocused()) {
+        selectFile(state.files.length - 1);
     } else {
-        // Scroll diff to bottom
-        const mainRows = state.viewportHeight - 2;
-        const selectedFile = state.files[state.selectedIndex];
-        if (selectedFile) {
-            const diffLines = buildDiffLines(state.viewportWidth - Math.max(28, Math.floor(state.viewportWidth * 0.3)) - 1);
-            state.diffScrollOffset = Math.max(0, diffLines.length - mainRows);
-        }
-        updateMagitDisplay();
+        editor.executeAction("move_document_end");
     }
 }
 registerHandler("review_nav_end", review_nav_end);
 
+function review_toggle_focus() {
+    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());
+}
+registerHandler("review_toggle_focus", review_toggle_focus);
+
 // --- Real git stage/unstage/discard actions (Step 4) ---
 
+/**
+ * Build a minimal unified diff patch for a single hunk.
+ */
+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;
+    const header = `@@ -${hunk.oldRange.start},${oldCount} +${hunk.range.start},${newCount} @@`;
+    return [
+        `diff --git a/${filePath} b/${filePath}`,
+        `--- a/${filePath}`,
+        `+++ b/${filePath}`,
+        header,
+        ...hunk.lines,
+        ''
+    ].join('\n');
+}
+
+/**
+ * Write a patch to a temp file and apply it with the given flags.
+ * Returns true on success.
+ */
+async function applyHunkPatch(patch: string, flags: string[]): Promise<boolean> {
+    const tmpDir = editor.getTempDir();
+    const patchPath = editor.pathJoin(tmpDir, `fresh-review-${Date.now()}.patch`);
+    editor.writeFile(patchPath, patch);
+    // Validate first
+    const check = await editor.spawnProcess("git", ["apply", "--check", ...flags, patchPath]);
+    if (check.exit_code !== 0) {
+        editor.setStatus("Patch failed: " + (check.stderr || "").trim());
+        return false;
+    }
+    const result = await editor.spawnProcess("git", ["apply", ...flags, patchPath]);
+    return result.exit_code === 0;
+}
+
+/**
+ * Merge all text-property records at the cursor of the given panel buffer
+ * into a single object. There's typically only one record covering each
+ * cursor position; merging keeps callers simple.
+ */
+function readPropsAtCursor(panel: 'files' | 'diff'): Record<string, unknown> | null {
+    const bufId = state.panelBuffers[panel];
+    if (bufId === undefined) return null;
+    const records = editor.getTextPropertiesAtCursor(bufId);
+    if (!records || records.length === 0) return null;
+    const merged: Record<string, unknown> = {};
+    for (const r of records) Object.assign(merged, r);
+    return merged;
+}
+
+/**
+ * Get the hunk under the cursor in the diff panel, or null.
+ *
+ * Reads the `hunkId` text property embedded by `buildDiffPanelEntries`. Falls
+ * back to the first hunk of the selected file when the cursor is somewhere
+ * without a hunkId (e.g. the panel header) so commands like `s` still do
+ * something useful.
+ */
+function getHunkAtDiffCursor(): Hunk | null {
+    const props = readPropsAtCursor('diff');
+    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;
+    return state.hunks.find(
+        h => h.file === selectedFile.path && h.gitStatus === selectedFile.category
+    ) || null;
+}
+
 async function review_stage_file() {
     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();
+        return;
+    }
     const f = state.files[state.selectedIndex];
     if (!f) return;
     await editor.spawnProcess("git", ["add", "--", f.path]);
@@ -772,6 +1135,20 @@ 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 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();
+        return;
+    }
     const f = state.files[state.selectedIndex];
     if (!f) return;
     await editor.spawnProcess("git", ["reset", "HEAD", "--", f.path]);
@@ -781,6 +1158,22 @@ registerHandler("review_unstage_file", review_unstage_file);
 
 function review_discard_file() {
     if (state.files.length === 0) return;
+    if (state.focusPanel === 'diff') {
+        // Hunk-level discard — show confirmation
+        const hunk = getHunkAtDiffCursor();
+        if (!hunk || !hunk.file) return;
+        editor.startPrompt(
+            editor.t("prompt.discard_hunk", { file: hunk.file }) ||
+            `Discard this hunk in "${hunk.file}"? This cannot be undone.`,
+            "review-discard-hunk-confirm"
+        );
+        const suggestions: PromptSuggestion[] = [
+            { text: "Discard hunk", description: "Permanently lose this change", value: "discard" },
+            { text: "Cancel", description: "Keep the hunk as-is", value: "cancel" },
+        ];
+        editor.setPromptSuggestions(suggestions);
+        return;
+    }
     const f = state.files[state.selectedIndex];
     if (!f) return;
 
@@ -795,6 +1188,26 @@ function review_discard_file() {
 }
 registerHandler("review_discard_file", review_discard_file);
 
+async function on_review_discard_hunk_confirm(args: { prompt_type: string; input: string; selected_index: number | null }): Promise<boolean> {
+    if (args.prompt_type !== "review-discard-hunk-confirm") return true;
+    const response = args.input.trim().toLowerCase();
+    if (response === "discard" || args.selected_index === 0) {
+        const hunk = getHunkAtDiffCursor();
+        if (hunk && hunk.file) {
+            const patch = buildHunkPatch(hunk.file, hunk);
+            const ok = await applyHunkPatch(patch, ["--reverse"]);
+            if (ok) {
+                editor.setStatus(editor.t("status.hunk_discarded") || "Hunk discarded");
+                await refreshMagitData();
+            }
+        }
+    } else {
+        editor.setStatus("Discard cancelled");
+    }
+    return false;
+}
+registerHandler("on_review_discard_hunk_confirm", on_review_discard_hunk_confirm);
+
 async function on_review_discard_confirm(args: { prompt_type: string; input: string; selected_index: number | null }): Promise<boolean> {
     if (args.prompt_type !== "review-discard-confirm") return true;
 
@@ -828,7 +1241,8 @@ async function refreshMagitData() {
     if (state.selectedIndex >= state.files.length) {
         state.selectedIndex = Math.max(0, state.files.length - 1);
     }
-    state.diffScrollOffset = 0;
+    state.diffCursorRow = 1;
+    state.diffCache = {}; // git state may have changed — invalidate cached diffs
     updateMagitDisplay();
 }
 
@@ -853,6 +1267,8 @@ 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);
@@ -1278,10 +1694,17 @@ async function review_drill_down() {
     }
 
     // Read new file content (use absolute path for readFile)
-    const newContent = await editor.readFile(absoluteFilePath);
-    if (newContent === null) {
-        editor.setStatus(editor.t("status.failed_new_version"));
-        return;
+    // For deleted files the path no longer exists — use empty content
+    let newContent: string;
+    if (selectedFile.status === 'D') {
+        newContent = "";
+    } else {
+        const readResult = await editor.readFile(absoluteFilePath);
+        if (readResult === null) {
+            editor.setStatus(editor.t("status.failed_new_version"));
+            return;
+        }
+        newContent = readResult;
     }
 
     // Close any existing side-by-side views (old split-based approach)
@@ -1415,15 +1838,68 @@ registerHandler("review_drill_down", review_drill_down);
 
 // --- Hunk navigation for side-by-side diff view ---
 
+/**
+ * Move the diff panel's native cursor to the given 1-indexed row, scrolling
+ * the viewport so the row is visible.
+ */
+function jumpDiffCursorToRow(row: number): void {
+    const diffId = state.panelBuffers["diff"];
+    if (diffId === undefined) return;
+    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);
+    }
+    state.diffCursorRow = row;
+    applyCursorLineOverlay('diff');
+}
+
 function review_next_hunk() {
-    if (!activeCompositeDiffState) return;
-    editor.compositeNextHunk(activeCompositeDiffState.compositeBufferId);
+    // 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;
+            }
+        }
+        return;
+    }
+    // Composite diff-view hunk navigation is handled by the Action system
+    // (CompositeNextHunk) via CompositeBuffer context keybindings, so no
+    // plugin fallback is needed here.
 }
 registerHandler("review_next_hunk", review_next_hunk);
 
 function review_prev_hunk() {
-    if (!activeCompositeDiffState) return;
-    editor.compositePrevHunk(activeCompositeDiffState.compositeBufferId);
+    // 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.
 }
 registerHandler("review_prev_hunk", review_prev_hunk);
 
@@ -1442,8 +1918,12 @@ editor.defineMode("diff-view", [
 // --- Review Comment Actions ---
 
 function getCurrentHunkId(): string | null {
-    // In magit mode, get the first hunk of the selected file
     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(
@@ -1452,6 +1932,8 @@ function getCurrentHunkId(): string | null {
     return hunk?.id || null;
 }
 
+
+
 interface PendingCommentInfo {
     hunkId: string;
     file: string;
@@ -1462,26 +1944,62 @@ interface PendingCommentInfo {
 }
 
 function getCurrentLineInfo(): PendingCommentInfo | null {
-    // In magit mode, get info from the selected file's first hunk
     if (state.files.length === 0) return null;
     const selectedFile = state.files[state.selectedIndex];
     if (!selectedFile) return null;
-    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,
-        lineType: undefined,
-        oldLine: undefined,
-        newLine: undefined,
-        lineContent: undefined
-    };
+
+    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 };
 }
 
 // Pending prompt state for event-based prompt handling
 let pendingCommentInfo: PendingCommentInfo | null = null;
+let editingCommentId: string | null = null; // non-null when editing an existing comment
+
+/**
+ * Find an existing comment at the current diff cursor position, either on the
+ * comment display line itself or on the diff line it's attached to.
+ */
+function findCommentAtCursor(): ReviewComment | null {
+    const props = readPropsAtCursor('diff');
+    if (!props) return null;
+
+    // Cursor sits directly on a comment display line.
+    const commentId = props["commentId"];
+    if (typeof commentId === 'string') {
+        return state.comments.find(c => c.id === commentId) || null;
+    }
+
+    // Cursor sits on a diff line — match by hunk + line type + line number.
+    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;
+    return 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)
+        )
+    ) || null;
+}
 
 async function review_add_comment() {
     const info = getCurrentLineInfo();
@@ -1489,9 +2007,13 @@ async function review_add_comment() {
         editor.setStatus(editor.t("status.no_hunk_selected"));
         return;
     }
+
+    // Check for existing comment to edit
+    const existing = findCommentAtCursor();
+
     pendingCommentInfo = info;
+    editingCommentId = existing?.id || null;
 
-    // Show line context in prompt (if on a specific line)
     let lineRef = 'hunk';
     if (info.lineType === 'add' && info.newLine) {
         lineRef = `+${info.newLine}`;
@@ -1502,15 +2024,107 @@ async function review_add_comment() {
     } else if (info.oldLine) {
         lineRef = `L${info.oldLine}`;
     }
-    editor.startPrompt(editor.t("prompt.comment", { line: lineRef }), "review-comment");
+
+    const label = existing
+        ? (editor.t("prompt.edit_comment", { line: lineRef }) || `Edit comment on ${lineRef}: `)
+        : editor.t("prompt.comment", { line: lineRef });
+
+    if (existing) {
+        editor.startPromptWithInitial(label, "review-comment", existing.text);
+    } else {
+        editor.startPrompt(label, "review-comment");
+    }
 }
 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;
+    }
+
+    if (!target) {
+        editor.setStatus("No comment to delete");
+        return;
+    }
+
+    pendingDeleteCommentId = target.id;
+    const preview = target.text.length > 40 ? target.text.substring(0, 37) + '...' : target.text;
+    editor.startPrompt(`Delete "${preview}"?`, "review-delete-comment-confirm");
+    const suggestions: PromptSuggestion[] = [
+        { text: "Delete", description: "Remove this comment", value: "delete" },
+        { text: "Cancel", description: "Keep the comment", value: "cancel" },
+    ];
+    editor.setPromptSuggestions(suggestions);
+}
+registerHandler("review_delete_comment", review_delete_comment);
+
+function on_review_delete_comment_confirm(args: { prompt_type: string; input: string; selected_index: number | null }): boolean {
+    if (args.prompt_type !== "review-delete-comment-confirm") return true;
+    const response = args.input.trim().toLowerCase();
+    if ((response === "delete" || args.selected_index === 0) && pendingDeleteCommentId) {
+        if (pendingDeleteCommentId === '__note__') {
+            state.note = '';
+        } else {
+            state.comments = state.comments.filter(c => c.id !== pendingDeleteCommentId);
+        }
+        state.diffCache = {}; // comment changed
+        updateMagitDisplay();
+        editor.setStatus("Deleted");
+    } else {
+        editor.setStatus("Delete cancelled");
+    }
+    pendingDeleteCommentId = null;
+    return false;
+}
+registerHandler("on_review_delete_comment_confirm", on_review_delete_comment_confirm);
+
 // Prompt event handlers
 function on_review_prompt_confirm(args: { prompt_type: string; input: string }): boolean {
     if (args.prompt_type !== "review-comment") {
-        return true; // Not our prompt
+        return true;
+    }
+
+    if (editingCommentId) {
+        // Edit mode: update existing comment (empty text keeps the comment unchanged)
+        if (args.input && args.input.trim()) {
+            const existing = state.comments.find(c => c.id === editingCommentId);
+            if (existing) {
+                existing.text = args.input.trim();
+                existing.timestamp = new Date().toISOString();
+                state.diffCache = {}; // comment changed
+                updateMagitDisplay();
+                editor.setStatus("Comment updated");
+            }
+        } else {
+            editor.setStatus("Comment unchanged (use x to delete)");
+        }
+        editingCommentId = null;
+        pendingCommentInfo = null;
+        return true;
     }
+
+    // New comment mode
     if (pendingCommentInfo && args.input && args.input.trim()) {
         const comment: ReviewComment = {
             id: `comment-${Date.now()}`,
@@ -1524,6 +2138,7 @@ 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
         updateMagitDisplay();
         let lineRef = 'hunk';
         if (comment.line_type === 'add' && comment.new_line) {
@@ -1545,6 +2160,7 @@ registerHandler("on_review_prompt_confirm", on_review_prompt_confirm);
 function on_review_prompt_cancel(args: { prompt_type: string }): boolean {
     if (args.prompt_type === "review-comment") {
         pendingCommentInfo = null;
+        editingCommentId = null;
         editor.setStatus(editor.t("status.comment_cancelled"));
     }
     return true;
@@ -1554,145 +2170,91 @@ registerHandler("on_review_prompt_cancel", on_review_prompt_cancel);
 // Register prompt event handlers
 editor.on("prompt_confirmed", "on_review_prompt_confirm");
 editor.on("prompt_confirmed", "on_review_discard_confirm");
+editor.on("prompt_confirmed", "on_review_discard_hunk_confirm");
+editor.on("prompt_confirmed", "on_review_edit_note_confirm");
+editor.on("prompt_confirmed", "on_review_delete_comment_confirm");
 editor.on("prompt_cancelled", "on_review_prompt_cancel");
 
-async function review_approve_hunk() {
-    const hunkId = getCurrentHunkId();
-    if (!hunkId) return;
-    const h = state.hunks.find(x => x.id === hunkId);
-    if (h) {
-        h.reviewStatus = 'approved';
-        updateMagitDisplay();
-        editor.setStatus(editor.t("status.hunk_approved"));
-    }
-}
-registerHandler("review_approve_hunk", review_approve_hunk);
-
-async function review_reject_hunk() {
-    const hunkId = getCurrentHunkId();
-    if (!hunkId) return;
-    const h = state.hunks.find(x => x.id === hunkId);
-    if (h) {
-        h.reviewStatus = 'rejected';
-        updateMagitDisplay();
-        editor.setStatus(editor.t("status.hunk_rejected"));
-    }
-}
-registerHandler("review_reject_hunk", review_reject_hunk);
-
-async function review_needs_changes() {
-    const hunkId = getCurrentHunkId();
-    if (!hunkId) return;
-    const h = state.hunks.find(x => x.id === hunkId);
-    if (h) {
-        h.reviewStatus = 'needs_changes';
-        updateMagitDisplay();
-        editor.setStatus(editor.t("status.hunk_needs_changes"));
-    }
-}
-registerHandler("review_needs_changes", review_needs_changes);
-
-async function review_question_hunk() {
-    const hunkId = getCurrentHunkId();
-    if (!hunkId) return;
-    const h = state.hunks.find(x => x.id === hunkId);
-    if (h) {
-        h.reviewStatus = 'question';
-        updateMagitDisplay();
-        editor.setStatus(editor.t("status.hunk_question"));
+async function review_edit_note() {
+    const label = editor.t("prompt.overall_comment") || "Note: ";
+    if (state.note) {
+        editor.startPromptWithInitial(label, "review-edit-note", state.note);
+    } else {
+        editor.startPrompt(label, "review-edit-note");
     }
 }
-registerHandler("review_question_hunk", review_question_hunk);
+registerHandler("review_edit_note", review_edit_note);
 
-async function review_clear_status() {
-    const hunkId = getCurrentHunkId();
-    if (!hunkId) return;
-    const h = state.hunks.find(x => x.id === hunkId);
-    if (h) {
-        h.reviewStatus = 'pending';
+function on_review_edit_note_confirm(args: { prompt_type: string; input: string }): boolean {
+    if (args.prompt_type !== "review-edit-note") return true;
+    if (args.input && args.input.trim()) {
+        state.note = args.input.trim();
         updateMagitDisplay();
-        editor.setStatus(editor.t("status.hunk_status_cleared"));
-    }
-}
-registerHandler("review_clear_status", review_clear_status);
-
-async function review_set_overall_feedback() {
-    const text = await editor.prompt(editor.t("prompt.overall_feedback"), state.overallFeedback || "");
-    if (text !== null) {
-        state.overallFeedback = text.trim();
-        editor.setStatus(text.trim() ? editor.t("status.feedback_set") : editor.t("status.feedback_cleared"));
+        editor.setStatus(state.note ? "Note saved" : "Note cleared");
+    } else {
+        // Empty submission: keep existing note unchanged (use x to delete)
+        if (state.note) {
+            editor.setStatus("Note unchanged (use x to delete)");
+        }
     }
+    return true;
 }
-registerHandler("review_set_overall_feedback", review_set_overall_feedback);
+registerHandler("on_review_edit_note_confirm", on_review_edit_note_confirm);
 
 async function review_export_session() {
     const cwd = editor.getCwd();
     const reviewDir = editor.pathJoin(cwd, ".review");
 
-    // Generate markdown content (writeFile creates parent directories)
     let md = `# Code Review Session\n`;
     md += `Date: ${new Date().toISOString()}\n\n`;
 
-    if (state.originalRequest) {
-        md += `## Original Request\n${state.originalRequest}\n\n`;
-    }
-
-    if (state.overallFeedback) {
-        md += `## Overall Feedback\n${state.overallFeedback}\n\n`;
+    if (state.note) {
+        md += `## Note\n${state.note}\n\n`;
     }
 
-    // Stats
-    const approved = state.hunks.filter(h => h.reviewStatus === 'approved').length;
-    const rejected = state.hunks.filter(h => h.reviewStatus === 'rejected').length;
-    const needsChanges = state.hunks.filter(h => h.reviewStatus === 'needs_changes').length;
-    const questions = state.hunks.filter(h => h.reviewStatus === 'question').length;
+    // Summary
+    const filesWithComments = new Set(state.comments.map(c => c.file)).size;
     md += `## Summary\n`;
-    md += `- Total hunks: ${state.hunks.length}\n`;
-    md += `- Approved: ${approved}\n`;
-    md += `- Rejected: ${rejected}\n`;
-    md += `- Needs changes: ${needsChanges}\n`;
-    md += `- Questions: ${questions}\n\n`;
-
-    // Group by file
-    const fileGroups: Record<string, Hunk[]> = {};
-    for (const hunk of state.hunks) {
-        if (!fileGroups[hunk.file]) fileGroups[hunk.file] = [];
-        fileGroups[hunk.file].push(hunk);
-    }
-
-    for (const [file, hunks] of Object.entries(fileGroups)) {
-        md += `## File: ${file}\n\n`;
-        for (const hunk of hunks) {
-            const statusStr = hunk.reviewStatus.toUpperCase();
-            md += `### ${hunk.contextHeader || 'Hunk'} (line ${hunk.range.start})\n`;
-            md += `**Status**: ${statusStr}\n\n`;
-
-            const hunkComments = state.comments.filter(c => c.hunk_id === hunk.id);
-            if (hunkComments.length > 0) {
-                md += `**Comments:**\n`;
-                for (const c of hunkComments) {
-                    // Format line reference
-                    let lineRef = '';
-                    if (c.line_type === 'add' && c.new_line) {
-                        lineRef = `[+${c.new_line}]`;
-                    } else if (c.line_type === 'remove' && c.old_line) {
-                        lineRef = `[-${c.old_line}]`;
-                    } else if (c.new_line) {
-                        lineRef = `[L${c.new_line}]`;
-                    } else if (c.old_line) {
-                        lineRef = `[L${c.old_line}]`;
-                    }
-                    md += `> 💬 ${lineRef} ${c.text}\n`;
-                    if (c.line_content) {
-                        md += `> \`${c.line_content.trim()}\`\n`;
-                    }
-                    md += `\n`;
-                }
+    md += `- Files: ${state.files.length}\n`;
+    md += `- Hunks: ${state.hunks.length}\n`;
+    if (filesWithComments > 0) {
+        md += `- Files with comments: ${filesWithComments}\n`;
+    }
+    md += `\n`;
+
+    // Group comments by file
+    const fileComments: Record<string, ReviewComment[]> = {};
+    for (const c of state.comments) {
+        const file = c.file || 'unknown';
+        if (!fileComments[file]) fileComments[file] = [];
+        fileComments[file].push(c);
+    }
+
+    for (const [file, comments] of Object.entries(fileComments)) {
+        md += `## ${file}\n\n`;
+        for (const c of comments) {
+            let lineRef = '';
+            if (c.line_type === 'add' && c.new_line) {
+                lineRef = `line +${c.new_line}`;
+            } else if (c.line_type === 'remove' && c.old_line) {
+                lineRef = `line -${c.old_line}`;
+            } else if (c.new_line) {
+                lineRef = `line ${c.new_line}`;
+            } else if (c.old_line) {
+                lineRef = `line ${c.old_line}`;
+            }
+            if (lineRef) {
+                md += `- **${lineRef}**: ${c.text}\n`;
+            } else {
+                md += `- ${c.text}\n`;
+            }
+            if (c.line_content) {
+                md += `  \`${c.line_content.trim()}\`\n`;
             }
         }
+        md += `\n`;
     }
 
-    // Write file
     const filePath = editor.pathJoin(reviewDir, "session.md");
     await editor.writeFile(filePath, md);
     editor.setStatus(editor.t("status.exported", { path: filePath }));
@@ -1702,34 +2264,21 @@ registerHandler("review_export_session", review_export_session);
 async function review_export_json() {
     const cwd = editor.getCwd();
     const reviewDir = editor.pathJoin(cwd, ".review");
-    // writeFile creates parent directories
 
     const session = {
-        version: "1.0",
+        version: "2.0",
         timestamp: new Date().toISOString(),
-        original_request: state.originalRequest || null,
-        overall_feedback: state.overallFeedback || null,
-        files: {} as Record<string, any>
+        note: state.note || null,
+        comments: state.comments.map(c => ({
+            file: c.file,
+            text: c.text,
+            line_type: c.line_type || null,
+            old_line: c.old_line || null,
+            new_line: c.new_line || null,
+            line_content: c.line_content || null
+        }))
     };
 
-    for (const hunk of state.hunks) {
-        if (!session.files[hunk.file]) session.files[hunk.file] = { hunks: [] };
-        const hunkComments = state.comments.filter(c => c.hunk_id === hunk.id);
-        session.files[hunk.file].hunks.push({
-            context: hunk.contextHeader,
-            old_lines: [hunk.oldRange.start, hunk.oldRange.end],
-            new_lines: [hunk.range.start, hunk.range.end],
-            status: hunk.reviewStatus,
-            comments: hunkComments.map(c => ({
-                text: c.text,
-                line_type: c.line_type || null,
-                old_line: c.old_line || null,
-                new_line: c.new_line || null,
-                line_content: c.line_content || null
-            }))
-        });
-    }
-
     const filePath = editor.pathJoin(reviewDir, "session.json");
     await editor.writeFile(filePath, JSON.stringify(session, null, 2));
     editor.setStatus(editor.t("status.exported", { path: filePath }));
@@ -1751,19 +2300,50 @@ async function start_review_diff() {
     state.files = await getGitStatus();
     state.hunks = await fetchDiffsForFiles(state.files);
     state.comments = [];
+    state.note = '';
     state.selectedIndex = 0;
-    state.fileScrollOffset = 0;
-    state.diffScrollOffset = 0;
+    state.diffCursorRow = 1;
+    state.hunkHeaderRows = [];
+    state.diffLineByteOffsets = [];
     state.focusPanel = 'files';
 
-    // Build initial display
-    const initialEntries = buildMagitDisplayEntries();
-
-    const bufferId = await VirtualBufferFactory.create({
-        name: "*Review Diff*", mode: "review-mode", readOnly: true,
-        entries: initialEntries, showLineNumbers: false, showCursors: false
+    // Create buffer group with layout:
+    // vertical: [toolbar(fixed 1), horizontal: [files, diff]]
+    const layout = JSON.stringify({
+        type: "split",
+        direction: "v",
+        ratio: 0.05,
+        first: { type: "fixed", id: "toolbar", height: 1 },
+        second: {
+            type: "split",
+            direction: "h",
+            ratio: 0.3,
+            first: { type: "scrollable", id: "files" },
+            second: { type: "scrollable", id: "diff" },
+        },
     });
-    state.reviewBufferId = bufferId;
+
+    const groupResult = await editor.createBufferGroup("*Review Diff*", "review-mode", 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.
+    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");
 
     // Register resize handler
     editor.on("resize", "onReviewDiffResize");
@@ -1771,25 +2351,71 @@ async function start_review_diff() {
     editor.setStatus(editor.t("status.review_summary", { count: String(state.hunks.length) }));
     editor.on("buffer_activated", "on_review_buffer_activated");
     editor.on("buffer_closed", "on_review_buffer_closed");
+    editor.on("cursor_moved", "on_review_cursor_moved");
 }
 registerHandler("start_review_diff", start_review_diff);
 
 function stop_review_diff() {
+    if (state.groupId !== null) {
+        editor.closeBufferGroup(state.groupId);
+        state.groupId = null;
+        state.panelBuffers = {};
+    }
     state.reviewBufferId = null;
     editor.setContext("review-mode", false);
     editor.off("resize", "onReviewDiffResize");
     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.setStatus(editor.t("status.stopped"));
 }
 registerHandler("stop_review_diff", stop_review_diff);
 
 
-function on_review_buffer_activated(data: any) {
-    if (data.buffer_id === state.reviewBufferId) refreshMagitData();
+/**
+ * React to a buffer becoming active. Used here purely to track which review
+ * panel currently has focus (Tab and mouse clicks both fire buffer_activated).
+ * The focus state drives toolbar hint rendering and the `review_nav_*`
+ * handlers' files-vs-diff branching.
+ *
+ * Note: this used to call `refreshMagitData()` on every activation, which
+ * spawned several `git` subprocesses every time the user switched panels.
+ * The user has a dedicated `r` key for that — auto-refresh was too aggressive.
+ */
+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';
+    if (newPanel === null || newPanel === state.focusPanel) return;
+    state.focusPanel = newPanel;
+    editor.setPanelContent(state.groupId, "toolbar", buildToolbarPanelEntries());
 }
 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.
+ */
+function on_review_cursor_moved(data: {
+    buffer_id: number;
+    cursor_id: number;
+    old_position: number;
+    new_position: number;
+    line: number;
+    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');
+}
+registerHandler("on_review_cursor_moved", on_review_cursor_moved);
+
 function on_review_buffer_closed(data: any) {
     if (data.buffer_id === state.reviewBufferId) stop_review_diff();
 }
@@ -1879,7 +2505,6 @@ async function side_by_side_diff_current_file() {
                     type: isUntracked ? 'add' : 'modify',
                     lines: [],
                     status: 'pending',
-                    reviewStatus: 'pending',
                     contextHeader: match[5]?.trim() || "",
                     byteOffset: 0
                 };
@@ -2046,12 +2671,7 @@ editor.registerCommand("%cmd.side_by_side_diff", "%cmd.side_by_side_diff_desc",
 
 // Review Comment Commands
 editor.registerCommand("%cmd.add_comment", "%cmd.add_comment_desc", "review_add_comment", "review-mode");
-editor.registerCommand("%cmd.approve_hunk", "%cmd.approve_hunk_desc", "review_approve_hunk", "review-mode");
-editor.registerCommand("%cmd.reject_hunk", "%cmd.reject_hunk_desc", "review_reject_hunk", "review-mode");
-editor.registerCommand("%cmd.needs_changes", "%cmd.needs_changes_desc", "review_needs_changes", "review-mode");
-editor.registerCommand("%cmd.question", "%cmd.question_desc", "review_question_hunk", "review-mode");
-editor.registerCommand("%cmd.clear_status", "%cmd.clear_status_desc", "review_clear_status", "review-mode");
-editor.registerCommand("%cmd.overall_feedback", "%cmd.overall_feedback_desc", "review_set_overall_feedback", "review-mode");
+editor.registerCommand("%cmd.edit_note", "%cmd.edit_note_desc", "review_edit_note", "review-mode");
 editor.registerCommand("%cmd.export_markdown", "%cmd.export_markdown_desc", "review_export_session", "review-mode");
 editor.registerCommand("%cmd.export_json", "%cmd.export_json_desc", "review_export_json", "review-mode");
 
@@ -2089,23 +2709,30 @@ registerHandler("on_buffer_closed", on_buffer_closed);
 editor.on("buffer_closed", "on_buffer_closed");
 
 editor.defineMode("review-mode", [
-    // Navigation (arrow keys, vim keys, page keys)
+    // 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.
     ["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"],
-    ["Left", "review_focus_files"], ["Right", "review_focus_diff"],
+    // Hunk navigation (diff panel) — jumps the native cursor between hunks.
+    ["n", "review_next_hunk"], ["p", "review_prev_hunk"],
     // Drill-down
     ["Enter", "review_drill_down"],
-    // Git actions (plain letter keys — safe because buffer is read-only with cursors hidden)
+    // Git actions (context-sensitive: file-level or hunk-level based on focus)
     ["s", "review_stage_file"], ["u", "review_unstage_file"],
     ["d", "review_discard_file"],
     ["r", "review_refresh"],
-    // Review actions
-    ["a", "review_approve_hunk"],
+    // Comments
     ["c", "review_add_comment"],
-    // Export
+    ["N", "review_edit_note"],
+    ["x", "review_delete_comment"],
+    // Close & export
+    ["q", "close"],
     ["e", "review_export_session"],
 ], true);