tamperward 2.23.16 → 2.23.17

package/dist/cli/index.js

@@ -6756,6 +6756,25 @@ function entryShape(h) {
   }
   return { problems, runs };
 }
+function judgeGateEntry(event, matcher, h) {
+  const cmd = typeof h.command === "string" ? h.command : "";
+  const a = analyseGateCommand(cmd, event);
+  const shape = entryShape(h);
+  const problems = [...a.problems, ...shape.problems];
+  let runs = a.runs && shape.runs;
+  let tools = null;
+  if (event === "PreToolUse") {
+    const sel = matcherSelection(matcher);
+    tools = sel.tools;
+    if (sel.problem) {
+      problems.push(sel.problem);
+    }
+  } else if (matcher !== void 0 && !(typeof matcher === "string" && (matcher === "" || matcher === "*"))) {
+    problems.push(`a \`matcher\` (${JSON.stringify(matcher)}) on the Stop entry`);
+    runs = false;
+  }
+  return { runs, problems, pin: a.pin, tools };
+}
 function gateCandidates(s, event) {
   const out3 = [];
   for (const group of eventEntries(s, event) ?? []) {
@@ -6778,22 +6797,7 @@ function gateCandidates(s, event) {
         continue;
       }
       if (!MENTIONS_GATE.test(cmd)) continue;
-      const a = analyseGateCommand(cmd, event);
-      const shape = entryShape(h);
-      const problems = [...a.problems, ...shape.problems];
-      let runs = a.runs && shape.runs;
-      let tools = null;
-      if (event === "PreToolUse") {
-        const sel = matcherSelection(group.matcher);
-        tools = sel.tools;
-        if (sel.problem) {
-          problems.push(sel.problem);
-        }
-      } else if (group.matcher !== void 0 && !(typeof group.matcher === "string" && (group.matcher === "" || group.matcher === "*"))) {
-        problems.push(`a \`matcher\` (${JSON.stringify(group.matcher)}) on the Stop entry`);
-        runs = false;
-      }
-      out3.push({ key: JSON.stringify({ m: group.matcher, h }), runs, problems, pin: a.pin, tools });
+      out3.push({ key: JSON.stringify({ m: group.matcher, h }), ...judgeGateEntry(event, group.matcher, h) });
     }
   }
   return out3;
@@ -11164,6 +11168,17 @@ function planGitignore(cwd) {
     apply: () => atomicReplaceFile(path, next, existingMode(path, 420))
   };
 }
+function gateVerdicts(event, groups, needle) {
+  const out3 = [];
+  for (const group of groups) {
+    for (const h of group.hooks ?? []) {
+      if (!needle.test(String(h.command ?? ""))) continue;
+      const { runs, problems } = judgeGateEntry(event, group.matcher, h);
+      out3.push({ event, group, h, runs, problems });
+    }
+  }
+  return out3;
+}
 function planClaudeHooks(cwd) {
   const rel = ".claude/settings.json";
   const path = join14(cwd, rel);
@@ -11197,10 +11212,24 @@ function planClaudeHooks(cwd) {
   const needPre = preEntries.length === 0;
   const stopEntries = entriesWith(hooks.Stop, SWEEP_RE);
   const needStop = stopEntries.length === 0;
+  const neutralised = [
+    ...gateVerdicts("PreToolUse", preEntries, HOOK_RE),
+    ...gateVerdicts("Stop", stopEntries, SWEEP_RE)
+  ].filter((v) => !v.runs);
+  const foreign = neutralised.filter((v) => ours(String(v.h.command ?? "")) === null);
+  if (foreign.length > 0) {
+    return {
+      item: "agent",
+      path: rel,
+      status: "error",
+      detail: `${foreign.map((v) => `the ${v.event} gate entry is neutralised (${v.problems.join("; ")})`).join("; ")} \u2014 the runtime would not run the gate through it; remove the entry, then re-run init (refusing to rewrite a hand-written entry)`
+    };
+  }
   const stale = preEntries.filter((m) => missingTools(m.matcher).length > 0);
-  const repin = [...preEntries, ...stopEntries].flatMap((m) => m.hooks ?? []).filter((h) => stalePin(String(h.command ?? "")));
+  const restoring = new Set(neutralised.map((v) => v.h));
+  const repin = [...preEntries, ...stopEntries].flatMap((m) => m.hooks ?? []).filter((h) => !restoring.has(h) && stalePin(String(h.command ?? "")));
   const needDisableFalse = settings.disableAllHooks !== false;
-  if (!needPre && !needStop && stale.length === 0 && repin.length === 0 && !needDisableFalse) {
+  if (!needPre && !needStop && stale.length === 0 && repin.length === 0 && neutralised.length === 0 && !needDisableFalse) {
     return { item: "agent", path: rel, status: "ok", detail: "PreToolUse + Stop hooks already wired" };
   }
   const repairing = stale.length > 0 ? [...new Set(stale.flatMap((m) => missingTools(m.matcher)))] : [];
@@ -11214,9 +11243,16 @@ function planClaudeHooks(cwd) {
       needStop && "wire Stop sweep",
       repairing.length > 0 && `widen the PreToolUse matcher to cover ${repairing.join(", ")}`,
       repin.length > 0 && `re-pin the hook commands to tamperward@${TW_VERSION} (was ${pins.join(", ")})`,
+      ...neutralised.map((v) => `restore the ${v.event} gate entry to the shape init writes \u2014 it is neutralised (${v.problems.join("; ")})`),
       needDisableFalse && (settings.disableAllHooks === void 0 ? "declare disableAllHooks: false so the user settings file cannot switch the hooks off" : `set disableAllHooks: false (was ${JSON.stringify(settings.disableAllHooks)})`)
     ].filter(Boolean).join(" + "),
     apply: () => {
+      for (const v of neutralised) {
+        for (const k of Object.keys(v.h)) delete v.h[k];
+        v.h.type = "command";
+        v.h.command = v.event === "PreToolUse" ? HOOK_CMD : SWEEP_CMD;
+        if (v.event === "Stop") delete v.group.matcher;
+      }
       for (const h of repin) {
         const kind = ours(String(h.command ?? ""))?.[2];
         h.command = kind === "hook claude" ? HOOK_CMD : kind === "sweep claude" ? SWEEP_CMD : h.command;
@@ -11316,7 +11352,7 @@ ${block.join("\n")}
   }
   const lines = existing.split("\n");
   const dead = unconditionalExitAt(lines);
-  const at = lines.findIndex((l) => PRECOMMIT_RE.test(l));
+  const at = lines.findIndex((l) => !/^\s*#/.test(l) && PRECOMMIT_RE.test(l));
   const write = (out3) => atomicReplaceFile(path, out3.join("\n"), hookMode());
   if (at !== -1 && (dead === -1 || at < dead)) {
     if (!stalePin(lines[at])) {
@@ -11559,6 +11595,7 @@ var init_init = __esm({
     init_verifier_limits();
     init_wiring();
     init_narrow();
+    init_hook_tampering();
     init_repo_context();
     init_safe_write();
     errText3 = (e) => (e instanceof Error ? e.message : String(e)).replace(/\s+/g, " ").trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamperward",
-  "version": "2.23.16",
+  "version": "2.23.17",
   "description": "The deterministic agent-integrity gate. One ruleset, evaluated on the actual diff/commands as a verdict, enforced everywhere a change can be made.",
   "license": "Apache-2.0",
   "author": "hexrift",