@jwilger/pi-development-system 0.19.0 → 0.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwilger/pi-development-system",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "description": "A pi extension package representing a seasoned approach to software development using a full AI SDLC.",
   "keywords": [
     "pi-package"

package/skills/code-review/SKILL.md

@@ -50,8 +50,8 @@ The verdict must agree with the findings.
 - **false-positive**: refuted; ignored.
 
 Jev may raise a finding's severity when it is at least 0.8 confident; it never
-lowers a blocking or should-fix finding (it only suggests, in the reply, and you
-re-check it yourself). A round is clean when it has no blocking or should-fix findings.
+lowers a finding to a severity that does not count (it only suggests, in the
+reply, and you re-check it yourself). A round is clean when it has no blocking or should-fix findings.
 The default is three consecutive clean rounds (`review.required_clean_rounds`).
 Only real findings reset the count; a changed diff alone does not, so a small fix
 commit keeps the clean rounds already earned unless findings come back.

package/src/core/review-flow.ts

@@ -65,7 +65,8 @@ export function splitDiffByFile(diff: string): Record<string, string> {
     if (path !== undefined) out[path] = lines.join("\n");
   };
   for (const line of diff.split("\n")) {
-    const header = /^diff --git a\/.* b\/(.*)$/.exec(line);
+    // Git quotes unusual paths ("b/na\303\257ve.md"); strip the quotes rather than lose the section.
+    const header = /^diff --git "?a\/.*?"? "?b\/(.*?)"?$/.exec(line);
     if (header !== null) {
       flush();
       path = header[1] ?? line;

package/src/gates/commit-guard.ts

@@ -119,7 +119,11 @@ async function jevNeeds(
 }
 
 /** While work is in flight, committing needs the slice review satisfied on the diff as it is now. */
-async function reviewNeeds(deps: CommitGuardDeps, ctx: ExtensionContext): Promise<Need[]> {
+async function reviewNeeds(
+  deps: CommitGuardDeps,
+  ctx: ExtensionContext,
+  command: string,
+): Promise<Need[]> {
   const { phase, activeSlice } = deps.state.get();
   if ((phase !== "implementing" && phase !== "reviewing") || activeSlice === undefined) return [];
   const snap = await snapshotDiff(deps.exec, ctx.cwd, "HEAD");
@@ -129,7 +133,45 @@ async function reviewNeeds(deps: CommitGuardDeps, ctx: ExtensionContext): Promis
     activeSlice,
     snap.ok ? { digest: snap.value.digest, files: snap.value.files } : { digest: "unknown" },
   );
-  return gap === undefined ? [] : [{ gate: REVIEW, why: gap }];
+  if (gap !== undefined) return [{ gate: REVIEW, why: gap }];
+  // The review saw the work tree; a plain `git commit` records the index. A file staged and then edited
+  // again would commit the older, unreviewed content.
+  const stale = stagedThenEdited(await changedNames(deps.exec, ctx.cwd), command);
+  return stale.length === 0
+    ? []
+    : [
+        {
+          gate: REVIEW,
+          why: `the staged content of ${stale.join(", ")} differs from the work tree that was reviewed (edited after \`git add\`); stage it again`,
+        },
+      ];
+}
+
+/** Files staged and also changed since staging; empty when the commit stages everything itself. */
+const stagedThenEdited = (
+  names: { staged: readonly string[]; unstaged: readonly string[] } | undefined,
+  command: string,
+): string[] =>
+  names === undefined || stagesEverything(command)
+    ? []
+    : names.staged.filter((name) => names.unstaged.includes(name));
+
+async function changedNames(
+  exec: Exec,
+  cwd: string,
+): Promise<{ staged: string[]; unstaged: string[] } | undefined> {
+  try {
+    const base = ["-c", "core.quotePath=false", "diff", "--no-ext-diff", "--name-only", "-z"];
+    const [staged, unstaged] = await Promise.all([
+      exec("git", [...base, "--cached"], { cwd, timeout: 10_000 }),
+      exec("git", base, { cwd, timeout: 10_000 }),
+    ]);
+    if (staged.code !== 0 || unstaged.code !== 0) return undefined;
+    const split = (text: string) => text.split("\0").filter((n) => n !== "");
+    return { staged: split(staged.stdout), unstaged: split(unstaged.stdout) };
+  } catch {
+    return undefined;
+  }
 }
 
 const reviewReason = (need: Need): string =>
@@ -187,7 +229,7 @@ export function registerCommitGuard(deps: CommitGuardDeps): void {
     if (forbidden.length > 0) return { block: true, reason: forbiddenReason(forbidden) };
 
     const known = messages.flatMap((m) => (m === undefined ? [] : [m]));
-    const all: Need[] = await reviewNeeds(deps, ctx);
+    const all: Need[] = await reviewNeeds(deps, ctx, command);
     // A -F file that cannot be read now (written by this same command, or stdin) cannot be checked.
     if (extractions.some((e, i) => e.kind === "file" && messages[i] === undefined)) {
       all.push({

package/src/review/digest.ts

@@ -1,4 +1,6 @@
 import { createHash } from "node:crypto";
+import { lstat, readlink } from "node:fs/promises";
+import { join } from "node:path";
 import type { Exec } from "../core/exec.ts";
 import { err, ok, type Result } from "../core/result.ts";
 import { splitDiffByFile } from "../core/review-flow.ts";
@@ -29,27 +31,67 @@ export async function snapshotDiff(
   range: string,
 ): Promise<Result<DiffSnapshot, string>> {
   try {
+    // Plain, parseable output whatever the user's git config says: an external diff driver or
+    // forced colour removes the `diff --git` headers the per-file digests are cut from.
+    const plain = ["-c", "core.quotePath=false", "diff", "--no-ext-diff", "--no-color"];
     const [diff, stat, others] = await Promise.all([
-      exec("git", ["diff", range], { cwd, timeout: 15_000 }),
-      exec("git", ["diff", "--stat", range], { cwd, timeout: 15_000 }),
-      range === "HEAD"
-        ? exec("git", ["ls-files", "--others", "--exclude-standard"], { cwd, timeout: 15_000 })
+      exec("git", [...plain, "--full-index", "--no-renames", range], { cwd, timeout: 15_000 }),
+      exec("git", [...plain, "--stat", range], { cwd, timeout: 15_000 }),
+      // Any range that ends in the work tree (HEAD, HEAD~1, a branch) leaves untracked files out of git diff.
+      !range.includes("..")
+        ? exec(
+            "git",
+            ["-c", "core.quotePath=false", "ls-files", "-z", "--others", "--exclude-standard"],
+            { cwd, timeout: 15_000 },
+          )
         : Promise.resolve({ code: 0, stdout: "", stderr: "" }),
     ]);
     if (diff.code !== 0) return err(diff.stderr.trim() || `git diff ${range} failed`);
-    const untracked = others.code === 0 ? others.stdout.split("\n").filter((p) => p !== "") : [];
+    if (others.code !== 0) return err(others.stderr.trim() || "git ls-files --others failed");
+    const listed = others.stdout.split("\0").filter((p) => p !== "");
+    // A nested repository is listed as `dir/` and has no blob to hash.
+    const nested = listed.filter((p) => p.endsWith("/"));
+    const untracked = listed.filter((p) => !p.endsWith("/"));
+    if (untracked.length > MAX_UNTRACKED) {
+      return err(
+        `${untracked.length} untracked files (more than ${MAX_UNTRACKED}); commit or ignore some so they can be reviewed`,
+      );
+    }
     const files: Record<string, string> = {};
     for (const [path, text] of Object.entries(splitDiffByFile(diff.stdout))) {
-      files[path] = digestOf(text);
+      files[path] = fileDigest(text);
+    }
+    if (diff.stdout.trim() !== "" && Object.keys(files).length === 0) {
+      return err("could not read the diff: no per-file sections were found");
     }
     if (untracked.length > 0) {
-      const shown = untracked.slice(0, MAX_UNTRACKED);
-      const hashes = await exec("git", ["hash-object", "--", ...shown], { cwd, timeout: 15_000 });
-      const lines = hashes.code === 0 ? hashes.stdout.split("\n").filter((l) => l !== "") : [];
-      for (const [i, path] of shown.entries()) files[path] = `new:${lines[i] ?? "unhashed"}`;
+      const links = new Set<string>();
+      for (const path of untracked) {
+        const target = await linkTarget(cwd, path);
+        if (target !== undefined) {
+          files[path] = `new:${blobOf(target)}`;
+          links.add(path);
+        }
+      }
+      // `git hash-object <path>` follows symlinks (and fails on dangling ones), so links are hashed above.
+      const regular = untracked.filter((p) => !links.has(p));
+      if (regular.length > 0) {
+        const hashes = await exec("git", ["hash-object", "--", ...regular], {
+          cwd,
+          timeout: 15_000,
+        });
+        const lines = hashes.stdout.split("\n").filter((l) => l !== "");
+        if (hashes.code !== 0 || lines.length !== regular.length) {
+          return err(hashes.stderr.trim() || "git hash-object could not hash every untracked file");
+        }
+        for (const [i, path] of regular.entries()) files[path] = `new:${lines[i]}`;
+      }
     }
     const names = Object.keys(files).sort();
-    const untrackedStat = untracked.map((p) => ` ${p} (untracked)`).join("\n");
+    const untrackedStat = [
+      ...untracked.map((p) => ` ${p} (untracked)`),
+      ...nested.map((p) => ` ${p} (nested repository, not reviewable)`),
+    ].join("\n");
     return ok({
       digest: digestOf(names.map((p) => `${p}\0${files[p]}`).join("\n")),
       files,
@@ -60,3 +102,28 @@ export async function snapshotDiff(
     return err(cause instanceof Error ? cause.message : String(cause));
   }
 }
+
+const NEW_FILE = /^new file mode .*\nindex 0+\.\.([0-9a-f]+)/m;
+
+/** A new file digests as its blob, the same form an untracked file gets, so `git add` changes nothing. */
+const fileDigest = (section: string): string => {
+  const blob = NEW_FILE.exec(section)?.[1];
+  return blob === undefined ? digestOf(section) : `new:${blob}`;
+};
+
+/** The text of a symlink, or undefined when `path` is not one (or cannot be inspected). */
+async function linkTarget(cwd: string, path: string): Promise<string | undefined> {
+  try {
+    const full = join(cwd, path);
+    return (await lstat(full)).isSymbolicLink() ? await readlink(full) : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+/** Git's blob id for some content: what `git add` stores for a symlink is its target text. */
+const blobOf = (content: string): string =>
+  createHash("sha1")
+    .update(`blob ${Buffer.byteLength(content)}\0`)
+    .update(content)
+    .digest("hex");

package/src/review/review-tools.ts

@@ -247,19 +247,9 @@ export function createReviewRecordTool(
 
       const merged = combinePackets(packets);
       const { findings, notes } = await adjusted(deps, ctx, merged.findings, snap.value.sample);
-      const review = addRound(
-        { ...before, required },
-        {
-          lenses: merged.lenses,
-          findings,
-          reviewedAt: (deps.now?.() ?? new Date()).toISOString(),
-          diffDigest: snap.value.digest,
-          files: snap.value.files,
-        },
-      );
-
       // File the nits first: if this fails nothing is recorded and a retry cannot count the round twice.
-      const followups = renderFollowups(slice, review.rounds.length, findings);
+      const followups = renderFollowups(slice, expected, findings);
+      let reviewed = snap.value;
       if (followups !== undefined) {
         try {
           const dir = join(ctx.cwd, "docs", "decisions");
@@ -271,7 +261,23 @@ export function createReviewRecordTool(
             true,
           );
         }
+        // The file is part of the work tree, so writing it changed the diff. The round covers the
+        // reviewed code plus its own follow-up note; otherwise `done` would be stale on arrival.
+        const after = await snapshotDiff(deps.exec, ctx.cwd, params.diffRange?.trim() || "HEAD");
+        if (!after.ok)
+          return reply(`cannot read the diff after filing follow-ups: ${after.error}`, true);
+        reviewed = after.value;
       }
+      const review = addRound(
+        { ...before, required },
+        {
+          lenses: merged.lenses,
+          findings,
+          reviewedAt: (deps.now?.() ?? new Date()).toISOString(),
+          diffDigest: reviewed.digest,
+          files: reviewed.files,
+        },
+      );
       deps.state.update((s) => upsertReview(s, review));
       const counts = (sev: Finding["severity"]) =>
         findings.filter((f) => f.severity === sev).length;
@@ -280,7 +286,7 @@ export function createReviewRecordTool(
           `Round ${review.rounds.length} recorded: ${counts("blocking")} blocking, ${counts("should-fix")} should-fix, ${counts("nit")} nit, ${counts("false-positive")} false-positive.`,
           reviewLabel(review),
           ...notes,
-          `next: ${nextAction(review, snap.value.digest)}`,
+          `next: ${nextAction(review, reviewed.digest)}`,
         ].join("\n"),
       );
     },