sawbuck 0.1.32 → 0.1.34

package/contract.mjs

@@ -1,7 +1,7 @@
 // contract.mjs: the contract's hard rules, read the way promptwheel reads them. Shared by the CLI
 // (frame / turn) and the Stop hook (the turn-level wall), so there is one resolver and one renderer.
 // Read-only, never throws, zero-dep.
-import { readFileSync } from 'node:fs';
+import { readFileSync, existsSync } from 'node:fs';
 import { join, dirname, resolve, isAbsolute, posix } from 'node:path';
 import { execFileSync } from 'node:child_process';
 
@@ -124,3 +124,13 @@ export function frameBlock(repo) {
   const lines = mandates.map((m) => `  ${m.paths.filter((s) => typeof s === 'string' && s.trim()).join(' · ')}${m.reason ? `  (${String(m.reason).slice(0, 160)})` : ''}`);
   return '▣ contract (sawbuck) · hard rules in force this session, enforced by the gate on every turn:\n  protected, do not touch:\n' + lines.join('\n');
 }
+
+// the repo's architecture lock, if the supply-chain preset is installed: structure the lock has not seen, and a
+// fingerprint of the resolved dependency tree. null when there is no lock here. Read-only, and fast (under 200 ms
+// on the largest repo tried), so it can run at every turn end.
+export function lockState(repo) {
+  const tool = join(repo, '.promptwheel', 'packs', 'supply-chain', 'lock.mjs');
+  if (!existsSync(tool) || !existsSync(join(repo, 'promptwheel.lock.json'))) return null;
+  const run = (...a) => execFileSync(process.execPath, [tool, ...a], { cwd: repo, encoding: 'utf8', timeout: 5000, stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+  try { return { drift: JSON.parse(run('drift', '.', '--json')), pins: run('pins', '.') }; } catch { return null; }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sawbuck",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "description": "Sign your agent to a contract: a deterministic, zero-LLM check re-proves every win from the agent's source edits alone, so a green that came from editing the test, grader, or config is caught and sent back. Works in Claude Code, Codex, git hooks, and CI.",
   "type": "module",
   "license": "Apache-2.0",
@@ -33,8 +33,8 @@
     "sawbuck": "sawbuck.mjs"
   },
   "dependencies": {
-    "@promptwheel/logbook": "^0.9.6",
-    "promptwheel": "^0.7.9"
+    "@promptwheel/logbook": "0.9.10",
+    "promptwheel": "0.7.11"
   },
   "files": [
     "sawbuck.mjs",

package/reflect.mjs

@@ -35,7 +35,10 @@ const noAuto = process.argv.includes('--no-auto');   // user-level wiring: measu
 const git = (...a) => execFileSync('git', ['-C', repo, ...a], { encoding: 'utf8' }).trim();
 // backstop so the check can never hang a commit/turn; generous default, overridable.
 const CHECK_TIMEOUT = +(process.env.SAWBUCK_CHECK_TIMEOUT_MS) || 600000;
-const runNode = (file, a) => execFileSync(process.execPath, [file, ...a], { cwd: repo, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], timeout: CHECK_TIMEOUT, killSignal: 'SIGKILL' });
+// a commit an agent made: its own Promptwheel-Allow trailer does not clear the verdict. An agent can write a
+// commit message, so the override for its work is a person running `sawbuck check --allow "<reason>"`.
+const childEnv = by ? { ...process.env, PROMPTWHEEL_NO_ALLOW_TRAILER: '1' } : process.env;
+const runNode = (file, a) => execFileSync(process.execPath, [file, ...a], { cwd: repo, encoding: 'utf8', env: childEnv, stdio: ['ignore', 'pipe', 'pipe'], timeout: CHECK_TIMEOUT, killSignal: 'SIGKILL' });
 
 // --- 1) the check: measure the commit, parse the structured result ----------
 // The check exits nonzero on fail/gamed/inconclusive, but still prints the JSON

package/sawbuck-hook.mjs

@@ -10,7 +10,7 @@ import { join, dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const HERE = dirname(fileURLToPath(import.meta.url));
-import { mandateHits, hashOf, protectedDirty, protectedAmong } from './contract.mjs';
+import { mandateHits, hashOf, protectedDirty, protectedAmong, lockState } from './contract.mjs';
 const flag = (n, d) => { const i = process.argv.indexOf(n); return i > -1 ? process.argv[i + 1] : d; };
 const by = flag('--by', '');   // attribution from the harness wiring: the Claude hook passes 'claude', the raw-git hook passes nothing
 const stop = process.argv.includes('--stop');   // wired as the Claude Code Stop hook: enforce the contract on a gamed turn
@@ -156,6 +156,25 @@ if (stop && gamedThisTurn && !process.env.SAWBUCK_NO_ENFORCE) {
   process.exit(0);
 }
 
+// 3b) THE LOCK AT TURN LEVEL: tell the person the moment a turn changes the repo's structure or its resolved
+// dependencies. A notice, not a block: a person who asked for a new dependency should not fight the wall, and
+// the gate in CI is the hard stop, which needs their reason. Said once per change.
+if (stop && !process.env.SAWBUCK_NO_ENFORCE && st.turnBaseline && st.turnBaseline.lock) {
+  const was = st.turnBaseline.lock, now = lockState(repo);
+  if (now) {
+    const known = new Set(was.drift || []);
+    const fresh = (now.drift || []).filter((i) => !known.has(i));
+    const pinsMoved = !!now.pins && now.pins !== was.pins;
+    const key = JSON.stringify([fresh, pinsMoved ? now.pins : '']);
+    if ((fresh.length || pinsMoved) && st.lockNotice !== key) {
+      st.lockNotice = key; saveState();
+      const what = [...fresh.slice(0, 8), ...(pinsMoved ? ['the resolved dependency tree'] : [])].join(', ');
+      process.stdout.write(JSON.stringify({ systemMessage: `Sawbuck: this turn changed what the lock holds: ${what}${fresh.length > 8 ? `, and ${fresh.length - 8} more` : ''}. If you did not ask for that, look before you commit. The gate needs your reason to pass it: promptwheel run --allow "<reason>".` }));
+      process.exit(0);
+    }
+  }
+}
+
 // 4) otherwise, surface a catch on a fresh catch or on cadence (a flag; never blocks)
 const freshCatch = total > (st.shownTotal || 0);
 const cadenceHit = everyTurns > 0 && st.turns % everyTurns === 0;

package/sawbuck.mjs

@@ -19,7 +19,7 @@ import { fileURLToPath } from 'node:url';
 import { homedir } from 'node:os';
 import { recall as memRecall, conform as memConform } from './memory.mjs';
 import { PW } from './bins.mjs';
-import { frameBlock, mandatesInForce, protectedDirty, blobAt } from './contract.mjs';
+import { frameBlock, mandatesInForce, protectedDirty, blobAt, lockState } from './contract.mjs';
 
 const SELF = fileURLToPath(import.meta.url);
 const HERE = dirname(SELF);
@@ -256,7 +256,7 @@ switch (cmd) {
             const stillInHead = moved && Object.entries(flagged).some(([f, h]) => { const b = blobAt(repo, sha, f); return h === 'deleted' ? b === '' : (!!h && b === h); });
             const pin = !!(st.lastViolation && st.lastViolation.sha);
             if (moved && !stillInHead && st.lastViolation) delete st.lastViolation.sha;
-            st.turnBaseline = { at: now, sha: ((!moved || stillInHead) && pin && st.lastViolation.sha) || sha, files };
+            st.turnBaseline = { at: now, sha: ((!moved || stillInHead) && pin && st.lastViolation.sha) || sha, files, lock: lockState(repo) };
           }
         }
         st.lastPromptAt = now;   // every prompt, mandates or not: the walls key their block budgets on it when the harness sends no prompt_id
@@ -444,7 +444,7 @@ function hookBlock(repo) {
   // git exports GIT_DIR / GIT_INDEX_FILE / GIT_WORK_TREE into its hooks. The check
   // shells out to git (worktrees, diffs) and would inherit them, operate on the wrong
   // repo, and silently catch nothing. Clear them so the reflex runs against `repo` clean.
-  return `${S_START}\nunset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE GIT_PREFIX GIT_OBJECT_DIRECTORY GIT_COMMON_DIR\nif command -v sawbuck >/dev/null 2>&1; then sawbuck __hook --repo ${r}; else node ${JSON.stringify(SELF)} __hook --repo ${r}; fi || true\n${S_END}\n`;
+  return `${S_START}\nunset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE GIT_PREFIX GIT_OBJECT_DIRECTORY GIT_COMMON_DIR\nif command -v sawbuck >/dev/null 2>&1; then sawbuck __hook --repo ${r}; else ${nodeCmd()} ${JSON.stringify(SELF)} __hook --repo ${r}; fi || true\n${S_END}\n`;
 }
 function wireGit(repo) {
   if (!gitTop(repo)) usage(`${repo} is not a git repository`);
@@ -498,6 +498,13 @@ function claudeFile(repo, { user, shared }) {
   const name = user || shared ? 'settings.json' : 'settings.local.json';
   return { dir, f: join(dir, name) };
 }
+// hooks run under /bin/sh, which does not load nvm, so a bare `node` is missing on many machines and the
+// hook fails quietly, leaving the wall off. Use node from PATH when there is one (it follows an upgrade),
+// else the node that ran this attach. Windows keeps plain node: its hooks do not run under sh.
+export function nodeCmd(execPath = process.execPath, platform = process.platform) {
+  if (platform === 'win32') return 'node';
+  return `"$(command -v node || echo ${JSON.stringify(execPath).replace(/^"|"$/g, "'")})"`;
+}
 function wireClaude(repo, opts) {
   const { user, shared } = opts;
   const { dir, f } = claudeFile(repo, opts);
@@ -505,8 +512,8 @@ function wireClaude(repo, opts) {
   const fileExisted = existsSync(f);
   let cfg = {};
   if (fileExisted) { try { cfg = JSON.parse(readFileSync(f, 'utf8')); } catch { die(`${f} exists but is not valid JSON; I will not overwrite it. Add the hooks by hand.`); } }
-  const ctx = user ? `node ${JSON.stringify(SELF)} turn --hook` : `node ${JSON.stringify(SELF)} turn --hook ${JSON.stringify(repo)}`;
-  const chk = user ? `node ${JSON.stringify(SELF)} __hook --by claude --stop` : `node ${JSON.stringify(SELF)} __hook --repo ${JSON.stringify(repo)} --by claude --stop`;
+  const ctx = user ? `${nodeCmd()} ${JSON.stringify(SELF)} turn --hook` : `${nodeCmd()} ${JSON.stringify(SELF)} turn --hook ${JSON.stringify(repo)}`;
+  const chk = user ? `${nodeCmd()} ${JSON.stringify(SELF)} __hook --by claude --stop` : `${nodeCmd()} ${JSON.stringify(SELF)} __hook --repo ${JSON.stringify(repo)} --by claude --stop`;
   // attached already? "already attached" only when every hook of THIS version is present; an older
   // attachment (say, without the SessionStart[compact] hook) is upgraded in place, never left stale.
   let upgrading = false;
@@ -627,7 +634,8 @@ function onPath() {
   if (process.env.SAWBUCK_NO_PATH_CHECK) return false;
   try { execFileSync('sh', ['-c', 'command -v sawbuck'], { stdio: 'ignore' }); return true; } catch { return false; }
 }
-function extractBaked(text) { const m = text.match(/node "([^"]+)"/); return m ? m[1] : null; }
+// the path a hook bakes in: the quoted one ending in sawbuck.mjs, in a shell hook or in JSON, where the quotes are escaped
+function extractBaked(text) { const m = text.match(/"([^"]*sawbuck\.mjs)\\?"/); return m ? m[1] : null; }
 function doctorRepo(repo) {
   const checks = [];
   const pc = gitPath(repo, 'hooks/post-commit');