diff --git a/.changeset/clean-rows-plan.md b/.changeset/clean-rows-plan.md
new file mode 100644
index 000000000..a845151cc
--- /dev/null
+++ b/.changeset/clean-rows-plan.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/hunk/src/ui/components/ui-components.test.tsx b/packages/hunk/src/ui/components/ui-components.test.tsx
index cce6bce78..8730bba37 100644
--- a/packages/hunk/src/ui/components/ui-components.test.tsx
+++ b/packages/hunk/src/ui/components/ui-components.test.tsx
@@ -41,6 +41,7 @@ const { DiffSectionBody } = await import("../diff/DiffSectionBody");
 const { measurePlannedRenderedRowHeight, measureRenderedRowHeight } =
   await import("../diff/codeRowLayout");
 const { DiffRowView } = await import("../diff/DiffRowView");
+const { RawDiffRowView } = await import("../diff/RawDiffRowView");
 
 function createTestDiffFile(
   id: string,
@@ -658,7 +659,7 @@ describe("UI components", () => {
     const theme = resolveTheme("github-dark-default", null);
     const startUserNote = mock(() => undefined);
     const setup = await testRender(
-      <DiffRowView
+      <RawDiffRowView
         row={{
           type: "stack-line",
           key: "alpha:line:1",
@@ -828,7 +829,7 @@ describe("UI components", () => {
     };
     const renderRow = (showAddNoteBadge: boolean) =>
       captureFrame(
-        <DiffRowView
+        <RawDiffRowView
           row={row}
           width={24}
           lineNumberDigits={1}
@@ -860,7 +861,7 @@ describe("UI components", () => {
   test("DiffRowView fills the reserved wrapped add-note column with row background", async () => {
     const theme = resolveTheme("github-dark-default", null);
     const setup = await testRender(
-      <DiffRowView
+      <RawDiffRowView
         row={{
           type: "stack-line",
           key: "alpha:line:hover-wrap-bg",
@@ -910,7 +911,7 @@ describe("UI components", () => {
   test("DiffRowView keeps metadata row background within the measured row width", async () => {
     const theme = resolveTheme("github-dark-default", null);
     const setup = await testRender(
-      <DiffRowView
+      <RawDiffRowView
         row={{
           type: "hunk-header",
           key: "alpha:hunk:0",
@@ -965,7 +966,7 @@ describe("UI components", () => {
 
     for (const wrapLines of [false, true]) {
       const setup = await testRender(
-        <DiffRowView
+        <RawDiffRowView
           row={row}
           width={40}
           lineNumberDigits={1}
@@ -1009,7 +1010,7 @@ describe("UI components", () => {
     };
     const measuredHeight = measureRenderedRowHeight(row, 4, 1, false, true, true, theme);
     const setup = await testRender(
-      <DiffRowView
+      <RawDiffRowView
         row={row}
         width={4}
         lineNumberDigits={1}
@@ -1203,7 +1204,7 @@ describe("UI components", () => {
       };
       const measuredHeight = measureRenderedRowHeight(row, 4, 1, false, true, true, theme);
       const setup = await testRender(
-        <DiffRowView
+        <RawDiffRowView
           row={row}
           width={4}
           lineNumberDigits={1}
diff --git a/packages/hunk/src/ui/diff/CodeCellView.test.tsx b/packages/hunk/src/ui/diff/CodeCellView.test.tsx
index 6a6ca8ff4..d5d30497c 100644
--- a/packages/hunk/src/ui/diff/CodeCellView.test.tsx
+++ b/packages/hunk/src/ui/diff/CodeCellView.test.tsx
@@ -12,7 +12,7 @@ import {
 import { legacyPlannedDiffRow, planCodeRowLayout } from "./codeRowLayout";
 import type { DiffRow } from "./diffRows";
 import { lineHighlightPaintKey, type LineHighlightPaintIndex } from "./lineHighlightPaint";
-import { DiffRowView } from "./DiffRowView";
+import { RawDiffRowView } from "./RawDiffRowView";
 import { resolveTheme, withTransparentSurfaces } from "../themes";
 
 /** Capture one code-row component and always release its OpenTUI renderer. */
@@ -66,10 +66,10 @@ const stackRow: Extract<DiffRow, { type: "stack-line" }> = {
 };
 
 /** Render common DiffRowView props while varying paint-sensitive inputs. */
-function codeRowView(row: DiffRow, options: Partial<Parameters<typeof DiffRowView>[0]> = {}) {
+function codeRowView(row: DiffRow, options: Partial<Parameters<typeof RawDiffRowView>[0]> = {}) {
   const theme = options.theme ?? resolveTheme("github-dark-default", null);
   return (
-    <DiffRowView
+    <RawDiffRowView
       row={row}
       width={12}
       lineNumberDigits={1}
diff --git a/packages/hunk/src/ui/diff/DiffRowView.tsx b/packages/hunk/src/ui/diff/DiffRowView.tsx
index 1da6c8f9b..4f1ca7934 100644
--- a/packages/hunk/src/ui/diff/DiffRowView.tsx
+++ b/packages/hunk/src/ui/diff/DiffRowView.tsx
@@ -1,21 +1,18 @@
-/** Adapts and dispatches diff rows to their focused mounted row views. */
+/** Dispatches planned diff rows to their focused mounted row views. */
 import { memo } from "react";
 import type { UserNoteLineTarget } from "../../core/liveComments";
 import type { CopySelectedRowRange } from "../lib/diffSpatial";
 import type { AppTheme } from "../themes";
 import { CodeRowView, type PlannedCodeReviewRow } from "./CodeRowView";
-import { legacyPlannedDiffRow, type PlannedDiffReviewRow } from "./codeRowLayout";
+import type { PlannedDiffReviewRow } from "./codeRowLayout";
 import type { CursorHighlight } from "./cursorHighlight";
 import { DiffMetaRowView, type PlannedDiffMetaReviewRow } from "./DiffMetaRowView";
-import type { DiffRow } from "./diffRows";
 import type { LineHighlightPaintIndex } from "./lineHighlightPaint";
 
 /** Inputs accepted by the memoized diff-row facade. */
 export interface DiffRowViewProps {
-  /** Complete review-stream row; preferred when the caller owns the shared render plan. */
-  plannedRow?: PlannedDiffReviewRow;
-  /** Raw row fallback for renderer-only surfaces outside the shared review stream. */
-  row?: DiffRow;
+  /** Complete row from the shared review render plan. */
+  plannedRow: PlannedDiffReviewRow;
   width: number;
   lineNumberDigits: number;
   showLineNumbers: boolean;
@@ -29,8 +26,6 @@ export interface DiffRowViewProps {
   cursorHighlight?: CursorHighlight;
   /** Extension marks for this row's file, resolved to terminal columns. */
   lineHighlights?: LineHighlightPaintIndex;
-  anchorId?: string;
-  noteGuideSide?: "old" | "new";
   showAddNoteBadge?: boolean;
   onHoverRow?: (rowKey: string) => void;
   onStartUserNoteAtHunk?: (hunkIndex: number, target?: UserNoteLineTarget) => void;
@@ -46,7 +41,6 @@ export interface DiffRowViewProps {
  */
 export const DiffRowView = memo(function DiffRowViewComponent({
   plannedRow,
-  row,
   width,
   lineNumberDigits,
   showLineNumbers,
@@ -59,26 +53,15 @@ export const DiffRowView = memo(function DiffRowViewComponent({
   copySelectedSide,
   cursorHighlight,
   lineHighlights,
-  anchorId,
-  noteGuideSide,
   showAddNoteBadge,
   onHoverRow,
   onStartUserNoteAtHunk,
   onToggleGap,
 }: DiffRowViewProps) {
-  const resolvedPlannedRow =
-    plannedRow ?? (row ? legacyPlannedDiffRow(row, anchorId, noteGuideSide) : undefined);
-  if (!resolvedPlannedRow) {
-    return null;
-  }
-
-  if (
-    resolvedPlannedRow.row.type === "collapsed" ||
-    resolvedPlannedRow.row.type === "hunk-header"
-  ) {
+  if (plannedRow.row.type === "collapsed" || plannedRow.row.type === "hunk-header") {
     return (
       <DiffMetaRowView
-        plannedRow={resolvedPlannedRow as PlannedDiffMetaReviewRow}
+        plannedRow={plannedRow as PlannedDiffMetaReviewRow}
         width={width}
         theme={theme}
         selected={selected || copySelectedRowRange !== undefined}
@@ -91,13 +74,10 @@ export const DiffRowView = memo(function DiffRowViewComponent({
     );
   }
 
-  if (
-    resolvedPlannedRow.row.type === "split-line" ||
-    resolvedPlannedRow.row.type === "stack-line"
-  ) {
+  if (plannedRow.row.type === "split-line" || plannedRow.row.type === "stack-line") {
     return (
       <CodeRowView
-        plannedRow={resolvedPlannedRow as PlannedCodeReviewRow}
+        plannedRow={plannedRow as PlannedCodeReviewRow}
         width={width}
         lineNumberDigits={lineNumberDigits}
         showLineNumbers={showLineNumbers}
diff --git a/packages/hunk/src/ui/diff/RawDiffRowView.tsx b/packages/hunk/src/ui/diff/RawDiffRowView.tsx
new file mode 100644
index 000000000..1c58829c3
--- /dev/null
+++ b/packages/hunk/src/ui/diff/RawDiffRowView.tsx
@@ -0,0 +1,24 @@
+/** Adapts renderer-only diff rows to the canonical planned-row view. */
+import { memo } from "react";
+import type { DiffRow } from "./diffRows";
+import { DiffRowView, type DiffRowViewProps } from "./DiffRowView";
+import { legacyPlannedDiffRow } from "./codeRowLayout";
+
+/** Inputs for a raw row rendered outside the shared review plan. */
+export interface RawDiffRowViewProps extends Omit<DiffRowViewProps, "plannedRow"> {
+  row: DiffRow;
+  anchorId?: string;
+  noteGuideSide?: "old" | "new";
+}
+
+/** Wrap a raw diff row in the planned envelope required by the mounted row view. */
+export const RawDiffRowView = memo(function RawDiffRowViewComponent({
+  row,
+  anchorId,
+  noteGuideSide,
+  ...viewProps
+}: RawDiffRowViewProps) {
+  return (
+    <DiffRowView {...viewProps} plannedRow={legacyPlannedDiffRow(row, anchorId, noteGuideSide)} />
+  );
+});
diff --git a/packages/hunk/src/ui/lib/extensionCurrentLine.tsx b/packages/hunk/src/ui/lib/extensionCurrentLine.tsx
index b9e62cf8f..bf73db650 100644
--- a/packages/hunk/src/ui/lib/extensionCurrentLine.tsx
+++ b/packages/hunk/src/ui/lib/extensionCurrentLine.tsx
@@ -1,6 +1,6 @@
 import type { ExtensionCurrentLinePaint } from "../../extension-api/types";
 import type { DiffRow, SplitLineCell, StackLineCell } from "../diff/diffRows";
-import { DiffRowView } from "../diff/DiffRowView";
+import { RawDiffRowView } from "../diff/RawDiffRowView";
 import type { DiffSectionRowPlan } from "../diff/diffSectionRowPlan";
 import type { LineCursor } from "./lineCursors";
 import type { AppTheme } from "../themes";
@@ -104,7 +104,7 @@ export function createExtensionCurrentLinePaint({
     line: cursor.target.line,
     render(side: "old" | "new", width: number) {
       return (
-        <DiffRowView
+        <RawDiffRowView
           key={rows[side].key}
           row={rows[side]}
           width={width}