pi-diff-review 0.1.13 → 0.1.15

package/README.md

@@ -2,9 +2,9 @@
 
 # pi-diff-review
 
-Embedded code reviews directly directly within [pi](https://pi.dev/).
+Embedded code reviews and AI summaries directly within [pi](https://pi.dev/).
 
-<img width="1986" height="1556" alt="pi-diff-review-screenshot(1)" src="https://github.com/user-attachments/assets/3fd00163-5d19-489b-94ed-3d4816c6cad3" />
+<img width="1986" height="1556" alt="pi-diff-review-screenshot" src="https://github.com/user-attachments/assets/5ddd7226-28d4-4617-8c5c-35b4b6af68dc" />
 
 ## Install
 
@@ -65,9 +65,10 @@ Review a branch or commit range by passing any `git diff` arguments after `/diff
 - `j/k` or arrow keys to move
 - `g/G` to jump to the top or bottom of the diff
 - `ctrl-u` / `ctrl-d` to move up/down by half a page
-- `t` toggles the comments/explanation sidebar
+- `t` toggles inline comments/explanations
 - `v` toggles the diff between unified and side-by-side split rendering
 - `?` toggles an AI-generated explanation for the current hunk
+- `/` searches diff lines; `n/N` moves between matches while a search is active
 - `J/K` to extend a highlighted selection into a comment range
 - `esc` clears the active selection, or exits review when no selection is active
 - `n/p` to jump hunks

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-diff-review",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "Local diff review TUI extension for pi",
   "license": "MIT",
   "type": "module",

package/src/prompt.ts

@@ -17,7 +17,7 @@ export function formatLocation(line: {
   return file;
 }
 
-function formatCommentLocation(comment: ReviewComment): string {
+export function formatCommentLocation(comment: ReviewComment): string {
   if (comment.global) return "Overall diff";
 
   const start = formatLocation({

package/src/review-component.ts

@@ -2,7 +2,13 @@ import {
   getLanguageFromPath,
   highlightCode,
 } from "@earendil-works/pi-coding-agent";
-import { Editor, matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
+import {
+  Editor,
+  matchesKey,
+  truncateToWidth,
+  visibleWidth,
+  wrapTextWithAnsi,
+} from "@earendil-works/pi-tui";
 import type { DiffExplainer } from "./explain.ts";
 import {
   GLOBAL_COMMENT_KEY,
@@ -15,12 +21,8 @@ import {
   ExplanationController,
   getCurrentHunkScope,
 } from "./explanation-controller.ts";
-import { formatLocation } from "./prompt.ts";
+import { formatCommentLocation, formatLocation } from "./prompt.ts";
 import { ReviewNavigationState } from "./review-navigation.ts";
-import {
-  renderCommentsPane as renderCommentsPaneContent,
-  renderExplanationPane as renderExplanationPaneContent,
-} from "./review-panes.ts";
 import { padToWidth, lineNumberCell } from "./render-utils.ts";
 import { buildSplitDiffRows } from "./split-diff.ts";
 import type {
@@ -30,28 +32,52 @@ import type {
   ReviewResult,
   ReviewTheme,
   ReviewTui,
-  RightPaneMode,
   SelectionBounds,
   SplitDiffCell,
   SplitDiffRow,
 } from "./types.ts";
 
+type InlineBoxPart = "top" | "body" | "bottom";
+type InlineBoxRowKind = "comment" | "editor" | "explanation";
+type InlineBoxRow = {
+  kind: InlineBoxRowKind;
+  text: string;
+  part: InlineBoxPart;
+};
+
+type AnnotatedDiffRow =
+  | { kind: "diff"; lineIndex: number }
+  | { kind: "split"; splitRowIndex: number }
+  | InlineBoxRow;
+
 export class ReviewComponent {
   private navigation: ReviewNavigationState;
   private editMode = false;
   private editingCommentKey?: string;
+  private searchMode = false;
+  private searchQuery = "";
+  private draftSearchQuery = "";
+  private searchMessage = "";
 
-  private showRightPane = true;
-  private rightPaneMode: RightPaneMode = "comments";
+  private inlineAnnotationsVisible = true;
+  private visibleExplanationKeys = new Set<string>();
   private explanationController: ExplanationController;
   private editor: Editor;
   private splitRows?: SplitDiffRow[];
-  private splitRowByLineIndex?: number[];
   private lineIndexById = new Map<string, number>();
   private commentLineKeys = new Map<number, string[]>();
   private commentsRevision = 0;
   private commentLineKeysRevision = -1;
   private highlightedLineCache = new Map<string, string>();
+  private annotatedRows?: AnnotatedDiffRow[];
+  private annotatedRowsWidth = 0;
+  private annotatedRowsRevision = -1;
+  private annotatedRowsEditMode = false;
+  private annotatedRowsEditingCommentKey?: string;
+  private annotatedRowsMode?: DiffRenderMode;
+  private annotatedRowsInlineAnnotationsVisible = true;
+  private annotatedRowsVisibleExplanationCount = 0;
+  private annotatedRowByLineIndex?: number[];
 
   constructor(
     private tui: ReviewTui,
@@ -120,6 +146,7 @@ export class ReviewComponent {
         this.markCommentsChanged();
       }
 
+      this.navigation.clearSelection();
       this.exitEditMode();
     };
   }
@@ -151,12 +178,20 @@ export class ReviewComponent {
         return;
       }
       this.editor.handleInput(data);
+      this.invalidateAnnotatedRows();
       this.tui.requestRender();
       return;
     }
 
+    if (this.searchMode) {
+      this.handleSearchInput(data);
+      return;
+    }
+
     if (matchesKey(data, "escape")) {
-      if (this.hasSelection()) {
+      if (this.searchQuery) {
+        this.clearSearch();
+      } else if (this.hasSelection()) {
         this.clearSelection();
       } else {
         this.done({ action: "cancel" });
@@ -168,7 +203,7 @@ export class ReviewComponent {
       return;
     }
     if (data === "t") {
-      this.toggleRightPane();
+      this.toggleInlineAnnotations();
       return;
     }
     if (data === "v") {
@@ -179,6 +214,10 @@ export class ReviewComponent {
       this.toggleExplanationPane();
       return;
     }
+    if (data === "/") {
+      this.startSearchMode();
+      return;
+    }
     if (matchesKey(data, "ctrl+d")) {
       this.move(this.getPageMoveAmount());
       return;
@@ -212,7 +251,15 @@ export class ReviewComponent {
       return;
     }
     if (data === "n") {
-      this.jumpHunk(1);
+      if (this.searchQuery) {
+        this.jumpSearch(1);
+      } else {
+        this.jumpHunk(1);
+      }
+      return;
+    }
+    if (data === "N" && this.searchQuery) {
+      this.jumpSearch(-1);
       return;
     }
     if (data === "p") {
@@ -250,23 +297,17 @@ export class ReviewComponent {
         this.theme.fg(
           "dim",
           this.editMode
-            ? `${this.lines.length} lines • ${this.comments.size} comments • editing comment • Enter save • Esc/Ctrl+C cancel`
+            ? `${this.title} • ${this.lines.length} lines • ${this.comments.size} comments • editing inline comment • Enter save • Esc/Ctrl+C cancel`
             : this.hasSelection()
-              ? `${this.lines.length} lines • ${this.comments.size} comments • J/K extend • Esc clear selection • c comment range • C overall comment • Enter submit`
-              : `${this.lines.length} lines • ${this.comments.size} comments • ${this.getPositionText(selectedLine)} • ${this.showRightPane ? "sidebar shown" : "sidebar hidden"} • j/k move • g/G top/bottom • ctrl-u/d page • t sidebar • v unified/split • ? explain • J/K extend • c comment • C overall • x delete • n/p hunk • Enter submit • q quit`,
+              ? `${this.title} • ${this.lines.length} lines • ${this.comments.size} comments • J/K extend • Esc clear selection • c comment range • C overall comment • Enter submit`
+              : `${this.title} • ${this.lines.length} lines • ${this.comments.size} comments • ${this.getPositionText(selectedLine)} • inline ${this.inlineAnnotationsVisible ? "shown" : "hidden"} • j/k move • g/G top/bottom • ctrl-u/d page • / search • t annotations • v unified/split • ? explain • J/K extend • c comment • C overall • x delete • ${this.searchQuery ? "n/N search" : "n/p hunk"} • Enter submit • q quit`,
         ),
         width,
       ),
     );
-    if (!this.showRightPane) {
-      this.ensureScroll(viewportHeight);
-      output.push(...this.renderFullWidthDiffRows(width, viewportHeight));
-    } else {
-      this.ensureScroll(viewportHeight);
-      output.push(
-        ...this.renderSideBySide(width, viewportHeight, selectedLine),
-      );
-    }
+
+    this.ensureScroll(viewportHeight, width);
+    output.push(...this.renderAnnotatedDiffRows(width, viewportHeight));
 
     output.push(
       truncateToWidth(
@@ -277,105 +318,415 @@ export class ReviewComponent {
     return output;
   }
 
-  private renderSideBySide(
-    width: number,
-    height: number,
-    selectedLine?: ReviewLine,
-  ): string[] {
-    const rightWidth = Math.max(28, Math.floor(width * 0.34));
-    const separatorWidth = 3;
-    const leftWidth = Math.max(30, width - rightWidth - separatorWidth);
-    const rightPane = this.renderRightPane(rightWidth, height, selectedLine);
+  private renderAnnotatedDiffRows(width: number, height: number): string[] {
+    const rows = this.getAnnotatedRows(width);
     const output: string[] = [];
-    const diffPane = this.renderDiffRows(leftWidth, height);
 
     for (let row = 0; row < height; row++) {
-      const left = diffPane[row] ?? " ".repeat(leftWidth);
-      const right = rightPane[row] ?? " ".repeat(rightWidth);
-      const combined = `${padToWidth(left, leftWidth)}${this.theme.fg("borderMuted", " │ ")}${padToWidth(right, rightWidth)}`;
-      output.push(truncateToWidth(combined, width));
+      const annotated = rows[this.scrollTop + row];
+      if (!annotated) {
+        output.push(" ".repeat(width));
+        continue;
+      }
+
+      if (annotated.kind === "diff") {
+        const index = annotated.lineIndex;
+        const line = this.lines[index]!;
+        output.push(
+          this.renderDiffLine(
+            line,
+            index,
+            width,
+            index === this.selected,
+            this.getSelectionBounds(),
+          ),
+        );
+        continue;
+      }
+
+      if (annotated.kind === "split") {
+        output.push(this.renderSplitDiffRowAt(annotated.splitRowIndex, width));
+        continue;
+      }
+
+      output.push(this.renderInlineAnnotationRow(annotated, width));
     }
 
     return output;
   }
 
-  private renderDiffRows(width: number, height: number): string[] {
-    return this.diffRenderMode === "split"
-      ? this.renderSplitDiffRows(width, height)
-      : this.renderUnifiedDiffRows(width, height);
+  private getAnnotatedRows(width: number): AnnotatedDiffRow[] {
+    if (
+      this.annotatedRows &&
+      this.annotatedRowsWidth === width &&
+      this.annotatedRowsRevision === this.commentsRevision &&
+      this.annotatedRowsEditMode === this.editMode &&
+      this.annotatedRowsEditingCommentKey === this.editingCommentKey &&
+      this.annotatedRowsMode === this.diffRenderMode &&
+      this.annotatedRowsInlineAnnotationsVisible ===
+        this.inlineAnnotationsVisible &&
+      this.annotatedRowsVisibleExplanationCount ===
+        this.visibleExplanationKeys.size &&
+      this.visibleExplanationKeys.size === 0
+    ) {
+      return this.annotatedRows;
+    }
+
+    const rows: AnnotatedDiffRow[] = [];
+    const rowByLineIndex: number[] = [];
+
+    this.pushGlobalAnnotationRows(rows, width);
+
+    if (this.diffRenderMode === "split") {
+      this.pushAnnotatedSplitRows(rows, rowByLineIndex, width);
+    } else {
+      this.pushAnnotatedUnifiedRows(rows, rowByLineIndex, width);
+    }
+
+    this.annotatedRows = rows;
+    this.annotatedRowsWidth = width;
+    this.annotatedRowsRevision = this.commentsRevision;
+    this.annotatedRowsEditMode = this.editMode;
+    this.annotatedRowsEditingCommentKey = this.editingCommentKey;
+    this.annotatedRowsMode = this.diffRenderMode;
+    this.annotatedRowsInlineAnnotationsVisible = this.inlineAnnotationsVisible;
+    this.annotatedRowsVisibleExplanationCount =
+      this.visibleExplanationKeys.size;
+    this.annotatedRowByLineIndex = rowByLineIndex;
+    return rows;
+  }
+
+  private pushAnnotatedUnifiedRows(
+    rows: AnnotatedDiffRow[],
+    rowByLineIndex: number[],
+    width: number,
+  ): void {
+    for (let index = 0; index < this.lines.length; index++) {
+      rowByLineIndex[index] = rows.length;
+      rows.push({ kind: "diff", lineIndex: index });
+
+      if (!this.inlineAnnotationsVisible) continue;
+
+      this.pushInlineCommentRows(rows, index, width);
+      this.pushInlineEditorRows(rows, index, width);
+      this.pushInlineExplanationRows(rows, index, width);
+    }
+  }
+
+  private pushAnnotatedSplitRows(
+    rows: AnnotatedDiffRow[],
+    rowByLineIndex: number[],
+    width: number,
+  ): void {
+    const splitRows = this.getSplitDiffRows();
+    for (
+      let splitRowIndex = 0;
+      splitRowIndex < splitRows.length;
+      splitRowIndex++
+    ) {
+      const splitRow = splitRows[splitRowIndex]!;
+      const lineIndexes = this.getLineIndexesForSplitRow(splitRow);
+      for (const lineIndex of lineIndexes) {
+        rowByLineIndex[lineIndex] = rows.length;
+      }
+
+      rows.push({ kind: "split", splitRowIndex });
+      if (!this.inlineAnnotationsVisible) continue;
+
+      for (const lineIndex of lineIndexes) {
+        this.pushInlineCommentRows(rows, lineIndex, width);
+        this.pushInlineEditorRows(rows, lineIndex, width);
+        this.pushInlineExplanationRows(rows, lineIndex, width);
+      }
+    }
   }
 
-  private renderFullWidthDiffRows(width: number, height: number): string[] {
-    return this.renderDiffRows(width, height).map((row) =>
-      padToWidth(truncateToWidth(row, width), width),
+  private getLineIndexesForSplitRow(row: SplitDiffRow): number[] {
+    if (row.kind === "full") return [row.cell.index];
+    const indexes: number[] = [];
+    if (row.left) indexes.push(row.left.index);
+    if (row.right && row.right.index !== row.left?.index) {
+      indexes.push(row.right.index);
+    }
+    return indexes;
+  }
+
+  private pushGlobalAnnotationRows(
+    rows: AnnotatedDiffRow[],
+    width: number,
+  ): void {
+    if (!this.inlineAnnotationsVisible) return;
+
+    const globalComment = this.comments.get(GLOBAL_COMMENT_KEY);
+    if (globalComment) {
+      this.pushAnnotationBlock(
+        rows,
+        "comment",
+        globalComment.text,
+        width,
+        "Overall diff comment",
+      );
+    }
+
+    if (this.editMode && this.editingCommentKey === GLOBAL_COMMENT_KEY) {
+      this.pushInlineEditorBlock(rows, "Draft overall diff note", width);
+    }
+  }
+
+  private pushInlineCommentRows(
+    rows: AnnotatedDiffRow[],
+    lineIndex: number,
+    width: number,
+  ): void {
+    for (const comment of this.getCommentsEndingAtLine(lineIndex)) {
+      if (this.editMode && comment.id === this.editingCommentKey) continue;
+      this.pushAnnotationBlock(
+        rows,
+        "comment",
+        comment.text,
+        width,
+        formatCommentLocation(comment),
+      );
+    }
+  }
+
+  private pushInlineEditorRows(
+    rows: AnnotatedDiffRow[],
+    lineIndex: number,
+    width: number,
+  ): void {
+    if (!this.editMode || this.editingCommentKey === GLOBAL_COMMENT_KEY) return;
+    const selection = this.getActiveCommentSelection();
+    if (!selection || selection.end !== lineIndex) return;
+    this.pushInlineEditorBlock(
+      rows,
+      `Draft note - ${this.formatSelectionLocation(selection)}`,
+      width,
     );
   }
 
-  private renderUnifiedDiffRows(width: number, height: number): string[] {
-    const output: string[] = [];
-    const selection = this.getSelectionBounds();
+  private pushInlineExplanationRows(
+    rows: AnnotatedDiffRow[],
+    lineIndex: number,
+    width: number,
+  ): void {
+    const scope = getCurrentHunkScope(this.lines, lineIndex);
+    if (!scope || !this.visibleExplanationKeys.has(scope.key)) return;
+
+    const end = this.getHunkEndIndex(lineIndex);
+    if (end !== lineIndex) return;
+
+    const explanation = this.explanationController.getState(scope);
+    if (!this.explanationController.isAvailable) {
+      this.pushExplanationBlock(rows, "Explanation unavailable.", width);
+    } else if (!explanation) {
+      this.pushExplanationBlock(rows, "No explanation generated yet.", width);
+    } else if (explanation.status === "loading") {
+      this.pushExplanationBlock(
+        rows,
+        `${this.explanationController.getLoadingFrame()} ${explanation.text || "Generating explanation..."}`,
+        width,
+      );
+    } else if (explanation.status === "error") {
+      this.pushExplanationBlock(
+        rows,
+        `Explanation failed: ${explanation.message}`,
+        width,
+      );
+    } else {
+      this.pushExplanationBlock(rows, explanation.text, width);
+    }
+  }
 
-    for (let row = 0; row < height; row++) {
-      const index = this.scrollTop + row;
-      const line = this.lines[index];
-      output.push(
-        line
-          ? this.renderDiffLine(
-              line,
-              index,
-              width,
-              index === this.selected,
-              selection,
-            )
-          : " ".repeat(width),
+  private pushAnnotationBlock(
+    rows: AnnotatedDiffRow[],
+    kind: "comment",
+    text: string,
+    width: number,
+    title?: string,
+  ): void {
+    this.pushCommentBlock(rows, text, width, title);
+  }
+
+  private pushCommentBlock(
+    rows: AnnotatedDiffRow[],
+    text: string,
+    width: number,
+    title?: string,
+  ): void {
+    rows.push({
+      kind: "comment",
+      text: title ? this.theme.fg("accent", ` ${title} `) : "",
+      part: "top",
+    });
+    const wrapped = wrapTextWithAnsi(
+      this.theme.fg("text", text),
+      this.getInlineContentWidth(width),
+    );
+    for (const line of wrapped.length > 0 ? wrapped : [""]) {
+      rows.push({ kind: "comment", text: line, part: "body" });
+    }
+    rows.push({ kind: "comment", text: "", part: "bottom" });
+  }
+
+  private pushExplanationBlock(
+    rows: AnnotatedDiffRow[],
+    text: string,
+    width: number,
+  ): void {
+    rows.push({
+      kind: "explanation",
+      text: this.theme.fg("accent", " ✨ Explanation "),
+      part: "top",
+    });
+    const wrapped = wrapTextWithAnsi(
+      this.theme.fg("muted", text),
+      this.getInlineContentWidth(width),
+    );
+    for (const line of wrapped.length > 0 ? wrapped : [""]) {
+      rows.push({ kind: "explanation", text: line, part: "body" });
+    }
+    rows.push({ kind: "explanation", text: "", part: "bottom" });
+  }
+
+  private pushInlineEditorBlock(
+    rows: AnnotatedDiffRow[],
+    title: string,
+    width: number,
+  ): void {
+    rows.push({
+      kind: "editor",
+      text: this.theme.fg("accent", ` ${title} `),
+      part: "top",
+    });
+    const editorLines = this.editor.render(this.getInlineContentWidth(width));
+    const bodyLines = editorLines.slice(1, -1);
+    for (const line of bodyLines.length > 0 ? bodyLines : [""]) {
+      rows.push({ kind: "editor", text: line, part: "body" });
+    }
+    rows.push({ kind: "editor", text: "", part: "bottom" });
+  }
+
+  private renderInlineAnnotationRow(
+    row: Exclude<AnnotatedDiffRow, { kind: "diff" } | { kind: "split" }>,
+    width: number,
+  ): string {
+    if (row.kind === "editor") {
+      return this.renderInlineBoxRow(
+        { text: row.text, part: row.part },
+        width,
+        "accent",
       );
     }
 
-    return output;
+    if (row.kind === "comment" || row.kind === "explanation") {
+      return this.renderInlineBoxRow(
+        { text: row.text, part: row.part },
+        width,
+        "borderMuted",
+      );
+    }
+
+    return " ".repeat(width);
   }
 
-  private renderSplitDiffRows(width: number, height: number): string[] {
-    const rows = this.getSplitDiffRows();
-    const output: string[] = [];
-    const separatorWidth = 3;
-    const leftWidth = Math.max(10, Math.floor((width - separatorWidth) / 2));
-    const rightWidth = Math.max(10, width - leftWidth - separatorWidth);
+  private renderInlineBoxRow(
+    row: { text: string; part: "top" | "body" | "bottom" },
+    width: number,
+    borderColor: "accent" | "borderMuted",
+  ): string {
+    const indent = "      ";
+    const contentWidth = this.getInlineContentWidth(width);
+    const body =
+      row.part === "top" || row.part === "bottom"
+        ? this.renderInlineBoxHorizontal(row.text, contentWidth, borderColor)
+        : padToWidth(truncateToWidth(row.text, contentWidth), contentWidth);
+    const left = row.part === "top" ? "╭" : row.part === "bottom" ? "╰" : "│";
+    const right = row.part === "top" ? "╮" : row.part === "bottom" ? "╯" : "│";
+    return padToWidth(
+      truncateToWidth(
+        `${indent}${this.theme.fg(borderColor, left)}${body}${this.theme.fg(borderColor, right)}`,
+        width,
+      ),
+      width,
+    );
+  }
 
-    for (let row = 0; row < height; row++) {
-      const splitRow = rows[this.scrollTop + row];
-      if (!splitRow) {
-        output.push(" ".repeat(width));
-        continue;
-      }
+  private renderInlineBoxHorizontal(
+    title: string,
+    width: number,
+    borderColor: "accent" | "borderMuted",
+  ): string {
+    if (!title) return this.theme.fg(borderColor, "─".repeat(width));
 
-      if (splitRow.kind === "full") {
-        output.push(
-          this.renderDiffLine(
-            splitRow.cell.line,
-            splitRow.cell.index,
-            width,
-            splitRow.cell.index === this.selected,
-            this.getSelectionBounds(),
-          ),
-        );
-        continue;
-      }
+    const visibleTitle = truncateToWidth(title, Math.max(0, width));
+    const remaining = Math.max(0, width - visibleWidth(visibleTitle));
+    return `${visibleTitle}${this.theme.fg(borderColor, "─".repeat(remaining))}`;
+  }
 
-      const left = splitRow.left
-        ? this.renderSplitDiffCell(splitRow.left, leftWidth, "left")
-        : " ".repeat(leftWidth);
-      const right = splitRow.right
-        ? this.renderSplitDiffCell(splitRow.right, rightWidth, "right")
-        : " ".repeat(rightWidth);
-      output.push(
-        truncateToWidth(
-          `${padToWidth(left, leftWidth)}${this.theme.fg("borderMuted", " │ ")}${padToWidth(right, rightWidth)}`,
-          width,
-        ),
+  private getInlineContentWidth(width: number): number {
+    return Math.max(10, width - 8);
+  }
+
+  private invalidateAnnotatedRows(): void {
+    this.annotatedRows = undefined;
+    this.annotatedRowByLineIndex = undefined;
+  }
+
+  private getCommentsEndingAtLine(lineIndex: number): ReviewComment[] {
+    const comments: ReviewComment[] = [];
+    for (const comment of this.comments.values()) {
+      if (comment.global) continue;
+      const start = this.lineIndexById.get(comment.startLineId);
+      const end = this.lineIndexById.get(comment.endLineId);
+      if (start == null || end == null) continue;
+      if (Math.max(start, end) === lineIndex) comments.push(comment);
+    }
+    return comments.sort((a, b) => a.id.localeCompare(b.id));
+  }
+
+  private getHunkEndIndex(selected: number): number | undefined {
+    const selectedLine = this.lines[selected];
+    if (!selectedLine?.filePath || !selectedLine.hunkLabel) return undefined;
+
+    let end = selected;
+    while (
+      end + 1 < this.lines.length &&
+      this.lines[end + 1]?.filePath === selectedLine.filePath &&
+      this.lines[end + 1]?.hunkLabel === selectedLine.hunkLabel
+    ) {
+      end++;
+    }
+    return end;
+  }
+
+  private renderSplitDiffRowAt(splitRowIndex: number, width: number): string {
+    const splitRow = this.getSplitDiffRows()[splitRowIndex];
+    if (!splitRow) return " ".repeat(width);
+
+    if (splitRow.kind === "full") {
+      return this.renderDiffLine(
+        splitRow.cell.line,
+        splitRow.cell.index,
+        width,
+        splitRow.cell.index === this.selected,
+        this.getSelectionBounds(),
       );
     }
 
-    return output;
+    const separatorWidth = 3;
+    const leftWidth = Math.max(10, Math.floor((width - separatorWidth) / 2));
+    const rightWidth = Math.max(10, width - leftWidth - separatorWidth);
+    const left = splitRow.left
+      ? this.renderSplitDiffCell(splitRow.left, leftWidth, "left")
+      : " ".repeat(leftWidth);
+    const right = splitRow.right
+      ? this.renderSplitDiffCell(splitRow.right, rightWidth, "right")
+      : " ".repeat(rightWidth);
+    return truncateToWidth(
+      `${padToWidth(left, leftWidth)}${this.theme.fg("borderMuted", " │ ")}${padToWidth(right, rightWidth)}`,
+      width,
+    );
   }
 
   private getContentHeight(): number {
@@ -387,6 +738,7 @@ export class ReviewComponent {
 
   invalidate(): void {
     this.highlightedLineCache.clear();
+    this.invalidateAnnotatedRows();
   }
 
   dispose(): void {
@@ -409,23 +761,28 @@ export class ReviewComponent {
     this.tui.requestRender(true);
   }
 
-  private toggleRightPane(): void {
-    this.showRightPane = !this.showRightPane;
+  private toggleInlineAnnotations(): void {
+    this.inlineAnnotationsVisible = !this.inlineAnnotationsVisible;
+    this.invalidateAnnotatedRows();
     this.tui.requestRender(true);
   }
 
-  private showCommentsPane(): void {
-    this.showRightPane = true;
-    this.rightPaneMode = "comments";
+  private hideInlineExplanation(): void {
+    this.visibleExplanationKeys.clear();
   }
 
   private toggleExplanationPane(): void {
-    this.showRightPane = true;
-    this.rightPaneMode =
-      this.rightPaneMode === "comments" ? "explanation" : "comments";
-    if (this.rightPaneMode === "explanation") {
+    const scope = this.getCurrentHunkScope();
+    if (!scope) return;
+
+    if (this.visibleExplanationKeys.has(scope.key)) {
+      this.visibleExplanationKeys.delete(scope.key);
+    } else {
+      this.visibleExplanationKeys.add(scope.key);
       this.ensureCurrentExplanation();
     }
+
+    this.invalidateAnnotatedRows();
     this.tui.requestRender(true);
   }
 
@@ -464,6 +821,16 @@ export class ReviewComponent {
     return getSelectionKey(this.lines, start, end);
   }
 
+  private formatSelectionLocation(selection: SelectionBounds): string {
+    const startLine = this.lines[selection.start];
+    const endLine = this.lines[selection.end];
+    if (!startLine || !endLine) return "diff";
+
+    const start = formatLocation(startLine);
+    const end = formatLocation(endLine);
+    return start === end ? start : `${start} -> ${end}`;
+  }
+
   private getCommentForSelection(
     selection: SelectionBounds | undefined,
   ): ReviewComment | undefined {
@@ -480,6 +847,7 @@ export class ReviewComponent {
 
   private markCommentsChanged(): void {
     this.commentsRevision++;
+    this.invalidateAnnotatedRows();
     this.onCommentsChanged?.(this.comments);
   }
 
@@ -501,6 +869,13 @@ export class ReviewComponent {
   }
 
   private getFooterText(selectedLine?: ReviewLine): string {
+    if (this.searchMode) {
+      return `Search: /${this.draftSearchQuery} • Enter jump • Esc cancel`;
+    }
+
+    const searchStatus = this.getSearchStatusText();
+    if (searchStatus) return searchStatus;
+
     const selection = this.getSelectionBounds();
     if (selection) {
       const count = selection.end - selection.start + 1;
@@ -511,6 +886,21 @@ export class ReviewComponent {
     return `Selected: ${selectedLine ? formatLocation(selectedLine) : "(no selection)"}`;
   }
 
+  private getSearchStatusText(): string {
+    if (this.searchMessage) return this.searchMessage;
+    if (!this.searchQuery) return "";
+
+    const matches = this.getSearchMatchIndexes(this.searchQuery);
+    if (matches.length === 0) return `No matches for /${this.searchQuery}`;
+
+    const current = matches.findIndex((index) => index === this.selected);
+    const position =
+      current >= 0
+        ? `${current + 1}/${matches.length}`
+        : `${matches.length} matches`;
+    return `Search /${this.searchQuery} • ${position} • n next • N previous • Esc clear search`;
+  }
+
   private jumpHunk(direction: 1 | -1): void {
     let index = this.selected + direction;
     while (index >= 0 && index < this.lines.length) {
@@ -536,10 +926,12 @@ export class ReviewComponent {
 
   private startGlobalEditMode(): void {
     const existing = this.comments.get(GLOBAL_COMMENT_KEY);
-    this.showCommentsPane();
+    this.inlineAnnotationsVisible = true;
+    this.hideInlineExplanation();
     this.editMode = true;
     this.editingCommentKey = GLOBAL_COMMENT_KEY;
     this.editor.setText(existing?.text ?? "");
+    this.invalidateAnnotatedRows();
     this.tui.requestRender(true);
   }
 
@@ -552,13 +944,15 @@ export class ReviewComponent {
     if (startLine.filePath !== endLine.filePath) return;
 
     const existing = this.getCommentForSelection(selection);
-    this.showCommentsPane();
+    this.inlineAnnotationsVisible = true;
+    this.hideInlineExplanation();
     this.editMode = true;
     this.editingCommentKey = this.getSelectionKey(
       selection.start,
       selection.end,
     );
     this.editor.setText(existing?.text ?? "");
+    this.invalidateAnnotatedRows();
     this.tui.requestRender(true);
   }
 
@@ -566,28 +960,112 @@ export class ReviewComponent {
     this.editMode = false;
     this.editingCommentKey = undefined;
     this.editor.setText("");
+    this.invalidateAnnotatedRows();
     this.tui.requestRender(true);
   }
 
+  private startSearchMode(): void {
+    this.searchMode = true;
+    this.draftSearchQuery = this.searchQuery;
+    this.searchMessage = "";
+    this.tui.requestRender();
+  }
+
+  private handleSearchInput(data: string): void {
+    if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) {
+      this.searchMode = false;
+      this.draftSearchQuery = "";
+      this.tui.requestRender();
+      return;
+    }
+
+    if (matchesKey(data, "enter")) {
+      const query = this.draftSearchQuery.trim();
+      this.searchMode = false;
+      this.draftSearchQuery = "";
+      this.searchQuery = query;
+      this.searchMessage = "";
+      if (query) {
+        this.jumpSearch(1);
+      } else {
+        this.tui.requestRender();
+      }
+      return;
+    }
+
+    if (matchesKey(data, "ctrl+u")) {
+      this.draftSearchQuery = "";
+      this.tui.requestRender();
+      return;
+    }
+
+    if (matchesKey(data, "backspace") || data === "\u007f" || data === "\b") {
+      this.draftSearchQuery = this.draftSearchQuery.slice(0, -1);
+      this.tui.requestRender();
+      return;
+    }
+
+    if (data.length === 1 && data >= " " && data !== "\u007f") {
+      this.draftSearchQuery += data;
+      this.tui.requestRender();
+    }
+  }
+
+  private clearSearch(): void {
+    this.searchMode = false;
+    this.searchQuery = "";
+    this.draftSearchQuery = "";
+    this.searchMessage = "";
+    this.tui.requestRender();
+  }
+
+  private jumpSearch(direction: 1 | -1): void {
+    const query = this.searchQuery.trim();
+    if (!query) return;
+
+    const matches = this.getSearchMatchIndexes(query);
+    if (matches.length === 0) {
+      this.searchMessage = `No matches for /${query}`;
+      this.tui.requestRender();
+      return;
+    }
+
+    this.searchMessage = "";
+    const current =
+      direction === 1
+        ? matches.find((index) => index > this.selected)
+        : [...matches].reverse().find((index) => index < this.selected);
+    this.selected =
+      current ?? (direction === 1 ? matches[0]! : matches[matches.length - 1]!);
+    this.tui.requestRender();
+  }
+
+  private getSearchMatchIndexes(query: string): number[] {
+    const needle = query.toLocaleLowerCase();
+    if (!needle) return [];
+
+    const matches: number[] = [];
+    this.lines.forEach((line, index) => {
+      if (line.text.toLocaleLowerCase().includes(needle)) matches.push(index);
+    });
+    return matches;
+  }
+
   private getSplitDiffRows(): SplitDiffRow[] {
     if (this.splitRows) return this.splitRows;
 
-    const { rows, rowByLineIndex } = buildSplitDiffRows(this.lines);
+    const { rows } = buildSplitDiffRows(this.lines);
     this.splitRows = rows;
-    this.splitRowByLineIndex = rowByLineIndex;
     return rows;
   }
 
-  private getSelectedDisplayRow(): number {
-    if (this.diffRenderMode === "unified") return this.selected;
-    this.getSplitDiffRows();
-    return this.splitRowByLineIndex?.[this.selected] ?? 0;
+  private getSelectedDisplayRow(width: number): number {
+    this.getAnnotatedRows(width);
+    return this.annotatedRowByLineIndex?.[this.selected] ?? 0;
   }
 
-  private getDisplayRowCount(): number {
-    return this.diffRenderMode === "unified"
-      ? this.lines.length
-      : this.getSplitDiffRows().length;
+  private getDisplayRowCount(width: number): number {
+    return this.getAnnotatedRows(width).length;
   }
 
   private renderSplitDiffCell(
@@ -597,7 +1075,7 @@ export class ReviewComponent {
   ): string {
     const { line, index } = cell;
     const hasComment = this.getCommentKeysForLine(index).length > 0;
-    const commentMark = hasComment ? this.theme.fg("warning", "●") : " ";
+    const commentMark = hasComment ? this.theme.fg("borderAccent", "│") : " ";
     const lineNumber =
       side === "left" ? line.oldLineNumber : line.newLineNumber;
     const prefix = `${commentMark} ${lineNumberCell(lineNumber)} `;
@@ -613,11 +1091,11 @@ export class ReviewComponent {
     return this.applyDiffBackground(line, styled, width);
   }
 
-  private ensureScroll(viewportHeight: number): void {
+  private ensureScroll(viewportHeight: number, width: number): void {
     this.navigation.ensureScroll(
       viewportHeight,
-      this.getSelectedDisplayRow(),
-      this.getDisplayRowCount(),
+      this.getSelectedDisplayRow(width),
+      this.getDisplayRowCount(width),
     );
   }
 
@@ -686,7 +1164,7 @@ export class ReviewComponent {
     selection?: SelectionBounds,
   ): string {
     const hasComment = this.getCommentKeysForLine(index).length > 0;
-    const commentMark = hasComment ? this.theme.fg("warning", "●") : " ";
+    const commentMark = hasComment ? this.theme.fg("borderAccent", "│") : " ";
     const numbers = `${lineNumberCell(line.oldLineNumber)} ${lineNumberCell(line.newLineNumber)}`;
     const prefix = `${commentMark} ${numbers} `;
     let styled = this.renderDiffRowContent(line, prefix);
@@ -700,54 +1178,6 @@ export class ReviewComponent {
     return this.applyDiffBackground(line, styled, width);
   }
 
-  private renderRightPane(
-    width: number,
-    height: number,
-    selectedLine?: ReviewLine,
-  ): string[] {
-    return this.rightPaneMode === "explanation"
-      ? this.renderExplanationPane(width, height, selectedLine)
-      : this.renderCommentsPane(width, height, selectedLine);
-  }
-
-  private renderCommentsPane(
-    width: number,
-    height: number,
-    selectedLine?: ReviewLine,
-  ): string[] {
-    const selection = this.getActiveCommentSelection();
-    return renderCommentsPaneContent({
-      width,
-      height,
-      selectedLine,
-      theme: this.theme,
-      lines: this.lines,
-      comments: this.comments,
-      editor: this.editor,
-      editMode: this.editMode,
-      editingCommentKey: this.editingCommentKey,
-      selection,
-      currentComment: this.getCommentForSelection(selection),
-      footerText: this.getFooterText(selectedLine),
-      hasSelection: this.hasSelection(),
-    });
-  }
-
-  private renderExplanationPane(
-    width: number,
-    height: number,
-    selectedLine?: ReviewLine,
-  ): string[] {
-    return renderExplanationPaneContent({
-      width,
-      height,
-      selectedLine,
-      theme: this.theme,
-      scope: this.getCurrentHunkScope(),
-      controller: this.explanationController,
-    });
-  }
-
   private ensureCurrentExplanation(): void {
     this.explanationController.ensure(this.getCurrentHunkScope());
   }

package/src/types.ts

@@ -59,5 +59,3 @@ export type ReviewTui = {
 };
 
 export type ReviewTheme = Theme;
-
-export type RightPaneMode = "comments" | "explanation";

package/src/review-panes.ts

@@ -1,286 +0,0 @@
-import { truncateToWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
-import type { Editor } from "@earendil-works/pi-tui";
-import type { ExplanationController } from "./explanation-controller.ts";
-import { GLOBAL_COMMENT_KEY } from "./comment-manager.ts";
-import { formatLocation } from "./prompt.ts";
-import type { ExplanationScope } from "./explain.ts";
-import type {
-  ReviewComment,
-  ReviewLine,
-  ReviewTheme,
-  SelectionBounds,
-} from "./types.ts";
-
-export type RenderCommentsPaneOptions = {
-  width: number;
-  height: number;
-  selectedLine?: ReviewLine;
-  theme: ReviewTheme;
-  lines: ReviewLine[];
-  comments: Map<string, ReviewComment>;
-  editor: Editor;
-  editMode: boolean;
-  editingCommentKey?: string;
-  selection: SelectionBounds | undefined;
-  currentComment: ReviewComment | undefined;
-  footerText: string;
-  hasSelection: boolean;
-};
-
-export function renderCommentsPane({
-  width,
-  height,
-  selectedLine,
-  theme,
-  lines: diffLines,
-  comments,
-  editor,
-  editMode,
-  editingCommentKey,
-  selection,
-  currentComment,
-  footerText,
-  hasSelection,
-}: RenderCommentsPaneOptions): string[] {
-  const lines: string[] = [];
-  const title = theme.fg("accent", theme.bold("Comments"));
-
-  lines.push(truncateToWidth(title, width));
-  lines.push(
-    truncateToWidth(
-      theme.fg(
-        "dim",
-        selection
-          ? footerText
-          : selectedLine
-            ? formatLocation(selectedLine)
-            : "No selection",
-      ),
-      width,
-    ),
-  );
-  lines.push("");
-
-  if (editMode && editingCommentKey === GLOBAL_COMMENT_KEY) {
-    lines[1] = truncateToWidth(theme.fg("dim", "Overall diff comment"), width);
-    lines.push(
-      ...wrapTextWithAnsi(
-        theme.fg(
-          "dim",
-          "Editing overall diff comment. Enter saves. Esc or Ctrl+C cancels.",
-        ),
-        width,
-      ),
-    );
-    lines.push("");
-    for (const line of editor.render(Math.max(10, width))) {
-      lines.push(truncateToWidth(line, width));
-    }
-    return lines.slice(0, height);
-  }
-
-  const globalComment = comments.get(GLOBAL_COMMENT_KEY);
-  if (globalComment) {
-    lines.push(
-      truncateToWidth(
-        theme.fg("accent", theme.bold("Overall diff comment")),
-        width,
-      ),
-    );
-    lines.push(
-      ...wrapTextWithAnsi(theme.fg("text", globalComment.text), width),
-    );
-    lines.push(...wrapTextWithAnsi(theme.fg("dim", "C edits"), width));
-    lines.push("");
-  }
-
-  if (!selectedLine) {
-    lines.push(
-      ...wrapTextWithAnsi(theme.fg("muted", "No diff lines available."), width),
-    );
-    return lines.slice(0, height);
-  }
-
-  if (!selection) {
-    lines.push(
-      ...wrapTextWithAnsi(
-        theme.fg(
-          "muted",
-          "Move to a diff line and press c to add a comment, or press C for an overall diff comment.",
-        ),
-        width,
-      ),
-    );
-    return lines.slice(0, height);
-  }
-
-  if (editMode && currentComment?.id === editingCommentKey) {
-    lines.push(
-      ...wrapTextWithAnsi(
-        theme.fg("dim", "Editing comment. Enter saves. Esc or Ctrl+C cancels."),
-        width,
-      ),
-    );
-    lines.push("");
-    for (const line of editor.render(Math.max(10, width))) {
-      lines.push(truncateToWidth(line, width));
-    }
-  } else if (editMode && editingCommentKey) {
-    lines.push(
-      ...wrapTextWithAnsi(
-        theme.fg("dim", "Editing comment. Enter saves. Esc or Ctrl+C cancels."),
-        width,
-      ),
-    );
-    lines.push("");
-    for (const line of editor.render(Math.max(10, width))) {
-      lines.push(truncateToWidth(line, width));
-    }
-  } else if (currentComment) {
-    lines.push(
-      ...wrapTextWithAnsi(theme.fg("text", currentComment.text), width),
-    );
-    lines.push("");
-    lines.push(
-      ...wrapTextWithAnsi(
-        theme.fg("dim", "x deletes this comment • c edits"),
-        width,
-      ),
-    );
-  } else {
-    lines.push(
-      ...wrapTextWithAnsi(
-        theme.fg(
-          "muted",
-          hasSelection
-            ? "No comment on this range."
-            : "No comment on this line.",
-        ),
-        width,
-      ),
-    );
-    lines.push("");
-    lines.push(
-      ...wrapTextWithAnsi(
-        theme.fg(
-          "dim",
-          hasSelection
-            ? "Press c to add a range comment, or C for an overall diff comment."
-            : "Press c to add one. Use J/K to extend a range. Press C for an overall diff comment.",
-        ),
-        width,
-      ),
-    );
-  }
-
-  lines.push("");
-  lines.push(truncateToWidth(theme.fg("accent", theme.bold("Excerpt")), width));
-  const excerpt = diffLines
-    .slice(selection.start, selection.end + 1)
-    .map((line) => line.text)
-    .join("\n");
-  lines.push(
-    ...wrapTextWithAnsi(
-      theme.fg("toolDiffContext", excerpt || "(blank line)"),
-      width,
-    ),
-  );
-  return lines.slice(0, height);
-}
-
-export type RenderExplanationPaneOptions = {
-  width: number;
-  height: number;
-  selectedLine?: ReviewLine;
-  theme: ReviewTheme;
-  scope: ExplanationScope | undefined;
-  controller: ExplanationController;
-};
-
-export function renderExplanationPane({
-  width,
-  height,
-  selectedLine,
-  theme,
-  scope,
-  controller,
-}: RenderExplanationPaneOptions): string[] {
-  const lines: string[] = [];
-  const title = theme.fg("accent", theme.bold("Explanation"));
-
-  lines.push(truncateToWidth(title, width));
-  lines.push(
-    truncateToWidth(
-      theme.fg(
-        "dim",
-        scope?.title ??
-          (selectedLine ? formatLocation(selectedLine) : "No selection"),
-      ),
-      width,
-    ),
-  );
-  lines.push("");
-
-  if (!controller.isAvailable) {
-    lines.push(
-      ...wrapTextWithAnsi(
-        theme.fg("warning", "Diff explanations are unavailable."),
-        width,
-      ),
-    );
-    return lines.slice(0, height);
-  }
-
-  if (!scope) {
-    lines.push(
-      ...wrapTextWithAnsi(
-        theme.fg(
-          "muted",
-          "Move to a changed hunk and press ? to generate an explanation.",
-        ),
-        width,
-      ),
-    );
-    return lines.slice(0, height);
-  }
-
-  const explanation = controller.getState(scope);
-  if (!explanation) {
-    lines.push(
-      ...wrapTextWithAnsi(
-        theme.fg(
-          "muted",
-          "No explanation generated yet. Press ? again after returning to comments to generate this hunk.",
-        ),
-        width,
-      ),
-    );
-  } else if (explanation.status === "loading") {
-    const spinner = controller.getLoadingFrame();
-    lines.push(
-      truncateToWidth(
-        theme.fg("accent", `${spinner} Generating explanation...`),
-        width,
-      ),
-    );
-    if (explanation.text.trim()) {
-      lines.push("");
-      lines.push(
-        ...wrapTextWithAnsi(theme.fg("text", explanation.text), width),
-      );
-    }
-  } else if (explanation.status === "error") {
-    lines.push(
-      ...wrapTextWithAnsi(
-        theme.fg("warning", `Unable to explain diff: ${explanation.message}`),
-        width,
-      ),
-    );
-  } else {
-    lines.push(...wrapTextWithAnsi(theme.fg("text", explanation.text), width));
-  }
-
-  lines.push("");
-  lines.push(...wrapTextWithAnsi(theme.fg("dim", "? comments"), width));
-  return lines.slice(0, height);
-}