pi-diff-review 0.1.4 → 0.1.6

package/README.md

@@ -4,7 +4,7 @@
 
 Easily provide code reviews directly within [pi](https://pi.dev/).
 
-<img width="1947" height="1103" alt="image" src="https://github.com/user-attachments/assets/3b1e1c51-4c77-4430-8915-1f7d481b64cb" />
+<img width="1095" height="853" alt="pi-diff-review-screenshot" src="https://github.com/user-attachments/assets/f1a39117-f2a6-4ee7-bf72-a299990ab1dd" />
 
 ## Install
 
@@ -27,6 +27,7 @@ pi install https://github.com/cmpadden/pi-diff-review
 - `/diff` reviews the current unstaged `git diff`
 - `/diff <git-diff-args>` passes arguments through to `git diff` (for example `/diff main...HEAD`)
 - `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 diff between unified and side-by-side split rendering
 - `J/K` to extend a highlighted selection into a comment range

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-diff-review",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Local diff review TUI extension for pi",
   "license": "MIT",
   "repository": {

package/src/diff-source.ts

@@ -11,7 +11,7 @@ export function parseDiffSource(args: string): DiffSource {
     };
   }
 
-  const gitArgs = trimmed.split(/\s+/).filter(Boolean);
+  const gitArgs = tokenizeDiffArgs(trimmed);
   return {
     label: `git diff ${trimmed}`,
     promptLabel: `\`git diff ${trimmed}\``,
@@ -19,6 +19,51 @@ export function parseDiffSource(args: string): DiffSource {
   };
 }
 
+function tokenizeDiffArgs(input: string): string[] {
+  const args: string[] = [];
+  let current = "";
+  let quote: '"' | "'" | undefined;
+  let escaping = false;
+
+  for (const char of input) {
+    if (escaping) {
+      current += char;
+      escaping = false;
+      continue;
+    }
+
+    if (char === "\\" && quote !== "'") {
+      escaping = true;
+      continue;
+    }
+
+    if ((char === '"' || char === "'") && !quote) {
+      quote = char;
+      continue;
+    }
+
+    if (char === quote) {
+      quote = undefined;
+      continue;
+    }
+
+    if (/\s/.test(char) && !quote) {
+      if (current) {
+        args.push(current);
+        current = "";
+      }
+      continue;
+    }
+
+    current += char;
+  }
+
+  if (escaping) current += "\\";
+  if (quote) throw new Error(`Unterminated ${quote} quote in git diff args`);
+  if (current) args.push(current);
+  return args;
+}
+
 export function getDiff(cwd: string, source: DiffSource): string {
   return execFileSync(
     "git",

package/src/index.ts

@@ -6,19 +6,20 @@ import { getDiff, parseDiffSource } from "./diff-source.ts";
 import { parseDiff } from "./diff-parser.ts";
 import { buildReviewPrompt } from "./prompt.ts";
 import { ReviewComponent } from "./review-component.ts";
-import type { ReviewComment, ReviewResult } from "./types.ts";
+import type { DiffSource, ReviewComment, ReviewResult } from "./types.ts";
 
 export function registerDiffReviewCommand(pi: ExtensionAPI): void {
   pi.registerCommand("diff", {
     description: "Review a git diff in a custom TUI (/diff [git diff args])",
     handler: async (args: string, ctx: ExtensionCommandContext) => {
-      const source = parseDiffSource(args);
+      let source: DiffSource;
       let diffText: string;
       try {
+        source = parseDiffSource(args);
         diffText = getDiff(ctx.cwd, source);
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        ctx.ui.notify(`Unable to read ${source.label}: ${message}`, "error");
+        ctx.ui.notify(`Unable to read diff: ${message}`, "error");
         return;
       }
 

package/src/review-component.ts

@@ -38,6 +38,12 @@ export class ReviewComponent {
   private layout: ReviewLayout = "side-by-side";
   private diffRenderMode: DiffRenderMode = "unified";
   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;
 
   constructor(
     private tui: ReviewTui,
@@ -49,6 +55,7 @@ export class ReviewComponent {
   ) {
     const firstCommentable = this.lines.findIndex((line) => line.commentable);
     this.selected = firstCommentable >= 0 ? firstCommentable : 0;
+    this.lines.forEach((line, index) => this.lineIndexById.set(line.id, index));
 
     this.editor = new Editor(tui as never, {
       borderColor: (s) => theme.fg("accent", s),
@@ -71,12 +78,13 @@ export class ReviewComponent {
       const trimmed = value.trim();
       const key = this.getSelectionKey(selection.start, selection.end);
       if (!trimmed) {
-        this.comments.delete(key);
+        if (this.comments.delete(key)) this.markCommentsChanged();
       } else {
         this.comments.set(
           key,
           this.buildCommentFromSelection(selection, trimmed),
         );
+        this.markCommentsChanged();
       }
 
       this.exitEditMode();
@@ -126,6 +134,14 @@ export class ReviewComponent {
       this.move(-1);
       return;
     }
+    if (data === "g") {
+      this.jumpToBoundary("start");
+      return;
+    }
+    if (data === "G") {
+      this.jumpToBoundary("end");
+      return;
+    }
     if (data === "J") {
       this.extendSelection(1);
       return;
@@ -172,7 +188,7 @@ export class ReviewComponent {
             ? `${this.lines.length} lines • ${this.comments.size} comments • editing 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 • Enter submit`
-              : `${this.lines.length} lines • ${this.comments.size} comments • j/k move • ctrl-u/d page • t unified/split • J/K extend • c comment • x delete • n/p hunk • Enter submit • q quit`,
+              : `${this.lines.length} lines • ${this.comments.size} comments • ${this.getPositionText(selectedLine)} • j/k move • g/G top/bottom • ctrl-u/d page • t unified/split • J/K extend • c comment • x delete • n/p hunk • Enter submit • q quit`,
         ),
         width,
       ),
@@ -268,7 +284,7 @@ export class ReviewComponent {
   }
 
   private renderSplitDiffRows(width: number, height: number): string[] {
-    const rows = this.buildSplitDiffRows();
+    const rows = this.getSplitDiffRows();
     const output: string[] = [];
     const separatorWidth = 3;
     const leftWidth = Math.max(10, Math.floor((width - separatorWidth) / 2));
@@ -337,13 +353,27 @@ export class ReviewComponent {
   invalidate(): void {}
 
   private move(delta: number): void {
-    this.selected = Math.max(
+    const next = Math.max(
       0,
       Math.min(this.lines.length - 1, this.selected + delta),
     );
+    if (next === this.selected) return;
+    this.selected = next;
     this.tui.requestRender();
   }
 
+  private jumpToBoundary(boundary: "start" | "end"): void {
+    const next = boundary === "start" ? 0 : Math.max(0, this.lines.length - 1);
+    const hadSelection = this.selectionAnchor != null;
+    if (next === this.selected && !hadSelection) return;
+    this.selected = next;
+    if (hadSelection) {
+      this.clearSelection();
+    } else {
+      this.tui.requestRender();
+    }
+  }
+
   private toggleLayout(): void {
     this.layout = this.layout === "side-by-side" ? "stacked" : "side-by-side";
     this.tui.requestRender(true);
@@ -369,14 +399,17 @@ export class ReviewComponent {
     if (this.selectionAnchor == null) {
       this.selectionAnchor = this.selected;
     }
-    this.selected = Math.max(
+    const next = Math.max(
       0,
       Math.min(this.lines.length - 1, this.selected + delta),
     );
+    if (next === this.selected) return;
+    this.selected = next;
     this.tui.requestRender();
   }
 
   private clearSelection(): void {
+    if (this.selectionAnchor == null) return;
     this.selectionAnchor = undefined;
     this.tui.requestRender();
   }
@@ -417,19 +450,35 @@ export class ReviewComponent {
   }
 
   private getCommentKeysForLine(index: number): string[] {
-    const line = this.lines[index];
-    if (!line) return [];
-    return [...this.comments.entries()]
-      .filter(([, comment]) => {
-        const start = this.lines.findIndex(
-          (item) => item.id === comment.startLineId,
-        );
-        const end = this.lines.findIndex(
-          (item) => item.id === comment.endLineId,
-        );
-        return start !== -1 && end !== -1 && index >= start && index <= end;
-      })
-      .map(([key]) => key);
+    this.ensureCommentLineKeys();
+    return this.commentLineKeys.get(index) ?? [];
+  }
+
+  private markCommentsChanged(): void {
+    this.commentsRevision++;
+  }
+
+  private ensureCommentLineKeys(): void {
+    if (this.commentLineKeysRevision === this.commentsRevision) return;
+
+    this.commentLineKeys = new Map<number, string[]>();
+    for (const [key, comment] of this.comments) {
+      const start = this.lineIndexById.get(comment.startLineId);
+      const end = this.lineIndexById.get(comment.endLineId);
+      if (start == null || end == null) continue;
+      const from = Math.min(start, end);
+      const to = Math.max(start, end);
+      for (let index = from; index <= to; index++) {
+        const keys = this.commentLineKeys.get(index);
+        if (keys) {
+          keys.push(key);
+        } else {
+          this.commentLineKeys.set(index, [key]);
+        }
+      }
+    }
+
+    this.commentLineKeysRevision = this.commentsRevision;
   }
 
   private buildCommentFromSelection(
@@ -456,6 +505,13 @@ export class ReviewComponent {
     };
   }
 
+  private getPositionText(selectedLine?: ReviewLine): string {
+    const position = `${Math.min(this.selected + 1, this.lines.length)}/${this.lines.length}`;
+    return selectedLine?.filePath
+      ? `${position} ${selectedLine.filePath}`
+      : position;
+  }
+
   private getFooterText(selectedLine?: ReviewLine): string {
     const selection = this.getSelectionBounds();
     if (selection) {
@@ -482,7 +538,11 @@ export class ReviewComponent {
   private deleteComment(): void {
     const selection = this.getActiveCommentSelection();
     if (!selection) return;
-    this.comments.delete(this.getSelectionKey(selection.start, selection.end));
+    if (
+      this.comments.delete(this.getSelectionKey(selection.start, selection.end))
+    ) {
+      this.markCommentsChanged();
+    }
     this.tui.requestRender();
   }
 
@@ -511,10 +571,24 @@ export class ReviewComponent {
     this.tui.requestRender(true);
   }
 
-  private buildSplitDiffRows(): SplitDiffRow[] {
+  private getSplitDiffRows(): SplitDiffRow[] {
+    if (this.splitRows) return this.splitRows;
+
     const rows: SplitDiffRow[] = [];
+    const rowByLineIndex: number[] = [];
     let index = 0;
 
+    const pushRow = (row: SplitDiffRow) => {
+      const displayRow = rows.length;
+      rows.push(row);
+      if (row.kind === "full") {
+        rowByLineIndex[row.cell.index] = displayRow;
+      } else {
+        if (row.left) rowByLineIndex[row.left.index] = displayRow;
+        if (row.right) rowByLineIndex[row.right.index] = displayRow;
+      }
+    };
+
     while (index < this.lines.length) {
       const line = this.lines[index]!;
 
@@ -533,7 +607,7 @@ export class ReviewComponent {
 
         const count = Math.max(removals.length, additions.length);
         for (let offset = 0; offset < count; offset++) {
-          rows.push({
+          pushRow({
             kind: "split",
             left: removals[offset],
             right: additions[offset],
@@ -544,32 +618,28 @@ export class ReviewComponent {
 
       if (line.kind === "context") {
         const cell = { line, index };
-        rows.push({ kind: "split", left: cell, right: cell });
+        pushRow({ kind: "split", left: cell, right: cell });
       } else {
-        rows.push({ kind: "full", cell: { line, index } });
+        pushRow({ kind: "full", cell: { line, index } });
       }
       index++;
     }
 
+    this.splitRows = rows;
+    this.splitRowByLineIndex = rowByLineIndex;
     return rows;
   }
 
   private getSelectedDisplayRow(): number {
     if (this.diffRenderMode === "unified") return this.selected;
-    const rows = this.buildSplitDiffRows();
-    const row = rows.findIndex((item) =>
-      item.kind === "full"
-        ? item.cell.index === this.selected
-        : item.left?.index === this.selected ||
-          item.right?.index === this.selected,
-    );
-    return row === -1 ? 0 : row;
+    this.getSplitDiffRows();
+    return this.splitRowByLineIndex?.[this.selected] ?? 0;
   }
 
   private getDisplayRowCount(): number {
     return this.diffRenderMode === "unified"
       ? this.lines.length
-      : this.buildSplitDiffRows().length;
+      : this.getSplitDiffRows().length;
   }
 
   private renderSplitDiffCell(