pi-pair-programmer 0.1.6 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-pair-programmer",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "A TypeScript extension for Pi and OMP",
   "repository": {
     "type": "git",
@@ -64,6 +64,7 @@
   },
   "dependencies": {
     "@typesafe-ai/sdk": "^0.6.0",
+    "diff": "^9.0.0",
     "minimatch": "^10.2.6",
     "pino": "^10.3.1",
     "typebox": "^1.3.34",

package/src/change-evidence.ts

@@ -13,11 +13,13 @@ import {
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { promisify } from "node:util";
+import { createTwoFilesPatch, diffArrays, FILE_HEADERS_ONLY } from "diff";
 import { z } from "zod";
 
 const execute = promisify(execFile);
 const NoMatchSchema = z.object({ code: z.literal(1), stderr: z.string() });
 const MAX_FILE_BYTES = 64_000;
+const MAX_EDIT_DISTANCE = 1000;
 const MAX_ENTRIES = 10_000;
 const MAX_LISTING_BYTES = 256_000_000;
 const CAPTURE_TIMEOUT_MS = 5000;
@@ -733,32 +735,30 @@ function matchingOrigins(
   return [...matches.values()];
 }
 
-function sourceDiff(before: SourceFile, after: SourceFile): string {
-  const oldLines = before.source.split("\n");
-  const newLines = after.source.split("\n");
-  let start = 0;
-  while (start < oldLines.length && oldLines.at(start) === newLines.at(start)) {
-    start += 1;
-  }
-  let oldEnd = oldLines.length;
-  let newEnd = newLines.length;
-  while (
-    oldEnd > start &&
-    newEnd > start &&
-    oldLines[oldEnd - 1] === newLines[newEnd - 1]
-  ) {
-    oldEnd -= 1;
-    newEnd -= 1;
-  }
-  const contextStart = Math.max(0, start - 3);
-  const contextEnd = Math.min(oldLines.length - oldEnd, 3);
-  const changes = [
-    ...oldLines.slice(contextStart, start).map((text) => ` ${text}`),
-    ...oldLines.slice(start, oldEnd).map((text) => `-${text}`),
-    ...newLines.slice(start, newEnd).map((text) => `+${text}`),
-    ...oldLines.slice(oldEnd, oldEnd + contextEnd).map((text) => ` ${text}`),
-  ];
-  return `--- ${before.file}\n+++ ${after.file}\n@@ -${String(contextStart + 1)},${String(oldEnd - contextStart + contextEnd)} +${String(contextStart + 1)},${String(newEnd - contextStart + contextEnd)} @@\n${changes.join("\n")}`;
+function sourceDiff(before: SourceFile, after: SourceFile): string | undefined {
+  return createTwoFilesPatch(
+    before.file,
+    after.file,
+    before.source,
+    after.source,
+    undefined,
+    undefined,
+    {
+      context: 3,
+      maxEditLength: MAX_EDIT_DISTANCE,
+      headerOptions: FILE_HEADERS_ONLY,
+    },
+  );
+}
+
+function baselineFile(
+  baseline: TaskBaseline | undefined,
+  file: string,
+): string | undefined {
+  return baseline === undefined
+    ? undefined
+    : (relativeFile(baseline.root, file) ??
+        relativeFile(baseline.requestedRoot, file));
 }
 
 export async function buildChangeEvidence(
@@ -769,11 +769,7 @@ export async function buildChangeEvidence(
   quote: string,
   signal?: AbortSignal,
 ): Promise<ChangeEvidence> {
-  const relative =
-    baseline === undefined
-      ? undefined
-      : (relativeFile(baseline.root, file) ??
-        relativeFile(baseline.requestedRoot, file));
+  const relative = baselineFile(baseline, file);
   const evidence: ChangeEvidence = {
     status: "unavailable",
     before: null,
@@ -833,8 +829,116 @@ export async function buildChangeEvidence(
       "No substantial matching baseline block or same-file source";
     return evidence;
   }
-  evidence.diff = sourceDiff(original, evidence.after);
+  const diff = sourceDiff(original, evidence.after);
   evidence.status = "available";
-  evidence.reason = null;
+  evidence.diff = diff ?? null;
+  evidence.reason =
+    diff === undefined
+      ? "The line diff was too large to compute; compare taskStartSource with currentSource directly"
+      : null;
   return evidence;
 }
+
+export interface LineHunk {
+  start: number;
+  added: number;
+  removed: readonly string[];
+}
+
+export type LineChanges =
+  | { status: "available"; hunks: readonly LineHunk[] }
+  | { status: "approximate"; region: LineHunk }
+  | { status: "unavailable"; reason: string };
+
+function compareLines(before: string, after: string): LineChanges {
+  const oldLines = before.split("\n");
+  const newLines = after.split("\n");
+  let start = 0;
+  while (
+    start < oldLines.length &&
+    start < newLines.length &&
+    oldLines.at(start) === newLines.at(start)
+  ) {
+    start += 1;
+  }
+  let oldEnd = oldLines.length;
+  let newEnd = newLines.length;
+  while (
+    oldEnd > start &&
+    newEnd > start &&
+    oldLines[oldEnd - 1] === newLines[newEnd - 1]
+  ) {
+    oldEnd -= 1;
+    newEnd -= 1;
+  }
+  const removed = oldLines.slice(start, oldEnd);
+  const added = newLines.slice(start, newEnd);
+  const changes = diffArrays(removed, added, {
+    maxEditLength: MAX_EDIT_DISTANCE,
+  });
+  if (changes === undefined)
+    return {
+      status: "approximate",
+      region: { start: start + 1, added: added.length, removed },
+    };
+  const hunks: LineHunk[] = [];
+  let line = start + 1;
+  let hunk: { start: number; added: number; removed: string[] } | undefined;
+  for (const change of changes) {
+    if (!change.added && !change.removed) {
+      hunk = undefined;
+      line += change.count;
+      continue;
+    }
+    if (hunk === undefined) {
+      hunk = { start: line, added: 0, removed: [] };
+      hunks.push(hunk);
+    }
+    if (change.added) {
+      hunk.added += change.count;
+      line += change.count;
+    } else {
+      hunk.removed.push(...change.value);
+    }
+  }
+  return { status: "available", hunks };
+}
+
+export async function lineChanges(
+  baseline: TaskBaseline | undefined,
+  file: string,
+  source: string,
+  signal?: AbortSignal,
+): Promise<LineChanges> {
+  if (baseline === undefined)
+    return { status: "unavailable", reason: "Task baseline is unavailable" };
+  const relative = baselineFile(baseline, file);
+  if (
+    relative === undefined ||
+    !eligible(relative) ||
+    baseline.unattributable(relative)
+  )
+    return {
+      status: "unavailable",
+      reason: "File is not covered by the task baseline",
+    };
+  if (Buffer.byteLength(source) > MAX_FILE_BYTES)
+    return { status: "unavailable", reason: "Current source is oversized" };
+  let before: BeforeState;
+  try {
+    before = await baseline.before(relative, signal);
+  } catch {
+    return { status: "unavailable", reason: "Task baseline could not be read" };
+  }
+  if (before.state === "unknown")
+    return {
+      status: "unavailable",
+      reason: "Task-start state of this file is unknown",
+    };
+  return before.state === "absent"
+    ? {
+        status: "available",
+        hunks: [{ start: 1, added: source.split("\n").length, removed: [] }],
+      }
+    : compareLines(before.source, source);
+}

package/src/index.ts

@@ -10,6 +10,7 @@ import { z } from "zod";
 import {
   buildChangeEvidence,
   captureBaseline,
+  lineChanges,
   type TaskBaseline,
 } from "./change-evidence.js";
 import { FindingAdmission, findingId } from "./finding-admission.js";
@@ -455,6 +456,7 @@ export default function pairProgrammer(pi: ExtensionAPI): void {
       prompt: job.reviewer.prompt,
       file: job.file,
       source: job.source,
+      changes: await lineChanges(baseline, job.file, job.source, signal),
       signal,
       onModelCall,
       onJudgment,

package/src/logger.ts

@@ -141,7 +141,6 @@ const reasonCodes = {
   too_many_findings: true,
   judged: true,
   evidence_unavailable: true,
-  no_diff: true,
   no_origin: true,
   response_invalid: true,
   request_failed: true,

package/src/pair-stats.ts

@@ -59,7 +59,6 @@ const Attribution = z.object({
   reason: z.enum([
     "judged",
     "evidence_unavailable",
-    "no_diff",
     "no_origin",
     "response_invalid",
     "request_failed",

package/src/review-runner.ts

@@ -1,7 +1,11 @@
 import { spawn } from "node:child_process";
 import { choice, TypeSafeClient } from "@typesafe-ai/sdk";
 import { z } from "zod";
-import type { ChangeEvidence } from "./change-evidence.js";
+import type {
+  ChangeEvidence,
+  LineChanges,
+  LineHunk,
+} from "./change-evidence.js";
 import {
   notify,
   observeJudgment,
@@ -84,11 +88,69 @@ interface ReviewRequest {
   prompt: string;
   file: string;
   source: string;
+  changes: LineChanges;
   signal: AbortSignal;
   onModelCall?: ModelCallObserver;
   onJudgment?: JudgmentObserver;
 }
 
+function numberedExcerpt(
+  lines: readonly string[],
+  changes: LineChanges,
+  truncated: boolean,
+): string {
+  const changed = new Set<number>();
+  const removed = new Map<number, readonly string[]>();
+  for (const hunk of markedHunks(changes)) {
+    for (let line = hunk.start; line < hunk.start + hunk.added; line += 1)
+      changed.add(line);
+    removed.set(hunk.start, hunk.removed);
+  }
+  const marker = changes.status === "approximate" ? "~" : "+";
+  const rows: string[] = [];
+  const pushRemoved = (line: number): void => {
+    for (const text of removed.get(line) ?? []) rows.push(`-: ${text}`);
+  };
+  for (const [index, text] of lines.entries()) {
+    const line = index + 1;
+    pushRemoved(line);
+    rows.push(`${String(line)}${changed.has(line) ? marker : ""}: ${text}`);
+  }
+  if (!truncated) pushRemoved(lines.length + 1);
+  return rows.join("\n");
+}
+
+function markedHunks(changes: LineChanges): readonly LineHunk[] {
+  if (changes.status === "available") return changes.hunks;
+  return changes.status === "approximate" ? [changes.region] : [];
+}
+
+const changeOnlyScope = `Report only violations the changes cause. That includes violations on changed lines, and unchanged code the changes left inconsistent: code that changed lines now duplicate, contradict, or break, or code the changes updated elsewhere but missed here (cite whichever line shows it best). Violations already present at task start that the changes neither create nor worsen are out of scope, even next to changed lines.`;
+
+function changeScope(file: string, changes: LineChanges): string {
+  if (changes.status === "unavailable")
+    return `Review ${file} against the criterion. Which lines changed since task start is unknown, so evaluate the whole file.`;
+  const review = `Review the changes made to ${file} since the task started against the criterion. The excerpt below is the current file.`;
+  if (changes.status === "approximate")
+    return `${review} The exact changed lines could not be computed. A gutter of "N~:" marks line N inside one region that contains every change since task start but may also contain unchanged lines, "N:" marks an unchanged line outside that region, and "-:" lists the task-start lines that region replaced. Removed lines no longer exist, so never cite them. Compare the "N~:" lines with the "-:" lines to tell which of them changed; a line is not changed merely because it is marked "N~:". ${changeOnlyScope}`;
+  const legend = `${review} A gutter of "N+:" marks line N as added or changed since task start, "N:" marks an unchanged line, and "-:" shows a task-start line removed at that position. Removed lines no longer exist, so never cite them.`;
+  return changes.hunks.length === 0
+    ? `${legend} No line has changed since task start.`
+    : `${legend} ${changeOnlyScope}`;
+}
+
+function reviewInstructions(
+  file: string,
+  changes: LineChanges,
+  lastLine: number | undefined,
+): string {
+  const truncation =
+    lastLine === undefined
+      ? ""
+      : ` The excerpt stops at line ${String(lastLine)}; the rest of the file is omitted.`;
+  return `${changeScope(file, changes)} Line numbers refer to the numbered excerpt below; cite the line number and quote code text only, never the gutter.${truncation}`;
+}
+
 function invoke(
   args: string[],
   cwd: string,
@@ -200,10 +262,9 @@ export async function reviewFile(
   request: ReviewRequest,
 ): Promise<ProposedFinding[]> {
   const excerpt = request.source.slice(0, MAX_SOURCE_CHARACTERS);
+  const truncated = excerpt.length < request.source.length;
   const lines = excerpt.split("\n");
-  const numbered = lines
-    .map((line, index) => `${String(index + 1)}: ${line}`)
-    .join("\n");
+  const numbered = numberedExcerpt(lines, request.changes, truncated);
   const result = await complete(
     request.host,
     request.cwd,
@@ -235,7 +296,7 @@ Return only JSON: {"findings":[{"line":1,"title":"specific criterion violation",
 Return at most ${String(MAX_FINDINGS)} findings.
 Return {"findings":[]} when the criterion is satisfied or the evidence is insufficient. An empty result is a successful review.
 Reply with the JSON object alone, without any other text.`,
-    `Evaluate the current edit to ${request.file} against the criterion. Line numbers refer to the numbered excerpt below. Report only criterion violations introduced by the current edit.\n\n${numbered}`,
+    `${reviewInstructions(request.file, request.changes, truncated ? lines.length : undefined)}\n\n${numbered}`,
     request.signal,
     request.onModelCall,
   );
@@ -376,7 +437,6 @@ async function attribute(request: AttributionRequest): Promise<Attribution> {
     evidenceReason: evidence.reason,
   });
   if (evidence.status !== "available") return keep("evidence_unavailable");
-  if (evidence.diff === null) return keep("no_diff");
   if (evidence.before === null && evidence.origins.length === 0) {
     return keep("no_origin");
   }