@mrclrchtr/supi-review 1.5.0 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-review",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "SuPi Review extension — structured code review via /supi-review command",
   "license": "MIT",
   "repository": {

package/src/review.ts

@@ -260,20 +260,60 @@ function maybeQueueReviewFollowUp(pi: ExtensionAPI, result: ReviewResult): void
 function buildReviewFollowUpInstruction(
   result: Extract<ReviewResult, { kind: "success" }>,
 ): string {
-  const findings = result.output.findings.map(
-    (finding, index) => `- #${index + 1}: ${finding.title}`,
-  );
+  const { findings, overall_correctness } = result.output;
+  const criticalCount = findings.filter((f) => f.priority === 3).length;
+  const majorCount = findings.filter((f) => f.priority === 2).length;
+
+  const findingList = findings.map((finding, index) => `- #${index + 1}: ${finding.title}`);
 
-  return [
-    "A code review just completed and the result is available in the preceding `supi-review` message.",
-    "Do not start fixing code immediately.",
-    "Your next task is to ask the user what to do with the review findings.",
-    "If the `ask_user` tool is available, use it for this decision.",
-    "Offer exactly these options: Done, Fix all, Fix selected, Verify findings.",
-    "If the user chooses Fix selected, ask a follow-up question listing the findings by number/title.",
-    "If the user chooses Verify findings, verify the findings first and then ask again whether to Fix all or Fix selected.",
+  const header =
+    "A code review just completed and the result is available in the preceding `supi-review` message.";
+  const noFixing = "Do not start fixing code immediately.";
+  const useAskUser = "If the `ask_user` tool is available, use it for this decision.";
+
+  const appendFindings = (lines: string[]): string[] => [
+    ...lines,
     "",
     "Current findings:",
-    ...findings,
-  ].join("\n");
+    ...findingList,
+  ];
+
+  if (criticalCount > 0) {
+    return appendFindings([
+      header,
+      `⚠️ ${criticalCount} critical finding(s) found. Urge the user to fix before merging.`,
+      noFixing,
+      useAskUser,
+      "Offer these options: Fix all, Fix critical only, Done.",
+    ]).join("\n");
+  }
+
+  const contradictionNote =
+    overall_correctness === "patch is correct" && findings.length > 0
+      ? "The reviewer marked the patch as correct but found issues — verify the verdict before acting."
+      : undefined;
+
+  if (majorCount > 0) {
+    const lines: string[] = [header];
+    if (contradictionNote) lines.push(contradictionNote);
+    lines.push(
+      noFixing,
+      useAskUser,
+      "Offer exactly these options: Done, Fix all, Fix selected, Verify findings.",
+      "If the user chooses Fix selected, ask a follow-up question listing the findings by number/title.",
+      "If the user chooses Verify findings, verify the findings first and then ask again whether to Fix all or Fix selected.",
+    );
+    return appendFindings(lines).join("\n");
+  }
+
+  // Only minor/info findings
+  return appendFindings([
+    header,
+    ...(contradictionNote
+      ? [contradictionNote]
+      : ["Only minor/info suggestions — no blocking issues."]),
+    noFixing,
+    useAskUser,
+    "Offer these options: Apply suggestions, Skip.",
+  ]).join("\n");
 }

package/src/target/packet.ts

@@ -5,9 +5,11 @@ import type {
   SynthesizedReviewBrief,
 } from "../types.ts";
 
-interface DiffSection {
+export interface DiffSection {
   file: string;
   text: string;
+  additions: number;
+  deletions: number;
 }
 
 /** Build the final prompt packet for the reviewer child session. */
@@ -49,6 +51,8 @@ export function buildReviewPacket(
     ...snapshot.changedFiles.map((file) => `- ${file}`),
   ];
 
+  baseParts.push("", buildFileOverviewTable(snapshot.changedFiles, sections));
+
   if (preamble.trim()) {
     baseParts.push("", "## Snapshot notes", truncate(preamble.trim(), 1_500));
   }
@@ -115,7 +119,21 @@ export function getPacketCharBudget(model: ReviewModelSelection): number {
   return tokenBudget * 4;
 }
 
-function splitDiffSections(text: string): { preamble: string; sections: DiffSection[] } {
+function countDiffLines(lines: string[]): { additions: number; deletions: number } {
+  let additions = 0;
+  let deletions = 0;
+  for (const line of lines) {
+    // Skip diff header lines (e.g. "--- a/file", "+++ b/file").
+    // The trailing space ensures we do not skip content lines whose first
+    // characters happen to be "+++" or "---".
+    if (line.startsWith("--- ") || line.startsWith("+++ ")) continue;
+    if (line.startsWith("+")) additions++;
+    else if (line.startsWith("-")) deletions++;
+  }
+  return { additions, deletions };
+}
+
+export function splitDiffSections(text: string): { preamble: string; sections: DiffSection[] } {
   const lines = text.split("\n");
   const preamble: string[] = [];
   const sections: DiffSection[] = [];
@@ -128,7 +146,13 @@ function splitDiffSections(text: string): { preamble: string; sections: DiffSect
       currentFile = undefined;
       return;
     }
-    sections.push({ file: currentFile, text: current.join("\n").trimEnd() });
+    const stats = countDiffLines(current);
+    sections.push({
+      file: currentFile,
+      text: current.join("\n").trimEnd(),
+      additions: stats.additions,
+      deletions: stats.deletions,
+    });
     current = [];
     currentFile = undefined;
   };
@@ -206,6 +230,100 @@ function toPathTokens(path: string): string[] {
     .filter((part) => part.length >= 3);
 }
 
+/** Categorize a file path for skip-list annotation, or undefined if it should be reviewed. */
+export function classifySkipCategory(file: string): string | undefined {
+  const lockfiles = new Set([
+    "package-lock.json",
+    "yarn.lock",
+    "pnpm-lock.yaml",
+    "Gemfile.lock",
+    "Cargo.lock",
+    "poetry.lock",
+    "composer.lock",
+  ]);
+
+  const name = file.split("/").pop() ?? file;
+  if (lockfiles.has(name)) return "lockfile";
+  if (name.startsWith("CHANGELOG") || name.startsWith("CHANGES") || name === "CHANGE_LOG") {
+    return "changelog";
+  }
+
+  if (file.includes("__snapshots__/") || name.endsWith(".snap")) {
+    return "snapshot";
+  }
+
+  if (
+    file.includes("dist/") ||
+    file.includes("build/") ||
+    file.includes(".next/") ||
+    file.includes("__generated__/")
+  ) {
+    return "generated";
+  }
+
+  if (file.includes("vendor/") || file.includes("third_party/")) {
+    return "vendored";
+  }
+
+  if (name.endsWith(".min.js") || name.endsWith(".min.css")) return "generated";
+
+  return undefined;
+}
+
+function formatOverviewRow(
+  file: string,
+  statsMap: Map<string, { additions: number; deletions: number }>,
+  binaryFiles: Set<string>,
+): string {
+  const stats = statsMap.get(file);
+  const skipCategory = classifySkipCategory(file);
+  const annotations: string[] = [];
+
+  if (!stats) {
+    // File in the changed-files manifest but not in the parsed diff sections.
+    // This happens for untracked files in working-tree snapshots, which
+    // have no diff section to parse. Do not guess 0/0 or mark as trivial.
+    if (skipCategory) annotations.push(`skip — ${skipCategory}`);
+    const annotation = annotations.length > 0 ? ` (${annotations.join(", ")})` : "";
+    return `| ${file} | ? | ?${annotation} |`;
+  }
+
+  if (binaryFiles.has(file)) {
+    // Binary diffs have no diffable +/- lines. Show unknown stats.
+    if (skipCategory) annotations.push(`skip — ${skipCategory}`);
+    annotations.push("binary");
+    const annotation = annotations.length > 0 ? ` (${annotations.join(", ")})` : "";
+    return `| ${file} | ? | ?${annotation} |`;
+  }
+
+  const total = stats.additions + stats.deletions;
+  if (total < 5) annotations.push("trivial");
+  if (skipCategory) annotations.push(`skip — ${skipCategory}`);
+  const annotation = annotations.length > 0 ? ` (${annotations.join(", ")})` : "";
+  return `| ${file} | ${stats.additions} | ${stats.deletions}${annotation} |`;
+}
+
+function buildFileOverviewTable(changedFiles: string[], sections: DiffSection[]): string {
+  const statsMap = new Map<string, { additions: number; deletions: number }>();
+  const binaryFiles = new Set<string>();
+  for (const section of sections) {
+    const existing = statsMap.get(section.file);
+    statsMap.set(section.file, {
+      additions: (existing?.additions ?? 0) + section.additions,
+      deletions: (existing?.deletions ?? 0) + section.deletions,
+    });
+    if (section.text.includes("Binary files ")) {
+      binaryFiles.add(section.file);
+    }
+  }
+
+  const header = "| File | +Add | -Del |";
+  const separator = "|---|---|---|";
+  const rows = changedFiles.map((file) => formatOverviewRow(file, statsMap, binaryFiles));
+
+  return [`## File overview`, "", header, separator, ...rows].join("\n");
+}
+
 function toBullets(items: string[], fallback: string): string[] {
   return items.length > 0 ? items.map((item) => `- ${item}`) : [fallback];
 }

package/src/tool/brief-runner.ts

@@ -69,7 +69,7 @@ async function createBriefSession(
     cwd: invocation.cwd,
     model: invocation.model,
     modelRegistry: invocation.modelRegistry,
-    thinkingLevel: clampThinkingLevel(invocation.model, "high"),
+    thinkingLevel: clampThinkingLevel(invocation.model, "xhigh"),
     tools: ["submit_review_brief"],
     customTools: [submitBriefTool],
     resourceLoader,

package/src/tool/review-runner.ts

@@ -65,9 +65,21 @@ export function buildReviewerSystemPrompt(): string {
     "- Title: concise and specific.",
     "- Body: explain the issue, why it matters, and a concrete fix direction.",
     "- code_location: 1-based inclusive line range.",
-    "- confidence_score: 0.0-1.0.",
-    "- priority: 0=info, 1=minor, 2=major, 3=critical.",
-    "- overall_correctness: 'patch is correct' | 'mostly correct' | 'patch is incorrect'.",
+    "",
+    "--- Finding calibration ---",
+    "Priority:",
+    "  0 (info): style nits, naming suggestions, non-functional improvements without real impact",
+    "  1 (minor): unlikely edge cases, minor perf concerns without benchmarks, missing comments",
+    "  2 (major): logic errors, incorrect error handling, API contract violations, race conditions",
+    "  3 (critical): security vulnerabilities, data loss/corruption, crashes, breaking changes",
+    "Confidence:",
+    "  0.8-1.0: you verified the issue by reading surrounding code or grepping the codebase",
+    "  0.5-0.8: suspected from the diff, plausible but not fully verified",
+    "  <0.5: do not report — too uncertain; either verify further or drop it",
+    "overall_correctness:",
+    "  'patch is correct': no issues found, or only info-level suggestions",
+    "  'mostly correct': minor issues present, safe to merge with fixes",
+    "  'patch is incorrect': major/critical issues that should block merge",
     "",
     "--- Tool strategy ---",
     "- Use read to inspect full files when the inline diff lacks context.",
@@ -75,6 +87,11 @@ export function buildReviewerSystemPrompt(): string {
     "- Use find to locate related files quickly.",
     "- Use ls when you need a quick directory overview.",
     "",
+    "--- Skipped files ---",
+    "- Skip reviewing: lockfiles, generated/bundled code (dist/, .next/, __generated__/),",
+    "  vendored dependencies, changelogs, snapshot files, minified bundles, and binary files.",
+    "- Focus on application source and test code.",
+    "",
     "Do NOT output JSON directly — call submit_review with the structured result.",
   ].join("\n");
 }

package/src/ui/flow.ts

@@ -1,8 +1,9 @@
 import { DynamicBorder, type ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { Container, type SelectItem, SelectList, Text } from "@earendil-works/pi-tui";
+import { Container, type SelectItem, SelectList, Spacer, Text } from "@earendil-works/pi-tui";
 import { getLocalBranches, getRecentCommits } from "../git.ts";
 import { getSelectableReviewModels } from "../model.ts";
 import type { ReviewModelSelection, ReviewPlan, ReviewTargetSpec } from "../types.ts";
+import type { ReviewTheme } from "./theme-type.ts";
 
 interface SelectFromListOptions<T> {
   items: SelectItem[];
@@ -132,9 +133,138 @@ export async function collectReviewNote(ctx: ExtensionContext): Promise<string |
   return value.trim();
 }
 
-/** Show the synthesized brief and packet coverage, then ask for approval. */
+/** Show the synthesized brief, the actual reviewer prompt preview, and ask for approval. */
 export function previewReviewPlan(ctx: ExtensionContext, plan: ReviewPlan): Promise<boolean> {
-  return ctx.ui.confirm("Run generated review?", formatPlanPreview(plan));
+  return ctx.ui.custom<boolean>((_tui, theme, _kb, done) => {
+    const container = buildReviewPlanContainer(theme, plan);
+
+    return {
+      render: (width) => container.render(width),
+      invalidate: () => container.invalidate(),
+      handleInput: (data) => {
+        if (data === "\r" || data === "\n" || data === "y" || data === "Y") {
+          done(true);
+        } else if (data === "\x1b" || data === "n" || data === "N") {
+          done(false);
+        }
+      },
+    };
+  });
+}
+
+/** Build the review plan preview container with all styled sections. */
+function buildReviewPlanContainer(theme: ReviewTheme, plan: ReviewPlan): Container {
+  const { model, snapshot, brief, packet } = plan;
+  const container = new Container();
+
+  const accent = (s: string) => theme.fg("accent", s);
+  const dim = (s: string) => theme.fg("dim", s);
+  const bold = (s: string) => theme.bold(s);
+
+  // ── Top border ──
+  container.addChild(new DynamicBorder((s: string) => accent(s)));
+  container.addChild(new Spacer(1));
+
+  // ── Title ──
+  container.addChild(new Text(accent(bold("  Review Plan")), 1, 0));
+  container.addChild(new Spacer(1));
+
+  // ── Metadata section ──
+  const kind = snapshot.target.kind;
+  const targetLabel =
+    kind === "working-tree"
+      ? "Working tree"
+      : kind === "branch"
+        ? `${snapshot.target.base} \u2190 current`
+        : `commit ${snapshot.target.sha.slice(0, 7)}`;
+
+  container.addChild(new Text(accent(bold("  \u2500\u2500 Metadata \u2500\u2500")), 1, 0));
+  container.addChild(
+    new Text(
+      [
+        `  ${dim("Model:")}   ${model.canonicalId}`,
+        `  ${dim("Target:")}  ${snapshot.title}`,
+        `  ${dim("Kind:")}    ${targetLabel}`,
+        `  ${dim("Files:")}   ${snapshot.changedFiles.length} changed  ${theme.fg("toolDiffAdded", `+${snapshot.stats.additions}`)}/${theme.fg("toolDiffRemoved", `-${snapshot.stats.deletions}`)}`,
+      ].join("\n"),
+      1,
+      0,
+    ),
+  );
+  container.addChild(new Spacer(1));
+
+  // ── Brief section ──
+  container.addChild(
+    new Text(accent(bold("  \u2500\u2500 Session-derived Brief \u2500\u2500")), 1, 0),
+  );
+  const briefParts = [
+    `  ${dim("Summary:")}  ${brief.summary}`,
+    `  ${dim("Outcome:")}  ${brief.intendedOutcome}`,
+  ];
+  if (brief.constraints.length > 0) {
+    briefParts.push(`  ${dim("Constraints:")}  ${brief.constraints.join("; ")}`);
+  }
+  if (brief.focusAreas.length > 0) {
+    briefParts.push(`  ${dim("Focus:")}  ${brief.focusAreas.join("; ")}`);
+  }
+  if (brief.riskyFiles.length > 0) {
+    briefParts.push(`  ${dim("Risky:")}  ${brief.riskyFiles.join(", ")}`);
+  }
+  if (brief.unresolvedQuestions.length > 0) {
+    briefParts.push(`  ${dim("Questions:")}  ${brief.unresolvedQuestions.join("; ")}`);
+  }
+  container.addChild(new Text(briefParts.join("\n"), 1, 0));
+  container.addChild(new Spacer(1));
+
+  // ── Reviewer Prompt preview ──
+  const totalChars = packet.prompt.length;
+  const maxPreview = 2000;
+  const previewText =
+    totalChars > maxPreview
+      ? `${packet.prompt.slice(0, maxPreview)}\n\n${theme.fg("warning", `[Preview truncated \u2014 showing ${maxPreview.toLocaleString()} of ${totalChars.toLocaleString()} total chars]`)}`
+      : packet.prompt;
+
+  container.addChild(
+    new Text(
+      accent(
+        bold(`  \u2500\u2500 Reviewer Prompt (${totalChars.toLocaleString()} chars) \u2500\u2500`),
+      ),
+      1,
+      0,
+    ),
+  );
+  container.addChild(new Text(previewText, 1, 0));
+  container.addChild(new Spacer(1));
+
+  // ── File coverage line ──
+  container.addChild(
+    new Text(
+      theme.fg(
+        "dim",
+        `  Included diffs: ${packet.includedFiles.length} file${packet.includedFiles.length === 1 ? "" : "s"}` +
+          `  \u2022  Omitted: ${packet.omittedFiles.length} file${packet.omittedFiles.length === 1 ? "" : "s"}` +
+          `  \u2022  Budget: ${(packet.charBudget / 1000).toFixed(0)}K chars`,
+      ),
+      1,
+      0,
+    ),
+  );
+  container.addChild(new Spacer(1));
+
+  // ── Confirm / Cancel hints ──
+  container.addChild(
+    new Text(
+      `  ${dim("Enter")} ${theme.fg("success", "Run review")}  ${dim("\u2022")}  ${dim("Esc")} ${theme.fg("muted", "Cancel")}  ${dim("\u2022 y/n")}`,
+      1,
+      0,
+    ),
+  );
+  container.addChild(new Spacer(1));
+
+  // ── Bottom border ──
+  container.addChild(new DynamicBorder((s: string) => accent(s)));
+
+  return container;
 }
 
 export async function selectBranch(ctx: ExtensionContext): Promise<string | undefined> {
@@ -170,47 +300,3 @@ export async function selectCommit(ctx: ExtensionContext): Promise<string | unde
     onSelect: (item) => item.value,
   });
 }
-
-function formatPlanPreview(plan: ReviewPlan): string {
-  const { model, snapshot, brief } = plan;
-  const parts: string[] = [
-    `Model: ${model.canonicalId}`,
-    `Snapshot: ${snapshot.title}`,
-    `Files changed: ${snapshot.changedFiles.length}`,
-    `Inline diff files: ${plan.packet.includedFiles.length}`,
-    `Omitted files: ${plan.packet.omittedFiles.length}`,
-    "",
-    "Summary:",
-    brief.summary,
-    "",
-    "Intended outcome:",
-    brief.intendedOutcome,
-  ];
-
-  if (brief.constraints.length > 0) {
-    parts.push("", "Constraints:", ...brief.constraints.map((item) => `- ${item}`));
-  }
-  if (brief.focusAreas.length > 0) {
-    parts.push("", "Focus areas:", ...brief.focusAreas.map((item) => `- ${item}`));
-  }
-  if (brief.riskyFiles.length > 0) {
-    parts.push("", "Risky files:", ...brief.riskyFiles.map((item) => `- ${item}`));
-  }
-  if (brief.unresolvedQuestions.length > 0) {
-    parts.push(
-      "",
-      "Unresolved questions:",
-      ...brief.unresolvedQuestions.map((item) => `- ${item}`),
-    );
-  }
-  if (plan.packet.omittedFiles.length > 0) {
-    parts.push(
-      "",
-      "Prompt coverage:",
-      `Included: ${plan.packet.includedFiles.join(", ") || "none"}`,
-      `Omitted: ${plan.packet.omittedFiles.join(", ")}`,
-    );
-  }
-
-  return parts.join("\n");
-}

package/src/ui/theme-type.ts

@@ -0,0 +1,16 @@
+/**
+ * The Theme-like interface consumed by review plan preview helpers.
+ *
+ * pi's `Theme` type is not publicly re-exported from
+ * `@earendil-works/pi-coding-agent`, so we define the subset of
+ * methods we use. A full `Theme` object is assignable to this type
+ * because `Theme.fg` accepts a superset of the color names listed
+ * here (contravariance: wider parameter type accepts narrower args).
+ */
+export type ReviewTheme = {
+  fg: (
+    color: "accent" | "dim" | "success" | "muted" | "warning" | "toolDiffAdded" | "toolDiffRemoved",
+    text: string,
+  ) => string;
+  bold: (text: string) => string;
+};