pi-diff-review 0.1.19 → 0.1.21

package/src/review/cache.ts

@@ -0,0 +1,171 @@
+import type {
+  ExtensionAPI,
+  ExtensionCommandContext,
+} from "@earendil-works/pi-coding-agent";
+import type { PersistedAsk, ReviewComment } from "./types.ts";
+
+const REVIEW_COMMENT_CACHE_ENTRY = "pi-diff-review-cache";
+const REVIEW_EXPLANATION_CACHE_ENTRY = "pi-diff-review-explanation-cache";
+const REVIEW_ASK_CACHE_ENTRY = "pi-diff-review-ask-cache";
+
+type ReviewCommentCacheEntry = {
+  cacheKey: string;
+  comments: ReviewComment[];
+  updatedAt: number;
+};
+
+type ReviewExplanationCacheEntry = {
+  cacheKey: string;
+  explanations: Record<string, string>;
+  updatedAt: number;
+};
+
+type ReviewAskCacheEntry = {
+  cacheKey: string;
+  ask?: PersistedAsk;
+  updatedAt: number;
+};
+
+export function getCachedComments(
+  ctx: ExtensionCommandContext,
+  cacheKey: string,
+): Map<string, ReviewComment> {
+  let latest: ReviewCommentCacheEntry | undefined;
+  for (const entry of ctx.sessionManager.getEntries()) {
+    if (
+      entry.type !== "custom" ||
+      entry.customType !== REVIEW_COMMENT_CACHE_ENTRY
+    ) {
+      continue;
+    }
+
+    const data = entry.data as Partial<ReviewCommentCacheEntry> | undefined;
+    if (data?.cacheKey !== cacheKey || !Array.isArray(data.comments)) continue;
+
+    if (!latest || (data.updatedAt ?? 0) >= latest.updatedAt) {
+      latest = {
+        cacheKey: data.cacheKey,
+        comments: data.comments,
+        updatedAt: data.updatedAt ?? 0,
+      };
+    }
+  }
+
+  return new Map(
+    (latest?.comments ?? []).map((comment) => [comment.id, comment]),
+  );
+}
+
+export function persistCachedComments(
+  pi: ExtensionAPI,
+  cacheKey: string,
+  comments: Iterable<ReviewComment>,
+): void {
+  pi.appendEntry(REVIEW_COMMENT_CACHE_ENTRY, {
+    cacheKey,
+    comments: [...comments],
+    updatedAt: Date.now(),
+  } satisfies ReviewCommentCacheEntry);
+}
+
+export function getCachedExplanations(
+  ctx: ExtensionCommandContext,
+  cacheKey: string,
+): Map<string, string> {
+  let latest: ReviewExplanationCacheEntry | undefined;
+  for (const entry of ctx.sessionManager.getEntries()) {
+    if (
+      entry.type !== "custom" ||
+      entry.customType !== REVIEW_EXPLANATION_CACHE_ENTRY
+    ) {
+      continue;
+    }
+
+    const data = entry.data as Partial<ReviewExplanationCacheEntry> | undefined;
+    if (
+      data?.cacheKey !== cacheKey ||
+      !data.explanations ||
+      typeof data.explanations !== "object" ||
+      Array.isArray(data.explanations)
+    ) {
+      continue;
+    }
+
+    if (!latest || (data.updatedAt ?? 0) >= latest.updatedAt) {
+      latest = {
+        cacheKey: data.cacheKey,
+        explanations: Object.fromEntries(
+          Object.entries(data.explanations).filter(
+            (entry): entry is [string, string] =>
+              typeof entry[0] === "string" && typeof entry[1] === "string",
+          ),
+        ),
+        updatedAt: data.updatedAt ?? 0,
+      };
+    }
+  }
+
+  return new Map(Object.entries(latest?.explanations ?? {}));
+}
+
+export function persistCachedExplanations(
+  pi: ExtensionAPI,
+  cacheKey: string,
+  explanations: Map<string, string>,
+): void {
+  pi.appendEntry(REVIEW_EXPLANATION_CACHE_ENTRY, {
+    cacheKey,
+    explanations: Object.fromEntries(explanations),
+    updatedAt: Date.now(),
+  } satisfies ReviewExplanationCacheEntry);
+}
+
+export function getCachedAsk(
+  ctx: ExtensionCommandContext,
+  cacheKey: string,
+): PersistedAsk | undefined {
+  let latest: ReviewAskCacheEntry | undefined;
+  for (const entry of ctx.sessionManager.getEntries()) {
+    if (
+      entry.type !== "custom" ||
+      entry.customType !== REVIEW_ASK_CACHE_ENTRY
+    ) {
+      continue;
+    }
+
+    const data = entry.data as Partial<ReviewAskCacheEntry> | undefined;
+    if (data?.cacheKey !== cacheKey) continue;
+
+    const ask = data.ask;
+    const validAsk =
+      ask &&
+      typeof ask === "object" &&
+      typeof ask.scopeKey === "string" &&
+      typeof ask.anchorLineId === "string" &&
+      typeof ask.text === "string"
+        ? ask
+        : undefined;
+
+    if (!latest || (data.updatedAt ?? 0) >= latest.updatedAt) {
+      latest = {
+        cacheKey: data.cacheKey,
+        ask: validAsk,
+        updatedAt: data.updatedAt ?? 0,
+      };
+    }
+  }
+
+  return latest?.ask;
+}
+
+export function persistCachedAsk(
+  pi: ExtensionAPI,
+  cacheKey: string,
+  ask?: PersistedAsk,
+): void {
+  pi.appendEntry(REVIEW_ASK_CACHE_ENTRY, {
+    cacheKey,
+    ask,
+    updatedAt: Date.now(),
+  } satisfies ReviewAskCacheEntry);
+}

package/src/review/component.ts

@@ -41,6 +41,7 @@ import type {
   SelectionBounds,
   SplitDiffCell,
   SplitDiffRow,
+  WorkspaceCommentSummary,
 } from "./types.ts";
 
 type InlineBoxPart = "top" | "body" | "bottom";
@@ -122,6 +123,9 @@ export class ReviewComponent {
     private onExplanationsChanged?: (explanations: Map<string, string>) => void,
     cachedAsk?: PersistedAsk,
     private onAskChanged?: (ask?: PersistedAsk) => void,
+    private getWorkspaceCommentSummary?: (
+      comments: Map<string, ReviewComment>,
+    ) => WorkspaceCommentSummary | undefined,
   ) {
     const firstCommentable = this.lines.findIndex((line) => line.commentable);
     this.navigation = new ReviewNavigationState(
@@ -394,11 +398,12 @@ export class ReviewComponent {
   render(width: number): string[] {
     const viewportHeight = this.getContentHeight();
     const selectedLine = this.lines[this.selected];
+    const workspaceSummary = this.getWorkspaceCommentSummary?.(this.comments);
     const output: string[] = [];
 
     output.push(
       this.renderStatusLine(
-        this.getHeaderText(selectedLine),
+        this.getHeaderText(selectedLine, workspaceSummary),
         "Press h for help",
         width,
       ),
@@ -409,15 +414,21 @@ export class ReviewComponent {
 
     output.push(
       truncateToWidth(
-        this.theme.fg("muted", this.getFooterText(selectedLine)),
+        this.theme.fg(
+          "muted",
+          this.getFooterText(selectedLine, workspaceSummary),
+        ),
         width,
       ),
     );
     return this.helpVisible ? this.renderHelpModal(output, width) : output;
   }
 
-  private getHeaderText(selectedLine?: ReviewLine): string {
-    const base = `${this.title} • ${this.lines.length} lines • ${this.comments.size} comments`;
+  private getHeaderText(
+    selectedLine?: ReviewLine,
+    workspaceSummary?: WorkspaceCommentSummary,
+  ): string {
+    const base = `${this.title} • ${this.lines.length} lines • ${this.comments.size} comments${this.formatWorkspaceSummary(workspaceSummary)}`;
 
     if (this.editMode) {
       return `${base} • editing ${this.editingCommentKey === GLOBAL_COMMENT_KEY ? "overall comment" : "inline comment"}`;
@@ -1209,7 +1220,10 @@ export class ReviewComponent {
       : position;
   }
 
-  private getFooterText(selectedLine?: ReviewLine): string {
+  private getFooterText(
+    selectedLine?: ReviewLine,
+    workspaceSummary?: WorkspaceCommentSummary,
+  ): string {
     if (this.search.mode) {
       return `Search: /${this.search.draftQuery} • Enter jump • Esc cancel`;
     }
@@ -1224,7 +1238,28 @@ export class ReviewComponent {
       const endLine = this.lines[selection.end]!;
       return `Selected ${count} lines: ${formatLocation(startLine)} -> ${formatLocation(endLine)}`;
     }
-    return `Selected: ${selectedLine ? formatLocation(selectedLine) : "(no selection)"}`;
+
+    const selectedText = `Selected: ${selectedLine ? formatLocation(selectedLine) : "(no selection)"}`;
+    const workspaceText = this.formatWorkspaceSummary(workspaceSummary, false);
+    return workspaceText ? `${selectedText} • ${workspaceText}` : selectedText;
+  }
+
+  private formatWorkspaceSummary(
+    summary?: WorkspaceCommentSummary,
+    includeVisible = true,
+  ): string {
+    if (!summary) return "";
+
+    const parts: string[] = [];
+    if (includeVisible && summary.visible > 0)
+      parts.push(`${summary.visible} visible persisted`);
+    if (summary.hiddenInCurrentFiles > 0) {
+      parts.push(`${summary.hiddenInCurrentFiles} hidden in current files`);
+    }
+    if (summary.elsewhere > 0) parts.push(`${summary.elsewhere} elsewhere`);
+    if (summary.stale > 0) parts.push(`${summary.stale} stale`);
+    if (summary.orphaned > 0) parts.push(`${summary.orphaned} orphaned`);
+    return parts.length > 0 ? ` • ${parts.join(" • ")}` : "";
   }
 
   private jumpHunk(direction: 1 | -1): void {
@@ -1340,7 +1375,7 @@ export class ReviewComponent {
     const lineNumber =
       side === "left" ? line.oldLineNumber : line.newLineNumber;
     const prefix = `${commentMark} ${lineNumberCell(lineNumber)} `;
-    let styled = this.renderDiffRowContent(line, prefix);
+    let styled = this.renderDiffRowContent(line, prefix, index);
 
     styled = truncateToWidth(styled, width);
     const selection = this.getSelectionBounds();
@@ -1393,14 +1428,18 @@ export class ReviewComponent {
     return styled;
   }
 
-  private renderDiffRowContent(line: ReviewLine, prefix: string): string {
+  private renderDiffRowContent(
+    line: ReviewLine,
+    prefix: string,
+    index: number,
+  ): string {
     switch (line.kind) {
       case "add":
-        return `${this.theme.fg("toolDiffAdded", prefix)}${this.getHighlightedDisplayText(line)}`;
+        return `${this.theme.fg("toolDiffAdded", prefix)}${this.getHighlightedDisplayText(line, index)}`;
       case "remove":
-        return `${this.theme.fg("toolDiffRemoved", prefix)}${this.getHighlightedDisplayText(line)}`;
+        return `${this.theme.fg("toolDiffRemoved", prefix)}${this.getHighlightedDisplayText(line, index)}`;
       case "context":
-        return `${this.theme.fg("toolDiffContext", prefix)}${this.getHighlightedDisplayText(line)}`;
+        return `${this.theme.fg("toolDiffContext", prefix)}${this.getHighlightedDisplayText(line, index)}`;
       case "hunk":
         return this.theme.fg("accent", `${prefix}${this.getDisplayText(line)}`);
       default:
@@ -1408,15 +1447,21 @@ export class ReviewComponent {
     }
   }
 
-  private getHighlightedDisplayText(line: ReviewLine): string {
+  private getHighlightedDisplayText(line: ReviewLine, index: number): string {
     const code = this.getDisplayText(line);
     if (!code) return code;
 
     const lang = line.filePath ? getLanguageFromPath(line.filePath) : undefined;
-    const cacheKey = `${line.id}\0${lang ?? ""}\0${code}`;
+    const cacheKey = `${line.id}\0${lang ?? ""}\0${this.search.getHighlightCacheKey()}\0${code}`;
     const cached = this.highlightedLineCache.get(cacheKey);
     if (cached != null) return cached;
 
+    const searchHighlighted = this.getSearchHighlightedDisplayText(code, index);
+    if (searchHighlighted) {
+      this.highlightedLineCache.set(cacheKey, searchHighlighted);
+      return searchHighlighted;
+    }
+
     let highlighted = code;
     try {
       highlighted = highlightCode(code, lang)[0] ?? code;
@@ -1428,6 +1473,32 @@ export class ReviewComponent {
     return highlighted;
   }
 
+  private getSearchHighlightedDisplayText(
+    code: string,
+    index: number,
+  ): string | undefined {
+    const matches = this.search.getMatchesForLine(index);
+    if (matches.length === 0) return undefined;
+
+    const activeMatch = this.search.getActiveMatch();
+    let result = "";
+    let cursor = 0;
+    for (const match of matches) {
+      result += code.slice(cursor, match.start);
+      const text = code.slice(match.start, match.end);
+      const isActive =
+        activeMatch?.lineIndex === match.lineIndex &&
+        activeMatch.start === match.start &&
+        activeMatch.end === match.end;
+      result += isActive
+        ? this.theme.bg("selectedBg", this.theme.fg("warning", text))
+        : this.theme.bg("selectedBg", this.theme.fg("accent", text));
+      cursor = match.end;
+    }
+    result += code.slice(cursor);
+    return result;
+  }
+
   private renderDiffLine(
     line: ReviewLine,
     index: number,
@@ -1439,7 +1510,7 @@ export class ReviewComponent {
     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);
+    let styled = this.renderDiffRowContent(line, prefix, index);
 
     styled = truncateToWidth(styled, width);
     const inSelection =

package/src/review/prompt.ts

@@ -36,16 +36,39 @@ export function formatCommentLocation(comment: ReviewComment): string {
 export function buildReviewPrompt(
   comments: ReviewComment[],
   promptLabel: string,
+): string {
+  return buildCommentPrompt(
+    comments,
+    `Address this local code review feedback for ${promptLabel}.`,
+    "diff",
+  );
+}
+
+export function buildViewReviewPrompt(
+  comments: ReviewComment[],
+  promptLabel: string,
+): string {
+  return buildCommentPrompt(
+    comments,
+    `Address this code review feedback for ${promptLabel}.`,
+    "ts",
+  );
+}
+
+function buildCommentPrompt(
+  comments: ReviewComment[],
+  intro: string,
+  codeFenceLanguage: string,
 ): string {
   const body = comments
     .map((comment) => {
       const location = formatCommentLocation(comment);
       const excerpt = comment.lineText.trim()
-        ? `\n  Excerpt:\n\n\`\`\`diff\n${comment.lineText}\n\`\`\``
+        ? `\n  Excerpt:\n\n\`\`\`${codeFenceLanguage}\n${comment.lineText}\n\`\`\``
         : "";
       return `- \`${location}\` — ${comment.text}${excerpt}`;
     })
     .join("\n");
 
-  return `Address this local code review feedback for ${promptLabel}.\n\n## Review comments\n${body}\n\nPlease apply the feedback and summarize what changed.`;
+  return `${intro}\n\n## Review comments\n${body}\n\nPlease apply the feedback and summarize what changed.`;
 }

package/src/review/search.ts

@@ -1,18 +1,42 @@
 import { matchesKey } from "@earendil-works/pi-tui";
 import type { ReviewLine } from "./types.ts";
 
+function getSearchableLineText(line: ReviewLine): string {
+  return (
+    line.kind === "add" || line.kind === "remove" || line.kind === "context"
+      ? line.text.slice(1)
+      : line.text
+  ).toLocaleLowerCase();
+}
+
 export type SearchInputResult = {
   selected?: number;
 };
 
+export type SearchMatch = {
+  lineIndex: number;
+  start: number;
+  end: number;
+};
+
 export class ReviewSearchState {
   mode = false;
-  query = "";
   draftQuery = "";
   message = "";
+  private _query = "";
+  private activeMatchIndex = -1;
 
   constructor(private readonly lines: ReviewLine[]) {}
 
+  get query(): string {
+    return this._query;
+  }
+
+  set query(value: string) {
+    this._query = value;
+    this.activeMatchIndex = -1;
+  }
+
   start(): void {
     this.mode = true;
     this.draftQuery = this.query;
@@ -63,46 +87,85 @@ export class ReviewSearchState {
     const query = this.query.trim();
     if (!query) return {};
 
-    const matches = this.getMatchIndexes(query);
+    const matches = this.getMatches(query);
     if (matches.length === 0) {
+      this.activeMatchIndex = -1;
       this.message = `No matches for /${query}`;
       return {};
     }
 
     this.message = "";
-    const current =
-      direction === 1
-        ? matches.find((index) => index > selected)
-        : [...matches].reverse().find((index) => index < selected);
-    return {
-      selected:
-        current ??
-        (direction === 1 ? matches[0]! : matches[matches.length - 1]!),
-    };
+    let nextIndex: number;
+    if (this.activeMatchIndex >= 0 && this.activeMatchIndex < matches.length) {
+      nextIndex =
+        (this.activeMatchIndex + direction + matches.length) % matches.length;
+    } else {
+      if (direction === 1) {
+        nextIndex = matches.findIndex((match) => match.lineIndex >= selected);
+      } else {
+        nextIndex = -1;
+        for (let index = matches.length - 1; index >= 0; index--) {
+          if (matches[index]!.lineIndex <= selected) {
+            nextIndex = index;
+            break;
+          }
+        }
+      }
+      if (nextIndex < 0) nextIndex = direction === 1 ? 0 : matches.length - 1;
+    }
+
+    this.activeMatchIndex = nextIndex;
+    return { selected: matches[nextIndex]!.lineIndex };
   }
 
-  getStatusText(selected: number): string {
+  getStatusText(_selected: number): string {
     if (this.message) return this.message;
     if (!this.query) return "";
 
-    const matches = this.getMatchIndexes(this.query);
+    const matches = this.getMatches(this.query);
     if (matches.length === 0) return `No matches for /${this.query}`;
 
-    const current = matches.findIndex((index) => index === selected);
     const position =
-      current >= 0
-        ? `${current + 1}/${matches.length}`
+      this.activeMatchIndex >= 0 && this.activeMatchIndex < matches.length
+        ? `${this.activeMatchIndex + 1}/${matches.length}`
         : `${matches.length} matches`;
     return `Search /${this.query} • ${position} • n next • N previous • Esc clear search`;
   }
 
-  private getMatchIndexes(query: string): number[] {
+  getMatchesForLine(lineIndex: number): SearchMatch[] {
+    if (!this.query.trim()) return [];
+    return this.getMatches(this.query).filter(
+      (match) => match.lineIndex === lineIndex,
+    );
+  }
+
+  getActiveMatch(): SearchMatch | undefined {
+    if (!this.query.trim()) return undefined;
+    const matches = this.getMatches(this.query);
+    return this.activeMatchIndex >= 0 && this.activeMatchIndex < matches.length
+      ? matches[this.activeMatchIndex]
+      : undefined;
+  }
+
+  getHighlightCacheKey(): string {
+    const active = this.getActiveMatch();
+    return active
+      ? `${this.query}\0${active.lineIndex}:${active.start}-${active.end}`
+      : this.query;
+  }
+
+  private getMatches(query: string): SearchMatch[] {
     const needle = query.toLocaleLowerCase();
     if (!needle) return [];
 
-    const matches: number[] = [];
-    this.lines.forEach((line, index) => {
-      if (line.text.toLocaleLowerCase().includes(needle)) matches.push(index);
+    const matches: SearchMatch[] = [];
+    this.lines.forEach((line, lineIndex) => {
+      const haystack = getSearchableLineText(line);
+      let start = haystack.indexOf(needle);
+      while (start >= 0) {
+        matches.push({ lineIndex, start, end: start + needle.length });
+        start = haystack.indexOf(needle, start + needle.length);
+      }
     });
     return matches;
   }

package/src/review/types.ts

@@ -48,6 +48,14 @@ export type PersistedAsk = {
   text: string;
 };
 
+export type WorkspaceCommentSummary = {
+  visible: number;
+  hiddenInCurrentFiles: number;
+  elsewhere: number;
+  stale: number;
+  orphaned: number;
+};
+
 export type DiffRenderMode = "unified" | "split";
 
 export type SplitDiffCell = {