@warren-dean/code-kit 0.4.1 → 0.5.0

package/hooks/lib/config.mjs

@@ -31,6 +31,9 @@ export function loadConfig(projectDir) {
 /** The rules the hooks enforce: the project's config, the kit's defaults, and any active adapters. */
 export const effectiveConfig = (raw, root) => applyAdapters(withDefaults(raw), raw, root);
 
+/** An anyActor entry's glob: entries are globs, or { glob, reviewer } naming who reviews changes to it. */
+export const anyActorGlob = (e) => (typeof e === 'string' ? e : e?.glob);
+
 /** The engine's fixed rules, merged into the project's: the kit and Claude's own files belong to the lead. */
 export function withDefaults(c) {
   return {
@@ -39,7 +42,11 @@ export function withDefaults(c) {
       paths: [...c.lead.paths, '.claude/**'],
       outside: [...(c.lead.outside ?? []), ...CLAUDE_OWN],
     },
-    anyActor: [...(c.anyActor ?? []), '.claude/state/**'],
+    anyActor: [...(c.anyActor ?? []).map(anyActorGlob), '.claude/state/**'],
+    // Who reviews changes to files any agent may write; the lead unless an entry names a lane.
+    anyActorReviewers: (c.anyActor ?? [])
+      .filter((e) => typeof e === 'object' && e?.reviewer)
+      .map((e) => ({ glob: e.glob, reviewer: e.reviewer })),
     protected: [KIT, ...(c.protected ?? []).filter((p) => p.glob !== KIT.glob)],
     layers: c.layers ?? [],
     importAliases: c.importAliases ?? {},
@@ -71,7 +78,12 @@ function delegateRules(d) {
           ],
           minWeeklyDownloads: d.dependencies.minWeeklyDownloads ?? 10_000,
           maxMonthsSinceRelease: d.dependencies.maxMonthsSinceRelease ?? 18,
-          allowInstallScripts: d.dependencies.allowInstallScripts === true,
+          // true (any), false (none), or the kinds allowed: binary, build (lib/registry.mjs).
+          allowInstallScripts:
+            d.dependencies.allowInstallScripts === true ||
+            (Array.isArray(d.dependencies.allowInstallScripts)
+              ? d.dependencies.allowInstallScripts
+              : false),
         }
       : null,
   };
@@ -113,9 +125,20 @@ export function validate(c) {
     c.lead?.outside === undefined || isList(c.lead.outside),
     '"lead.outside" must be a list of globs',
   );
-  need(c.anyActor === undefined || isList(c.anyActor), '"anyActor" must be a list of globs');
   validateLanes(c, need);
   const lanes = Object.keys(isObj(c.lanes) ? c.lanes : {});
+  need(
+    c.anyActor === undefined ||
+      (Array.isArray(c.anyActor) &&
+        c.anyActor.every(
+          (e) =>
+            isStr(e) ||
+            (isObj(e) &&
+              isStr(e.glob) &&
+              (e.reviewer === undefined || e.reviewer === 'lead' || lanes.includes(e.reviewer))),
+        )),
+    '"anyActor" must be a list of globs, or { "glob", "reviewer" } with the lead or a lane as reviewer',
+  );
   each('protected', (e, at) => {
     need(isStr(e.glob) && isStr(e.why), `${at} needs "glob" and "why"`);
     need(
@@ -159,8 +182,10 @@ export function validate(c) {
             (dep.licences === undefined || isList(dep.licences)) &&
             isCount(dep.minWeeklyDownloads) &&
             isCount(dep.maxMonthsSinceRelease) &&
-            [undefined, true, false].includes(dep.allowInstallScripts)))),
-    '"approvals.delegate" must be { protected?: [approval names], merge?: true|false, dependencies?: { licences?, minWeeklyDownloads?, maxMonthsSinceRelease?, allowInstallScripts? } }',
+            ([undefined, true, false].includes(dep.allowInstallScripts) ||
+              (isList(dep.allowInstallScripts) &&
+                dep.allowInstallScripts.every((k) => ['binary', 'build', 'other'].includes(k))))))),
+    '"approvals.delegate" must be { protected?: [approval names], merge?: true|false, dependencies?: { licences?, minWeeklyDownloads?, maxMonthsSinceRelease?, allowInstallScripts?: true|false|["binary","build","other"] } }',
   );
   need(
     c.branches === undefined || isList(c.branches?.protected),

package/hooks/lib/diff.mjs

@@ -2,6 +2,10 @@
 // lanes, layers and rules added, removed or changed, and which files would change owner.
 import { ownerOf } from './rules.mjs';
 
+/** An anyActor entry in words: its glob, with its reviewer when named. */
+const anyActorText = (e) =>
+  typeof e === 'string' ? e : `${e.glob} (reviewed by ${e.reviewer ?? 'the lead'})`;
+
 const same = (a, b) => JSON.stringify(a) === JSON.stringify(b);
 const lists = (a = [], b = []) => ({
   added: b.filter((x) => !a.includes(x)),
@@ -95,7 +99,7 @@ export function diffConfigs(before, after) {
   for (const [label, a, b] of [
     ['lead paths', before.lead?.paths, after.lead?.paths],
     ['lead outside paths', before.lead?.outside, after.lead?.outside],
-    ['any-actor paths', before.anyActor, after.anyActor],
+    ['any-actor paths', before.anyActor?.map(anyActorText), after.anyActor?.map(anyActorText)],
     ['protected branches', before.branches?.protected, after.branches?.protected],
   ]) {
     const change = listChange('', a, b);

package/hooks/lib/next.mjs

@@ -150,7 +150,9 @@ export function nextStep(root, base) {
     );
 
   const ids = (state) => status.stories.filter((s) => s.state === state).map((s) => s.id);
-  const [review, building, blocked] = ['review', 'in progress', 'blocked'].map(ids);
+  const [review, building, blocked, fixes] = ['review', 'in progress', 'blocked', 'sent back'].map(
+    ids,
+  );
   // A ready story with a gap (unknown lane, a requirement no spec defines) waits for the plan's fix.
   const defined = new Set(status.requirements.map((r) => r.id));
   const buildable = (s) =>
@@ -167,13 +169,22 @@ export function nextStep(root, base) {
       `${unbuildable.join(', ')} can't be dispatched until the plan's gaps are fixed.`,
     );
   const then = [];
-  if (review.length && ready.length) then.push({ step: 'dispatch', args: ready.join(' ') });
+  // A sent-back story goes back to its lane with the review's findings, before new work starts.
+  const toDispatch = [...fixes, ...ready];
+  if (review.length && toDispatch.length)
+    then.push({ step: 'dispatch', args: toDispatch.join(' ') });
   if (forLead.length) then.push({ step: 'lead', args: forLead.join(' ') });
   if (review.length)
     return result('review', `${review.join(', ')} finished and wait for review.`, {
       args: review.join(' '),
       then,
     });
+  if (fixes.length)
+    return result(
+      'dispatch',
+      `${fixes.join(', ')} ${fixes.length === 1 ? 'was' : 'were'} sent back and ${fixes.length === 1 ? 'waits' : 'wait'} for the lane's fix: dispatch ${fixes.length === 1 ? 'it' : 'each'} again with the review's findings${ready.length ? `, then ${ready.join(', ')}` : ''}.`,
+      { args: toDispatch.join(' '), then },
+    );
   if (ready.length)
     return result('dispatch', `${ready.join(', ')} can start: their dependencies are done.`, {
       args: ready.join(' '),

package/hooks/lib/plan.mjs

@@ -7,6 +7,7 @@
 import { execFileSync } from 'node:child_process';
 import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
 import { join } from 'node:path';
+import { sentBack } from './reviews.mjs';
 
 export const REQUIREMENT = /\b(?!ST-)([A-Z][A-Z0-9]*-\d+)\b/g;
 const STORY_HEADING = /^###\s+(ST-\d+)\b\s*(.*)$/;
@@ -125,18 +126,22 @@ function worktrees(root) {
  * Where each story is. The plan's `done` stands (the lead marks it after merging, and merged
  * branches are often deleted or squashed). Otherwise git decides: a branch with commits not in
  * `base` is in review; one level with it is in progress, or done once the plan had it in review.
- * Without a branch, the plan's status stands. A todo story is `blocked` until every story it
- * depends on is done, then `ready`.
+ * A branch still at the commit a review sent back is `sent back`, waiting for its lane's fix.
+ * Without a branch, the plan's status stands. A story is `blocked` while a story it depends on
+ * isn't done, whatever its branch holds; a todo story whose dependencies are done is `ready`.
  */
 export function storyStates(root, stories, base) {
   const trees = worktrees(root);
+  const backs = sentBack(root);
   const states = stories.map((story) => {
     const branch = storyBranch(story);
     const ref = story.lane ? branchRef(root, branch) : null;
     const ahead = ref ? Number(git(root, 'rev-list', '--count', `${base}..${ref}`) ?? 0) : 0;
     let state = story.status;
     if (ref && story.status !== 'done') {
-      if (ahead > 0) state = 'review';
+      const head = backs[branch] ? git(root, 'rev-parse', ref) : null;
+      if (head && head === backs[branch].sha) state = 'sent back';
+      else if (ahead > 0) state = 'review';
       else state = story.status === 'review' ? 'done' : 'in progress';
     }
     return {
@@ -151,9 +156,10 @@ export function storyStates(root, stories, base) {
   });
   const done = new Set(states.filter((s) => s.state === 'done').map((s) => s.id));
   for (const s of states) {
-    if (s.state !== 'todo') continue;
+    if (s.state === 'done') continue;
     s.waitingOn = s.dependsOn.filter((d) => !done.has(d));
-    s.state = s.waitingOn.length ? 'blocked' : 'ready';
+    if (s.waitingOn.length) s.state = 'blocked';
+    else if (s.state === 'todo') s.state = 'ready';
   }
   return states;
 }
@@ -200,13 +206,18 @@ export function buildStatus(root, config, base, files) {
     let state = 'no story';
     if (r.removed) state = 'removed';
     else if (covering.length && covering.every((s) => s.state === 'done')) state = 'done';
-    else if (covering.some((s) => ['in progress', 'review', 'done'].includes(s.state)))
+    else if (covering.some((s) => ['in progress', 'review', 'sent back', 'done'].includes(s.state)))
       state = 'in progress';
     else if (covering.length) state = 'todo';
     return { ...r, state, stories: covering.map((s) => s.id), tests: tested[r.id] ?? [] };
   });
   const drift = stories
-    .filter((s) => !['ready', 'blocked'].includes(s.state) && s.state !== s.status)
+    .filter(
+      (s) =>
+        !['ready', 'blocked'].includes(s.state) &&
+        s.state !== s.status &&
+        !(s.state === 'sent back' && s.status === 'in progress'),
+    )
     .map((s) => ({ story: s.id, plan: s.status, actual: s.state }));
   return { stories, requirements: byRequirement, problems, drift };
 }

package/hooks/lib/registry.mjs

@@ -12,7 +12,35 @@ export const packageOf = (approvalName) =>
 
 const INSTALL_SCRIPTS = ['preinstall', 'install', 'postinstall'];
 
-/** { licence, weeklyDownloads, lastRelease (ISO), installScripts } for `pkg`, or { error }. */
+// Kinds of install script, for the rule's allowInstallScripts:
+//   binary  fetches a prebuilt binary for this platform (esbuild, sharp): a prebuild tool, or a script
+//           beside optional dependencies built per platform;
+//   build   compiles native code from source (node-gyp);
+//   other   anything else: code the package runs on install.
+const BINARY_TOOLS =
+  /\b(prebuild-install|node-pre-gyp|node-gyp-build|prebuildify|napi-postinstall)\b/;
+const PLATFORM = /(darwin|linux|win32|windows|freebsd|android|musl|arm64|x64|ia32)/;
+
+/** The kind of install script a package version runs (binary, build or other), or null for none. */
+export function installScriptKind(version) {
+  const scripts = INSTALL_SCRIPTS.map((s) => version?.scripts?.[s]).filter(Boolean);
+  if (!scripts.length) return null;
+  const text = scripts.join(' && ');
+  const perPlatform = Object.keys(version?.optionalDependencies ?? {}).filter((d) =>
+    PLATFORM.test(d),
+  );
+  if (BINARY_TOOLS.test(text) || perPlatform.length >= 2) return 'binary';
+  if (/\bnode-gyp\b|\bcmake-js\b/.test(text)) return 'build';
+  return 'other';
+}
+
+const KIND_WORDS = {
+  binary: 'downloads a prebuilt binary',
+  build: 'compiles native code',
+  other: 'runs its own code',
+};
+
+/** { licence, weeklyDownloads, lastRelease (ISO), installScripts, installScriptKind } for `pkg`, or { error }. */
 export async function npmFacts(pkg) {
   const name = pkg.startsWith('@')
     ? `@${encodeURIComponent(pkg.slice(1))}`
@@ -34,6 +62,7 @@ export async function npmFacts(pkg) {
       weeklyDownloads,
       lastRelease: (latest && doc.time?.[latest]) ?? doc.time?.modified ?? null,
       installScripts: INSTALL_SCRIPTS.some((s) => version?.scripts?.[s]),
+      installScriptKind: installScriptKind(version),
     };
   } catch (e) {
     return { error: `couldn't reach the npm registry (${e.message})` };
@@ -57,7 +86,12 @@ export function dependencyRuleProblems(facts, rule, now = Date.now()) {
     problems.push(
       `its last release was ${Number.isFinite(months) ? `${Math.floor(months)} months` : 'never'} ago, over ${rule.maxMonthsSinceRelease}`,
     );
-  if (facts.installScripts && !rule.allowInstallScripts)
-    problems.push('installing it runs scripts');
+  if (facts.installScripts) {
+    const kind = facts.installScriptKind ?? 'other';
+    const allowed =
+      rule.allowInstallScripts === true ||
+      (Array.isArray(rule.allowInstallScripts) && rule.allowInstallScripts.includes(kind));
+    if (!allowed) problems.push(`installing it runs a script that ${KIND_WORDS[kind]}`);
+  }
   return problems;
 }

package/hooks/lib/reviews.mjs

@@ -0,0 +1,39 @@
+// The lead's send-backs: which commit of a branch a review sent back. Until the branch moves past it,
+// status reads the story as waiting for its lane's fix, not as finished again (and next proposes the
+// fix, not a second review of the same commits). Kept beside the requests, in the main checkout.
+import { appendFileSync, mkdirSync, readFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { projectWorktrees } from './rules.mjs';
+
+export const REVIEWS_FILE = '.claude/state/reviews.jsonl';
+const reviewsFile = (root) => join(projectWorktrees(root)[0] ?? root, REVIEWS_FILE);
+
+/** Records that the review of `branch` at commit `sha` sent it back, and why. */
+export function recordSentBack(root, branch, sha, reason, now = Date.now()) {
+  const file = reviewsFile(root);
+  mkdirSync(dirname(file), { recursive: true });
+  appendFileSync(
+    file,
+    `${JSON.stringify({ at: new Date(now).toISOString(), branch, sha, verdict: 'sent back', reason: reason ?? null })}\n`,
+  );
+}
+
+/** The latest send-back of each branch: { branch: { at, sha, reason } }. */
+export function sentBack(root) {
+  const found = {};
+  let lines = [];
+  try {
+    lines = readFileSync(reviewsFile(root), 'utf8').split('\n').filter(Boolean);
+  } catch {
+    return found;
+  }
+  for (const line of lines) {
+    try {
+      const r = JSON.parse(line);
+      if (r.verdict === 'sent back' && r.branch && r.sha) found[r.branch] = r;
+    } catch {
+      // a line being written, or not one of ours
+    }
+  }
+  return found;
+}

package/hooks/lib/rules.mjs

@@ -20,12 +20,13 @@ import {
   readFileSync,
   readdirSync,
   realpathSync,
+  rmSync,
   statSync,
   writeFileSync,
 } from 'node:fs';
 import { execFileSync } from 'node:child_process';
 import { homedir } from 'node:os';
-import { dirname, join, relative, resolve } from 'node:path';
+import { basename, dirname, join, relative, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { DEPENDENCY_APPROVAL, isDependencyFile } from './dependencies.mjs';
 import { globToRegExp, matchesAny } from './glob.mjs';
@@ -33,6 +34,23 @@ import { globToRegExp, matchesAny } from './glob.mjs';
 export const APPROVAL_LOG = '.claude/approval-log.jsonl';
 export const APPROVALS_DIR = '.claude/approvals';
 export const APPROVAL_MINUTES = 60;
+// A dependency approval lasts until the lane commits the install it allows (the story may resume
+// hours later), and at most a week, so a forgotten one doesn't linger.
+export const DEPENDENCY_APPROVAL_DAYS = 7;
+
+/** How long an approval named `name` lasts, in minutes. */
+export const approvalMinutes = (name) =>
+  String(name).startsWith(DEPENDENCY_APPROVAL)
+    ? DEPENDENCY_APPROVAL_DAYS * 24 * 60
+    : APPROVAL_MINUTES;
+
+/** How long approvals for `names` last, in words. */
+export function approvalLifetime(names) {
+  const list = [names].flat();
+  return list.every((n) => String(n).startsWith(DEPENDENCY_APPROVAL))
+    ? `until the install is committed, at most ${DEPENDENCY_APPROVAL_DAYS} days`
+    : `for ${APPROVAL_MINUTES} minutes`;
+}
 // Marks a worktree as a lane's, for a person running that lane; the lead creates it, and it is never work.
 export const LANE_FILE = '.lane';
 const NEVER_WRITABLE = [`${APPROVALS_DIR}/**`, APPROVAL_LOG];
@@ -80,7 +98,7 @@ export function approvalHowTo(names, actor, root, allows = 'these edits', config
     : '';
   return (
     `${lines.join('\n')}\n` +
-    `(a person runs it; the reason is recorded in ${APPROVAL_LOG}, and it allows ${allows} for ${whom}, for ${APPROVAL_MINUTES} minutes)${relay}${delegated}`
+    `(a person runs it; the reason is recorded in ${APPROVAL_LOG}, and it allows ${allows} for ${whom}, ${approvalLifetime(names)})${relay}${delegated}`
   );
 }
 
@@ -211,7 +229,7 @@ export function owns(actor, rel, config) {
 function inForce(file) {
   if (!existsSync(file) || !statSync(file).isFile()) return null;
   const { mtimeMs } = statSync(file);
-  if (Date.now() - mtimeMs >= APPROVAL_MINUTES * 60_000) return null;
+  if (Date.now() - mtimeMs >= approvalMinutes(basename(file)) * 60_000) return null;
   const reason = readFileSync(file, 'utf8').trim();
   return reason ? { reason, grantedAt: new Date(mtimeMs).toISOString() } : null;
 }
@@ -223,6 +241,16 @@ export function approval(root, name, actor) {
   return lane ?? inForce(join(dir, name));
 }
 
+/** Uses up the approval in force for `name` and `actor`: a dependency approval, once its install is committed. */
+export function useApproval(root, name, actor) {
+  const dir = approvalsDir(root);
+  for (const file of [
+    ...(actor?.kind === 'lane' ? [join(dir, actor.lane, name)] : []),
+    join(dir, name),
+  ])
+    if (inForce(file)) return rmSync(file, { force: true });
+}
+
 const requestsFile = (root) => join(projectWorktrees(root)[0] ?? root, REQUESTS_FILE);
 const sameRequest = (a, b) =>
   a.actor === b.actor &&
@@ -306,7 +334,7 @@ export function approvalsInForce(root, now = Date.now()) {
       }
       const a = inForce(file);
       if (!a) continue;
-      const left = APPROVAL_MINUTES - (now - Date.parse(a.grantedAt)) / 60_000;
+      const left = approvalMinutes(name) - (now - Date.parse(a.grantedAt)) / 60_000;
       found.push({
         name,
         ...(lane ? { lane } : {}),
@@ -336,6 +364,33 @@ export function dependencyGrants(root, actor) {
     .filter((g) => g.reason);
 }
 
+/**
+ * During a merge, whether `rel` is exactly as the incoming branch (MERGE_HEAD) has it: then its change
+ * arrives with that branch's history, approvals and audit-log entries, not from the actor concluding
+ * the merge. `staged` compares what will be committed; otherwise the working tree. A file both sides
+ * delete counts too. verify still holds the branch to its rules afterwards.
+ */
+export function arrivesWithMerge(root, rel, { staged = false } = {}) {
+  const run = (...args) => {
+    try {
+      return execFileSync('git', ['-C', root, ...args], {
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'ignore'],
+      }).trim();
+    } catch {
+      return null;
+    }
+  };
+  if (run('rev-parse', '--verify', '--quiet', 'MERGE_HEAD') === null) return false;
+  const incoming = run('rev-parse', '--verify', '--quiet', `MERGE_HEAD:${rel}`);
+  const mine = staged
+    ? run('rev-parse', '--verify', '--quiet', `:${rel}`)
+    : existsSync(join(root, rel))
+      ? run('hash-object', '--', rel)
+      : null;
+  return incoming === mine;
+}
+
 /**
  * Whether a dependency approval lets `actor` change `rel`: a manifest or lockfile no other lane owns,
  * changed while the actor has a dependency approval in force. Installing a package rewrites them.
@@ -415,6 +470,13 @@ export function laneOf(rel, config) {
   );
 }
 
+/** Who reviews a change to a file any agent may write: the lane an anyActor entry names, else the lead. Null for other files. */
+export function reviewerOf(rel, config) {
+  if (!matchesAny(rel, config.anyActor)) return null;
+  const named = (config.anyActorReviewers ?? []).find((e) => matchesAny(rel, [e.glob]));
+  return named?.reviewer ?? 'lead';
+}
+
 export function ownerOf(rel, config) {
   const lane = laneOf(rel, config);
   if (lane) return `${lane} lane / ${config.lanes[lane].agent}`;

package/hooks/lib/shell.mjs

@@ -0,0 +1,94 @@
+// What a shell command runs, as distinct from the text it carries. Heredoc bodies and quoted strings
+// are data: a commit message, a card's --text, a grep pattern. So rules that recognise a command
+// (`git commit`, `code-kit merge`) look only at the simple commands it runs, each from its own start.
+// Rules about text the command carries (a commit trailer, a path in a redirect) still read it whole.
+
+/** The command with each heredoc's body taken out: the lines after `<<WORD` up to the line `WORD`. */
+export function withoutHeredocs(cmd) {
+  const out = [];
+  let until = null;
+  for (const line of String(cmd).split('\n')) {
+    if (until) {
+      if (line.trim() === until) until = null;
+      continue;
+    }
+    out.push(line);
+    // `<<WORD`, `<<-WORD`, `<<'WORD'` or `<<"WORD"`; not a `<<<` here-string, whose text is on the line.
+    const m = line.match(/(?<!<)<<-?\s*(['"]?)([\w.-]+)\1(?!<)/);
+    if (m && !line.includes('<<<')) until = m[2];
+  }
+  return out.join('\n');
+}
+
+/** `text` with every quoted character replaced by `_`, the quotes kept: same length, nothing inside to match. */
+export function maskQuotes(text) {
+  let out = '';
+  let quote = null;
+  for (let i = 0; i < text.length; i++) {
+    const c = text[i];
+    if (quote) {
+      if (c === '\\' && quote === '"' && i + 1 < text.length) {
+        out += '__';
+        i++;
+      } else if (c === quote) {
+        quote = null;
+        out += c;
+      } else out += c === '\n' ? '\n' : '_';
+    } else if (c === '\\' && i + 1 < text.length) {
+      out += '__';
+      i++;
+    } else {
+      if (c === '"' || c === "'") quote = c;
+      out += c;
+    }
+  }
+  return out;
+}
+
+const SEPARATOR = /[;&|\n()`]/;
+const LEADING =
+  /^(?:(?:[A-Za-z_]\w*=(?:"[^"]*"|'[^']*'|\S*)\s+)|(?:sudo|exec|time|command|nohup|env)\s+|!\s+)+/;
+
+/**
+ * The simple commands `cmd` runs, in order: split at `;`, `&`, `|`, newlines, parentheses and
+ * backticks outside quotes, heredoc bodies left out, each without leading `VAR=value` assignments.
+ * Each is `{ text, code }`: `text` as written, `code` with its quoted text masked.
+ */
+export function commandsOf(cmd) {
+  const text = withoutHeredocs(cmd);
+  const mask = maskQuotes(text);
+  const found = [];
+  let start = 0;
+  const take = (end) => {
+    const raw = text.slice(start, end);
+    const lead = raw.length - raw.trimStart().length;
+    const body = raw.trim();
+    const skip = body.match(LEADING)?.[0].length ?? 0;
+    const from = start + lead + skip;
+    const piece = text.slice(from, start + lead + body.length);
+    if (piece) found.push({ text: piece, code: mask.slice(from, from + piece.length) });
+  };
+  for (let i = 0; i < mask.length; i++)
+    if (SEPARATOR.test(mask[i])) {
+      take(i);
+      start = i + 1;
+    }
+  take(mask.length);
+  return found;
+}
+
+/** Whether `cmd` runs a command matching `pattern`, which is anchored at the command's start. */
+export function runs(cmd, pattern, { quoted = true } = {}) {
+  return commandsOf(cmd).some((c) => pattern.test(quoted ? c.text : c.code));
+}
+
+/** The whole command with heredoc bodies out and quoted text masked: for rules that span commands (`curl … | sh`). */
+export function codeOf(cmd) {
+  return maskQuotes(withoutHeredocs(cmd));
+}
+
+/** `git`, with any `-C dir` and `-c key=value` before its subcommand. */
+export const GIT = String.raw`git\s+(?:-[Cc]\s+(?:"[^"]*"|'[^']*'|\S+)\s+)*`;
+
+/** code-kit's command line however it's run: installed, through node (its path quoted or not), or npx. */
+export const CODE_KIT = String.raw`(?:code-kit|node\s+(?:"[^"]*code-kit(?:\.mjs)?"|'[^']*code-kit(?:\.mjs)?'|\S*code-kit(?:\.mjs)?)|npx\s+(?:--yes\s+|-y\s+)?@warren-dean\/code-kit(?:@\S+)?)`;

package/hooks/lib/trace.mjs

@@ -6,7 +6,7 @@ import { execFileSync } from 'node:child_process';
 import { matchesAny } from './glob.mjs';
 import { layerOf } from './layers.mjs';
 import { readRequirements, readStories } from './plan.mjs';
-import { ownerOf } from './rules.mjs';
+import { ownerOf, reviewerOf } from './rules.mjs';
 
 const git = (root, ...args) => {
   try {
@@ -30,7 +30,7 @@ export function storiesOf(root, rel) {
   return [...ids];
 }
 
-/** { path, owner, lane, layer, requirements: [{ id, title, spec, stories }] } for one repository path. */
+/** { path, owner, reviewer, lane, layer, requirements: [{ id, title, spec, stories }] } for one repository path. */
 export function traceFile(root, rel, config) {
   const laneName = Object.keys(config.lanes).find((l) => {
     const { paths, exclude } = config.lanes[l];
@@ -40,6 +40,8 @@ export function traceFile(root, rel, config) {
   const out = {
     path: rel,
     owner: ownerOf(rel, config),
+    // For a file any agent may write: who reviews changes to it.
+    reviewer: reviewerOf(rel, config),
     lane: laneName ? { name: laneName, agent: config.lanes[laneName].agent } : null,
     layer: layer
       ? { name: layer.name, mayImport: layer.mayImport, denyPackages: layer.denyPackages ?? [] }

package/hooks/lib/verify.mjs

@@ -1,7 +1,7 @@
 // The rules for a branch's changes as a whole, for CI and the lead's review: the hooks only see work
 // done in Claude Code sessions, so a person's commits or another tool would otherwise go unchecked.
 // Everything is judged from git (base...HEAD), except the checks, which run in the checkout.
-import { execFileSync } from 'node:child_process';
+import { execFileSync, spawnSync } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { BASELINE_FILE, loadBaseline, newProblems } from './baseline.mjs';
@@ -10,7 +10,15 @@ import { CONFIG_FILE } from './config.mjs';
 import { isDependencyFile } from './dependencies.mjs';
 import { matchesAny } from './glob.mjs';
 import { layerProblems } from './layers.mjs';
-import { APPROVAL_LOG, SECRETS, laneOf, ownerOf, protectedEntry, screenProblem } from './rules.mjs';
+import {
+  APPROVAL_LOG,
+  SECRETS,
+  laneOf,
+  ownerOf,
+  owns,
+  protectedEntry,
+  screenProblem,
+} from './rules.mjs';
 
 const git = (root, ...args) =>
   execFileSync('git', ['-C', root, ...args], {
@@ -31,9 +39,30 @@ function showAt(root, ref, rel) {
 /** The lane a branch belongs to by its name (`<lane>/<story>`), or null. */
 export function laneOfBranch(branch, config) {
   const lane = branch?.split('/')[0];
+  if (lane === 'lead') return 'lead';
   return lane && config.lanes[lane] ? lane : null;
 }
 
+/** What verify holds a branch to, in words: a lane's paths, or the lead's. */
+export const heldTo = (lane) => (lane === 'lead' ? "the lead's paths" : `the ${lane} lane`);
+
+/**
+ * Files changed by commits made on the branch itself (first parents, merges left out): on the lead's
+ * branch, what the lead wrote, as distinct from lane work it merged in after review.
+ */
+function directChanges(root, from) {
+  const out = git(
+    root,
+    'log',
+    '--first-parent',
+    '--no-merges',
+    '--format=',
+    '--name-only',
+    `${from}..HEAD`,
+  );
+  return new Set(out.split('\n').filter(Boolean));
+}
+
 /** Files changed on this branch since it left `base`. */
 export function branchChanges(root, base) {
   return git(root, 'diff', '--name-only', '--no-renames', `${base}...HEAD`)
@@ -96,6 +125,33 @@ function signedByPerson(root, from, file, signedBy) {
   return messages.length > 0 && messages.every((m) => line.test(m));
 }
 
+/**
+ * Secrets anywhere in the branch's history, not only in the files as they end up: a secret committed
+ * and then deleted is still in the commits that merge. Names that look like secret files, from every
+ * commit; and, where gitleaks is installed, what it finds in the commits' content.
+ */
+function historySecrets(root, from, changed) {
+  const problems = [];
+  const touched = git(root, 'log', '--format=', '--name-only', `${from}..HEAD`)
+    .split('\n')
+    .filter(Boolean);
+  for (const f of new Set(touched))
+    if (SECRETS(f) && !changed.includes(f))
+      problems.push(
+        `${f} may hold secrets, and it's in this branch's history even though it's gone now. Rewrite the history without it before it merges.`,
+      );
+  const scan = spawnSync(
+    'gitleaks',
+    ['detect', '--source', root, `--log-opts=${from}..HEAD`, '--redact', '--no-banner'],
+    { encoding: 'utf8' },
+  );
+  if (scan.error?.code !== 'ENOENT' && scan.status === 1)
+    problems.push(
+      `gitleaks found possible secrets in this branch's commits:\n${`${scan.stdout}${scan.stderr}`.trim()}`,
+    );
+  return problems;
+}
+
 /**
  * Every problem with the branch, grouped: { ownership, protected, layers, baseline, design, checks }.
  * `lane` holds the branch to that lane's paths; `checks: false` leaves the project's checks to CI's
@@ -110,7 +166,9 @@ export function verifyBranch({ root, base, config, lane = null, checks = true })
   const { entries, problems: logProblems } = logEntries(root, from);
   found.protected.push(...logProblems);
   const logged = new Map(entries.map((e) => [e.file, e]));
+  const direct = lane === 'lead' ? directChanges(root, from) : null;
 
+  found.ownership.push(...historySecrets(root, from, changed));
   for (const f of changed) {
     if (SECRETS(f))
       found.ownership.push(`${f} may hold secrets; secrets never go in the repository.`);
@@ -122,7 +180,20 @@ export function verifyBranch({ root, base, config, lane = null, checks = true })
         `${f} is ${guarded.why}, but no approval-log entry records this change. Protected files are committed through Claude Code with code-kit, which logs them.`,
       );
     if (matchesAny(f, config.anyActor)) continue;
-    if (lane) {
+    if (lane === 'lead') {
+      // The lead's branch is held to the lead's paths for what it changes itself; lane work reaches it
+      // by merging the lane's branch, which verify held to that lane.
+      if (!direct.has(f)) continue;
+      const entry = logged.get(f);
+      const approved =
+        (guarded && entry?.approval === guarded.approval) ||
+        signed ||
+        (isDependencyFile(f) && entry?.approval === 'dependency');
+      if (!owns({ kind: 'lead' }, f, config) && !approved)
+        found.ownership.push(
+          `${f}: changed by a commit on the lead's branch, but the lead doesn't own it (owner: ${ownerOf(f, config) ?? 'nobody'}). Lane work comes in by merging the lane's reviewed branch.`,
+        );
+    } else if (lane) {
       const { paths, exclude } = config.lanes[lane];
       const own = matchesAny(f, paths) && !matchesAny(f, exclude);
       const entry = logged.get(f);