@warren-dean/code-kit 0.3.15 → 0.5.0

package/hooks/guard-bash.mjs

@@ -5,19 +5,22 @@
 // approval log on commit and scans commits for secrets. Shell writes are also checked afterwards by
 // lane-audit.mjs. With `approvals.lead` on, the lead may act for the person on what they say in chat:
 // record their approvals (`code-kit approve`) and run blocked commands marked `person`.
-import { appendFileSync } from 'node:fs';
+import { appendFileSync, existsSync, readFileSync } from 'node:fs';
 import { spawnSync } from 'node:child_process';
 import { join, resolve } from 'node:path';
-import { addedPackages, dependencyApproval } from './lib/dependencies.mjs';
+import { addedPackages, dependencyApproval, isDependencyFile } from './lib/dependencies.mjs';
+import { CODE_KIT, GIT, codeOf, runs } from './lib/shell.mjs';
 import { block, start } from './lib/hook.mjs';
 import {
   APPROVAL_LOG,
   actorFor,
+  arrivesWithMerge,
   approval,
   approvalHowTo,
   currentBranch,
   dependencyChange,
   dependencyGrants,
+  useApproval,
   owns,
   protectedEntry,
   recordRequest,
@@ -27,28 +30,46 @@ import {
 const { input, project, config, error } = start();
 const cmd = String(input.tool_input?.command || '');
 
-const ALWAYS = [
-  [/\bgit\s+push\b.*(--force\b|\s-f\b|--force-with-lease\b)/, 'Force-push is not allowed.'],
-  [/--no-verify\b/, 'Skipping git hooks is not allowed.'],
+// Commands are recognised where they run (lib/shell.mjs), so a commit message, a heredoc, a quoted
+// --text or a grep pattern that mentions one doesn't trip its rule.
+const RUNS = [
+  [
+    new RegExp(String.raw`^${GIT}push\b.*(--force\b|\s-f\b|--force-with-lease\b)`),
+    'Force-push is not allowed.',
+  ],
+  [new RegExp(String.raw`^${GIT}\S+\b.*\s--no-verify\b`), 'Skipping git hooks is not allowed.'],
   [
-    /\brm\s+-rf?\s+(\/|~|\$HOME|\.\.?)(\s|$)/,
+    /^rm\s+-rf?\s+(\/|~|\$HOME|\.\.?)(\s|$)/,
     'Refusing a destructive delete of a root, home or parent directory.',
   ],
-  [/\b(curl|wget)\b[^|]*\|\s*(sh|bash|zsh)\b/, 'Piping downloads into a shell is not allowed.'],
-  [/\.claude\/approvals/, 'Approvals are created only by a person, with a `!` shell command.'],
+];
+for (const [re, why] of RUNS) {
+  if (runs(cmd, re, { quoted: false })) block(`Blocked: ${why}\nCommand: ${cmd}`);
+}
+// These read the command whole: a pipe spans commands, and an approval or the log can be written
+// through a quoted path.
+const ALWAYS = [
+  [
+    /\b(curl|wget)\b[^|]*\|\s*(sh|bash|zsh)\b/,
+    'Piping downloads into a shell is not allowed.',
+    codeOf(cmd),
+  ],
+  [/\.claude\/approvals/, 'Approvals are created only by a person, with a `!` shell command.', cmd],
   [
     /approval-log\.jsonl/,
     'The approval audit log is appended only by the commit hook; nobody edits it.',
+    cmd,
   ],
 ];
-for (const [re, why] of ALWAYS) {
-  if (re.test(cmd)) block(`Blocked: ${why}\nCommand: ${cmd}`);
+for (const [re, why, text] of ALWAYS) {
+  if (re.test(text)) block(`Blocked: ${why}\nCommand: ${cmd}`);
 }
 const packages = addedPackages(cmd);
-const approves = /\bcode-kit(\.mjs)?["']?\s+approve\b/.test(cmd);
-const delegatedMerge = /\bcode-kit(\.mjs)?["']?\s+merge\b/.test(cmd);
+const approves = runs(cmd, new RegExp(String.raw`^${CODE_KIT}\s+approve\b`));
+const delegatedMerge = runs(cmd, new RegExp(String.raw`^${CODE_KIT}\s+merge\b`));
+const commits = runs(cmd, new RegExp(String.raw`^${GIT}commit\b`));
 if (error) {
-  if (/\bgit\s+commit\b/.test(cmd)) block(`Blocked: ${error}\nFix the config before committing.`);
+  if (commits) block(`Blocked: ${error}\nFix the config before committing.`);
   if (approves) block(`Blocked: ${error}\nApprovals wait until the config is valid.`);
   if (delegatedMerge) block(`Blocked: ${error}\nMerges wait until the config is valid.`);
   if (packages.length)
@@ -62,23 +83,35 @@ const branches = config.branches.protected
 // The branch is read before the command runs, so a command that switches to a protected branch and then
 // commits or merges in the same breath is judged by what it does, not by where it starts. Moving a
 // protected branch directly (branch -f, update-ref) is a commit on it by another name.
-const writesHistory = /\bgit\s+(commit|merge|cherry-pick|rebase|revert|am)\b/.test(cmd);
-const switchesToProtected = new RegExp(
-  `\\bgit\\s+(?:switch|checkout)\\s+(?:-[^\\s]+\\s+)*(${branches})(?![\\w./-])(?!\\s+--)`,
-).test(cmd);
-const movesProtected =
-  new RegExp(
-    `\\bgit\\s+branch\\s+(?:\\S+\\s+)*(?:-f|--force|-M|-C)\\b.*\\b(${branches})(?![\\w./-])`,
-  ).test(cmd) ||
+const writesHistory = runs(
+  cmd,
+  new RegExp(String.raw`^${GIT}(commit|merge|cherry-pick|rebase|revert|am)\b`),
+);
+const switchesToProtected = runs(
+  cmd,
   new RegExp(
-    `\\bgit\\s+update-ref\\s+(?:-\\S+\\s+)*(?:refs/heads/)?(${branches})(?![\\w./-])`,
-  ).test(cmd);
+    String.raw`^${GIT}(?:switch|checkout)\s+(?:-[^\s]+\s+)*(${branches})(?![\w./-])(?!\s+--)`,
+  ),
+);
+const movesProtected =
+  runs(
+    cmd,
+    new RegExp(
+      String.raw`^${GIT}branch\s+(?:\S+\s+)*(?:-f|--force|-M|-C)\b.*\b(${branches})(?![\w./-])`,
+    ),
+  ) ||
+  runs(
+    cmd,
+    new RegExp(
+      String.raw`^${GIT}update-ref\s+(?:-\S+\s+)*(?:refs/heads/)?(${branches})(?![\w./-])`,
+    ),
+  );
 if ((switchesToProtected && writesHistory) || movesProtected) {
   block(
     `Blocked: never commit to, merge into or move ${config.branches.protected.join(' or ')}, even by switching to it first. Work on a branch; a person merges after review${config.approvals.delegate?.merge ? ', or the lead merges a verified branch with `code-kit merge <branch> --delegated`' : ''}.\nCommand: ${cmd}`,
   );
 }
-if (new RegExp(`\\bgit\\s+push\\b.*\\b(${branches})\\b`).test(cmd)) {
+if (runs(cmd, new RegExp(String.raw`^${GIT}push\b.*\b(${branches})\b`))) {
   block(
     `Blocked: push to your own branch; a person merges to ${config.branches.protected[0]} after review.\nCommand: ${cmd}`,
   );
@@ -180,10 +213,7 @@ try {
 } catch {
   // not a git repository yet
 }
-if (
-  /\bgit\s+(commit|merge|cherry-pick|rebase|revert)\b/.test(cmd) &&
-  config.branches.protected.includes(branch)
-) {
+if (writesHistory && config.branches.protected.includes(branch)) {
   block(
     `Blocked: never commit or merge on ${branch}. Work on a branch; a person merges after review.`,
   );
@@ -253,6 +283,8 @@ function recordApprovals() {
       }),
     );
   for (const file of files) {
+    // Concluding a merge: what arrives as the other branch has it was logged there, with its approvals.
+    if (arrivesWithMerge(root, file, { staged: true })) continue;
     const entry = protectedEntry(file, config);
     const granted = entry && approval(root, entry.approval, actor);
     const byDependency = actor.kind === 'lane' && dependencyChange(actor, file, root, config);
@@ -283,12 +315,30 @@ function recordApprovals() {
         grantedAt: null,
       });
   }
+  // A dependency approval is used up by the commit that adds its package to a manifest or lockfile.
+  const manifests = files.filter((f) => isDependencyFile(f));
+  if (manifests.length && actor.kind !== 'readonly') {
+    // The lines each manifest gains on HEAD, read from the working tree: this hook runs before
+    // `git add … && git commit` has staged anything, and a new manifest isn't tracked yet.
+    const added = manifests
+      .flatMap((f) => {
+        const before = new Set(git('show', `HEAD:${f}`).split('\n'));
+        const now = existsSync(join(root, f)) ? readFileSync(join(root, f), 'utf8') : '';
+        return now.split('\n').filter((l) => !before.has(l));
+      })
+      .join('\n');
+    for (const g of dependencyGrants(root, actor)) {
+      const pkg = g.name.slice('dep-'.length).replaceAll('+', '/');
+      const quoted = pkg.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+      if (new RegExp(`["'\\s/]${quoted}["'@=:\\s]`).test(added)) useApproval(root, g.name, actor);
+    }
+  }
   if (lines.length === 0) return;
   appendFileSync(join(root, APPROVAL_LOG), `${lines.join('\n')}\n`);
   git('add', APPROVAL_LOG);
 }
 
-if (/\bgit\s+commit\b/.test(cmd)) {
+if (commits) {
   recordApprovals();
   const scan = spawnSync('gitleaks', ['protect', '--staged', '--redact', '--no-banner'], {
     cwd: root,

package/hooks/hooks.json

@@ -1,5 +1,6 @@
 {
   "description": "code-kit: lanes, protected paths with an approval log, spec-check and design gates, layer rules and the project's checks, from .claude/code-kit.json",
+  "modules": ["./mod/register.mjs"],
   "hooks": {
     "PreToolUse": [
       {

package/hooks/lane-audit.mjs

@@ -5,7 +5,14 @@
 import { readFileSync } from 'node:fs';
 import { spawnSync } from 'node:child_process';
 import { join } from 'node:path';
-import { APPROVAL_LOG, LANE_FILE, actorFor, actorRoot, writeProblem } from './lib/rules.mjs';
+import {
+  APPROVAL_LOG,
+  LANE_FILE,
+  actorFor,
+  actorRoot,
+  arrivesWithMerge,
+  writeProblem,
+} from './lib/rules.mjs';
 
 // The commit hook appends to the approval log and stages it; if that commit then fails, the
 // appended lines are left uncommitted. That is the only change to the log that is not a problem.
@@ -36,11 +43,15 @@ export function auditProblems(input, config) {
   const root = actorRoot(input);
   if (!root) return [];
   const actor = actorFor(input, root, config);
-  return changedFiles(root)
-    .filter((rel) => !(rel === APPROVAL_LOG && appendedOnly(root, rel)))
-    .map((rel) => [rel, writeProblem(actor, rel, root, config)])
-    .filter(([, problem]) => problem)
-    .map(([rel, problem]) => `${rel}: ${problem.split('\n')[0]}`);
+  return (
+    changedFiles(root)
+      .filter((rel) => !(rel === APPROVAL_LOG && appendedOnly(root, rel)))
+      // Mid-merge, the incoming branch's changes are its own, not this actor's writes.
+      .filter((rel) => !arrivesWithMerge(root, rel))
+      .map((rel) => [rel, writeProblem(actor, rel, root, config)])
+      .filter(([, problem]) => problem)
+      .map(([rel, problem]) => `${rel}: ${problem.split('\n')[0]}`)
+  );
 }
 
 if (import.meta.url === `file://${process.argv[1]}`) {

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}`;