tamperward 2.29.11 → 2.29.13

package/dist/cli/index.js

@@ -3663,32 +3663,57 @@ function kindOfType(type, resolveName) {
   return null;
 }
 function buildAliasMap(sf) {
-  const decls = /* @__PURE__ */ new Map();
+  const bindings = [];
+  const shadow = (name, scope) => {
+    if (scope) bindings.push({ kind: "shadow", name, scope });
+  };
   const collect2 = (node) => {
-    if (ts.isTypeAliasDeclaration(node) && (!node.typeParameters || node.typeParameters.length === 0)) decls.set(node.name.text, node.type);
+    if (ts.isTypeAliasDeclaration(node)) {
+      if (!node.typeParameters || node.typeParameters.length === 0) {
+        bindings.push({ kind: "alias", name: node.name.text, scope: node.parent, type: node.type });
+      } else {
+        shadow(node.name.text, node.parent);
+      }
+    } else if (ts.isInterfaceDeclaration(node) || ts.isEnumDeclaration(node)) {
+      shadow(node.name.text, node.parent);
+    } else if ((ts.isClassDeclaration(node) || ts.isModuleDeclaration(node)) && node.name && ts.isIdentifier(node.name)) {
+      shadow(node.name.text, node.parent);
+    } else if (ts.isTypeParameterDeclaration(node) && ts.isIdentifier(node.name)) {
+      shadow(node.name.text, node.parent);
+    }
     ts.forEachChild(node, collect2);
   };
   collect2(sf);
-  const resolve17 = (name, seen) => {
+  const kindOfBinding = (b, seen) => b.type ? kindOfType(b.type, (n) => resolveLexical(n, b.type, seen)) : null;
+  const resolveLexical = (name, at, seen) => {
     if (seen.has(name)) return null;
-    seen.add(name);
-    const t = decls.get(name);
-    return t ? kindOfType(t, (n) => resolve17(n, seen)) : null;
+    for (let n = at; n; n = n.parent) {
+      const here = bindings.filter((x) => x.name === name && x.scope === n);
+      if (here.length === 0) continue;
+      if (here.some((b) => b.kind !== "alias" || !b.type)) return null;
+      return kindOfBinding(here[0], new Set(seen).add(name));
+    }
+    return null;
+  };
+  const resolveFlat = (name, seen) => {
+    if (seen.has(name)) return null;
+    if (bindings.some((b) => b.name === name && (b.kind !== "alias" || !b.type))) return null;
+    const aliases = bindings.filter((b) => b.kind === "alias" && b.name === name);
+    if (aliases.length === 0) return null;
+    const kinds = new Set(aliases.map((b) => kindOfBinding(b, new Set(seen).add(name))));
+    return kinds.size === 1 ? [...kinds][0] ?? null : null;
+  };
+  return {
+    resolve: (name, at) => at && at.getSourceFile() === sf ? resolveLexical(name, at, /* @__PURE__ */ new Set()) : resolveFlat(name, /* @__PURE__ */ new Set())
   };
-  const resolved = /* @__PURE__ */ new Map();
-  for (const name of decls.keys()) {
-    const k = resolve17(name, /* @__PURE__ */ new Set());
-    if (k) resolved.set(name, k);
-  }
-  return resolved;
 }
-function assertedLaunderKind(node, aliasMap) {
-  return kindOfType(assertedType(node), (n) => aliasMap.get(n) ?? null);
+function assertedLaunderKind(node, aliases) {
+  return kindOfType(assertedType(node), (n) => aliases.resolve(n, node));
 }
-function isDoubleCast(node, aliasMap) {
+function isDoubleCast(node, aliases) {
   const inner = unparenthesized(node.expression);
   if (!(ts.isAsExpression(inner) || ts.isTypeAssertionExpression(inner))) return false;
-  const k = assertedLaunderKind(inner, aliasMap ?? EMPTY_ALIASES);
+  const k = assertedLaunderKind(inner, aliases ?? EMPTY_ALIASES);
   return k != null && DOUBLE_CAST_INNER.has(k);
 }
 function surfaceOf(path, src) {
@@ -3767,7 +3792,7 @@ var init_ts_cast_growth = __esm({
     GENERATED_HEADER = /@generated\b|\bAUTO-?GENERATED\b|\bDO NOT EDIT\b/i;
     HEADER_LINES = 20;
     DOUBLE_CAST_INNER = /* @__PURE__ */ new Set(["any", "never", "unknown", "empty", "objectish"]);
-    EMPTY_ALIASES = /* @__PURE__ */ new Map();
+    EMPTY_ALIASES = { resolve: () => null };
     tsCastGrowth = {
       id: RULE2,
       surface: ["file"],
@@ -3895,7 +3920,7 @@ function lineHasRow4Cast(line, aliasMap) {
 function aliasMapForAddedLines(c) {
   const snippet = addedLines(c).map((l) => l.content).join("\n");
   const sf = parseSource("lines.ts", snippet);
-  return sf ? buildAliasMap(sf) : /* @__PURE__ */ new Map();
+  return sf ? buildAliasMap(sf) : EMPTY_ALIASES;
 }
 var BLOCK_RULE, WARN_RULE, JSDOC_ANY_CAST, JS_FILE, countMatches, DIRECTIVE_START, NARROW_LINE, BROAD_LINE, FRAGMENT_DIRECTIVE, BLOCK_REMEDIATION, WARN_REMEDIATION, tsAnyCast;
 var init_ts_any_cast = __esm({
@@ -15720,6 +15745,21 @@ function renderStageDiagnostics(out3, stage, result) {
   if (!result.diagnostics) return;
   for (const line of diagnosticLines(stage, result.diagnostics)) out3(line);
 }
+function verifyVerdictLine(verdict2, ctx) {
+  const base10 = ctx.base.slice(0, 10);
+  switch (verdict2) {
+    case "VERIFIED":
+      return `verified: the suite passes, and still passes with all ${ctx.restored} protected files restored from ${base10}.`;
+    case "MASKED_FAILURE":
+      return `MASKED FAILURE: the visible suite passes, but with the ${ctx.restored} protected files restored from ${base10} it FAILS (exit ${ctx.pristineExit}). Something weakened the checks; the code does not pass the original suite.`;
+    case "SUITE_RED":
+      return `suite red: the visible suite fails (exit ${ctx.visibleExit}) \u2014 fix the code first (pristine exit ${ctx.pristineExit}).`;
+    case "BUDGET_EXCEEDED":
+      return `budget exceeded (${ctx.budget}s): could not verify \u2014 failing closed, not open.`;
+    default:
+      return verdict2;
+  }
+}
 function runVerify(opts) {
   const cwd = opts.cwd ?? process.cwd();
   const out3 = opts.silent ? (_s) => {
@@ -16046,13 +16086,15 @@ function runVerify(opts) {
       })
     );
   } else {
-    const lines = {
-      VERIFIED: `verified: the suite passes, and still passes with all ${restored.length} protected files restored from ${base.slice(0, 10)}.`,
-      MASKED_FAILURE: `MASKED FAILURE: the visible suite passes, but with the ${restored.length} protected files restored from ${base.slice(0, 10)} it FAILS (exit ${pristine.exit}). Something weakened the checks; the code does not pass the original suite.`,
-      SUITE_RED: `suite red: the visible suite fails (exit ${visible.exit}) \u2014 fix the code first (pristine exit ${pristine.exit}).`,
-      BUDGET_EXCEEDED: `budget exceeded (${budget}s): could not verify \u2014 failing closed, not open.`
-    };
-    out3(`tamperward verify \u2014 ${lines[verdict2]}`);
+    out3(
+      `tamperward verify \u2014 ${verifyVerdictLine(verdict2, {
+        restored: restored.length,
+        base,
+        visibleExit: visible.exit,
+        pristineExit: pristine.exit,
+        budget
+      })}`
+    );
     out3(`verifier backend: ${verifierBackendSummary(verifierBackend)}`);
     out3(
       "oracle assurance: suite-exit-only (candidate source executes inside the suite process; execution-domain isolation is not semantic/oracle isolation)"
@@ -18195,18 +18237,69 @@ var init_trace_verify = __esm({
 });
 
 // src/runtimes.ts
-import { existsSync as existsSync17 } from "node:fs";
+import { existsSync as existsSync17, readFileSync as readFileSync21 } from "node:fs";
 import { join as join23 } from "node:path";
+function isRecord4(x) {
+  return typeof x === "object" && x !== null && !Array.isArray(x);
+}
+function hooksBeyondTamperward(hooks) {
+  if (!isRecord4(hooks)) return hooks != null;
+  for (const entries of Object.values(hooks)) {
+    if (!Array.isArray(entries)) {
+      if (entries != null) return true;
+      continue;
+    }
+    for (const entry of entries) {
+      const hs = isRecord4(entry) ? entry.hooks : null;
+      if (!Array.isArray(hs)) {
+        if (hs != null) return true;
+        continue;
+      }
+      for (const h of hs) {
+        const cmd = isRecord4(h) ? String(h.command ?? "") : "";
+        if (!/tamperward/.test(cmd)) return true;
+      }
+    }
+  }
+  return false;
+}
+function claudeSettingsBeyondTamperward(cwd) {
+  const path = join23(cwd, ".claude", "settings.json");
+  let raw;
+  try {
+    if (!existsSync17(path)) return false;
+    raw = readFileSync21(path, "utf8");
+  } catch {
+    return false;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return raw.trim().length > 0;
+  }
+  if (!isRecord4(parsed)) return raw.trim().length > 0;
+  for (const [key2, value] of Object.entries(parsed)) {
+    if (key2 === "disableAllHooks") continue;
+    if (key2 === "hooks") {
+      if (hooksBeyondTamperward(value)) return true;
+      continue;
+    }
+    return true;
+  }
+  return false;
+}
 function detectRuntimes(cwd) {
   const found = [];
   for (const rt of KNOWN_RUNTIMES) {
-    const matchedMarker = rt.markers.find((m) => {
+    const marker = rt.markers.find((m) => {
       try {
         return existsSync17(join23(cwd, m));
       } catch {
         return false;
       }
     });
+    const matchedMarker = marker ?? rt.detectExtra?.(cwd) ?? void 0;
     if (matchedMarker !== void 0) found.push({ ...rt, matchedMarker });
   }
   return found;
@@ -18226,10 +18319,14 @@ function detectionHeadline(detected) {
   return `Detected ${detected.length} agent runtimes: ${parts.join(", ")}.`;
 }
 function neutralOnlyCaveat(detected) {
-  if (detected.length === 0 || hasInLoopRuntime(detected)) return null;
-  const names = detected.map((r) => r.label).join(", ");
-  const tracking = [...new Set(detected.map((r) => r.adapterTracking).filter(Boolean))].join(", ");
-  return `In-loop steering (deny-before-execute) ships for Claude Code only today, so on ${names} your live protection is the agent-neutral layers: pre-commit and CI. The Claude hook wiring is still written and is inert unless Claude Code runs in this repository.${tracking ? ` A native in-loop adapter is tracked in ${tracking}.` : ""}`;
+  const neutral = detected.filter((r) => r.steering === "neutral");
+  if (neutral.length === 0) return null;
+  const names = neutral.map((r) => r.label).join(", ");
+  const tracking = [...new Set(neutral.map((r) => r.adapterTracking).filter(Boolean))].join(", ");
+  const claudeAlso = hasInLoopRuntime(detected);
+  const lead = claudeAlso ? `In-loop steering (deny-before-execute) ships for Claude Code only today: Claude Code here gets it, but on ${names} your live protection is ` : `In-loop steering (deny-before-execute) ships for Claude Code only today, so on ${names} your live protection is `;
+  const tail = claudeAlso ? "" : " The Claude hook wiring is still written and is inert unless Claude Code runs in this repository.";
+  return `${lead}the agent-neutral layers: pre-commit and CI.${tail}${tracking ? ` A native in-loop adapter is tracked in ${tracking}.` : ""}`;
 }
 var KNOWN_RUNTIMES;
 var init_runtimes = __esm({
@@ -18238,8 +18335,13 @@ var init_runtimes = __esm({
     KNOWN_RUNTIMES = [
       {
         id: "claude-code",
+        // Markers are Claude Code files `init` never writes, so detection never mistakes
+        // TamperWard's own generated `.claude/settings.json` for evidence a human runs
+        // Claude here (#526). `detectExtra` looks at that generated file's CONTENT for
+        // real use (configuration beyond the two hooks init merges in).
         label: "Claude Code",
-        markers: [".claude/settings.json", ".claude"],
+        markers: ["CLAUDE.md", ".claude/settings.local.json", ".claude/commands", ".claude/agents"],
+        detectExtra: (cwd) => claudeSettingsBeyondTamperward(cwd) ? ".claude/settings.json" : null,
         steering: "in-loop",
         note: "native in-loop steering (PreToolUse deny + Stop sweep) plus the agent-neutral layers."
       },
@@ -18273,7 +18375,7 @@ var init_runtimes = __esm({
 
 // src/cli/onboard.ts
 import { execFileSync as execFileSync12 } from "node:child_process";
-import { lstatSync as lstatSync10, mkdtempSync as mkdtempSync6, readFileSync as readFileSync21, realpathSync as realpathSync11, rmSync as rmSync10 } from "node:fs";
+import { lstatSync as lstatSync10, mkdtempSync as mkdtempSync6, readFileSync as readFileSync22, realpathSync as realpathSync11, rmSync as rmSync10 } from "node:fs";
 import { tmpdir as tmpdir7 } from "node:os";
 import { join as join24, relative as relative7, resolve as resolve12, sep as sep5 } from "node:path";
 import { createInterface } from "node:readline";
@@ -18349,7 +18451,7 @@ function writeVerifyCommand(cwd, command) {
     return `${POLICY_FILE} is not a regular file; refusing to follow or replace a symlink or special file`;
   }
   const mode = existingMode(path, 420);
-  const original = kind === "file" ? readFileSync21(path, "utf8") : null;
+  const original = kind === "file" ? readFileSync22(path, "utf8") : null;
   let next;
   try {
     const doc = parseDocument(original && original.trim() ? original : "version: 1\n");
@@ -18950,7 +19052,7 @@ var init_capture = __esm({
 
 // src/research/manifest.ts
 import { createHash as createHash13 } from "node:crypto";
-import { readFileSync as readFileSync22 } from "node:fs";
+import { readFileSync as readFileSync23 } from "node:fs";
 import { dirname as dirname10, resolve as resolve14 } from "node:path";
 function taskFrom(raw, index, manifestDir) {
   const where = `task #${index + 1}`;
@@ -18984,7 +19086,7 @@ function readManifest(path) {
   const abs = resolve14(path);
   let bytes;
   try {
-    bytes = readFileSync22(abs);
+    bytes = readFileSync23(abs);
   } catch (e) {
     throw new ResearchError(`cannot read task manifest ${abs}: ${e instanceof Error ? e.message : String(e)}`);
   }
@@ -19196,7 +19298,7 @@ var init_record = __esm({
 
 // src/research/run.ts
 import { execFileSync as execFileSync13 } from "node:child_process";
-import { existsSync as existsSync18, mkdirSync as mkdirSync9, readFileSync as readFileSync23, renameSync as renameSync4, rmSync as rmSync11, writeFileSync as writeFileSync11 } from "node:fs";
+import { existsSync as existsSync18, mkdirSync as mkdirSync9, readFileSync as readFileSync24, renameSync as renameSync4, rmSync as rmSync11, writeFileSync as writeFileSync11 } from "node:fs";
 import { join as join25, resolve as resolve15 } from "node:path";
 function git6(args, cwd) {
   return execFileSync13("git", args, { cwd, encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }).trim();
@@ -19207,7 +19309,7 @@ function pairRecordPath(ledger, task, pair) {
 function resumableRecord(path, expected) {
   let raw;
   try {
-    raw = JSON.parse(readFileSync23(path, "utf8"));
+    raw = JSON.parse(readFileSync24(path, "utf8"));
   } catch (e) {
     throw new ResearchError(`ledger record ${path} is malformed (${errorMessage(e).split("\n")[0]}); remove it to regenerate the pair, or use a new --out`);
   }
@@ -19630,7 +19732,7 @@ var init_run2 = __esm({
 });
 
 // src/research/summarize.ts
-import { readdirSync as readdirSync7, readFileSync as readFileSync24 } from "node:fs";
+import { readdirSync as readdirSync7, readFileSync as readFileSync25 } from "node:fs";
 import { join as join26, resolve as resolve16 } from "node:path";
 function readLedger2(dir) {
   const pairsDir = join26(resolve16(dir), "pairs");
@@ -19645,7 +19747,7 @@ function readLedger2(dir) {
     const path = join26(pairsDir, n);
     let raw;
     try {
-      raw = JSON.parse(readFileSync24(path, "utf8"));
+      raw = JSON.parse(readFileSync25(path, "utf8"));
     } catch (e) {
       throw new ResearchError(`ledger record ${path} is not valid JSON: ${errorMessage(e)}`);
     }
@@ -20352,7 +20454,7 @@ var init_main = __esm({
 // src/cli/index.ts
 init_hook_client();
 init_exit();
-import { readFileSync as readFileSync25 } from "node:fs";
+import { readFileSync as readFileSync26 } from "node:fs";
 function loadMain() {
   return Promise.resolve().then(() => (init_main(), main_exports));
 }
@@ -20365,7 +20467,7 @@ async function launch(argv) {
   if (kind && hookServiceEnabled()) {
     let raw = null;
     try {
-      raw = readFileSync25(0, "utf8");
+      raw = readFileSync26(0, "utf8");
     } catch {
       raw = null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamperward",
-  "version": "2.29.11",
+  "version": "2.29.13",
   "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",