tdd-enforcer 0.1.1 → 0.1.3

package/adapters/pi/hooks.ts

@@ -1,8 +1,8 @@
-import { join } from "node:path";
+import { join, relative } from "node:path";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { isToolCallEventType, isBashToolResult } from "@earendil-works/pi-coding-agent";
 import { isAllowed } from "../../engine/enforce.js";
-import { changesSinceSnapshot, restoreFiles } from "../../engine/git.js";
+import { changesSinceSnapshot } from "../../engine/git.js";
 import { loadTddState } from "./helpers.js";
 import { tddLog } from "./log.js";
 
@@ -44,22 +44,24 @@ export function registerHooks(pi: ExtensionAPI): void {
       return;
     }
 
-    const allowed = isAllowed(filePath, phase, config);
-    tddLog(tddDir, "DEBUG", "tool_call: check", { toolName, filePath, phase, allowed });
+    // Patterns in rules.json are relative to repo root; convert absolute path
+    const relPath = relative(root, filePath);
+    const allowed = isAllowed(relPath, phase, config);
+    tddLog(tddDir, "DEBUG", "tool_call: check", { toolName, relPath, phase, allowed });
 
     if (!allowed) {
       tddLog(tddDir, "INFO", "tool_call: blocked file modification", {
         toolName,
-        filePath,
+        relPath,
         phase,
       });
       return {
         block: true,
-        reason: `TDD ${phase.toUpperCase()}: "${filePath}" is locked in this phase.`,
+        reason: `TDD ${phase.toUpperCase()}: "${relPath}" is locked in this phase.`,
       };
     }
 
-    tddLog(tddDir, "DEBUG", "tool_call: allowed", { toolName, filePath, phase });
+    tddLog(tddDir, "DEBUG", "tool_call: allowed", { toolName, relPath, phase });
   });
 
   pi.on("tool_result", async (event, ctx: ExtensionContext) => {
@@ -96,14 +98,11 @@ export function registerHooks(pi: ExtensionAPI): void {
       return;
     }
 
-    tddLog(tddDir, "INFO", "tool_result: reverting violations", {
+    tddLog(tddDir, "WARN", "tool_result: locked files modified by bash", {
       phase,
       violations,
-      allChanged: changed,
     });
 
-    restoreFiles(root, violations);
-
     const existingText = event.content.map((c) => ("text" in c ? c.text : "")).join("");
     return {
       content: [
@@ -111,8 +110,9 @@ export function registerHooks(pi: ExtensionAPI): void {
           type: "text",
           text:
             existingText +
-            `\n\n⚠️ TDD: Bash modified files locked in ${phase.toUpperCase()} phase. ` +
-            `Reverted: ${violations.join(", ")}`,
+            `\n\n⚠️ ${phase.toUpperCase()}: bash modified locked files: ${violations.join(", ")}\n` +
+            `next_tdd_phase blocked until reverted. ` +
+            `Inspect with: cd .pi/tdd && git diff HEAD -- ${violations[0]}`,
         },
       ],
     };

package/adapters/pi/index.ts

@@ -1,7 +1,7 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { existsSync } from "node:fs";
 import { join } from "node:path";
-import { loadPhaseState, loadConfig, savePhaseState, initGit } from "../../engine/index.js";
+import { loadPhaseState, loadConfig, savePhaseState, initGit, snapshot } from "../../engine/index.js";
 import { registerTools } from "./tools.js";
 import { registerHooks } from "./hooks.js";
 import { loadTddState } from "./helpers.js";
@@ -80,6 +80,12 @@ export default function (pi: ExtensionAPI) {
         tddLog(tddDir, "DEBUG", "tdd:on: git repo already exists");
       }
 
+      // Snapshot working tree so stale baseline doesn't nuke user changes
+      snapshot(root, state.current);
+      tddLog(tddDir, "INFO", "tdd:on: snapshot taken", {
+        phase: state.current,
+      });
+
       state.enabled = true;
       savePhaseState(root, state);
       tddLog(tddDir, "INFO", "tdd:on: enabled", {

package/engine/git.ts

@@ -1,5 +1,5 @@
 import { execSync, type ExecSyncOptions } from "node:child_process";
-import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, writeFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 
 const TDD_DIR = ".pi/tdd";
@@ -63,8 +63,29 @@ export function changesSinceSnapshot(projectRoot: string): string[] {
 
 export function restoreFiles(projectRoot: string, files: string[]): void {
   if (files.length === 0) return;
-  const escaped = files.map((f) => `"${f}"`).join(" ");
-  gitExec(`restore -- ${escaped}`, projectRoot, { stdio: "pipe" as const });
+
+  // Separate tracked (git restore) from untracked (delete)
+  const tracked = gitExec("ls-files", projectRoot)
+    .trim()
+    .split("\n")
+    .filter(Boolean);
+  const trackedSet = new Set(tracked);
+
+  const trackedFiles = files.filter((f) => trackedSet.has(f));
+  const untrackedFiles = files.filter((f) => !trackedSet.has(f));
+
+  if (trackedFiles.length > 0) {
+    const escaped = trackedFiles.map((f) => `"${f}"`).join(" ");
+    gitExec(`restore -- ${escaped}`, projectRoot, { stdio: "pipe" as const });
+  }
+
+  for (const f of untrackedFiles) {
+    try {
+      unlinkSync(f);
+    } catch {
+      // File may already be gone, ignore
+    }
+  }
 }
 
 export function headHash(projectRoot: string): string {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tdd-enforcer",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "type": "module",
   "keywords": [
     "pi-package"