pi-diff-review 0.1.18 → 0.1.20

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

@@ -32,6 +32,7 @@ import { padToWidth, lineNumberCell } from "../render/utils.ts";
 import { buildSplitDiffRows } from "../diff/split.ts";
 import type {
   DiffRenderMode,
+  PersistedAsk,
   ReviewComment,
   ReviewLine,
   ReviewResult,
@@ -40,6 +41,7 @@ import type {
   SelectionBounds,
   SplitDiffCell,
   SplitDiffRow,
+  WorkspaceCommentSummary,
 } from "./types.ts";
 
 type InlineBoxPart = "top" | "body" | "bottom";
@@ -58,6 +60,7 @@ type AnnotatedDiffRow =
 const HELP_COMMANDS = [
   ["h", "show or hide this help"],
   ["j/k or arrows", "move selection"],
+  ["PgUp / PgDown", "move up or down half a page"],
   ["ctrl-u / ctrl-d", "move up or down half a page"],
   ["g / G", "jump to top or bottom"],
   ["n / p", "jump to next or previous hunk"],
@@ -85,8 +88,10 @@ export class ReviewComponent {
 
   private inlineAnnotationsVisible = true;
   private visibleExplanationKeys = new Set<string>();
+  private explanationAnchorByScope = new Map<string, number>();
   private askInputMode = false;
   private askScope?: ExplanationScope;
+  private askAnchorIndex?: number;
   private explanationController: ExplanationController;
   private editor: Editor;
   private splitRows?: SplitDiffRow[];
@@ -116,6 +121,11 @@ export class ReviewComponent {
     private onCommentsChanged?: (comments: Map<string, ReviewComment>) => void,
     cachedExplanations?: Map<string, string>,
     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(
@@ -124,11 +134,36 @@ export class ReviewComponent {
     );
     this.lines.forEach((line, index) => this.lineIndexById.set(line.id, index));
     this.search = new ReviewSearchState(this.lines);
+
+    const restoredAsk = cachedAsk
+      ? this.restorePersistedAsk(cachedAsk)
+      : undefined;
+    if (restoredAsk) {
+      this.askScope = restoredAsk.scope;
+      this.askAnchorIndex = restoredAsk.anchorIndex;
+    }
+
     this.explanationController = new ExplanationController(
       tui,
       explainer,
       cachedExplanations,
       onExplanationsChanged,
+      restoredAsk ? cachedAsk?.text : undefined,
+      (state) => {
+        if (!state) {
+          this.onAskChanged?.(undefined);
+          return;
+        }
+        if (state.status !== "ready") return;
+        if (!this.askScope || this.askAnchorIndex == null) return;
+        const anchorLine = this.lines[this.askAnchorIndex];
+        if (!anchorLine) return;
+        this.onAskChanged?.({
+          scopeKey: this.askScope.key,
+          anchorLineId: anchorLine.id,
+          text: state.text,
+        });
+      },
     );
 
     this.editor = new Editor(tui as never, {
@@ -151,6 +186,7 @@ export class ReviewComponent {
           this.explanationController.ask(this.askScope, question);
         } else {
           this.askScope = undefined;
+          this.askAnchorIndex = undefined;
         }
         this.invalidateAnnotatedRows();
         this.tui.requestRender(true);
@@ -259,7 +295,11 @@ export class ReviewComponent {
       return;
     }
     if (data === "q") {
-      this.done({ action: "cancel" });
+      if (this.hasSelection()) {
+        this.clearSelection();
+      } else {
+        this.done({ action: "cancel" });
+      }
       return;
     }
     if (data === "h") {
@@ -286,11 +326,11 @@ export class ReviewComponent {
       this.startSearchMode();
       return;
     }
-    if (matchesKey(data, "ctrl+d")) {
+    if (matchesKey(data, "pageDown") || matchesKey(data, "ctrl+d")) {
       this.move(this.getPageMoveAmount());
       return;
     }
-    if (matchesKey(data, "ctrl+u")) {
+    if (matchesKey(data, "pageUp") || matchesKey(data, "ctrl+u")) {
       this.move(-this.getPageMoveAmount());
       return;
     }
@@ -358,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,
       ),
@@ -373,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"}`;
@@ -700,10 +747,10 @@ export class ReviewComponent {
     const scope = getCurrentHunkScope(this.lines, lineIndex);
     if (!scope) return;
 
-    const end = this.getHunkEndIndex(lineIndex);
-    if (end !== lineIndex) return;
-
-    if (this.visibleExplanationKeys.has(scope.key)) {
+    if (
+      this.visibleExplanationKeys.has(scope.key) &&
+      this.getExplanationAnchorIndex(lineIndex, scope.key) === lineIndex
+    ) {
       const explanation = this.explanationController.getState(scope);
       if (!this.explanationController.isAvailable) {
         this.pushExplanationBlock(rows, "Explanation unavailable.", width);
@@ -726,11 +773,19 @@ export class ReviewComponent {
       }
     }
 
-    if (this.askInputMode && this.askScope?.key === scope.key) {
+    if (
+      this.askInputMode &&
+      this.askScope?.key === scope.key &&
+      this.askAnchorIndex === lineIndex
+    ) {
       this.pushInlineEditorBlock(rows, "Ask about this hunk", width);
     }
 
-    if (!this.askInputMode && this.askScope?.key === scope.key) {
+    if (
+      !this.askInputMode &&
+      this.askScope?.key === scope.key &&
+      this.askAnchorIndex === lineIndex
+    ) {
       const askState = this.explanationController.getAskState();
       if (askState) this.pushAskBlock(rows, askState, width);
     }
@@ -908,6 +963,27 @@ export class ReviewComponent {
     return comments.sort((a, b) => a.id.localeCompare(b.id));
   }
 
+  private restorePersistedAsk(
+    cachedAsk: PersistedAsk,
+  ): { scope: ExplanationScope; anchorIndex: number } | undefined {
+    const anchorIndex = this.lineIndexById.get(cachedAsk.anchorLineId);
+    if (anchorIndex != null) {
+      const scope = getCurrentHunkScope(this.lines, anchorIndex);
+      if (scope?.key === cachedAsk.scopeKey) {
+        return { scope, anchorIndex };
+      }
+    }
+
+    for (let index = 0; index < this.lines.length; index++) {
+      const scope = getCurrentHunkScope(this.lines, index);
+      if (scope?.key === cachedAsk.scopeKey) {
+        return { scope, anchorIndex: index };
+      }
+    }
+
+    return undefined;
+  }
+
   private getHunkEndIndex(selected: number): number | undefined {
     const selectedLine = this.lines[selected];
     if (!selectedLine?.filePath || !selectedLine.hunkLabel) return undefined;
@@ -923,6 +999,16 @@ export class ReviewComponent {
     return end;
   }
 
+  private getExplanationAnchorIndex(
+    lineIndex: number,
+    scopeKey: string,
+  ): number | undefined {
+    return (
+      this.explanationAnchorByScope.get(scopeKey) ??
+      this.getHunkEndIndex(lineIndex)
+    );
+  }
+
   private renderSplitDiffRowAt(splitRowIndex: number, width: number): string {
     const splitRow = this.getSplitDiffRows()[splitRowIndex];
     if (!splitRow) return " ".repeat(width);
@@ -974,6 +1060,7 @@ export class ReviewComponent {
     if (!scope) return;
     this.clearAsk();
     this.askScope = scope;
+    this.askAnchorIndex = this.selected;
     this.askInputMode = true;
     this.inlineAnnotationsVisible = true;
     this.editor.setText("");
@@ -984,7 +1071,10 @@ export class ReviewComponent {
   private exitAskInputMode(): void {
     this.askInputMode = false;
     this.editor.setText("");
-    if (!this.explanationController.getAskState()) this.askScope = undefined;
+    if (!this.explanationController.getAskState()) {
+      this.askScope = undefined;
+      this.askAnchorIndex = undefined;
+    }
     this.invalidateAnnotatedRows();
     this.tui.requestRender(true);
   }
@@ -992,6 +1082,7 @@ export class ReviewComponent {
   private clearAsk(): void {
     this.askInputMode = false;
     this.askScope = undefined;
+    this.askAnchorIndex = undefined;
     this.explanationController.clearAsk();
     this.editor.setText("");
     this.invalidateAnnotatedRows();
@@ -1027,6 +1118,7 @@ export class ReviewComponent {
 
   private hideInlineExplanation(): void {
     this.visibleExplanationKeys.clear();
+    this.explanationAnchorByScope.clear();
   }
 
   private toggleExplanationPane(): void {
@@ -1035,8 +1127,10 @@ export class ReviewComponent {
 
     if (this.visibleExplanationKeys.has(scope.key)) {
       this.visibleExplanationKeys.delete(scope.key);
+      this.explanationAnchorByScope.delete(scope.key);
     } else {
       this.visibleExplanationKeys.add(scope.key);
+      this.explanationAnchorByScope.set(scope.key, this.selected);
       this.ensureCurrentExplanation();
     }
 
@@ -1126,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`;
     }
@@ -1141,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 {

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/types.ts

@@ -42,6 +42,20 @@ export type DiffSource = {
   args: string[];
 };
 
+export type PersistedAsk = {
+  scopeKey: string;
+  anchorLineId: string;
+  text: string;
+};
+
+export type WorkspaceCommentSummary = {
+  visible: number;
+  hiddenInCurrentFiles: number;
+  elsewhere: number;
+  stale: number;
+  orphaned: number;
+};
+
 export type DiffRenderMode = "unified" | "split";
 
 export type SplitDiffCell = {