tamperward 2.42.0 → 2.43.0

package/dist/cli/index.js

@@ -15763,7 +15763,9 @@ function runCapturedProcessSync(executable, args, opts) {
         detached: Boolean(opts.detached),
         killGroupOnFinish: Boolean(opts.killGroupOnFinish),
         drainMs: opts.drainMs ?? 1e3,
-        captureBytes: DIAGNOSTIC_TAIL_BYTES
+        captureBytes: DIAGNOSTIC_TAIL_BYTES,
+        progressStage: opts.progressStage,
+        progressIntervalMs: opts.progressIntervalMs
       }),
       { mode: 384 }
     );
@@ -15774,7 +15776,7 @@ function runCapturedProcessSync(executable, args, opts) {
         cwd: opts.cwd,
         env: opts.env,
         encoding: "utf8",
-        stdio: ["ignore", "pipe", "ignore"],
+        stdio: ["ignore", "pipe", opts.progressStage ? "inherit" : "ignore"],
         // The trusted result is at most two 16 KiB tails plus small metadata.
         // A candidate that somehow writes into the supervisor's stdout through
         // same-UID /proc can only overflow/corrupt this bounded channel and make
@@ -15928,6 +15930,16 @@ let timedOut = false;
 let exitInfo = { exit: null, signal: null };
 let descendantTracker = null;
 let drainTimer = null;
+let progressTimer = null;
+const started = Date.now();
+function progress() {
+  if (cfg.progressStage !== 'visible' && cfg.progressStage !== 'pristine') return;
+  try {
+    fs.writeSync(2, 'verify: ' + cfg.progressStage + ' suite running (' +
+      Math.floor((Date.now() - started) / 1000) + 's; ' +
+      (stdout.total + stderr.total) + ' output bytes captured)\n');
+  } catch {}
+}
 
 function killOwned() {
   if (!child || !child.pid) return;
@@ -15950,6 +15962,7 @@ function finish(extra) {
   done = true;
   if (descendantTracker) clearInterval(descendantTracker);
   if (drainTimer) clearTimeout(drainTimer);
+  if (progressTimer) clearInterval(progressTimer);
   // fd 1 is the reserved result channel (suite streams are separate pipes).
   // Write synchronously: process.stdout.write is async on a POSIX pipe, so an
   // immediate process.exit(0) can truncate the result before it flushes.
@@ -15988,6 +16001,11 @@ try {
 }
 
 if (child) {
+  if (cfg.progressStage === 'visible' || cfg.progressStage === 'pristine') {
+    progress();
+    progressTimer = setInterval(progress, Number(cfg.progressIntervalMs) || 30000);
+    progressTimer.unref();
+  }
   if (process.platform === 'linux') {
     trackDescendants();
     descendantTracker = setInterval(trackDescendants, 5);
@@ -16392,7 +16410,7 @@ function containerStateResult(state, secs) {
   }
   return { exit: state.ExitCode, secs };
 }
-function runContainerStage(backend, dir, command, budgetSecs) {
+function runContainerStage(backend, dir, command, budgetSecs, progressStage) {
   const t0 = Date.now();
   if (backend.kind !== "container" || !backend.available || !backend.image || !backend.enginePath || !backend.engineSha256 || !backend.daemonHost || !engineStable(backend)) {
     return {
@@ -16422,7 +16440,8 @@ function runContainerStage(backend, dir, command, budgetSecs) {
         cwd: dirname7(backend.enginePath),
         env: engineClientEnv(),
         timeoutMs: budgetSecs * 1e3,
-        backstopMs: 3e4
+        backstopMs: 3e4,
+        progressStage
       }
     );
     const secs = Math.round((Date.now() - t0) / 1e3);
@@ -17165,7 +17184,7 @@ var init_verification_receipt = __esm({
 // src/cli/verify.ts
 import { execFileSync as execFileSync9, spawnSync as spawnSync3 } from "node:child_process";
 import { createHash as createHash14 } from "node:crypto";
-import { chmodSync as chmodSync2, cpSync, lstatSync as lstatSync10, mkdirSync as mkdirSync10, mkdtempSync as mkdtempSync3, readFileSync as readFileSync13, readlinkSync as readlinkSync3, rmSync as rmSync9, symlinkSync, writeFileSync as writeFileSync8, existsSync as existsSync10 } from "node:fs";
+import { chmodSync as chmodSync2, cpSync, lstatSync as lstatSync10, mkdirSync as mkdirSync10, mkdtempSync as mkdtempSync3, readFileSync as readFileSync13, readlinkSync as readlinkSync3, realpathSync as realpathSync8, rmSync as rmSync9, symlinkSync, writeFileSync as writeFileSync8, existsSync as existsSync10 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
 import { dirname as dirname10, isAbsolute as isAbsolute11, join as join22, relative as relative6, resolve as resolve9, sep as sep4 } from "node:path";
 function oracleAssuranceReport() {
@@ -17508,7 +17527,28 @@ function localVerifierShell(platform = process.platform, command) {
       return null;
   }
 }
-function runLocalSuite(dir, cmd, budgetSecs) {
+function cargoStageTargets(root, cwd) {
+  const absolute = resolve9(cwd, root);
+  mkdirSync10(absolute, { recursive: true });
+  const canonical2 = realpathSync8(absolute);
+  const checkout = realpathSync8(cwd);
+  const contains = (parent, child) => {
+    const rel = relative6(parent, child);
+    return rel === "" || !rel.startsWith(".." + sep4) && rel !== ".." && !isAbsolute11(rel);
+  };
+  if (contains(checkout, canonical2) || contains(canonical2, checkout)) {
+    throw new Error("Cargo target root must be outside the checkout and cannot contain it");
+  }
+  const targets = { visible: join22(canonical2, "visible"), pristine: join22(canonical2, "pristine") };
+  for (const target of Object.values(targets)) {
+    mkdirSync10(target, { recursive: true });
+    if (lstatSync10(target).isSymbolicLink() || realpathSync8(target) !== target) {
+      throw new Error("Cargo stage targets must be distinct real directories, not links");
+    }
+  }
+  return targets;
+}
+function runLocalSuite(dir, cmd, budgetSecs, stage, target, progress) {
   const t0 = Date.now();
   const shell = localVerifierShell(process.platform, cmd);
   if (!shell) {
@@ -17521,13 +17561,26 @@ function runLocalSuite(dir, cmd, budgetSecs) {
   }
   const scratch = mkdtempSync3(join22(tmpdir4(), "tw-verify-run-"));
   try {
+    const env = suiteEnv(scratch);
+    if (target) {
+      let valid = false;
+      try {
+        valid = realpathSync8(target) === target && !lstatSync10(target).isSymbolicLink();
+      } catch {
+      }
+      if (!valid) {
+        return { exit: null, secs: 0, failure: "backend", reason: "Cargo stage target changed before execution" };
+      }
+      env.CARGO_TARGET_DIR = target;
+    }
     const r = runCapturedProcessSync(shell.executable, shell.args, {
       cwd: dir,
-      env: suiteEnv(scratch),
+      env,
       timeoutMs: budgetSecs * 1e3,
       detached: true,
       killGroupOnFinish: true,
-      backstopMs: 3e4
+      backstopMs: 3e4,
+      progressStage: progress ? stage : void 0
     });
     const secs = Math.round((Date.now() - t0) / 1e3);
     if (r.timedOut) {
@@ -17693,6 +17746,15 @@ function runVerifyImpl(opts) {
     return 2;
   }
   const isolated = verifierBackend.kind === "container";
+  let cargoTargets;
+  if (opts.cargoTargetRoot !== void 0) {
+    if (isolated) return cannotVerify("INVALID_ARGUMENTS", "--cargo-target-root is supported only by the checkpointed-local backend");
+    try {
+      cargoTargets = cargoStageTargets(opts.cargoTargetRoot, cwd);
+    } catch (e) {
+      return cannotVerify("INVALID_ARGUMENTS", `cannot configure Cargo stage targets (${e instanceof Error ? e.message : String(e)})`);
+    }
+  }
   if (!isolated && !localVerifierShell(process.platform, cmd)) {
     opts.onVerdict?.({ verdict: "CANNOT_VERIFY", reason: "LOCAL_VERIFIER_UNSUPPORTED_PLATFORM", detail: `checkpointed-local verifier is unsupported on ${process.platform}` });
     if (opts.json) {
@@ -17736,7 +17798,7 @@ function runVerifyImpl(opts) {
   }
   const frozenNodeModules = dependencyEnvironment ? dependencyEnvironment.roots.find((root) => root.kind === "node_modules")?.realPath ?? null : null;
   const checkDeps = () => dependencyEnvironment ? checkDependencyEnvironment(cwd, dependencyEnvironment) : { ok: true };
-  const runStage = opts.runStage ?? ((dir) => isolated ? runContainerStage(verifierBackend, dir, cmd, budget) : runLocalSuite(dir, cmd, budget));
+  const runStage = (dir, stage) => opts.runStage ? opts.runStage(dir) : isolated ? runContainerStage(verifierBackend, dir, cmd, budget, opts.silent ? void 0 : stage) : runLocalSuite(dir, cmd, budget, stage, cargoTargets?.[stage], !opts.silent);
   const notQuiescent = (stage, r) => {
     const detail = `the ${stage} suite exited (code ${r.exit ?? "unknown"}) but left a process holding stdout open after termination was attempted; the stage is not quiescent, so the run cannot be certified`;
     opts.onVerdict?.({ verdict: "CANNOT_VERIFY", reason: "VERIFIER_BACKEND_RUNTIME_FAILURE", detail });
@@ -17817,7 +17879,7 @@ function runVerifyImpl(opts) {
       { verifier_backend: backendReport(), dependency_environment: dependencyReport(), oracle_assurance: oracleAssuranceReport(), materialization_reason: materializationFailureReason(e) }
     );
   }
-  const visible = runStage(visDir);
+  const visible = runStage(visDir, "visible");
   if (visible.pipeHeldOpen) {
     cleanup([visRoot]);
     return notQuiescent("visible", visible);
@@ -17933,7 +17995,7 @@ function runVerifyImpl(opts) {
     );
   }
   const overlayBefore = overlayDigest(priDir, restored);
-  const pristine = runStage(priDir);
+  const pristine = runStage(priDir, "pristine");
   if (pristine.pipeHeldOpen) {
     cleanup([visRoot, priRoot]);
     return notQuiescent("pristine", pristine);
@@ -18109,13 +18171,14 @@ function parseVerify(args) {
     if (a === "--json") o.json = true;
     else if (a === "--keep") o.keep = true;
     else if (a === "--require-ancestor") o.requireAncestor = true;
-    else if (a === "--base" || a === "--cmd" || a === "--cwd" || a === "--budget") {
+    else if (a === "--base" || a === "--cmd" || a === "--cwd" || a === "--budget" || a === "--cargo-target-root") {
       const v = value(i, a);
       if (v === void 0) continue;
       i++;
       if (a === "--base") o.base = v;
       else if (a === "--cmd") o.cmd = v;
       else if (a === "--cwd") o.cwd = v;
+      else if (a === "--cargo-target-root") o.cargoTargetRoot = v;
       else {
         o.budget = Number(v);
         if (!Number.isFinite(o.budget) || o.budget <= 0)
@@ -18239,7 +18302,7 @@ var init_verify = __esm({
 // src/cli/run.ts
 import { execFileSync as execFileSync10, spawn, spawnSync as spawnSync4 } from "node:child_process";
 import { randomBytes as randomBytes3 } from "node:crypto";
-import { accessSync as accessSync3, constants as fsConstants, mkdtempSync as mkdtempSync4, readdirSync as readdirSync5, readFileSync as readFileSync14, readlinkSync as readlinkSync4, realpathSync as realpathSync8, rmSync as rmSync10, statSync as statSync6, writeFileSync as writeFileSync9 } from "node:fs";
+import { accessSync as accessSync3, constants as fsConstants, mkdtempSync as mkdtempSync4, readdirSync as readdirSync5, readFileSync as readFileSync14, readlinkSync as readlinkSync4, realpathSync as realpathSync9, rmSync as rmSync10, statSync as statSync6, writeFileSync as writeFileSync9 } from "node:fs";
 import { tmpdir as tmpdir5 } from "node:os";
 import { dirname as dirname11, join as join23, resolve as resolve10 } from "node:path";
 function authoritativeRunLifecyclePlatform(platform = process.platform) {
@@ -18294,7 +18357,7 @@ function trustedLinuxPython(candidates = DEFAULT_TRUSTED_PYTHON_CANDIDATES) {
   }
   for (const candidate of candidates) {
     try {
-      const real = realpathSync8(candidate);
+      const real = realpathSync9(candidate);
       const st = statSync6(real);
       if (!st.isFile() || writableByCaller2(real)) continue;
       const probe = spawnSync4(
@@ -18567,7 +18630,7 @@ function survivorsHoldingTree(cwd, spawnedAfterTicks) {
   const out3 = [];
   let real;
   try {
-    real = realpathSync8(cwd);
+    real = realpathSync9(cwd);
   } catch {
     return out3;
   }
@@ -19982,7 +20045,7 @@ import {
   mkdtempSync as mkdtempSync5,
   readFileSync as readFileSync16,
   readdirSync as readdirSync7,
-  realpathSync as realpathSync9,
+  realpathSync as realpathSync10,
   rmSync as rmSync11,
   symlinkSync as symlinkSync2
 } from "node:fs";
@@ -20255,7 +20318,7 @@ function rewriteTraceRoot(accesses, actualRoot) {
     if (!inside3(actualRoot, abs)) return { ...item, path: abs };
     const rel = relative7(actualRoot, abs).split(sep5).join("/");
     try {
-      const real = resolve12(realpathSync9(abs));
+      const real = resolve12(realpathSync10(abs));
       if (!inside3(actualRoot, real)) return { ...item, path: real };
     } catch {
     }
@@ -21492,7 +21555,7 @@ var init_adapter3 = __esm({
 
 // src/adapters/copilot-sdk/changes.ts
 import { execFileSync as execFileSync13 } from "node:child_process";
-import { mkdtempSync as mkdtempSync6, writeFileSync as writeFileSync10, readFileSync as readFileSync17, rmSync as rmSync12, existsSync as existsSync13, realpathSync as realpathSync10 } from "node:fs";
+import { mkdtempSync as mkdtempSync6, writeFileSync as writeFileSync10, readFileSync as readFileSync17, rmSync as rmSync12, existsSync as existsSync13, realpathSync as realpathSync11 } from "node:fs";
 import { tmpdir as tmpdir7 } from "node:os";
 import { basename as basename5, dirname as dirname12, isAbsolute as isAbsolute16, relative as relative11, resolve as resolve15, join as join26 } from "node:path";
 function asStr4(v) {
@@ -21505,7 +21568,7 @@ function relForDisplay5(path, cwd) {
 function canonicalContainedTarget(abs, root) {
   let realRoot;
   try {
-    realRoot = realpathSync10(root);
+    realRoot = realpathSync11(root);
   } catch (e) {
     throw new Error(`trusted repository root ${root} cannot be resolved: ${e instanceof Error ? e.message : String(e)}`);
   }
@@ -21519,7 +21582,7 @@ function canonicalContainedTarget(abs, root) {
   }
   let realDir;
   try {
-    realDir = realpathSync10(dir);
+    realDir = realpathSync11(dir);
   } catch (e) {
     throw new Error(`write target ${abs} cannot be resolved: ${e instanceof Error ? e.message : String(e)}`);
   }
@@ -22849,7 +22912,7 @@ var init_runtime = __esm({
 
 // src/cli/onboard.ts
 import { execFileSync as execFileSync15 } from "node:child_process";
-import { lstatSync as lstatSync11, mkdtempSync as mkdtempSync7, readFileSync as readFileSync19, realpathSync as realpathSync11, rmSync as rmSync13 } from "node:fs";
+import { lstatSync as lstatSync11, mkdtempSync as mkdtempSync7, readFileSync as readFileSync19, realpathSync as realpathSync12, rmSync as rmSync13 } from "node:fs";
 import { tmpdir as tmpdir8 } from "node:os";
 import { join as join28, relative as relative12, resolve as resolve16, sep as sep6 } from "node:path";
 import { createInterface } from "node:readline";
@@ -22982,7 +23045,7 @@ async function runOnboard(opts, io = {}) {
   const cwd = resolve16(rootText);
   let sameRoot = cwd === requestedCwd;
   try {
-    sameRoot = realpathSync11(cwd) === realpathSync11(requestedCwd);
+    sameRoot = realpathSync12(cwd) === realpathSync12(requestedCwd);
   } catch {
   }
   if (!sameRoot) {
@@ -23365,8 +23428,8 @@ function runDemo(cwd, head, runners, out3) {
     let worktreeRoot;
     let realTarget;
     try {
-      worktreeRoot = realpathSync11(wt);
-      realTarget = realpathSync11(targetPath);
+      worktreeRoot = realpathSync12(wt);
+      realTarget = realpathSync12(targetPath);
     } catch {
       out3("Demo skipped: the selected test could not be resolved safely inside the disposable worktree.");
       return;
@@ -24616,7 +24679,7 @@ var init_run2 = __esm({
 });
 
 // src/research/ledger-files.ts
-import { closeSync as closeSync6, constants as constants5, fstatSync as fstatSync3, lstatSync as lstatSync12, openSync as openSync5, readFileSync as readFileSync23, readdirSync as readdirSync8, realpathSync as realpathSync12 } from "node:fs";
+import { closeSync as closeSync6, constants as constants5, fstatSync as fstatSync3, lstatSync as lstatSync12, openSync as openSync5, readFileSync as readFileSync23, readdirSync as readdirSync8, realpathSync as realpathSync13 } from "node:fs";
 import { join as join30, resolve as resolve20 } from "node:path";
 function lstatOrNull(path) {
   try {
@@ -24642,7 +24705,7 @@ function readRegularFile(path, realPairsDir, name) {
   if (listed.nlink !== 1) {
     throw new ResearchError(`ledger record ${path} has ${listed.nlink} links; a hard link can name a file outside pairs/, so only a singly linked regular file is read`);
   }
-  const real = realpathSync12.native(path);
+  const real = realpathSync13.native(path);
   if (real !== join30(realPairsDir, name)) {
     throw new ResearchError(`ledger record ${path} resolves outside the pairs directory (${real}); refusing to read it`);
   }
@@ -24672,7 +24735,7 @@ function readPairFiles(ledger) {
     throw new ResearchError(`ledger pairs directory ${pairsDir} is a symlink; only a real directory is read`);
   }
   if (dirStat === null || !dirStat.isDirectory()) throw new ResearchError(`ledger ${root} has no pairs directory`);
-  const realPairsDir = realpathSync12.native(pairsDir);
+  const realPairsDir = realpathSync13.native(pairsDir);
   let names;
   try {
     names = readdirSync8(pairsDir).filter((n2) => n2.endsWith(".json")).sort();
@@ -26051,6 +26114,7 @@ function validateCliArgs(cmd, args) {
         "--base": "string",
         "--cmd": "string",
         "--cwd": "string",
+        "--cargo-target-root": "string",
         "--budget": "positive"
       }
     }).error;
@@ -26228,6 +26292,8 @@ Formats:
                                             (exit 1, or 0 under a compact tw1:<digest>
                                             or legacy verify@<full-sha> approval); cannot-verify
                                             fails closed (2)
+             [--cargo-target-root D]        separate local Cargo targets D/visible
+                                            and D/pristine (operator-owned cache)
   tamperward trace-verify [--base R]          advisory Linux verifier-input discovery:
              [--cmd C] [--budget S] [--runs N] trace a trusted/known-good base with
              [--json] [--cwd D]                strace, union repeated observations,

package/package.json

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