pi-diff-review 0.1.18 → 0.1.19

package/package.json

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

package/src/explanation/controller.ts

@@ -62,12 +62,19 @@ export class ExplanationController {
     private readonly onExplanationsChanged?: (
       explanations: Map<string, string>,
     ) => void,
+    cachedAskText?: string,
+    private readonly onAskChanged?: (state?: ExplanationState) => void,
   ) {
     for (const [key, text] of cachedExplanations) {
       const trimmed = text.trim();
       if (trimmed)
         this.explanations.set(key, { status: "ready", text: trimmed });
     }
+
+    const trimmedAskText = cachedAskText?.trim();
+    if (trimmedAskText) {
+      this.askState = { status: "ready", text: trimmedAskText };
+    }
   }
 
   get isAvailable(): boolean {
@@ -90,6 +97,7 @@ export class ExplanationController {
     const requestId = ++this.askRequestId;
     let text = "";
     this.askState = { status: "loading", text };
+    this.onAskChanged?.(this.askState);
     this.startLoadingTimer();
 
     void this.explainer
@@ -99,6 +107,7 @@ export class ExplanationController {
           if (requestId !== this.askRequestId) return;
           text += delta;
           this.askState = { status: "loading", text };
+          this.onAskChanged?.(this.askState);
           this.tui.requestRender();
         },
       })
@@ -108,6 +117,7 @@ export class ExplanationController {
           status: "ready",
           text: finalText.trim() || text.trim() || "No answer returned.",
         };
+        this.onAskChanged?.(this.askState);
       })
       .catch((error) => {
         if (requestId !== this.askRequestId) return;
@@ -116,6 +126,7 @@ export class ExplanationController {
           status: "error",
           message: error instanceof Error ? error.message : String(error),
         };
+        this.onAskChanged?.(this.askState);
       })
       .finally(() => {
         if (requestId !== this.askRequestId) return;
@@ -134,6 +145,7 @@ export class ExplanationController {
     this.askAbortController?.abort();
     this.askAbortController = undefined;
     this.askState = undefined;
+    this.onAskChanged?.(undefined);
   }
 
   ensure(scope: ExplanationScope | undefined): void {

package/src/index.ts

@@ -10,12 +10,14 @@ import { buildReviewPrompt } from "./review/prompt.ts";
 import { ReviewComponent } from "./review/component.ts";
 import type {
   DiffSource,
+  PersistedAsk,
   ReviewComment,
   ReviewResult,
 } from "./review/types.ts";
 
 const DIFF_REVIEW_CACHE_ENTRY = "pi-diff-review-cache";
 const DIFF_REVIEW_EXPLANATION_CACHE_ENTRY = "pi-diff-review-explanation-cache";
+const DIFF_REVIEW_ASK_CACHE_ENTRY = "pi-diff-review-ask-cache";
 
 type DiffReviewCacheEntry = {
   cacheKey: string;
@@ -29,6 +31,12 @@ type DiffExplanationCacheEntry = {
   updatedAt: number;
 };
 
+type DiffAskCacheEntry = {
+  cacheKey: string;
+  ask?: PersistedAsk;
+  updatedAt: number;
+};
+
 function getDiffCacheKey(
   cwd: string,
   source: DiffSource,
@@ -134,6 +142,56 @@ function persistCachedExplanations(
   } satisfies DiffExplanationCacheEntry);
 }
 
+function getCachedAsk(
+  ctx: ExtensionCommandContext,
+  cacheKey: string,
+): PersistedAsk | undefined {
+  let latest: DiffAskCacheEntry | undefined;
+  for (const entry of ctx.sessionManager.getEntries()) {
+    if (
+      entry.type !== "custom" ||
+      entry.customType !== DIFF_REVIEW_ASK_CACHE_ENTRY
+    ) {
+      continue;
+    }
+
+    const data = entry.data as Partial<DiffAskCacheEntry> | 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;
+}
+
+function persistCachedAsk(
+  pi: ExtensionAPI,
+  cacheKey: string,
+  ask?: PersistedAsk,
+): void {
+  pi.appendEntry(DIFF_REVIEW_ASK_CACHE_ENTRY, {
+    cacheKey,
+    ask,
+    updatedAt: Date.now(),
+  } satisfies DiffAskCacheEntry);
+}
+
 export function registerDiffReviewCommand(pi: ExtensionAPI): void {
   pi.registerCommand("diff", {
     description: "Review a git diff in a custom TUI (/diff [git diff args])",
@@ -158,6 +216,7 @@ export function registerDiffReviewCommand(pi: ExtensionAPI): void {
       const cacheKey = getDiffCacheKey(ctx.cwd, source, diffText);
       const comments = getCachedComments(ctx, cacheKey);
       const explanations = getCachedExplanations(ctx, cacheKey);
+      const ask = getCachedAsk(ctx, cacheKey);
       if (comments.size > 0) {
         ctx.ui.notify(
           `Restored ${comments.size} cached diff comment${comments.size === 1 ? "" : "s"}.`,
@@ -170,6 +229,9 @@ export function registerDiffReviewCommand(pi: ExtensionAPI): void {
           "info",
         );
       }
+      if (ask) {
+        ctx.ui.notify("Restored cached ask answer.", "info");
+      }
 
       const result = await ctx.ui.custom<ReviewResult>(
         (tui, theme, _keybindings, done) => {
@@ -188,6 +250,10 @@ export function registerDiffReviewCommand(pi: ExtensionAPI): void {
             (updatedExplanations) => {
               persistCachedExplanations(pi, cacheKey, updatedExplanations);
             },
+            ask,
+            (updatedAsk) => {
+              persistCachedAsk(pi, cacheKey, updatedAsk);
+            },
           );
         },
       );

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,
@@ -58,6 +59,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 +87,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 +120,8 @@ 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,
   ) {
     const firstCommentable = this.lines.findIndex((line) => line.commentable);
     this.navigation = new ReviewNavigationState(
@@ -124,11 +130,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 +182,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 +291,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 +322,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;
     }
@@ -700,10 +736,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 +762,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 +952,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 +988,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 +1049,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 +1060,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 +1071,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 +1107,7 @@ export class ReviewComponent {
 
   private hideInlineExplanation(): void {
     this.visibleExplanationKeys.clear();
+    this.explanationAnchorByScope.clear();
   }
 
   private toggleExplanationPane(): void {
@@ -1035,8 +1116,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();
     }
 

package/src/review/types.ts

@@ -42,6 +42,12 @@ export type DiffSource = {
   args: string[];
 };
 
+export type PersistedAsk = {
+  scopeKey: string;
+  anchorLineId: string;
+  text: string;
+};
+
 export type DiffRenderMode = "unified" | "split";
 
 export type SplitDiffCell = {