@earntori/cli 0.2.20 → 0.2.21

package/dist/index.js

@@ -4,7 +4,7 @@ import { readdirSync, realpathSync } from "node:fs";
 import { readFileSync, writeFileSync, mkdirSync, existsSync, appendFileSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, resolve, relative, isAbsolute, dirname } from "node:path";
-import { execSync } from "node:child_process";
+import { execSync, execFileSync } from "node:child_process";
 import { createHash, createPublicKey, verify as edVerify } from "node:crypto";
 const CONFIG_DIR = join(homedir(), ".tori");
 const CONFIG = join(CONFIG_DIR, "config.json");
@@ -408,6 +408,35 @@ function formatRun(r, n) {
 }
 const dbg = (m) => { if (process.env.TORI_DEBUG)
     console.error(`[tori ${new Date().toISOString().slice(11, 23)}] ${m}`); };
+/** Spec rev 101 (fits in phase A3; extends rev 90): the lines of `path` that differ from the last commit, as
+ *  line numbers in the working copy. "all" when the file has no committed version, and when git cannot answer
+ *  (the behaviour before rev 101). */
+const changedLinesCache = new Map();
+function changedLines(path) {
+    const hit = changedLinesCache.get(path);
+    if (hit)
+        return hit;
+    let v = "all";
+    try {
+        const git = (a) => execFileSync("git", a, { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], maxBuffer: 16 * 1024 * 1024 });
+        if (git(["ls-tree", "--name-only", "HEAD", "--", path]).trim()) {
+            const diff = git(["diff", "--no-color", "--no-ext-diff", "--no-textconv", "-U0", "HEAD", "--", path]);
+            const s = new Set();
+            let hunks = 0;
+            for (const m of diff.matchAll(/^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@/gm)) {
+                hunks++;
+                const start = Number(m[1]), n = m[2] === undefined ? 1 : Number(m[2]);
+                for (let i = 0; i < n; i++)
+                    s.add(start + i);
+            }
+            if (hunks > 0 || !diff.trim())
+                v = s; // a diff with no readable hunks stays "all"
+        }
+    }
+    catch { }
+    changedLinesCache.set(path, v);
+    return v;
+}
 async function check() {
     dbg("check: start");
     if (has("reminder")) {
@@ -472,7 +501,12 @@ async function check() {
         die(e.message);
     }
     const text = formatRun(r, files.length);
-    const highs = r.findings.filter((f) => f.severity === "high").length, meds = r.findings.filter((f) => f.severity === "medium").length, lows = r.findings.length - highs - meds;
+    // Spec rev 101: in hook mode a turn is held only by findings on lines it changed. A finding with no line number
+    // holds, since it cannot be placed. Findings on other lines stay open on the record and are counted as older.
+    const held = hook ? r.findings.filter((f) => { if (!f.line)
+        return true; const c = changedLines(f.path); return c === "all" || c.has(f.line); }) : r.findings;
+    const older = r.findings.length - held.length;
+    const highs = held.filter((f) => f.severity === "high").length, meds = held.filter((f) => f.severity === "medium").length, lows = held.length - highs - meds;
     if (hook) {
         if (r.clean)
             return;
@@ -480,9 +514,13 @@ async function check() {
             console.log(`Tori: ${r.findings.length} finding(s) still open \u2014 run \`tori check\` to see them.`);
             return;
         }
-        if (highs === 0)
-            return; // only high blocks; medium/low are recorded and shown in status and at session start
-        console.error(text + `\n\n${highs} high (blocking)${meds ? `, ${meds} medium` : ""}${lows ? `, ${lows} low` : ""} — medium and low are recorded and do not block.`);
+        const olderNote = older ? `Tori: ${older} older finding(s) open on lines this turn did not change \u2014 recorded, not blocking. Run \`tori check\` to see them.` : "";
+        if (highs === 0) {
+            if (olderNote)
+                console.log(olderNote);
+            return;
+        } // only high on a changed line blocks; medium/low are recorded and shown in status and at session start
+        console.error(formatRun({ ...r, findings: held }, files.length) + `\n\n${highs} high (blocking)${meds ? `, ${meds} medium` : ""}${lows ? `, ${lows} low` : ""} — medium and low are recorded and do not block.` + (olderNote ? `\n${olderNote}` : ""));
         process.exit(2); // exit 2 = block the stop; stderr goes to the agent
     }
     out(r, text);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@earntori/cli",
-  "version": "0.2.20",
+  "version": "0.2.21",
   "description": "Tori CLI — holds your coding agent to a standard: checks before it calls a task done, each finding with its fix, on a signed record you can verify offline.",
   "license": "MIT",
   "type": "module",