@xuhaojun/githunk 0.3.0 → 0.3.1

package/dist/githunk.js

@@ -12,7 +12,7 @@ import { Command, CommanderError } from "commander";
 // package.json
 var package_default = {
   name: "@xuhaojun/githunk",
-  version: "0.3.0",
+  version: "0.3.1",
   description: "A review-first Git TUI combining lazygit's everyday Git workflow with focused hunk review.",
   type: "module",
   bin: {
@@ -15961,9 +15961,8 @@ function isWorkerAvailable() {
 }
 
 // src/ui/review-workspace/ReviewWorkspaceApp.tsx
-import { StyledText as StyledText8, parseColor as parseColor3 } from "@opentui/core";
-import { useKeyboard, useTerminalDimensions } from "@opentui/react";
-import { useCallback, useEffect as useEffect3, useLayoutEffect as useLayoutEffect2, useMemo as useMemo4, useRef as useRef2, useState as useState3, useSyncExternalStore } from "react";
+import { useKeyboard as useKeyboard2, useTerminalDimensions } from "@opentui/react";
+import { useCallback, useEffect as useEffect3, useLayoutEffect as useLayoutEffect3, useMemo as useMemo5, useRef as useRef3, useState as useState4, useSyncExternalStore } from "react";
 
 // src/review/core/selectors.ts
 function resolveViewedRecord(file, viewed) {
@@ -16124,16 +16123,23 @@ function reviewHeaderLines(state, width) {
     totalDeletions = null;
   const additionsText = totalAdditions === null ? "—" : `+${totalAdditions}`;
   const deletionsText = totalDeletions === null ? "—" : `−${totalDeletions}`;
-  const projectionLabel = "Aggregate";
-  const line1Raw = `${headLabel} → ${baseLabel}  ·  ${commits} commits · ${files} files · ${additionsText} ${deletionsText}  [${projectionLabel}]`;
-  const line1 = truncateCell(line1Raw, w);
+  const projectionLabel = state.projection.kind === "since-last-review" ? "Since last review" : state.projection.kind === "commit" ? `Commit ${state.projection.oid.slice(0, 7)}` : "Aggregate";
+  const baseBudget = Math.min(cellWidth(baseLabel), Math.max(1, Math.floor(w / 2)));
+  const headPrefix = w > baseBudget + 3 ? `${truncateCell(headLabel, w - baseBudget - 3)} → ` : "";
+  const baseText = truncateCell(baseLabel, Math.max(0, w - cellWidth(headPrefix)));
+  const suffix = `  ·  ${commits} commits · ${files} files · ${additionsText} ${deletionsText}  [${projectionLabel}]`;
+  const suffixText = truncateCell(suffix, Math.max(0, w - cellWidth(headPrefix) - cellWidth(baseText)));
   const reviewedLabel = `Reviewed ${progress.viewed}/${progress.total}`;
   const changedPart = progress.changed > 0 ? ` · ${progress.changed} changed` : "";
   const pendingPart = progress.pending > 0 ? ` · ${progress.pending} pending` : progress.pending === 0 ? " · 0 pending" : "";
   const reviewingPart = progress.reviewing > 0 ? ` · ${progress.reviewing} reviewing` : "";
   const line2Raw = `${reviewedLabel}${changedPart}${reviewingPart}${pendingPart}`;
   const line2 = truncateCell(line2Raw, w);
-  const line1Spans = [{ text: line1, style: "strong" }];
+  const line1Spans = [
+    { text: headPrefix, style: "strong" },
+    { text: baseText, style: "strong", action: "choose-base" },
+    { text: suffixText, style: "strong" }
+  ];
   const line2Spans = [{ text: line2, style: "dim" }];
   return [line1Spans, line2Spans];
 }
@@ -16368,6 +16374,22 @@ var REVIEW_COMMANDS = [
     available: always,
     hint: "help"
   },
+  {
+    id: "review.toggleSinceLastReview",
+    title: "Review only what changed since the last review",
+    keys: ["s"],
+    focus: ["any"],
+    available: (state) => state.projection.kind !== "aggregate" || state.lastSubmission !== null,
+    hint: "since"
+  },
+  {
+    id: "review.chooseBase",
+    title: "Change base branch",
+    keys: ["B"],
+    focus: ["any"],
+    available: always,
+    hint: "base"
+  },
   {
     id: "review.close",
     title: "Close overlay or workspace",
@@ -16383,7 +16405,7 @@ for (const cmd of REVIEW_COMMANDS) {
     if (!keyToCommand.has(k))
       keyToCommand.set(k, cmd);
     const lower = k.toLowerCase();
-    if (lower !== k && !keyToCommand.has(lower))
+    if (k.length > 1 && lower !== k && !keyToCommand.has(lower))
       keyToCommand.set(lower, cmd);
   }
 }
@@ -16406,7 +16428,8 @@ function reviewHelp(focus, state) {
     "review.focusDiff": 0,
     "review.focusFiles": 1,
     "review.toggleFocus": 2,
-    "review.layoutCycle": 3
+    "review.layoutCycle": 3,
+    "review.chooseBase": 4
   };
   const ordered = [...available].sort((a, b) => (panelPriority[a.id] ?? 99) - (panelPriority[b.id] ?? 99));
   const lines = ordered.map((c) => `${c.keys.map((key) => key === "tab" ? "Tab" : key).join("/")} ${c.title}`);
@@ -16770,7 +16793,7 @@ function hunkHeaderText(file, index) {
   const hunk = file.metadata.hunks[index];
   if (!hunk)
     return "@@";
-  return hunk.hunkSpecs ?? `@@ -${hunk.deletionStart},${hunk.deletionCount} +${hunk.additionStart},${hunk.additionCount} @@`;
+  return hunk.hunkSpecs?.replace(/\r?\n$/u, "") ?? `@@ -${hunk.deletionStart},${hunk.deletionCount} +${hunk.additionStart},${hunk.additionCount} @@`;
 }
 function hunkGapBefore(file, hunkIndex) {
   if (hunkIndex <= 0)
@@ -17377,8 +17400,114 @@ function ReviewDiffSection({
   });
 }
 
+// src/ui/review-workspace/components/ReviewStickyHeader.tsx
+import { StyledText as StyledText8, parseColor as parseColor3 } from "@opentui/core";
+import { jsx as jsx3 } from "@opentui/react/jsx-runtime";
+var STICKY_BACKGROUND = "#2b3138";
+var PATH_FOREGROUND = "#e0e2e4";
+var HUNK_FOREGROUND = "#7aa6da";
+var colorCache3 = new Map;
+function color2(value) {
+  const cached = colorCache3.get(value);
+  if (cached)
+    return cached;
+  const parsed = parseColor3(value);
+  colorCache3.set(value, parsed);
+  return parsed;
+}
+function chunk2(text, fg5) {
+  return { __isChunk: true, text, fg: color2(fg5), bg: color2(STICKY_BACKGROUND) };
+}
+function fit(text, width) {
+  if (width <= 0)
+    return { text: "", used: 0 };
+  let out = "";
+  let used = 0;
+  for (const character of text) {
+    const characterWidth = cellWidth(character);
+    if (used + characterWidth > width)
+      break;
+    out += character;
+    used += characterWidth;
+  }
+  return { text: out, used };
+}
+function stickyHeaderChunks(sticky, width) {
+  if (width <= 0)
+    return [];
+  const chunks = [];
+  const hunkText2 = sticky.hunkText ?? "";
+  const hunkWidth = hunkText2.length === 0 ? 0 : Math.min(width, cellWidth(hunkText2) + 2);
+  const path = fit(sticky.filePath, Math.max(0, width - hunkWidth));
+  if (path.text.length > 0)
+    chunks.push(chunk2(path.text, PATH_FOREGROUND));
+  let used = path.used;
+  if (hunkText2.length > 0 && used < width) {
+    const separator = fit("  ", width - used);
+    if (separator.text.length > 0) {
+      chunks.push(chunk2(separator.text, PATH_FOREGROUND));
+      used += separator.used;
+    }
+    const hunk = fit(hunkText2, width - used);
+    if (hunk.text.length > 0) {
+      chunks.push(chunk2(hunk.text, HUNK_FOREGROUND));
+      used += hunk.used;
+    }
+  }
+  if (used < width)
+    chunks.push(chunk2(" ".repeat(width - used), PATH_FOREGROUND));
+  return chunks;
+}
+function ReviewStickyHeader({ sticky, width }) {
+  return /* @__PURE__ */ jsx3("box", {
+    id: "review-sticky-header",
+    style: { width: "100%", height: 1, flexShrink: 0, backgroundColor: STICKY_BACKGROUND },
+    children: /* @__PURE__ */ jsx3("text", {
+      content: new StyledText8([...stickyHeaderChunks(sticky, Math.max(0, width))]),
+      wrapMode: "none",
+      truncate: true
+    })
+  });
+}
+
+// src/ui/review-workspace/sticky-header.ts
+function headerTopOf(sectionOffsets, index) {
+  return (sectionOffsets[index] ?? 0) + (index > 0 ? 1 : 0);
+}
+function sectionIndexAt(sectionOffsets, fileCount, top) {
+  let index = 0;
+  while (index < fileCount - 1 && headerTopOf(sectionOffsets, index + 1) < top)
+    index += 1;
+  return index;
+}
+function resolveStickyDiffHeader(request) {
+  const { files, state, layout, sectionOffsets, expandedSourceByGap } = request;
+  if (files.length === 0)
+    return;
+  const top = Math.max(0, Math.floor(request.scrollTop));
+  const fileIndex = sectionIndexAt(sectionOffsets, files.length, top);
+  const file = files[fileIndex];
+  if (!file)
+    return;
+  const localRow = top - (sectionOffsets[fileIndex] ?? 0);
+  const showDivider = fileIndex > 0;
+  let hunkIndex = -1;
+  for (let candidate = 0;candidate < file.metadata.hunks.length; candidate += 1) {
+    const headerRow = hunkSectionRowOffset(file, layout, candidate, state, expandedSourceByGap, showDivider);
+    if (headerRow > localRow)
+      break;
+    hunkIndex = candidate;
+  }
+  return {
+    fileKey: file.id,
+    filePath: file.path,
+    hunkIndex,
+    ...hunkIndex < 0 ? {} : { hunkText: hunkHeaderText(file, hunkIndex) }
+  };
+}
+
 // src/ui/review-workspace/components/ReviewDiffPane.tsx
-import { jsx as jsx3, jsxs as jsxs3 } from "@opentui/react/jsx-runtime";
+import { jsx as jsx4, jsxs as jsxs3 } from "@opentui/react/jsx-runtime";
 function sectionWindow(files, state, layout, scrollTop, viewportHeight, overscan, expandedSourceByGap) {
   const heights = [];
   const offsets = [0];
@@ -17412,6 +17541,7 @@ function ReviewDiffPane({
   selectedHunkIndex,
   showLineNumbers = true,
   wrapLines = false,
+  showStickyHeader = true,
   overscan = Math.max(10, height * 2),
   highlightByFileKey,
   expandedSourceByGap,
@@ -17430,12 +17560,14 @@ function ReviewDiffPane({
   const ownedScrollRef = useRef(null);
   const scrollRef = externalScrollRef ?? ownedScrollRef;
   const [scrollTop, setScrollTop] = useState(0);
+  const stickyRows = showStickyHeader && files.length > 0 ? 1 : 0;
+  const viewportHeight = Math.max(1, height - stickyRows);
   const previousFileRevealTokenRef = useRef(selectedFileRevealToken);
   const previousSelectionRef = useRef(null);
   const previousHunkRevealTokenRef = useRef(undefined);
   const pendingSelectionRevealRequestRef = useRef(null);
   const pendingSelectionRevealTimersRef = useRef([]);
-  const window = useMemo2(() => sectionWindow(files, state, layout, scrollTop, height, overscan, expandedSourceByGap), [expandedSourceByGap, files, height, layout, overscan, scrollTop, state.expandedGaps, state.feedback]);
+  const window = useMemo2(() => sectionWindow(files, state, layout, scrollTop, viewportHeight, overscan, expandedSourceByGap), [expandedSourceByGap, files, layout, overscan, scrollTop, state.expandedGaps, state.feedback, viewportHeight]);
   useEffect(() => {
     if (!onVisibleFileKeysChange)
       return;
@@ -17474,13 +17606,13 @@ function ReviewDiffPane({
     if (state.reveal.scrollToFeedback)
       return;
     const sectionTop = window.offsets[index] ?? 0;
-    const target = Math.min(Math.max(0, sectionTop), Math.max(0, window.total - height));
+    const target = Math.min(Math.max(0, sectionTop), Math.max(0, window.total - viewportHeight));
     const scrollBox = scrollRef.current;
     if (scrollBox)
       scrollBox.scrollTop = target;
     setScrollTop(target);
     onViewportChange?.(target);
-  }, [files, height, onViewportChange, scrollRef, selectedFileKey, selectedFileRevealToken, state.reveal.scrollToFeedback, window]);
+  }, [files, onViewportChange, scrollRef, selectedFileKey, selectedFileRevealToken, state.reveal.scrollToFeedback, viewportHeight, window]);
   useLayoutEffect(() => {
     const currentSelection = { fileKey: selectedFileKey, hunkIndex: selectedHunkIndex };
     const previousSelection = previousSelectionRef.current;
@@ -17540,11 +17672,11 @@ function ReviewDiffPane({
       const scrollBox = scrollRef.current;
       if (!scrollBox)
         return;
-      const viewportHeight = Math.max(1, Math.floor(scrollBox.viewport.height || height));
+      const measuredHeight = Math.max(1, Math.floor(scrollBox.viewport.height || viewportHeight));
       const currentTop = Math.max(0, Math.floor(scrollBox.scrollTop));
-      const currentEnd = currentTop + viewportHeight;
+      const currentEnd = currentTop + measuredHeight;
       if (target < currentTop || target + 1 > currentEnd) {
-        const nextTop = Math.min(Math.max(0, target), Math.max(0, window.total - viewportHeight));
+        const nextTop = Math.min(Math.max(0, target), Math.max(0, window.total - measuredHeight));
         scrollBox.scrollTop = nextTop;
         setScrollTop(nextTop);
         onViewportChange?.(nextTop);
@@ -17563,73 +17695,323 @@ function ReviewDiffPane({
       }
     }, delay));
     return clearPendingTimers;
-  }, [expandedSourceByGap, files, height, layout, onViewportChange, selectedFileKey, selectedFileRevealToken, selectedHunkIndex, selectedHunkRevealToken, state]);
+  }, [expandedSourceByGap, files, layout, onViewportChange, selectedFileKey, selectedFileRevealToken, selectedHunkIndex, selectedHunkRevealToken, state, viewportHeight]);
+  const sticky = useMemo2(() => stickyRows === 0 ? undefined : resolveStickyDiffHeader({
+    files,
+    state,
+    layout,
+    scrollTop,
+    sectionOffsets: window.offsets,
+    ...expandedSourceByGap ? { expandedSourceByGap } : {}
+  }), [expandedSourceByGap, files, layout, scrollTop, state, stickyRows, window.offsets]);
   const leadingSpacer = window.offsets[window.first] ?? 0;
   const trailingSpacer = window.total - (window.offsets[window.last + 1] ?? window.total);
-  return /* @__PURE__ */ jsx3("scrollbox", {
-    id: "review-diff-scrollbox",
-    ref: scrollRef,
-    ...focused === undefined ? {} : { focused },
-    width: "100%",
-    height: "100%",
-    scrollY: true,
-    viewportCulling: true,
-    verticalScrollbarOptions: { visible: false },
-    onMouseScroll: (event) => {
-      const direction = event.scroll?.direction;
-      const delta = Math.max(1, Math.floor(event.scroll?.delta ?? 1));
-      const target = event.currentTarget;
-      const scrollBox = target && typeof target.scrollBy === "function" ? target : scrollRef.current;
-      if (direction === "down")
-        scrollBox?.scrollBy(delta);
-      else if (direction === "up")
-        scrollBox?.scrollBy(-delta);
-    },
-    children: /* @__PURE__ */ jsxs3("box", {
-      id: "review-diff-content",
-      style: { width: "100%", flexDirection: "column" },
+  return /* @__PURE__ */ jsxs3("box", {
+    id: "review-diff-pane",
+    style: { width: "100%", height: "100%", flexDirection: "column" },
+    children: [
+      sticky ? /* @__PURE__ */ jsx4(ReviewStickyHeader, {
+        sticky,
+        width
+      }) : null,
+      /* @__PURE__ */ jsx4("scrollbox", {
+        id: "review-diff-scrollbox",
+        ref: scrollRef,
+        ...focused === undefined ? {} : { focused },
+        width: "100%",
+        flexGrow: 1,
+        minHeight: 0,
+        scrollY: true,
+        viewportCulling: true,
+        verticalScrollbarOptions: { visible: false },
+        onMouseScroll: (event) => {
+          const direction = event.scroll?.direction;
+          const delta = Math.max(1, Math.floor(event.scroll?.delta ?? 1));
+          const target = event.currentTarget;
+          const scrollBox = target && typeof target.scrollBy === "function" ? target : scrollRef.current;
+          if (direction === "down")
+            scrollBox?.scrollBy(delta);
+          else if (direction === "up")
+            scrollBox?.scrollBy(-delta);
+        },
+        children: /* @__PURE__ */ jsxs3("box", {
+          id: "review-diff-content",
+          style: { width: "100%", flexDirection: "column" },
+          children: [
+            leadingSpacer > 0 ? /* @__PURE__ */ jsx4("box", {
+              style: { width: "100%", height: leadingSpacer }
+            }, "review-leading-spacer") : null,
+            window.first <= window.last ? files.slice(window.first, window.last + 1).map((file, offset) => {
+              const fileIndex = window.first + offset;
+              const sectionTop = window.offsets[fileIndex] ?? 0;
+              const sectionHeight = window.heights[fileIndex] ?? 0;
+              const rowStart = Math.max(0, Math.floor(scrollTop - sectionTop - overscan));
+              const rowEnd = Math.min(sectionHeight, Math.ceil(scrollTop + viewportHeight + overscan - sectionTop));
+              const highlight = highlightByFileKey?.get(file.id);
+              const select = onSelectFile ? () => onSelectFile(file.id) : undefined;
+              return /* @__PURE__ */ jsx4(ReviewDiffSection, {
+                file,
+                state,
+                layout,
+                width,
+                selectedHunkIndex: file.id === selectedFileKey ? selectedHunkIndex : -1,
+                showDivider: fileIndex > 0,
+                showLineNumbers,
+                wrapLines,
+                rowStart,
+                rowEnd: Math.max(rowStart, rowEnd),
+                ...highlight ? { highlight } : {},
+                ...expandedSourceByGap ? { expandedSourceByGap } : {},
+                ...select ? { onSelect: select } : {},
+                ...onSelectFeedback ? { onSelectFeedback } : {},
+                ...onSelectDiffAddress ? { onSelectDiffAddress } : {},
+                ...selectedFeedbackId !== undefined ? { selectedFeedbackId } : {},
+                ...onToggleGap ? { onToggleGap: (gapId) => onToggleGap(file.id, gapId) } : {}
+              }, file.id);
+            }) : null,
+            trailingSpacer > 0 ? /* @__PURE__ */ jsx4("box", {
+              style: { width: "100%", height: trailingSpacer }
+            }, "review-trailing-spacer") : null
+          ]
+        })
+      })
+    ]
+  });
+}
+
+// src/ui/review-workspace/components/ReviewBasePicker.tsx
+import { useKeyboard } from "@opentui/react";
+import { useLayoutEffect as useLayoutEffect2, useMemo as useMemo3, useRef as useRef2, useState as useState2 } from "react";
+import { jsx as jsx5, jsxs as jsxs4 } from "@opentui/react/jsx-runtime";
+function consume(event) {
+  event.preventDefault();
+  event.stopPropagation();
+}
+function ReviewBasePicker({ selection, width, height, active: active2, warning, onChoose, onCancel, onRetry }) {
+  const [query, setQuery] = useState2("");
+  const [selectedIndex, setSelectedIndex] = useState2(0);
+  const inputRef = useRef2(null);
+  const scrollRef = useRef2(null);
+  const busy = selection.loading || selection.selecting;
+  const candidates = useMemo3(() => {
+    const filter = query.trim().toLowerCase();
+    return filter ? selection.candidates.filter((candidate) => candidate.label.toLowerCase().includes(filter) || candidate.ref.toLowerCase().includes(filter)) : selection.candidates;
+  }, [query, selection.candidates]);
+  const index = Math.min(selectedIndex, Math.max(0, candidates.length - 1));
+  const selected = candidates[index];
+  const dialogWidth = Math.max(1, Math.min(90, width - (width > 20 ? 4 : 0)));
+  const dialogHeight = Math.max(1, Math.min(20, height - (height > 10 ? 2 : 0)));
+  const border = dialogWidth >= 4 && dialogHeight >= 5;
+  const showDetail = dialogHeight >= 9;
+  const contentWidth = Math.max(1, dialogWidth - (border ? 2 : 0));
+  const warningHeight = warning && dialogHeight >= 9 ? 1 : 0;
+  const listHeight = Math.max(1, dialogHeight - (border ? 2 : 0) - 3 - (showDetail ? 1 : 0) - warningHeight);
+  const reveal = (next) => {
+    const scroll = scrollRef.current;
+    if (!scroll)
+      return;
+    const viewportHeight = Math.max(1, Math.floor(scroll.viewport.height || listHeight));
+    if (next < scroll.scrollTop)
+      scroll.scrollTop = next;
+    else if (next >= scroll.scrollTop + viewportHeight)
+      scroll.scrollTop = next - viewportHeight + 1;
+  };
+  useLayoutEffect2(() => {
+    reveal(index);
+  }, [index, candidates, listHeight]);
+  useLayoutEffect2(() => {
+    inputRef.current?.blur();
+  }, [active2, busy]);
+  const move = (direction) => {
+    if (busy)
+      return;
+    const next = Math.max(0, Math.min(candidates.length - 1, index + (direction === "down" ? 1 : -1)));
+    setSelectedIndex(next);
+    reveal(next);
+  };
+  const submit = () => {
+    if (busy)
+      return;
+    if (selected)
+      onChoose(selected.ref);
+    else if (selection.error)
+      onRetry();
+  };
+  const handlePickerKey = (event) => {
+    const name = event.name.toLowerCase();
+    if (busy) {
+      consume(event);
+      return true;
+    }
+    if (name === "escape") {
+      consume(event);
+      onCancel();
+      return true;
+    }
+    if (name === "up" || name === "down") {
+      move(name);
+      consume(event);
+      return true;
+    }
+    if (name === "return" || name === "enter") {
+      consume(event);
+      submit();
+      return true;
+    }
+    if (event.ctrl && name === "r") {
+      consume(event);
+      onRetry();
+      return true;
+    }
+    if (name === "tab") {
+      consume(event);
+      return true;
+    }
+    if (name === "backspace") {
+      consume(event);
+      setQuery((previous) => previous.length > 0 ? previous.slice(0, -1) : previous);
+      setSelectedIndex(0);
+      if (scrollRef.current)
+        scrollRef.current.scrollTop = 0;
+      return true;
+    }
+    if (!event.ctrl && !event.meta) {
+      const char = name === "space" ? " " : name;
+      if ([...char].length === 1) {
+        const code = char.codePointAt(0) ?? 0;
+        if (code >= 32 && code !== 127) {
+          consume(event);
+          setQuery((previous) => `${previous}${char}`);
+          setSelectedIndex(0);
+          if (scrollRef.current)
+            scrollRef.current.scrollTop = 0;
+          return true;
+        }
+      }
+    }
+    return false;
+  };
+  useKeyboard((event) => {
+    if (!active2)
+      return;
+    handlePickerKey(event);
+  });
+  const status = selection.loading ? "Loading branches…" : selection.selecting ? "Loading review…" : selection.error ? `Error: ${selection.error}` : selection.candidates.length === 0 ? "No branches available. Ctrl-R retry." : candidates.length === 0 ? "No matching branches." : `${candidates.length} branches · recommendations first`;
+  return /* @__PURE__ */ jsx5("box", {
+    id: "review-base-backdrop",
+    onMouse: consume,
+    style: { position: "absolute", left: 0, top: 0, width, height, zIndex: 100, backgroundColor: "#151515" },
+    children: /* @__PURE__ */ jsxs4("box", {
+      id: "review-base-picker",
+      style: { position: "absolute", left: Math.floor((width - dialogWidth) / 2), top: Math.floor((height - dialogHeight) / 2), width: dialogWidth, height: dialogHeight, border, borderColor: "#b9ca4a", flexDirection: "column", backgroundColor: "#202020", overflow: "hidden" },
       children: [
-        leadingSpacer > 0 ? /* @__PURE__ */ jsx3("box", {
-          style: { width: "100%", height: leadingSpacer }
-        }, "review-leading-spacer") : null,
-        window.first <= window.last ? files.slice(window.first, window.last + 1).map((file, offset) => {
-          const fileIndex = window.first + offset;
-          const sectionTop = window.offsets[fileIndex] ?? 0;
-          const sectionHeight = window.heights[fileIndex] ?? 0;
-          const rowStart = Math.max(0, Math.floor(scrollTop - sectionTop - overscan));
-          const rowEnd = Math.min(sectionHeight, Math.ceil(scrollTop + Math.max(1, height) + overscan - sectionTop));
-          const highlight = highlightByFileKey?.get(file.id);
-          const select = onSelectFile ? () => onSelectFile(file.id) : undefined;
-          return /* @__PURE__ */ jsx3(ReviewDiffSection, {
-            file,
-            state,
-            layout,
-            width,
-            selectedHunkIndex: file.id === selectedFileKey ? selectedHunkIndex : -1,
-            showDivider: fileIndex > 0,
-            showLineNumbers,
-            wrapLines,
-            rowStart,
-            rowEnd: Math.max(rowStart, rowEnd),
-            ...highlight ? { highlight } : {},
-            ...expandedSourceByGap ? { expandedSourceByGap } : {},
-            ...select ? { onSelect: select } : {},
-            ...onSelectFeedback ? { onSelectFeedback } : {},
-            ...onSelectDiffAddress ? { onSelectDiffAddress } : {},
-            ...selectedFeedbackId !== undefined ? { selectedFeedbackId } : {},
-            ...onToggleGap ? { onToggleGap: (gapId) => onToggleGap(file.id, gapId) } : {}
-          }, file.id);
+        /* @__PURE__ */ jsx5("text", {
+          content: "Choose base branch",
+          wrapMode: "none",
+          truncate: true
+        }),
+        /* @__PURE__ */ jsx5("input", {
+          id: "review-base-filter",
+          ref: inputRef,
+          width: contentWidth,
+          value: query,
+          placeholder: "Filter branches…",
+          focused: false,
+          onInput: (value) => {
+            if (busy)
+              return;
+            setQuery(value);
+            setSelectedIndex(0);
+            if (scrollRef.current)
+              scrollRef.current.scrollTop = 0;
+          },
+          onKeyDown: (event) => {
+            if (handlePickerKey(event))
+              return;
+          },
+          onSubmit: () => {
+            submit();
+          }
+        }),
+        /* @__PURE__ */ jsx5("scrollbox", {
+          id: "review-base-list",
+          ref: scrollRef,
+          width: "100%",
+          height: listHeight,
+          flexShrink: 0,
+          scrollY: true,
+          viewportCulling: true,
+          verticalScrollbarOptions: { visible: false },
+          children: /* @__PURE__ */ jsxs4("box", {
+            style: { width: "100%", flexDirection: "column" },
+            children: [
+              candidates.length === 0 ? /* @__PURE__ */ jsx5("text", {
+                content: status,
+                wrapMode: "none",
+                truncate: true
+              }) : null,
+              candidates.map((candidate, candidateIndex) => /* @__PURE__ */ jsx5("box", {
+                id: `review-base-row:${candidate.ref}`,
+                style: { width: "100%", height: 1, flexShrink: 0, backgroundColor: index === candidateIndex ? "#365f8a" : "#202020" },
+                onMouseUp: (event) => {
+                  consume(event);
+                  if (busy)
+                    return;
+                  setSelectedIndex(candidateIndex);
+                  onChoose(candidate.ref);
+                },
+                children: /* @__PURE__ */ jsx5("text", {
+                  content: `${index === candidateIndex ? ">" : " "} ${candidate.label}${candidate.reason ? ` — ${candidate.reason}` : ""}`,
+                  selectable: false,
+                  wrapMode: "none",
+                  truncate: true
+                })
+              }, candidate.ref))
+            ]
+          })
+        }),
+        showDetail ? /* @__PURE__ */ jsx5("text", {
+          id: "review-base-status",
+          content: status,
+          fg: selection.error ? "#f0c674" : "#b4b4b4",
+          wrapMode: "none",
+          truncate: true
         }) : null,
-        trailingSpacer > 0 ? /* @__PURE__ */ jsx3("box", {
-          style: { width: "100%", height: trailingSpacer }
-        }, "review-trailing-spacer") : null
+        warningHeight > 0 && warning ? /* @__PURE__ */ jsx5("text", {
+          id: "review-base-warning",
+          content: warning,
+          fg: "#f0c674",
+          wrapMode: "none",
+          truncate: true
+        }) : null,
+        /* @__PURE__ */ jsxs4("box", {
+          style: { width: "100%", height: 1, flexShrink: 0, flexDirection: "row" },
+          children: [
+            selection.error || selection.candidates.length === 0 ? /* @__PURE__ */ jsx5("box", {
+              id: "review-base-retry",
+              onMouseUp: (event) => {
+                consume(event);
+                if (!busy)
+                  onRetry();
+              },
+              children: /* @__PURE__ */ jsx5("text", {
+                content: "[Ctrl-R retry] "
+              })
+            }) : null,
+            /* @__PURE__ */ jsx5("text", {
+              content: selection.error !== undefined || busy ? status : "↑↓ choose · Enter select · Esc cancel",
+              wrapMode: "none",
+              truncate: true
+            })
+          ]
+        })
       ]
     })
   });
 }
 
 // src/ui/review-workspace/hooks/useReviewHighlights.ts
-import { useEffect as useEffect2, useMemo as useMemo3, useState as useState2 } from "react";
+import { useEffect as useEffect2, useMemo as useMemo4, useState as useState3 } from "react";
 
 // src/review/git/highlight/highlight-cache.ts
 class HighlightCache {
@@ -18237,7 +18619,7 @@ function findPatchChunk(metadata, chunks, index) {
   const byIndex = chunks[index];
   if (byIndex)
     return byIndex;
-  return chunks.find((chunk2) => [metadata.name, metadata.prevName].map((v) => normalizeDiffPath2(v)).filter((v) => Boolean(v)).map(stripPrefixes).some((path) => chunk2.includes(`a/${path}`) || chunk2.includes(`b/${path}`) || chunk2.includes(path))) ?? "";
+  return chunks.find((chunk3) => [metadata.name, metadata.prevName].map((v) => normalizeDiffPath2(v)).filter((v) => Boolean(v)).map(stripPrefixes).some((path) => chunk3.includes(`a/${path}`) || chunk3.includes(`b/${path}`) || chunk3.includes(path))) ?? "";
 }
 function parseHunkHeader(line) {
   const m = line.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
@@ -18249,8 +18631,8 @@ function parseHunkHeader(line) {
   const newCount = m[4] !== undefined ? Number.parseInt(m[4], 10) : 1;
   return { oldStart, oldCount, newStart, newCount };
 }
-function extractHunksFromChunk(chunk2) {
-  const lines = chunk2.split(`
+function extractHunksFromChunk(chunk3) {
+  const lines = chunk3.split(`
 `);
   const hunks = [];
   let currentHunk = null;
@@ -18400,10 +18782,10 @@ function collectHastHighlightRuns(node, appearance) {
     }
     const props = cur.properties ?? {};
     const style = parseStyleValue(props["style"]);
-    const color2 = style.get("color");
+    const color3 = style.get("color");
     const bg3 = style.get("background-color");
     const isWordDiff = bg3 !== undefined && bg3 !== "transparent";
-    const nextFg = color2 ?? fg5;
+    const nextFg = color3 ?? fg5;
     const nextWordDiff = wordDiff || isWordDiff;
     const pushFg = nextFg;
     const children = cur.children ?? [];
@@ -18590,9 +18972,9 @@ function useReviewHighlights(options) {
   } = options;
   const reviewId = options.reviewId ?? state?.document.identity.id ?? "review";
   const generationId = options.generationId ?? state?.document.generation.id ?? "generation";
-  const requestedKey = useMemo3(() => requestedFileKeys?.join("\x00") ?? "", [requestedFileKeys]);
-  const [highlights, setHighlights] = useState2(new Map);
-  const [loading, setLoading] = useState2(false);
+  const requestedKey = useMemo4(() => requestedFileKeys?.join("\x00") ?? "", [requestedFileKeys]);
+  const [highlights, setHighlights] = useState3(new Map);
+  const [loading, setLoading] = useState3(false);
   useEffect2(() => {
     let cancelled = false;
     if (!enabled || files.length === 0) {
@@ -19153,7 +19535,7 @@ function planReviewIntent(state, intent) {
 }
 
 // src/ui/review-workspace/ReviewWorkspaceApp.tsx
-import { jsx as jsx4, jsxs as jsxs4, Fragment } from "@opentui/react/jsx-runtime";
+import { jsx as jsx6, jsxs as jsxs5, Fragment } from "@opentui/react/jsx-runtime";
 var REVIEW_SIDEBAR_DEFAULT_WIDTH = 30;
 var REVIEW_SIDEBAR_MIN_WIDTH = 20;
 var REVIEW_DIFF_MIN_CONTENT_WIDTH = 40;
@@ -19168,30 +19550,6 @@ var COLORS2 = {
   changed: "#f0c674",
   feedback: "#c397d8"
 };
-var colorCache3 = new Map;
-function textChunk(text, style) {
-  let fg5 = colorCache3.get(COLORS2[style]);
-  if (!fg5) {
-    fg5 = parseColor3(COLORS2[style]);
-    colorCache3.set(COLORS2[style], fg5);
-  }
-  return { __isChunk: true, text, fg: fg5 };
-}
-function headerText(state, width, error) {
-  const lines = [...reviewHeaderLines(state, width)];
-  if (error)
-    lines.push([{ text: `! ${error.title}: ${error.detail}`, style: "dim" }]);
-  const chunks = [];
-  for (const [index, line] of lines.entries()) {
-    if (index > 0)
-      chunks.push(textChunk(`
-`, "plain"));
-    for (const span of line) {
-      chunks.push(textChunk(span.text, span.style === "strong" ? "strong" : span.style === "dim" ? "dim" : "plain"));
-    }
-  }
-  return new StyledText8(chunks);
-}
 function fitText(text, width, overflowMarker = ".") {
   if (cellWidth(text) <= width)
     return text;
@@ -19216,7 +19574,14 @@ function padText(text, width) {
     return text;
   return text + " ".repeat(width - w);
 }
-function reviewFooter(state, layout, focus) {
+var PROJECTION_NOTICES = {
+  "no-previous-review": "Since last review needs a finished review to measure from",
+  "history-rewritten": "History was rewritten since the last review — showing the full range",
+  "already-projected": "A projection is already open",
+  stale: "The review moved on while loading — try again",
+  unavailable: "Not available right now"
+};
+function reviewFooter(state, layout, focus, notice) {
   const selected = state.selection.fileKey ?? "none";
   const entryFor = (id) => REVIEW_COMMANDS.find((candidate) => candidate.id === id);
   const keyFor = (id) => {
@@ -19231,6 +19596,7 @@ function reviewFooter(state, layout, focus) {
     command("review.focusFiles", true),
     command("review.toggleFocus", true),
     `${command("review.layoutCycle", true)}(${layout})`,
+    command("review.chooseBase"),
     pair("review.moveDown", "review.moveUp"),
     pair("review.nextHunk", "review.prevHunk"),
     pair("review.nextFile", "review.prevFile"),
@@ -19249,7 +19615,8 @@ function reviewFooter(state, layout, focus) {
     command("review.help"),
     command("review.close")
   ];
-  return `${hints.join(" | ")} | ${focus} — ${selected}`;
+  const trailer = `${focus} — ${selected}`;
+  return notice ? `${notice} | ${hints.join(" | ")} | ${trailer}` : `${hints.join(" | ")} | ${trailer}`;
 }
 function feedbackDraftText(state) {
   const draft = state.draft;
@@ -19293,7 +19660,7 @@ function isPrintableFilterKey(name) {
   const codePoint = value.codePointAt(0) ?? 0;
   return codePoint >= 32 && codePoint !== 127;
 }
-function consume(event) {
+function consume2(event) {
   try {
     event.preventDefault?.();
   } catch {}
@@ -19379,37 +19746,53 @@ function ReviewWorkspaceApp({ session }) {
   const active2 = session.active;
   const onClose = session.onClose;
   const finishDialog = session.finishDialog;
-  const [publishedState, setPublishedState] = useState3(() => controller.state);
+  const [publishedState] = useState4(() => controller.state);
+  useEffect3(() => {
+    let lastSelection = controller.baseSelection;
+    let hadState = controller.state !== undefined;
+    return controller.subscribe(() => {
+      const nextSelection = controller.baseSelection;
+      const hasState = controller.state !== undefined;
+      if (nextSelection !== lastSelection || hasState !== hadState) {
+        lastSelection = nextSelection;
+        hadState = hasState;
+        session.invalidate();
+      }
+    });
+  }, [controller, session]);
   const state = controller.state ?? publishedState;
-  const [layoutMode, setLayoutMode] = useState3("auto");
-  const [sidebarWidthPreference, setSidebarWidthPreference] = useState3(REVIEW_SIDEBAR_DEFAULT_WIDTH);
-  const [resizeBarHovered, setResizeBarHovered] = useState3(false);
-  const [resizingSidebar, setResizingSidebar] = useState3(false);
-  const [visibleFileKeys, setVisibleFileKeys] = useState3([]);
-  const [focus, setFocus] = useState3("stream");
-  const [rangeStart, setRangeStart] = useState3(null);
-  const [pendingRangeAnchor, setPendingRangeAnchor] = useState3(null);
-  const localRangeIdentityRef = useRef2(null);
-  const [selectedFeedbackId, setSelectedFeedbackId] = useState3(null);
-  const [editingFeedbackId, setEditingFeedbackId] = useState3(null);
-  const [pendingDeleteFeedbackId, setPendingDeleteFeedbackId] = useState3(null);
-  const [composerFocus, setComposerFocus] = useState3("body");
-  const [composerControlIndex, setComposerControlIndex] = useState3(0);
-  const [reanchorFeedbackId, setReanchorFeedbackId] = useState3(null);
-  const [feedbackMessage, setFeedbackMessage] = useState3(null);
-  const [helpOpen, setHelpOpen] = useState3(false);
-  const diffScrollRef = useRef2(null);
-  const resizingSidebarRef = useRef2(false);
-  const resizeDraggedRef = useRef2(false);
-  const resizeReleaseSuppressionRef = useRef2(false);
-  const resizeReleaseCleanupTokenRef = useRef2(0);
-  const filterInputRef = useRef2(null);
-  const pendingDeleteFeedbackRef = useRef2(null);
-  const composerBodyRef = useRef2(null);
-  const replacementRef = useRef2(null);
-  const finishSummaryRef = useRef2(null);
-  const finishSubmitRef = useRef2(false);
-  const expandedSourceRef = useRef2(new Map);
+  const baseSelection = controller.baseSelection;
+  const [layoutMode, setLayoutMode] = useState4("auto");
+  const [projectionNotice, setProjectionNotice] = useState4(null);
+  const [sidebarWidthPreference, setSidebarWidthPreference] = useState4(REVIEW_SIDEBAR_DEFAULT_WIDTH);
+  const [resizeBarHovered, setResizeBarHovered] = useState4(false);
+  const [resizingSidebar, setResizingSidebar] = useState4(false);
+  const [visibleFileKeys, setVisibleFileKeys] = useState4([]);
+  const [focus, setFocus] = useState4("stream");
+  const [rangeStart, setRangeStart] = useState4(null);
+  const [pendingRangeAnchor, setPendingRangeAnchor] = useState4(null);
+  const localRangeIdentityRef = useRef3(null);
+  const [selectedFeedbackId, setSelectedFeedbackId] = useState4(null);
+  const [editingFeedbackId, setEditingFeedbackId] = useState4(null);
+  const [pendingDeleteFeedbackId, setPendingDeleteFeedbackId] = useState4(null);
+  const [composerFocus, setComposerFocus] = useState4("body");
+  const [composerControlIndex, setComposerControlIndex] = useState4(0);
+  const [reanchorFeedbackId, setReanchorFeedbackId] = useState4(null);
+  const [feedbackMessage, setFeedbackMessage] = useState4(null);
+  const [helpOpen, setHelpOpen] = useState4(false);
+  const diffScrollRef = useRef3(null);
+  const resizingSidebarRef = useRef3(false);
+  const resizeDraggedRef = useRef3(false);
+  const resizeReleaseSuppressionRef = useRef3(false);
+  const resizeReleaseCleanupTokenRef = useRef3(0);
+  const filterInputRef = useRef3(null);
+  const pendingDeleteFeedbackRef = useRef3(null);
+  const composerBodyRef = useRef3(null);
+  const replacementRef = useRef3(null);
+  const finishSummaryRef = useRef3(null);
+  const finishSubmitRef = useRef3(false);
+  const localReviewIdentityRef = useRef3(state?.document.identity.id);
+  const expandedSourceRef = useRef3(new Map);
   const dimensions2 = { width: Math.max(1, terminal.width), height: Math.max(1, terminal.height) };
   const maxSidebarWidth = Math.max(REVIEW_SIDEBAR_MIN_WIDTH, dimensions2.width - REVIEW_RESIZE_BAR_WIDTH - REVIEW_DIFF_BORDER_WIDTH - REVIEW_DIFF_MIN_CONTENT_WIDTH);
   const sidebarWidth = dimensions2.width >= REVIEW_SIDEBAR_VISIBILITY_WIDTH ? Math.min(Math.max(sidebarWidthPreference, REVIEW_SIDEBAR_MIN_WIDTH), maxSidebarWidth) : 0;
@@ -19420,12 +19803,12 @@ function ReviewWorkspaceApp({ session }) {
   const resizeBarHeight = Math.max(1, dimensions2.height - 4 - composerHeight);
   const sidebarFocused = focus === "sidebar" || focus === "filter";
   const diffFocused = focus === "stream";
-  const files = useMemo4(() => state ? toHunkReviewFiles(visibleReviewFiles(state)) : [], [state?.document, state?.feedback, state?.filter, state?.viewed]);
-  const sidebarEntries = useMemo4(() => state ? buildReviewSidebarEntries(state) : [], [state]);
-  const sidebarFileEntries = useMemo4(() => sidebarEntries.filter((entry) => entry.kind === "file"), [sidebarEntries]);
-  const sidebarStatsWidth = useMemo4(() => Math.max(0, ...sidebarFileEntries.map((entry) => sidebarEntryStatsWidth(entry))), [sidebarFileEntries]);
+  const files = useMemo5(() => state ? toHunkReviewFiles(visibleReviewFiles(state)) : [], [state?.document, state?.feedback, state?.filter, state?.viewed]);
+  const sidebarEntries = useMemo5(() => state ? buildReviewSidebarEntries(state) : [], [state]);
+  const sidebarFileEntries = useMemo5(() => sidebarEntries.filter((entry) => entry.kind === "file"), [sidebarEntries]);
+  const sidebarStatsWidth = useMemo5(() => Math.max(0, ...sidebarFileEntries.map((entry) => sidebarEntryStatsWidth(entry))), [sidebarFileEntries]);
   const sidebarTextWidth = Math.max(8, sidebarWidth - 2);
-  const expandedSourceByGap = useMemo4(() => {
+  const expandedSourceByGap = useMemo5(() => {
     const next = typeof controller.getExpandedSourceByGap === "function" ? controller.getExpandedSourceByGap() : new Map;
     const previous = expandedSourceRef.current;
     if (previous.size === next.size && [...next].every(([key, lines]) => previous.get(key) === lines))
@@ -19506,9 +19889,7 @@ function ReviewWorkspaceApp({ session }) {
     setResizingSidebar(false);
     setResizeBarHovered(false);
   }, []);
-  useLayoutEffect2(() => {
-    if (active2)
-      return;
+  const resetLocalReviewUi = useCallback(() => {
     setRangeStart(null);
     setPendingRangeAnchor(null);
     setSelectedFeedbackId(null);
@@ -19522,8 +19903,33 @@ function ReviewWorkspaceApp({ session }) {
     setHelpOpen(false);
     setFocus("stream");
     resetSidebarResize();
-  }, [active2, resetSidebarResize]);
-  useLayoutEffect2(() => {
+    setVisibleFileKeys([]);
+    localRangeIdentityRef.current = null;
+    if (diffScrollRef.current)
+      diffScrollRef.current.scrollTop = 0;
+    session.setViewportStart(0);
+    finishDialog.close();
+  }, [finishDialog, resetSidebarResize, session]);
+  useLayoutEffect3(() => {
+    if (!active2)
+      resetLocalReviewUi();
+  }, [active2, resetLocalReviewUi]);
+  useLayoutEffect3(() => {
+    const identity = state?.document.identity.id;
+    if (identity === localReviewIdentityRef.current)
+      return;
+    localReviewIdentityRef.current = identity;
+    resetLocalReviewUi();
+  }, [resetLocalReviewUi, state?.document.identity.id]);
+  useLayoutEffect3(() => {
+    if (!baseSelection)
+      return;
+    filterInputRef.current?.blur();
+    composerBodyRef.current?.blur();
+    replacementRef.current?.blur();
+    resetSidebarResize();
+  }, [baseSelection !== undefined, resetSidebarResize]);
+  useLayoutEffect3(() => {
     if (sidebarWidth > 0)
       return;
     resetSidebarResize();
@@ -19532,8 +19938,8 @@ function ReviewWorkspaceApp({ session }) {
     if (sidebarWidth === 0 && focus !== "stream")
       setFocus("stream");
   }, [focus, sidebarWidth]);
-  useLayoutEffect2(() => {
-    if (!state?.draft)
+  useLayoutEffect3(() => {
+    if (!state?.draft || baseSelection)
       return;
     if (composerFocus === "body") {
       composerBodyRef.current?.focus();
@@ -19545,7 +19951,7 @@ function ReviewWorkspaceApp({ session }) {
       composerBodyRef.current?.blur();
       replacementRef.current?.blur();
     }
-  }, [composerFocus, state?.draft]);
+  }, [baseSelection !== undefined, composerFocus, state?.draft]);
   useEffect3(() => {
     const pending = pendingRangeAnchor;
     const start = rangeStart;
@@ -19794,7 +20200,48 @@ function ReviewWorkspaceApp({ session }) {
       session.invalidate();
     } catch {}
   }, [controller, rangeStart, session]);
+  const requestBaseSelection = useCallback(() => {
+    if (controller.baseSelection || finishDialog.isOpen() || helpOpen)
+      return;
+    controller.requestBaseSelection();
+  }, [controller, finishDialog, helpOpen]);
+  const cancelBaseSelection = useCallback(() => {
+    if (controller.baseSelection?.loading || controller.baseSelection?.selecting)
+      return;
+    controller.cancelBaseSelection();
+    if (!controller.state)
+      onClose();
+  }, [controller, onClose]);
+  const chooseBase = useCallback((ref) => {
+    controller.chooseBase(ref);
+  }, [controller]);
+  const retryBaseSelection = useCallback(() => {
+    controller.requestBaseSelection();
+  }, [controller]);
   const executeCommand = useCallback((commandId, payload) => {
+    if (controller.baseSelection)
+      return false;
+    if (commandId === "review.chooseBase") {
+      requestBaseSelection();
+      return true;
+    }
+    if (commandId === "review.toggleSinceLastReview") {
+      if (controller.exitProjection()) {
+        setProjectionNotice(null);
+        session.invalidate();
+        return true;
+      }
+      setProjectionNotice(null);
+      controller.enterSinceLastReview().then((result) => {
+        if (result.ok) {
+          setProjectionNotice(result.fileCount === 0 ? "Nothing changed since the last review" : null);
+        } else {
+          setProjectionNotice(PROJECTION_NOTICES[result.reason] ?? result.message ?? "Could not open the projection");
+        }
+        session.invalidate();
+      });
+      return true;
+    }
     const current = controller.state;
     if (commandId === "review.focusDiff") {
       setFocus("stream");
@@ -20037,10 +20484,17 @@ function ReviewWorkspaceApp({ session }) {
       return true;
     }
     return false;
-  }, [controller, deleteFeedback, diffWidth, editFeedback, finishDialog, focus, onClose, pendingRangeAnchor, rangeStart, reanchorFeedback, selectedFeedbackId, selectFeedback, selectDiffAddress, session, sidebarWidth, toggleGap]);
+  }, [controller, deleteFeedback, diffWidth, editFeedback, finishDialog, focus, onClose, pendingRangeAnchor, rangeStart, reanchorFeedback, requestBaseSelection, selectedFeedbackId, selectFeedback, selectDiffAddress, session, sidebarWidth, toggleGap]);
   const handleKey = useCallback((event) => {
     if (!active2)
       return;
+    if (baseSelection || controller.baseSelection) {
+      if (keyName(event) === "escape") {
+        consume2(event);
+        cancelBaseSelection();
+      }
+      return;
+    }
     const name = keyName(event);
     const current = controller.state;
     if (name === "escape") {
@@ -20052,25 +20506,25 @@ function ReviewWorkspaceApp({ session }) {
         setComposerFocus("body");
         setComposerControlIndex(0);
         session.invalidate();
-        consume(event);
+        consume2(event);
         return;
       }
       if (finishDialog.isOpen()) {
         finishDialog.close();
         session.invalidate();
-        consume(event);
+        consume2(event);
         return;
       }
       if (helpOpen) {
         setHelpOpen(false);
-        consume(event);
+        consume2(event);
         return;
       }
       if (pendingDeleteFeedbackId) {
         pendingDeleteFeedbackRef.current = null;
         setPendingDeleteFeedbackId(null);
         session.invalidate();
-        consume(event);
+        consume2(event);
         return;
       }
       if (focus === "filter") {
@@ -20083,19 +20537,19 @@ function ReviewWorkspaceApp({ session }) {
           filterInputRef.current?.blur();
           setFocus("stream");
         }
-        consume(event);
+        consume2(event);
         return;
       }
       if (reanchorFeedbackId) {
         setReanchorFeedbackId(null);
         setFeedbackMessage(null);
-        consume(event);
+        consume2(event);
         return;
       }
       if (rangeStart || pendingRangeAnchor) {
         setRangeStart(null);
         setPendingRangeAnchor(null);
-        consume(event);
+        consume2(event);
         return;
       }
     }
@@ -20103,24 +20557,24 @@ function ReviewWorkspaceApp({ session }) {
       if (event.ctrl && (name === "1" || name === "2" || name === "3")) {
         finishDialog.setDecision(name === "1" ? "comment" : name === "2" ? "approve" : "request-changes");
         session.invalidate();
-        consume(event);
+        consume2(event);
         return;
       }
       if (event.ctrl && name.toLowerCase() === "s" || name === "enter") {
         submitFinish();
-        consume(event);
+        consume2(event);
         return;
       }
       return;
     }
     if (helpOpen) {
-      consume(event);
+      consume2(event);
       return;
     }
     if (current?.draft) {
       if (event.ctrl && name.toLowerCase() === "s") {
         saveDraft();
-        consume(event);
+        consume2(event);
       } else if (name === "tab") {
         const hasReplacement = canShowReplacementDraft(current);
         const backwards = event.shift === true;
@@ -20150,14 +20604,14 @@ function ReviewWorkspaceApp({ session }) {
             setComposerControlIndex(0);
           }
         }
-        consume(event);
+        consume2(event);
       }
       return;
     }
     if (focus === "filter" && name === "enter") {
       filterInputRef.current?.blur();
       setFocus("stream");
-      consume(event);
+      consume2(event);
       return;
     }
     if (focus === "filter" && !event.ctrl && !event.meta && !event.option && isPrintableFilterKey(name))
@@ -20167,17 +20621,30 @@ function ReviewWorkspaceApp({ session }) {
     if (!command || current && !command.available(current))
       return;
     if (executeCommand(command.id))
-      consume(event);
-  }, [active2, composerControlIndex, composerFocus, controller, executeCommand, finishDialog, focus, helpOpen, onClose, pendingDeleteFeedbackId, pendingRangeAnchor, rangeStart, reanchorFeedbackId, saveDraft, session, submitFinish]);
-  useKeyboard(handleKey);
+      consume2(event);
+  }, [active2, baseSelection, cancelBaseSelection, composerControlIndex, composerFocus, controller, executeCommand, finishDialog, focus, helpOpen, onClose, pendingDeleteFeedbackId, pendingRangeAnchor, rangeStart, reanchorFeedbackId, saveDraft, session, submitFinish]);
+  useKeyboard2(handleKey);
+  const basePicker = baseSelection ? /* @__PURE__ */ jsx6(ReviewBasePicker, {
+    selection: baseSelection,
+    width: dimensions2.width,
+    height: dimensions2.height,
+    active: active2,
+    ...controller.error ? { warning: `! ${controller.error.title}: ${controller.error.detail}` } : {},
+    onChoose: chooseBase,
+    onCancel: cancelBaseSelection,
+    onRetry: retryBaseSelection
+  }) : null;
   if (!state) {
-    return /* @__PURE__ */ jsx4("box", {
+    return /* @__PURE__ */ jsxs5("box", {
       id: "react-review-workspace",
       visible: active2,
-      style: { width: "100%", height: "100%" },
-      children: /* @__PURE__ */ jsx4("text", {
-        content: "Loading branch review…"
-      })
+      style: { position: "relative", width: "100%", height: "100%", overflow: "hidden" },
+      children: [
+        /* @__PURE__ */ jsx6("text", {
+          content: "Choose a base branch to start reviewing."
+        }),
+        basePicker
+      ]
     });
   }
   function selectFile(fileKey, nextFocus2 = "stream") {
@@ -20199,28 +20666,55 @@ function ReviewWorkspaceApp({ session }) {
   const suggestionAllowed = state.draft !== null && state.draft.anchor.kind === "range" && state.draft.anchor.side === "new" && state.document.files.some((file) => file.key === state.draft?.anchor.fileKey && file.source !== "binary" && file.source !== "too-large");
   const replacementInvalid = suggestionReplacementInvalid(state);
   const orphanedFeedback = state.feedback.filter((feedback) => !state.document.files.some((file) => file.key === feedback.anchor.fileKey));
-  return /* @__PURE__ */ jsxs4("box", {
+  return /* @__PURE__ */ jsxs5("box", {
     id: "react-review-workspace",
     visible: active2,
     onMouse: handleSidebarResizeMouse,
     style: { position: "relative", width: "100%", height: "100%", flexDirection: "column", overflow: "hidden" },
     children: [
-      /* @__PURE__ */ jsx4("box", {
+      /* @__PURE__ */ jsxs5("box", {
         id: "react-review-header",
-        style: { width: "100%", height: 3, flexShrink: 0 },
-        children: /* @__PURE__ */ jsx4("text", {
-          content: headerText(state, dimensions2.width, controller.error),
-          wrapMode: "none",
-          truncate: true
-        })
+        style: { width: "100%", height: 3, flexShrink: 0, flexDirection: "column" },
+        children: [
+          reviewHeaderLines(state, dimensions2.width).map((line, lineIndex) => /* @__PURE__ */ jsx6("box", {
+            style: { width: "100%", height: 1, flexShrink: 0, flexDirection: "row" },
+            children: line.map((span, spanIndex) => span.action === "choose-base" ? /* @__PURE__ */ jsx6("box", {
+              id: "review-base-selector",
+              style: { width: cellWidth(span.text), height: 1, flexShrink: 0 },
+              onMouseUp: (event) => {
+                event.preventDefault();
+                event.stopPropagation();
+                requestBaseSelection();
+              },
+              children: /* @__PURE__ */ jsx6("text", {
+                content: span.text,
+                fg: COLORS2.strong,
+                selectable: false,
+                wrapMode: "none",
+                truncate: true
+              })
+            }, spanIndex) : /* @__PURE__ */ jsx6("text", {
+              content: span.text,
+              fg: span.style === "dim" ? COLORS2.dim : COLORS2.strong,
+              wrapMode: "none",
+              truncate: true
+            }, spanIndex))
+          }, lineIndex)),
+          controller.error ? /* @__PURE__ */ jsx6("text", {
+            content: `! ${controller.error.title}: ${controller.error.detail}`,
+            fg: COLORS2.dim,
+            wrapMode: "none",
+            truncate: true
+          }) : null
+        ]
       }),
-      /* @__PURE__ */ jsxs4("box", {
+      /* @__PURE__ */ jsxs5("box", {
         id: "react-review-body",
         style: { width: "100%", flexGrow: 1, flexDirection: "row", overflow: "hidden" },
         children: [
-          sidebarWidth > 0 ? /* @__PURE__ */ jsxs4(Fragment, {
+          sidebarWidth > 0 ? /* @__PURE__ */ jsxs5(Fragment, {
             children: [
-              /* @__PURE__ */ jsxs4("box", {
+              /* @__PURE__ */ jsxs5("box", {
                 id: "react-review-sidebar",
                 borderColor: sidebarFocused ? ANSI_GREEN : DEFAULT_FOREGROUND,
                 title: `[1] Files ${sidebarFileEntries.length}/${state.document.files.length}`,
@@ -20228,21 +20722,21 @@ function ReviewWorkspaceApp({ session }) {
                 style: { width: sidebarWidth, height: "100%", flexShrink: 0, border: true, flexDirection: "column" },
                 onMouseDown: () => setFocus("sidebar"),
                 children: [
-                  /* @__PURE__ */ jsxs4("box", {
+                  /* @__PURE__ */ jsxs5("box", {
                     id: "review-file-filter",
                     style: { width: "100%", height: 1, flexShrink: 0, flexDirection: "row" },
                     children: [
-                      /* @__PURE__ */ jsx4("text", {
+                      /* @__PURE__ */ jsx6("text", {
                         content: "/ ",
                         fg: COLORS2.dim
                       }),
-                      /* @__PURE__ */ jsx4("input", {
+                      /* @__PURE__ */ jsx6("input", {
                         id: "review-file-filter-input",
                         ref: filterInputRef,
                         width: Math.max(4, sidebarWidth - 4),
                         value: state.filter.query,
                         placeholder: "filter files",
-                        focused: focus === "filter",
+                        focused: focus === "filter" && !baseSelection,
                         onMouseUp: () => {
                           if (resizingSidebarRef.current || resizeReleaseSuppressionRef.current)
                             return;
@@ -20269,28 +20763,28 @@ function ReviewWorkspaceApp({ session }) {
                             filterInputRef.current?.blur();
                             setFocus("stream");
                           }
-                          consume(event);
+                          consume2(event);
                         }
                       })
                     ]
                   }),
-                  /* @__PURE__ */ jsx4("scrollbox", {
+                  /* @__PURE__ */ jsx6("scrollbox", {
                     id: "react-review-sidebar-scrollbox",
-                    focused: focus === "sidebar",
+                    focused: focus === "sidebar" && !baseSelection,
                     width: "100%",
                     flexGrow: 1,
                     scrollY: true,
                     viewportCulling: true,
                     verticalScrollbarOptions: { visible: false },
                     onMouseDown: () => setFocus("sidebar"),
-                    children: /* @__PURE__ */ jsx4("box", {
+                    children: /* @__PURE__ */ jsx6("box", {
                       style: { width: "100%", flexDirection: "column" },
                       children: sidebarEntries.map((entry) => {
                         if (entry.kind === "group") {
-                          return /* @__PURE__ */ jsx4("box", {
+                          return /* @__PURE__ */ jsx6("box", {
                             id: `review-file-group:${entry.label}`,
                             style: { width: "100%", height: 1, backgroundColor: REVIEW_SIDEBAR_THEME.panel, paddingLeft: 1 },
-                            children: /* @__PURE__ */ jsx4("text", {
+                            children: /* @__PURE__ */ jsx6("text", {
                               fg: REVIEW_SIDEBAR_THEME.muted,
                               children: fitText(entry.label, sidebarTextWidth)
                             })
@@ -20299,11 +20793,11 @@ function ReviewWorkspaceApp({ session }) {
                         const selected = entry.id === state.selection.fileKey;
                         const rowBackground = selected ? REVIEW_SIDEBAR_THEME.panelAlt : REVIEW_SIDEBAR_THEME.panel;
                         const stats = sidebarEntryStats(entry);
-                        const { icon, color: color2 } = getFileStateIcon(entry);
+                        const { icon, color: color3 } = getFileStateIcon(entry);
                         const iconWidth = icon ? 2 : 0;
                         const statsSectionWidth = sidebarStatsWidth > 0 ? sidebarStatsWidth + 1 : 0;
                         const nameWidth = Math.max(1, sidebarTextWidth - 1 - iconWidth - statsSectionWidth);
-                        return /* @__PURE__ */ jsxs4("box", {
+                        return /* @__PURE__ */ jsxs5("box", {
                           id: `review-file-row:${entry.id}`,
                           style: { width: "100%", height: 1, backgroundColor: rowBackground, flexDirection: "row" },
                           onMouseDown: () => setFocus("sidebar"),
@@ -20311,30 +20805,30 @@ function ReviewWorkspaceApp({ session }) {
                             executeCommand("review.selectFile", { fileKey: entry.id, nextFocus: "sidebar" });
                           },
                           children: [
-                            /* @__PURE__ */ jsx4("box", {
+                            /* @__PURE__ */ jsx6("box", {
                               style: { width: 1, height: 1, backgroundColor: selected ? REVIEW_SIDEBAR_THEME.accent : rowBackground }
                             }),
-                            /* @__PURE__ */ jsxs4("box", {
+                            /* @__PURE__ */ jsxs5("box", {
                               style: { flexGrow: 1, height: 1, paddingLeft: 0, flexDirection: "row", backgroundColor: rowBackground },
                               children: [
-                                icon ? /* @__PURE__ */ jsx4("text", {
-                                  fg: color2,
+                                icon ? /* @__PURE__ */ jsx6("text", {
+                                  fg: color3,
                                   children: `${icon} `
                                 }) : null,
-                                /* @__PURE__ */ jsx4("text", {
+                                /* @__PURE__ */ jsx6("text", {
                                   fg: REVIEW_SIDEBAR_THEME.text,
                                   children: padText(fitText(entry.name, nameWidth), nameWidth)
                                 }),
-                                statsSectionWidth > 0 ? /* @__PURE__ */ jsx4("box", {
+                                statsSectionWidth > 0 ? /* @__PURE__ */ jsx6("box", {
                                   style: { width: statsSectionWidth, height: 1, flexDirection: "row", justifyContent: "flex-end", backgroundColor: rowBackground },
-                                  children: stats.map((stat3, index) => /* @__PURE__ */ jsxs4("box", {
+                                  children: stats.map((stat3, index) => /* @__PURE__ */ jsxs5("box", {
                                     style: { height: 1, flexDirection: "row", backgroundColor: rowBackground },
                                     children: [
-                                      index > 0 ? /* @__PURE__ */ jsx4("text", {
+                                      index > 0 ? /* @__PURE__ */ jsx6("text", {
                                         fg: selected ? REVIEW_SIDEBAR_THEME.text : REVIEW_SIDEBAR_THEME.muted,
                                         children: " "
                                       }) : null,
-                                      /* @__PURE__ */ jsx4("text", {
+                                      /* @__PURE__ */ jsx6("text", {
                                         fg: stat3.kind === "agent-comment" ? REVIEW_SIDEBAR_THEME.noteBorder : stat3.kind === "addition" ? REVIEW_SIDEBAR_THEME.badgeAdded : REVIEW_SIDEBAR_THEME.badgeRemoved,
                                         children: stat3.text
                                       })
@@ -20350,7 +20844,7 @@ function ReviewWorkspaceApp({ session }) {
                   })
                 ]
               }),
-              /* @__PURE__ */ jsx4("box", {
+              /* @__PURE__ */ jsx6("box", {
                 id: "review-pane-resize-bar",
                 style: { width: REVIEW_RESIZE_BAR_WIDTH, height: "100%", flexShrink: 0 },
                 onMouseOver: () => setResizeBarHovered(true),
@@ -20383,7 +20877,7 @@ function ReviewWorkspaceApp({ session }) {
                   event.preventDefault();
                   event.stopPropagation();
                 },
-                children: /* @__PURE__ */ jsx4("text", {
+                children: /* @__PURE__ */ jsx6("text", {
                   id: "review-pane-resize-bar-glyphs",
                   selectable: false,
                   content: splitterGlyphs("vertical", REVIEW_RESIZE_BAR_WIDTH, resizeBarHeight, resizeBarHovered || resizingSidebar),
@@ -20396,20 +20890,20 @@ function ReviewWorkspaceApp({ session }) {
               })
             ]
           }) : null,
-          /* @__PURE__ */ jsx4("box", {
+          /* @__PURE__ */ jsx6("box", {
             id: "react-review-diff",
             borderColor: diffFocused ? ANSI_GREEN : DEFAULT_FOREGROUND,
             title: `[0] Diff — ${layout}`,
             titleColor: diffFocused ? ANSI_GREEN : DEFAULT_FOREGROUND,
             style: { width: "100%", height: "100%", flexGrow: 1, border: true, minWidth: 0 },
             onMouseDown: () => setFocus("stream"),
-            children: /* @__PURE__ */ jsx4(ReviewDiffPane, {
+            children: /* @__PURE__ */ jsx6(ReviewDiffPane, {
               files,
               state,
               layout,
               width: diffWidth,
               height: diffHeight,
-              focused: focus === "stream",
+              focused: focus === "stream" && !baseSelection,
               scrollRef: diffScrollRef,
               selectedFileKey: state.selection.fileKey,
               selectedHunkIndex: state.selection.hunkIndex,
@@ -20430,14 +20924,14 @@ function ReviewWorkspaceApp({ session }) {
               },
               selectedFeedbackId,
               onViewportChange: session.setViewportStart
-            })
+            }, state.document.identity.id)
           })
         ]
       }),
-      orphanedFeedback.length > 0 ? /* @__PURE__ */ jsx4("box", {
+      orphanedFeedback.length > 0 ? /* @__PURE__ */ jsx6("box", {
         id: "review-orphaned-feedback",
         style: { position: "absolute", left: 1, bottom: 1, width: Math.max(20, dimensions2.width - 2), height: Math.min(4, orphanedFeedback.length), zIndex: 50, border: true, flexDirection: "column", backgroundColor: "#202020" },
-        children: orphanedFeedback.slice(0, 4).map((feedback) => /* @__PURE__ */ jsxs4("box", {
+        children: orphanedFeedback.slice(0, 4).map((feedback) => /* @__PURE__ */ jsxs5("box", {
           style: { width: "100%", height: 1, flexDirection: "row" },
           onMouseUp: () => {
             if (resizingSidebarRef.current || resizeReleaseSuppressionRef.current)
@@ -20445,32 +20939,32 @@ function ReviewWorkspaceApp({ session }) {
             executeCommand("review.selectFeedback", feedback.id);
           },
           children: [
-            /* @__PURE__ */ jsx4("text", {
+            /* @__PURE__ */ jsx6("text", {
               content: `${feedback.resolution} feedback ${feedback.id} — ${feedback.anchor.kind === "range" ? `${feedback.anchor.side}:${feedback.anchor.startLine === feedback.anchor.endLine ? feedback.anchor.startLine : `${feedback.anchor.startLine}-${feedback.anchor.endLine}`}` : "file"} — [a]nchor`,
               wrapMode: "none",
               truncate: true
             }),
-            /* @__PURE__ */ jsx4("box", {
+            /* @__PURE__ */ jsx6("box", {
               id: `review-delete-feedback:${feedback.id}`,
               onMouseUp: () => {
                 if (resizingSidebarRef.current || resizeReleaseSuppressionRef.current)
                   return;
                 deleteFeedback(feedback.id);
               },
-              children: /* @__PURE__ */ jsx4("text", {
+              children: /* @__PURE__ */ jsx6("text", {
                 content: pendingDeleteFeedbackId === feedback.id ? "[delete again]" : "[delete]",
                 wrapMode: "none",
                 truncate: true
               })
             }),
-            /* @__PURE__ */ jsx4("box", {
+            /* @__PURE__ */ jsx6("box", {
               id: `review-reanchor-feedback:${feedback.id}`,
               onMouseUp: () => {
                 if (resizingSidebarRef.current || resizeReleaseSuppressionRef.current)
                   return;
                 reanchorFeedback(feedback.id);
               },
-              children: /* @__PURE__ */ jsx4("text", {
+              children: /* @__PURE__ */ jsx6("text", {
                 content: "[re-anchor]",
                 wrapMode: "none",
                 truncate: true
@@ -20479,29 +20973,29 @@ function ReviewWorkspaceApp({ session }) {
           ]
         }, feedback.id))
       }) : null,
-      feedbackMessage ? /* @__PURE__ */ jsx4("box", {
+      feedbackMessage ? /* @__PURE__ */ jsx6("box", {
         id: "review-feedback-message",
         style: { position: "absolute", left: 1, bottom: orphanedFeedback.length > 0 ? Math.min(5, orphanedFeedback.length + 1) : 1, width: Math.max(20, dimensions2.width - 2), height: 1, zIndex: 55, backgroundColor: "#202020" },
-        children: /* @__PURE__ */ jsx4("text", {
+        children: /* @__PURE__ */ jsx6("text", {
           content: feedbackMessage,
           wrapMode: "none",
           truncate: true
         })
       }) : null,
-      state.draft ? /* @__PURE__ */ jsxs4("box", {
+      state.draft ? /* @__PURE__ */ jsxs5("box", {
         id: "review-feedback-composer",
         style: { width: "100%", height: composerHeight, flexShrink: 0, border: true, flexDirection: "column" },
         children: [
-          /* @__PURE__ */ jsx4("text", {
+          /* @__PURE__ */ jsx6("text", {
             content: feedbackDraftText(state),
             wrapMode: "none",
             truncate: true
           }),
-          /* @__PURE__ */ jsxs4("box", {
+          /* @__PURE__ */ jsxs5("box", {
             id: "review-feedback-controls",
             style: { width: "100%", height: 1, flexDirection: "row" },
             children: [
-              /* @__PURE__ */ jsx4("box", {
+              /* @__PURE__ */ jsx6("box", {
                 id: "review-feedback-kind-note",
                 style: composerFocus === "controls" && composerControlIndex === 0 ? { backgroundColor: "#365f8a" } : {},
                 onMouseUp: () => {
@@ -20517,11 +21011,11 @@ function ReviewWorkspaceApp({ session }) {
                     session.invalidate();
                   } catch {}
                 },
-                children: /* @__PURE__ */ jsx4("text", {
+                children: /* @__PURE__ */ jsx6("text", {
                   content: state.draft.kind === "note" ? "[Note]" : " Note "
                 })
               }),
-              /* @__PURE__ */ jsx4("box", {
+              /* @__PURE__ */ jsx6("box", {
                 id: "review-feedback-kind-suggestion",
                 style: composerFocus === "controls" && composerControlIndex === 1 ? { backgroundColor: "#365f8a" } : {},
                 onMouseUp: () => {
@@ -20538,11 +21032,11 @@ function ReviewWorkspaceApp({ session }) {
                     session.invalidate();
                   } catch {}
                 },
-                children: /* @__PURE__ */ jsx4("text", {
+                children: /* @__PURE__ */ jsx6("text", {
                   content: state.draft.kind === "suggestion" ? "[Suggestion]" : " Suggestion "
                 })
               }),
-              /* @__PURE__ */ jsx4("box", {
+              /* @__PURE__ */ jsx6("box", {
                 id: "review-feedback-severity-comment",
                 style: composerFocus === "controls" && composerControlIndex === 2 ? { backgroundColor: "#365f8a" } : {},
                 onMouseUp: () => {
@@ -20558,11 +21052,11 @@ function ReviewWorkspaceApp({ session }) {
                     session.invalidate();
                   } catch {}
                 },
-                children: /* @__PURE__ */ jsx4("text", {
+                children: /* @__PURE__ */ jsx6("text", {
                   content: state.draft.severity === "comment" ? "[Comment]" : " Comment "
                 })
               }),
-              /* @__PURE__ */ jsx4("box", {
+              /* @__PURE__ */ jsx6("box", {
                 id: "review-feedback-severity-blocking",
                 style: composerFocus === "controls" && composerControlIndex === 3 ? { backgroundColor: "#365f8a" } : {},
                 onMouseUp: () => {
@@ -20578,11 +21072,11 @@ function ReviewWorkspaceApp({ session }) {
                     session.invalidate();
                   } catch {}
                 },
-                children: /* @__PURE__ */ jsx4("text", {
+                children: /* @__PURE__ */ jsx6("text", {
                   content: state.draft.severity === "blocking" ? "[Blocking]" : " Blocking "
                 })
               }),
-              /* @__PURE__ */ jsx4("box", {
+              /* @__PURE__ */ jsx6("box", {
                 id: "review-feedback-save",
                 style: composerFocus === "controls" && composerControlIndex === 4 ? { backgroundColor: "#365f8a" } : {},
                 onMouseUp: () => {
@@ -20592,11 +21086,11 @@ function ReviewWorkspaceApp({ session }) {
                   setComposerControlIndex(4);
                   saveDraft();
                 },
-                children: /* @__PURE__ */ jsx4("text", {
+                children: /* @__PURE__ */ jsx6("text", {
                   content: replacementInvalid ? "[Save disabled]" : " [Save] "
                 })
               }),
-              /* @__PURE__ */ jsx4("box", {
+              /* @__PURE__ */ jsx6("box", {
                 id: "review-feedback-cancel",
                 style: composerFocus === "controls" && composerControlIndex === 5 ? { backgroundColor: "#365f8a" } : {},
                 onMouseUp: () => {
@@ -20614,19 +21108,19 @@ function ReviewWorkspaceApp({ session }) {
                     session.invalidate();
                   } catch {}
                 },
-                children: /* @__PURE__ */ jsx4("text", {
+                children: /* @__PURE__ */ jsx6("text", {
                   content: " [Cancel] "
                 })
               })
             ]
           }),
-          /* @__PURE__ */ jsx4("textarea", {
+          /* @__PURE__ */ jsx6("textarea", {
             id: "review-feedback-body",
             ref: composerBodyRef,
             width: "100%",
             height: 2,
             initialValue: state.draft.body,
-            focused: composerFocus === "body",
+            focused: composerFocus === "body" && !baseSelection,
             keyBindings: [{ name: "escape", action: "submit" }],
             onSubmit: () => {
               const latest = controller.state;
@@ -20651,10 +21145,10 @@ function ReviewWorkspaceApp({ session }) {
                 setComposerFocus("body");
                 setComposerControlIndex(0);
                 session.invalidate();
-                consume(event);
+                consume2(event);
               } else if (event.ctrl && name.toLowerCase() === "s" && latest?.draft) {
                 saveDraft();
-                consume(event);
+                consume2(event);
               }
             },
             onContentChange: () => {
@@ -20666,16 +21160,16 @@ function ReviewWorkspaceApp({ session }) {
                 controller.dispatch(planReviewIntent(latest, { type: "feedback/update-draft", body }));
               } catch {}
             }
-          }),
-          canShowReplacementDraft(state) ? /* @__PURE__ */ jsxs4(Fragment, {
+          }, state.document.identity.id),
+          canShowReplacementDraft(state) ? /* @__PURE__ */ jsxs5(Fragment, {
             children: [
-              /* @__PURE__ */ jsx4("textarea", {
+              /* @__PURE__ */ jsx6("textarea", {
                 id: "review-feedback-replacement",
                 ref: replacementRef,
                 width: "100%",
                 height: 2,
                 initialValue: state.draft.replacement ?? "",
-                focused: composerFocus === "replacement",
+                focused: composerFocus === "replacement" && !baseSelection,
                 wrapMode: "char",
                 placeholder: "Replacement text",
                 onContentChange: () => {
@@ -20688,8 +21182,8 @@ function ReviewWorkspaceApp({ session }) {
                     session.invalidate();
                   } catch {}
                 }
-              }),
-              replacementInvalid ? /* @__PURE__ */ jsx4("text", {
+              }, state.document.identity.id),
+              replacementInvalid ? /* @__PURE__ */ jsx6("text", {
                 id: "review-feedback-replacement-error",
                 content: "Invalid replacement: enter non-whitespace text.",
                 wrapMode: "none",
@@ -20699,10 +21193,10 @@ function ReviewWorkspaceApp({ session }) {
           }) : null
         ]
       }) : null,
-      helpOpen ? /* @__PURE__ */ jsx4("box", {
+      helpOpen ? /* @__PURE__ */ jsx6("box", {
         id: "review-help-dialog",
-        style: { position: "absolute", left: Math.max(1, Math.floor(dimensions2.width / 10)), top: 2, width: Math.max(50, Math.floor(dimensions2.width * 4 / 5)), height: Math.min(26, Math.max(14, dimensions2.height - 4)), zIndex: 70, border: true, flexDirection: "column", backgroundColor: "#202020" },
-        children: /* @__PURE__ */ jsx4("text", {
+        style: { position: "absolute", left: Math.max(1, Math.floor(dimensions2.width / 10)), top: 2, width: Math.max(50, Math.floor(dimensions2.width * 4 / 5)), height: Math.min(27, Math.max(14, dimensions2.height - 3)), zIndex: 70, border: true, flexDirection: "column", backgroundColor: "#202020" },
+        children: /* @__PURE__ */ jsx6("text", {
           content: `Review commands
 ${reviewHelp(focus, state)}
 Esc close this help`,
@@ -20710,16 +21204,16 @@ Esc close this help`,
           truncate: true
         })
       }) : null,
-      finishDialog.isOpen() ? /* @__PURE__ */ jsxs4("box", {
+      finishDialog.isOpen() ? /* @__PURE__ */ jsxs5("box", {
         id: "review-finish-dialog",
         style: { position: "absolute", left: Math.max(1, Math.floor(dimensions2.width / 8)), top: 3, width: Math.max(40, Math.floor(dimensions2.width * 3 / 4)), height: 10, zIndex: 60, border: true, flexDirection: "column", backgroundColor: "#202020" },
         children: [
-          /* @__PURE__ */ jsx4("text", {
+          /* @__PURE__ */ jsx6("text", {
             content: `Finish review — ${finishDialog.getDecision()}`,
             wrapMode: "none",
             truncate: true
           }),
-          /* @__PURE__ */ jsx4("textarea", {
+          /* @__PURE__ */ jsx6("textarea", {
             id: "review-finish-summary",
             ref: finishSummaryRef,
             width: "100%",
@@ -20733,10 +21227,10 @@ Esc close this help`,
               if (name === "escape") {
                 finishDialog.close();
                 session.invalidate();
-                consume(event);
+                consume2(event);
               } else if (event.ctrl && name.toLowerCase() === "s") {
                 submitFinish();
-                consume(event);
+                consume2(event);
               }
             },
             keyBindings: [{ name: "enter", action: "submit" }],
@@ -20746,15 +21240,15 @@ Esc close this help`,
               session.invalidate();
             }
           }),
-          /* @__PURE__ */ jsx4("text", {
+          /* @__PURE__ */ jsx6("text", {
             content: finishDialog.getValidationMessage(),
             wrapMode: "none",
             truncate: true
           }),
-          /* @__PURE__ */ jsxs4("box", {
+          /* @__PURE__ */ jsxs5("box", {
             style: { flexDirection: "row", height: 1 },
             children: [
-              /* @__PURE__ */ jsx4("box", {
+              /* @__PURE__ */ jsx6("box", {
                 id: "review-finish-comment",
                 onMouseUp: () => {
                   if (resizingSidebarRef.current || resizeReleaseSuppressionRef.current)
@@ -20762,11 +21256,11 @@ Esc close this help`,
                   finishDialog.setDecision("comment");
                   session.invalidate();
                 },
-                children: /* @__PURE__ */ jsx4("text", {
+                children: /* @__PURE__ */ jsx6("text", {
                   content: finishDialog.getDecision() === "comment" ? "[Comment]" : " Comment "
                 })
               }),
-              /* @__PURE__ */ jsx4("box", {
+              /* @__PURE__ */ jsx6("box", {
                 id: "review-finish-approve",
                 onMouseUp: () => {
                   if (resizingSidebarRef.current || resizeReleaseSuppressionRef.current)
@@ -20774,11 +21268,11 @@ Esc close this help`,
                   finishDialog.setDecision("approve");
                   session.invalidate();
                 },
-                children: /* @__PURE__ */ jsx4("text", {
+                children: /* @__PURE__ */ jsx6("text", {
                   content: finishDialog.getDecision() === "approve" ? "[Approve]" : " Approve "
                 })
               }),
-              /* @__PURE__ */ jsx4("box", {
+              /* @__PURE__ */ jsx6("box", {
                 id: "review-finish-request-changes",
                 onMouseUp: () => {
                   if (resizingSidebarRef.current || resizeReleaseSuppressionRef.current)
@@ -20786,39 +21280,40 @@ Esc close this help`,
                   finishDialog.setDecision("request-changes");
                   session.invalidate();
                 },
-                children: /* @__PURE__ */ jsx4("text", {
+                children: /* @__PURE__ */ jsx6("text", {
                   content: finishDialog.getDecision() === "request-changes" ? "[Request Changes]" : " Request Changes "
                 })
               })
             ]
           }),
-          /* @__PURE__ */ jsx4("box", {
+          /* @__PURE__ */ jsx6("box", {
             id: "review-finish-submit",
             onMouseUp: () => {
               if (resizingSidebarRef.current || resizeReleaseSuppressionRef.current)
                 return;
               submitFinish();
             },
-            children: /* @__PURE__ */ jsx4("text", {
+            children: /* @__PURE__ */ jsx6("text", {
               content: " Submit "
             })
           }),
-          /* @__PURE__ */ jsx4("text", {
+          /* @__PURE__ */ jsx6("text", {
             content: "Ctrl-1 comment · Ctrl-2 approve · Ctrl-3 request changes · Enter/Ctrl-S submit · Esc cancel",
             wrapMode: "none",
             truncate: true
           })
         ]
       }) : null,
-      /* @__PURE__ */ jsx4("box", {
+      /* @__PURE__ */ jsx6("box", {
         id: "react-review-footer",
         style: { width: "100%", height: 1, flexShrink: 0 },
-        children: /* @__PURE__ */ jsx4("text", {
-          content: reviewFooter(state, layout, focus),
+        children: /* @__PURE__ */ jsx6("text", {
+          content: reviewFooter(state, layout, focus, projectionNotice),
           wrapMode: "none",
           truncate: true
         })
-      })
+      }),
+      basePicker
     ]
   });
 }
@@ -21144,7 +21639,7 @@ var persistedReviewStateSchema = z.object({
   lastSubmission: submittedReviewRefSchema.nullable(),
   submissionInProgress: submissionInProgressSchema.nullable().optional()
 }).strict();
-var baseByHeadSchema = z.record(z.string(), z.object({ baseRef: z.string().min(1) }).strict()).superRefine((val, ctx) => {
+var baseByHeadSchema = z.record(z.string(), z.object({ baseRef: z.string().min(1), confirmed: z.boolean().optional() }).strict()).superRefine((val, ctx) => {
   for (const key of Object.keys(val)) {
     if (!isValidBaseByHeadKey(key)) {
       ctx.addIssue({ code: z.ZodIssueCode.custom, message: `invalid baseByHead key: ${key}`, path: [key] });
@@ -21298,8 +21793,9 @@ function toDatabase(raw) {
   for (const [k, v] of Object.entries(raw.reviews))
     reviews[k] = toPersistedReviewState(v);
   const baseByHead = {};
-  for (const [k, v] of Object.entries(raw.baseByHead))
-    baseByHead[k] = { baseRef: v.baseRef };
+  for (const [k, v] of Object.entries(raw.baseByHead)) {
+    baseByHead[k] = { baseRef: v.baseRef, ...v.confirmed === undefined ? {} : { confirmed: v.confirmed } };
+  }
   return { version: 2, baseByHead, reviews };
 }
 function toIdentity(raw) {
@@ -21665,7 +22161,7 @@ class ReactReviewSession {
 }
 
 // src/ui/review-workspace/react-review-host.tsx
-import { jsx as jsx5 } from "@opentui/react/jsx-runtime";
+import { jsx as jsx7 } from "@opentui/react/jsx-runtime";
 var rootsByRenderer = new WeakMap;
 
 class ReactReviewHost {
@@ -21688,7 +22184,7 @@ class ReactReviewHost {
       if (!existing.mounted) {
         existing.mounted = true;
         flushSync(() => {
-          this.reactRoot.render(/* @__PURE__ */ jsx5(ReviewWorkspaceApp, {
+          this.reactRoot.render(/* @__PURE__ */ jsx7(ReviewWorkspaceApp, {
             session: this.session
           }));
         });
@@ -21700,7 +22196,7 @@ class ReactReviewHost {
     this.reactRoot = createRoot(renderer);
     rootsByRenderer.set(renderer, { root: this.reactRoot, session: this.session, mounted: true });
     flushSync(() => {
-      this.reactRoot.render(/* @__PURE__ */ jsx5(ReviewWorkspaceApp, {
+      this.reactRoot.render(/* @__PURE__ */ jsx7(ReviewWorkspaceApp, {
         session: this.session
       }));
     });
@@ -22281,6 +22777,24 @@ function reduceReviewState(state, action) {
         revision: state.revision + 1
       };
     }
+    case "projection/apply": {
+      const firstFile = action.document.files[0] ?? null;
+      return {
+        ...state,
+        document: action.document,
+        projection: action.projection,
+        selection: { fileKey: firstFile?.key ?? null, hunkIndex: 0 },
+        lineSelection: null,
+        expandedGaps: [],
+        reveal: {
+          fileTopToken: state.reveal.fileTopToken + 1,
+          fileTopRequestToken: state.reveal.fileTopRequestToken + 1,
+          hunkToken: state.reveal.hunkToken + 1,
+          scrollToFeedback: false
+        },
+        revision: state.revision + 1
+      };
+    }
     case "projection/set": {
       if (projectionsEqual(state.projection, action.projection))
         return state;
@@ -22860,65 +23374,97 @@ async function currentBranchRef(runner) {
   const ref = (await output(runner, ["symbolic-ref", "--quiet", "HEAD"]))?.trim();
   return ref?.startsWith("refs/heads/") ? ref : undefined;
 }
-async function symbolicDefault(runner, remote) {
-  const symbolic = (await output(runner, ["symbolic-ref", "--quiet", `refs/remotes/${remote}/HEAD`]))?.trim();
-  if (symbolic === undefined || !symbolic.startsWith(`refs/remotes/${remote}/`))
-    return;
-  const oid = await resolveRefOid(runner, symbolic);
-  return oid === undefined ? undefined : { ref: symbolic, oid };
-}
-async function remotes(runner) {
-  const raw = await output(runner, ["remote"]);
-  return (raw ?? "").split(/\r?\n/).map((remote) => remote.trim()).filter(Boolean);
-}
-async function reviewBaseCandidates(runner) {
-  const localRaw = await output(runner, ["for-each-ref", "--format=%(refname:short)", "refs/heads"]);
-  const remoteRaw = await output(runner, ["for-each-ref", "--format=%(refname)", "refs/remotes"]);
-  const configuredRemotes = await remotes(runner);
-  const values = [
-    ...(localRaw ?? "").split(/\r?\n/),
-    ...(remoteRaw ?? "").split(/\r?\n/)
-  ].map((ref) => ref.trim()).filter((ref) => {
-    if (ref.length === 0)
-      return false;
-    if (!ref.startsWith("refs/remotes/"))
-      return true;
-    const remoteRef = ref.slice("refs/remotes/".length);
-    return !configuredRemotes.some((remote) => remoteRef === `${remote}/HEAD`);
+async function inferReviewBase(runner, preferredRef) {
+  const [refResult, branchResult, headResult, remoteResult] = await Promise.all([
+    runner.run([
+      "for-each-ref",
+      "--format=%(refname)%09%(objectname)%09%(objecttype)%09%(symref)%09%(upstream:remotename)",
+      "refs/heads",
+      "refs/remotes"
+    ], { readOnly: true }),
+    runner.run(["symbolic-ref", "--quiet", "HEAD"], { readOnly: true, acceptedExitCodes: [0, 1] }),
+    runner.run(["rev-parse", "--verify", "--quiet", "HEAD^{commit}"], { readOnly: true, acceptedExitCodes: [0, 1] }),
+    runner.run(["remote"], { readOnly: true })
+  ]);
+  const branchRef = branchResult.exitCode === 0 ? branchResult.stdout.trim() : undefined;
+  const headOid = headResult.exitCode === 0 ? headResult.stdout.trim() : undefined;
+  const branchName = branchRef?.startsWith("refs/heads/") ? branchRef.slice("refs/heads/".length) : undefined;
+  const refs = [];
+  for (const line of refResult.stdout.split(/\r?\n/)) {
+    const [ref, oid, objectType, symbolic = "", upstreamRemote2 = ""] = line.split("\t");
+    if (ref === undefined || oid === undefined || objectType !== "commit")
+      continue;
+    refs.push({ ref, oid, symbolic, upstreamRemote: upstreamRemote2 });
+  }
+  const upstreamRemote = refs.find(({ ref }) => ref === branchRef)?.upstreamRemote;
+  const remoteNames = remoteResult.stdout.split(/\r?\n/).filter(Boolean).sort((left2, right2) => right2.length - left2.length || (left2 < right2 ? -1 : left2 > right2 ? 1 : 0));
+  const remoteOrder = (remote) => remote === upstreamRemote ? 0 : remote === "origin" ? 1 : 2;
+  const defaults = refs.filter(({ ref, symbolic }) => ref.startsWith("refs/remotes/") && ref.endsWith("/HEAD") && symbolic !== "").sort((left2, right2) => {
+    const leftRemote = left2.ref.slice("refs/remotes/".length, -"/HEAD".length);
+    const rightRemote = right2.ref.slice("refs/remotes/".length, -"/HEAD".length);
+    return remoteOrder(leftRemote) - remoteOrder(rightRemote) || (left2.ref < right2.ref ? -1 : left2.ref > right2.ref ? 1 : 0);
   });
-  return [...new Set(values)].sort();
-}
-async function candidates(runner) {
-  return reviewBaseCandidates(runner);
-}
-async function inferReviewBase(runner) {
-  const branchRef = await currentBranchRef(runner);
-  const allCandidates = await candidates(runner);
-  if (branchRef === undefined || await resolveRefOid(runner, "HEAD") === undefined) {
-    return { kind: "choose", candidates: allCandidates, reason: branchRef === undefined ? "HEAD is detached" : "HEAD has no commit" };
-  }
-  const remoteNames = await remotes(runner);
-  const upstream = (await output(runner, ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{upstream}"]))?.trim();
-  const upstreamRemote = remoteNames.filter((remote) => upstream !== undefined && upstream.startsWith(`${remote}/`)).sort((left2, right2) => right2.length - left2.length)[0];
-  if (upstreamRemote !== undefined) {
-    const preferred = await symbolicDefault(runner, upstreamRemote);
-    if (preferred !== undefined) {
-      return { kind: "confident", ref: preferred.ref, oid: preferred.oid, reason: `remote default for upstream ${upstreamRemote}` };
-    }
-  }
-  if (remoteNames.includes("origin")) {
-    const preferred = await symbolicDefault(runner, "origin");
-    if (preferred !== undefined) {
-      return { kind: "confident", ref: preferred.ref, oid: preferred.oid, reason: "origin symbolic default" };
-    }
-  }
-  if (remoteNames.length === 1) {
-    const preferred = await symbolicDefault(runner, remoteNames[0]);
-    if (preferred !== undefined) {
-      return { kind: "confident", ref: preferred.ref, oid: preferred.oid, reason: "sole remote symbolic default" };
+  const defaultRanks = new Map(defaults.map(({ symbolic }, index) => [symbolic, index]));
+  const defaultRemotes = new Map(defaults.map(({ ref, symbolic }) => [symbolic, ref.slice("refs/remotes/".length, -"/HEAD".length)]));
+  const branches = refs.filter(({ ref, symbolic }) => ref !== branchRef && symbolic === "" && !(ref.startsWith("refs/remotes/") && ref.endsWith("/HEAD")));
+  const firstParentDistances = new Map;
+  if (headOid !== undefined && branches.length > 0) {
+    const history = await runner.run(["rev-list", "--first-parent", "--max-count=2049", headOid, "--"], { readOnly: true });
+    let distance = 0;
+    for (const oid of history.stdout.trim().split(/\r?\n/)) {
+      if (oid !== "")
+        firstParentDistances.set(oid, distance++);
+    }
+  }
+  const ranked = branches.map(({ ref, oid }) => {
+    const local = ref.startsWith("refs/heads/");
+    const label = ref.slice(local ? "refs/heads/".length : "refs/remotes/".length);
+    const remote = local ? undefined : remoteNames.find((name) => label.startsWith(`${name}/`));
+    const shortName = local ? label : remote === undefined ? undefined : label.slice(remote.length + 1);
+    const trackingHead = !local && branchName !== undefined && shortName === branchName;
+    const sameHead = headOid !== undefined && oid === headOid;
+    const distance = firstParentDistances.get(oid);
+    const defaultRank = defaultRanks.get(ref);
+    const defaultRemote = defaultRemotes.get(ref);
+    const conventionalRank = shortName === "main" ? 0 : shortName === "master" ? 1 : shortName === "develop" ? 2 : 3;
+    const defaultReason = defaultRemote === undefined ? undefined : `Default branch of ${defaultRemote === upstreamRemote ? "upstream remote " : "remote "}${defaultRemote}`;
+    let priority;
+    let reason;
+    if (ref === preferredRef) {
+      priority = 0;
+      reason = "Previously selected review base";
+    } else if (trackingHead || sameHead) {
+      priority = 5;
+      reason = trackingHead ? "Same-name remote branch for current HEAD" : "Points at current HEAD";
+    } else if (distance !== undefined && distance > 0) {
+      priority = 1;
+      reason = `Branch tip ${distance} first-parent ${distance === 1 ? "commit" : "commits"} behind HEAD`;
+      if (defaultReason !== undefined)
+        reason += `; ${defaultReason}`;
+    } else if (defaultRank !== undefined) {
+      priority = 2;
+      reason = defaultReason;
+    } else if (conventionalRank < 3) {
+      priority = 3;
+      reason = `Conventional ${shortName} base branch`;
+    } else {
+      priority = 4;
+      reason = local ? "Local branch" : "Remote branch";
     }
-  }
-  return { kind: "choose", candidates: allCandidates, reason: "no authoritative remote default" };
+    return {
+      candidate: { ref, label, reason },
+      priority,
+      distance: priority === 1 ? distance : 0,
+      defaultRank: priority === 1 || priority === 2 ? defaultRank ?? defaults.length : 0,
+      conventionalRank: priority === 1 || priority === 3 ? conventionalRank : 0
+    };
+  });
+  ranked.sort((left2, right2) => left2.priority - right2.priority || left2.distance - right2.distance || left2.defaultRank - right2.defaultRank || left2.conventionalRank - right2.conventionalRank || (left2.candidate.ref < right2.candidate.ref ? -1 : left2.candidate.ref > right2.candidate.ref ? 1 : 0));
+  return {
+    kind: "choose",
+    candidates: ranked.map(({ candidate }) => candidate),
+    reason: headOid === undefined ? "HEAD has no commit" : branchRef === undefined ? "HEAD is detached; choose a review base" : "Choose a review base; likely branches are listed first"
+  };
 }
 
 // src/review/git/load-review-document.ts
@@ -23105,6 +23651,187 @@ async function loadReviewDocument(runner, baseRef) {
   return createReviewDocument({ identity, generation, commits: commitsForDoc, files });
 }
 
+// src/review/git/load-review-projection.ts
+function normalizePathForJoin2(p) {
+  return p.replace(/[\r\n]+$/u, "");
+}
+function kindFromRaw2(rawStatus, isBinary) {
+  if (isBinary)
+    return "binary";
+  const letter = rawStatus[0] ?? "";
+  if (letter === "R")
+    return "renamed";
+  if (letter === "C")
+    return "copied";
+  if (letter === "A")
+    return "added";
+  if (letter === "D")
+    return "deleted";
+  return "modified";
+}
+function sourceFromKind2(kind, isBinary) {
+  if (isBinary || kind === "binary")
+    return "binary";
+  return "available";
+}
+async function buildFilesForRange(runner, rangeArgs) {
+  const patchResult = await runner.run(["diff", "--no-ext-diff", "--no-color", "--find-renames", "--binary", "--src-prefix=a/", "--dst-prefix=b/", ...rangeArgs, "--"], { readOnly: true });
+  const rawResult = await runner.run(["diff", "--no-ext-diff", "--no-color", "--find-renames", "--raw", "-z", ...rangeArgs, "--"], { readOnly: true });
+  const numstatResult = await runner.run(["diff", "--no-ext-diff", "--no-color", "--find-renames", "--numstat", "-z", ...rangeArgs, "--"], { readOnly: true });
+  const patchText = patchResult.stdout;
+  const rawText = rawResult.stdout;
+  const numstatText = numstatResult.stdout;
+  const parsedPatches = parseReviewPatch(patchText);
+  const rawEntries = parseRawDiffZ(rawText);
+  const numstatEntries = parseNumstatZ(numstatText);
+  const rawByKey = new Map;
+  for (const entry of rawEntries) {
+    const key = `${normalizePathForJoin2(entry.path)}|${entry.previousPath ? normalizePathForJoin2(entry.previousPath) : ""}`;
+    const list = rawByKey.get(key);
+    if (list)
+      list.push(entry);
+    else
+      rawByKey.set(key, [entry]);
+  }
+  const numstatByKey = new Map;
+  for (const entry of numstatEntries) {
+    const key = `${normalizePathForJoin2(entry.path)}|${entry.previousPath ? normalizePathForJoin2(entry.previousPath) : ""}`;
+    const list = numstatByKey.get(key);
+    if (list)
+      list.push(entry);
+    else
+      numstatByKey.set(key, [entry]);
+  }
+  const seenPatchKeys = new Set;
+  for (const pf of parsedPatches) {
+    const key = `${normalizePathForJoin2(pf.path)}|${pf.previousPath ? normalizePathForJoin2(pf.previousPath) : ""}`;
+    if (seenPatchKeys.has(key))
+      throw new Error(`ambiguous patch join: duplicate path ${key}`);
+    seenPatchKeys.add(key);
+  }
+  if (parsedPatches.length === 0) {
+    if (rawEntries.length !== 0)
+      throw new Error(`missing patch for raw entries: ${rawEntries.map((r) => r.path).join(",")}`);
+    if (numstatEntries.length !== 0)
+      throw new Error(`missing patch for numstat entries: ${numstatEntries.map((r) => r.path).join(",")}`);
+    return [];
+  }
+  const files = [];
+  const matchedRawKeys = new Set;
+  const matchedNumstatKeys = new Set;
+  for (const pf of parsedPatches) {
+    const key = `${normalizePathForJoin2(pf.path)}|${pf.previousPath ? normalizePathForJoin2(pf.previousPath) : ""}`;
+    const rawList = rawByKey.get(key);
+    if (!rawList || rawList.length === 0) {
+      throw new Error(`missing raw entry for patch file ${pf.path}${pf.previousPath ? ` (from ${pf.previousPath})` : ""}`);
+    }
+    if (rawList.length > 1)
+      throw new Error(`ambiguous raw join for ${pf.path}`);
+    const raw = rawList[0];
+    matchedRawKeys.add(key);
+    const numstatList = numstatByKey.get(key);
+    let numstat = numstatList?.[0];
+    if (!numstat) {
+      throw new Error(`missing numstat entry for patch file ${pf.path}`);
+    }
+    if (numstatList && numstatList.length > 1)
+      throw new Error(`ambiguous numstat join for ${pf.path}`);
+    matchedNumstatKeys.add(key);
+    const patchPrevNorm = pf.previousPath ? normalizePathForJoin2(pf.previousPath) : undefined;
+    const numstatPrevNorm = numstat.previousPath ? normalizePathForJoin2(numstat.previousPath) : undefined;
+    if (patchPrevNorm !== numstatPrevNorm) {
+      if (patchPrevNorm !== undefined || numstatPrevNorm !== undefined) {
+        throw new Error(`mismatched previousPath for ${pf.path}: patch ${patchPrevNorm} vs numstat ${numstatPrevNorm}`);
+      }
+    }
+    const kind = kindFromRaw2(raw.status, pf.isBinary);
+    const source = sourceFromKind2(kind, pf.isBinary);
+    const normalizedHunkBody = pf.normalizedHunkBody;
+    const contentId = sha256Tuple2([raw.oldBlobOid ?? "", raw.newBlobOid ?? "", raw.oldMode ?? "", raw.newMode ?? "", normalizedHunkBody]);
+    const patchDigest = pf.patchDigest;
+    const stats = { additions: numstat.additions, deletions: numstat.deletions };
+    const hunks = pf.isBinary ? [] : pf.hunks;
+    const file = pf.previousPath ? {
+      key: pf.path,
+      path: pf.path,
+      previousPath: pf.previousPath,
+      kind,
+      oldBlobOid: raw.oldBlobOid,
+      newBlobOid: raw.newBlobOid,
+      oldMode: raw.oldMode,
+      newMode: raw.newMode,
+      contentId,
+      patchDigest,
+      stats,
+      hunks,
+      source
+    } : {
+      key: pf.path,
+      path: pf.path,
+      kind,
+      oldBlobOid: raw.oldBlobOid,
+      newBlobOid: raw.newBlobOid,
+      oldMode: raw.oldMode,
+      newMode: raw.newMode,
+      contentId,
+      patchDigest,
+      stats,
+      hunks,
+      source
+    };
+    files.push(file);
+  }
+  for (const [key, list] of rawByKey) {
+    if (!matchedRawKeys.has(key))
+      throw new Error(`missing patch for raw entries: ${key} (${list.length})`);
+  }
+  for (const [key] of numstatByKey) {
+    if (!matchedNumstatKeys.has(key))
+      throw new Error(`missing patch for numstat entries: ${key}`);
+  }
+  return files;
+}
+async function isAncestor(runner, ancestorOid, descendantOid) {
+  if (!ancestorOid || !descendantOid)
+    return false;
+  if (ancestorOid === descendantOid)
+    return true;
+  try {
+    const result = await runner.run(["merge-base", "--is-ancestor", ancestorOid, descendantOid], {
+      readOnly: true,
+      acceptedExitCodes: [0, 1]
+    });
+    return result.exitCode === 0;
+  } catch {
+    return false;
+  }
+}
+async function loadSinceLastReviewProjection(runner, aggregateDocument, lastHeadOid) {
+  if (!lastHeadOid || lastHeadOid.trim() === "") {
+    throw new Error("lastHeadOid must be non-empty");
+  }
+  const headOid = aggregateDocument.generation.headOid;
+  const ancestor = await isAncestor(runner, lastHeadOid, headOid);
+  if (!ancestor) {
+    return {
+      kind: "history-rewritten",
+      lastHeadOid,
+      headOid,
+      reason: "history rewritten: last submission head is not an ancestor of current HEAD"
+    };
+  }
+  const range = `${lastHeadOid}..${headOid}`;
+  const files = await buildFilesForRange(runner, [range]);
+  const projection = { kind: "since-last-review", fromHeadOid: lastHeadOid };
+  const doc = {
+    reviewId: aggregateDocument.identity.id,
+    generationId: aggregateDocument.generation.id,
+    projection,
+    files
+  };
+  return { kind: "ok", document: doc };
+}
+
 // src/review/git/load-source-context.ts
 var DEFAULT_MAX_BYTES = 1e6;
 function isZeroOid(oid) {
@@ -23691,6 +24418,7 @@ class ReviewWorkspaceController {
   stateStore;
   artifactStore;
   loadDocumentImpl;
+  loadSinceLastReviewImpl;
   loadSourceContextImpl;
   nowImpl;
   randomIdImpl;
@@ -23703,14 +24431,18 @@ class ReviewWorkspaceController {
   activeReviewId;
   activeGenerationId;
   baseRef;
+  _baseSelection;
+  baseSelectionRequestId = 0;
   sourceContextCache = new Map;
   pendingGapRequests = new Map;
   gapRequestCounter = 0;
+  aggregateDocument;
   constructor(options) {
     this.runner = options.runner;
     this.stateStore = options.stateStore;
     this.artifactStore = options.artifactStore;
     this.loadDocumentImpl = options.loadDocument ?? ((baseRef) => loadReviewDocument(options.runner, baseRef));
+    this.loadSinceLastReviewImpl = options.loadSinceLastReview ?? ((aggregate, fromHeadOid) => loadSinceLastReviewProjection(options.runner, aggregate, fromHeadOid));
     this.loadSourceContextImpl = options.loadSourceContextImpl;
     this.nowImpl = options.now ?? (() => new Date().toISOString());
     this.randomIdImpl = options.randomId ?? (() => {
@@ -23736,6 +24468,78 @@ class ReviewWorkspaceController {
   get base() {
     return this.baseRef;
   }
+  get baseSelection() {
+    return this._baseSelection;
+  }
+  async requestBaseSelection() {
+    if (this.destroyed || this._baseSelection?.selecting)
+      return;
+    const token = ++this.baseSelectionRequestId;
+    this.requestId++;
+    this._baseSelection = { candidates: [], loading: true, selecting: false };
+    this.publish();
+    try {
+      const remembered = this.baseRef === undefined ? await this.rememberedBase() : undefined;
+      const inferred = await inferReviewBase(this.runner, this.baseRef ?? remembered?.baseRef);
+      if (this.destroyed || token !== this.baseSelectionRequestId)
+        return;
+      this._baseSelection = { candidates: inferred.candidates, loading: false, selecting: false };
+    } catch (err) {
+      if (this.destroyed || token !== this.baseSelectionRequestId)
+        return;
+      this._baseSelection = {
+        candidates: [],
+        loading: false,
+        selecting: false,
+        error: err instanceof Error ? err.message : String(err)
+      };
+    }
+    this.publish();
+  }
+  cancelBaseSelection() {
+    if (this._baseSelection?.selecting)
+      return;
+    this.baseSelectionRequestId++;
+    this._baseSelection = undefined;
+    this.publish();
+  }
+  async chooseBase(ref) {
+    const picker = this._baseSelection;
+    if (this.destroyed || !picker || picker.loading || picker.selecting || !picker.candidates.some((candidate) => candidate.ref === ref))
+      return false;
+    const token = ++this.baseSelectionRequestId;
+    this.requestId++;
+    this._baseSelection = { candidates: picker.candidates, loading: false, selecting: true };
+    this.publish();
+    return this.reviewOperationQueue.run(async () => {
+      if (this.destroyed || token !== this.baseSelectionRequestId)
+        return false;
+      try {
+        if (this._state !== undefined)
+          await this.persistState();
+        await this.stateStore?.flush();
+        if (this.destroyed || token !== this.baseSelectionRequestId)
+          return false;
+        await this.open(ref);
+        if (this.destroyed || token !== this.baseSelectionRequestId)
+          return false;
+        this._baseSelection = undefined;
+        this.publish();
+        return true;
+      } catch (err) {
+        if (this.destroyed || token !== this.baseSelectionRequestId)
+          return false;
+        this._baseSelection = {
+          candidates: picker.candidates,
+          loading: false,
+          selecting: false,
+          error: err instanceof Error ? err.message : String(err)
+        };
+        this.publish();
+        return false;
+      }
+    });
+  }
   clearError() {
     if (this._error === undefined)
       return;
@@ -23744,7 +24548,7 @@ class ReviewWorkspaceController {
   }
   get refreshGeneration() {
     return async () => {
-      if (this.baseRef === undefined || this.destroyed)
+      if (this.baseRef === undefined || this.destroyed || this._baseSelection !== undefined)
         return;
       const token = ++this.requestId;
       const capturedGeneration = this.activeGenerationId;
@@ -23788,10 +24592,12 @@ class ReviewWorkspaceController {
       this.sourceContextCache.clear();
       this.pendingGapRequests.clear();
       const currentState = this._state;
-      const nextState = currentState === undefined ? createInitialReviewState(doc) : reconcileReviewState(currentState, doc);
+      const reconcileFrom = currentState !== undefined && currentState.projection.kind !== "aggregate" ? { ...currentState, projection: { kind: "aggregate" } } : currentState;
+      const nextState = reconcileFrom === undefined ? createInitialReviewState(doc) : reconcileReviewState(reconcileFrom, doc);
       if (!ownsRequest())
         return;
       this._state = nextState;
+      this.aggregateDocument = undefined;
       this.activeReviewId = doc.identity.id;
       this.activeGenerationId = doc.generation.id;
       this._error = undefined;
@@ -23812,10 +24618,21 @@ class ReviewWorkspaceController {
       throw new Error("controller destroyed");
     const token = ++this.requestId;
     let resolvedBase = baseRef;
-    let corruptError;
+    if (resolvedBase !== undefined && this._baseSelection !== undefined && !this._baseSelection.selecting) {
+      this.baseSelectionRequestId++;
+      this._baseSelection = undefined;
+      this.publish();
+    }
+    let corruptError = this._error?.kind === "corrupt-state" || this._error?.kind === "storage" ? this._error : undefined;
     if (resolvedBase === undefined) {
       try {
-        resolvedBase = await this.resolveBase();
+        const remembered = await this.rememberedBase();
+        if (remembered?.confirmed === true && await resolveRefOid(this.runner, remembered.baseRef) !== undefined) {
+          resolvedBase = remembered.baseRef;
+        } else {
+          await this.requestBaseSelection();
+          return;
+        }
         const warning = this.stateStore?.quarantineWarning;
         if (warning) {
           const pathMatch = warning.match(/moved to (\S+)/);
@@ -23831,6 +24648,8 @@ class ReviewWorkspaceController {
     }
     if (this.destroyed || token !== this.requestId)
       throw new Error("open cancelled");
+    if (resolvedBase === undefined)
+      throw new Error("base selection required");
     let doc;
     try {
       doc = await this.loadDocumentImpl(resolvedBase);
@@ -23855,7 +24674,20 @@ class ReviewWorkspaceController {
         const qPath = pathMatch?.[1] ?? warning;
         corruptError = createCorruptStateError(qPath, warning);
       }
-      const persisted = db.reviews[doc.identity.id];
+      let persisted = db.reviews[doc.identity.id];
+      if (persisted === undefined) {
+        const headKey = doc.identity.headRef ?? `detached:${doc.identity.detachedHeadOid}`;
+        const previousBase = db.baseByHead[headKey]?.baseRef;
+        if (previousBase && previousBase !== resolvedBase && !previousBase.startsWith("refs/")) {
+          const previousId = sha256Tuple2(["branch-review-v2", headKey, previousBase]);
+          const previous = db.reviews[previousId];
+          if (previous !== undefined) {
+            const canonical = await this.runner.run(["rev-parse", "--symbolic-full-name", "--verify", "--end-of-options", previousBase], { readOnly: true, acceptedExitCodes: [0, 1, 128] });
+            if (canonical.stdout.trim() === resolvedBase)
+              persisted = previous;
+          }
+        }
+      }
       if (persisted !== undefined) {
         const initial = createInitialReviewState(doc);
         const reconstructed = {
@@ -23900,7 +24732,7 @@ class ReviewWorkspaceController {
   }
   dispatch(action) {
     const current = this._state;
-    if (current === undefined)
+    if (current === undefined || this._baseSelection !== undefined)
       return;
     const next = reduceReviewState(current, action);
     if (next === current)
@@ -23918,7 +24750,7 @@ class ReviewWorkspaceController {
   }
   dispatchIntent(intent) {
     const current = this._state;
-    if (current === undefined)
+    if (current === undefined || this._baseSelection !== undefined)
       return false;
     try {
       const action = planReviewIntent(current, intent);
@@ -23928,6 +24760,50 @@ class ReviewWorkspaceController {
       return false;
     }
   }
+  async enterSinceLastReview() {
+    const current = this._state;
+    if (current === undefined || this._baseSelection !== undefined)
+      return { ok: false, reason: "unavailable" };
+    if (current.projection.kind !== "aggregate")
+      return { ok: false, reason: "already-projected" };
+    const fromHeadOid = current.lastSubmission?.headOid;
+    if (fromHeadOid === undefined || fromHeadOid.trim() === "")
+      return { ok: false, reason: "no-previous-review" };
+    const aggregate = current.document;
+    let result;
+    try {
+      result = await this.loadSinceLastReviewImpl(aggregate, fromHeadOid);
+    } catch (err) {
+      return { ok: false, reason: "load-failed", message: err instanceof Error ? err.message : String(err) };
+    }
+    if (result.kind === "history-rewritten")
+      return { ok: false, reason: "history-rewritten", message: result.reason };
+    const latest = this._state;
+    if (latest === undefined || latest.document !== aggregate || latest.projection.kind !== "aggregate") {
+      return { ok: false, reason: "stale" };
+    }
+    this.aggregateDocument = aggregate;
+    this.dispatch({
+      type: "projection/apply",
+      projection: result.document.projection,
+      document: createReviewDocument({
+        identity: aggregate.identity,
+        generation: aggregate.generation,
+        commits: aggregate.commits,
+        files: result.document.files
+      })
+    });
+    return { ok: true, fileCount: result.document.files.length };
+  }
+  exitProjection() {
+    const current = this._state;
+    const aggregate = this.aggregateDocument;
+    if (current === undefined || aggregate === undefined || current.projection.kind === "aggregate")
+      return false;
+    this.aggregateDocument = undefined;
+    this.dispatch({ type: "projection/apply", projection: { kind: "aggregate" }, document: aggregate });
+    return true;
+  }
   async flushDrafts() {
     if (!this.stateStore)
       return;
@@ -24176,6 +25052,8 @@ class ReviewWorkspaceController {
     this.destroyed = true;
     this.listeners.clear();
     this.requestId++;
+    this.baseSelectionRequestId++;
+    this._baseSelection = undefined;
     this.pendingGapRequests.clear();
     this.sourceContextCache.clear();
     if (this.activeReviewId && this.stateStore) {
@@ -24208,7 +25086,7 @@ class ReviewWorkspaceController {
         const submissionInProgress = db.reviews[reviewId]?.submissionInProgress ?? null;
         return {
           ...db,
-          baseByHead: { ...db.baseByHead, [headKey]: { baseRef: snapshot.document.identity.baseRef } },
+          baseByHead: { ...db.baseByHead, [headKey]: { baseRef: snapshot.document.identity.baseRef, confirmed: true } },
           reviews: { ...db.reviews, [reviewId]: { ...persisted, submissionInProgress } }
         };
       });
@@ -24221,37 +25099,26 @@ class ReviewWorkspaceController {
       throw err;
     }
   }
-  async resolveBase() {
+  async rememberedBase() {
     const headRef = await currentBranchRef(this.runner);
     const detachedOid = headRef === undefined ? await resolveRefOid(this.runner, "HEAD") : undefined;
     const headKey = headRef ?? (detachedOid ? `detached:${detachedOid}` : undefined);
-    if (headKey !== undefined && this.stateStore) {
-      try {
-        const db = await this.stateStore.load();
-        const warning = this.stateStore.quarantineWarning;
-        if (warning) {
-          const pathMatch = warning.match(/moved to (\S+)/);
-          const qPath = pathMatch?.[1] ?? warning;
-          this._error = createCorruptStateError(qPath, warning);
-          this.publish();
-        }
-        const remembered = db.baseByHead[headKey]?.baseRef;
-        if (remembered && await resolveRefOid(this.runner, remembered) !== undefined) {
-          return remembered;
-        }
-      } catch {}
-    }
+    if (headKey === undefined || this.stateStore === undefined)
+      return;
     try {
-      const inferred = await inferReviewBase(this.runner);
-      if (inferred.kind === "confident")
-        return inferred.ref;
-      const candidates2 = inferred.kind === "choose" ? inferred.candidates : await reviewBaseCandidates(this.runner);
-      if (candidates2.length > 0)
-        return candidates2[0];
+      const db = await this.stateStore.load();
+      const warning = this.stateStore.quarantineWarning;
+      if (warning) {
+        const qPath = warning.match(/moved to (\S+)/)?.[1] ?? warning;
+        this._error = createCorruptStateError(qPath, warning);
+        this.publish();
+      }
+      return db.baseByHead[headKey];
     } catch (err) {
-      throw classifyLoadError(err);
+      this._error = createStorageError(err instanceof Error ? err.message : String(err));
+      this.publish();
+      return;
     }
-    return "refs/heads/main";
   }
 }