@warren-dean/code-kit 0.21.0 → 0.22.1

package/bin/code-kit.mjs

@@ -34,6 +34,13 @@
 //   settings [--json] | settings set <key> <value> --reason … [--via pane]
 //                                    the harness settings; set is the person's own change
 //                         record approvals a person gave in chat (with approvals.lead on, the lead runs it)
+//   decisions [--json] [--all]       what waits on the person in this session, and a count of each other's
+//   who                              which session this is, whether it leads, and its task (spec 23)
+//   sessions [--json] | sessions lead the sessions working the project; make this one the lead
+//   task "<what>" --touches globs | task done | task take <session>
+//                                    a working session's ad hoc task and the paths it leases
+//   lanes [--json] | lanes release <lane>
+//                                    the lanes running a story now, one each across sessions (spec 23)
 // --config <file> reads a draft (.claude/code-kit.draft.json) instead of .claude/code-kit.json.
 import { execFileSync, spawnSync } from 'node:child_process';
 import {
@@ -52,10 +59,12 @@ import { BASELINE_FILE, loadBaseline } from '../hooks/lib/baseline.mjs';
 import { matchesAny } from '../hooks/lib/glob.mjs';
 import {
   CONFIG_FILE,
+  approvalSettings,
   committedConfig,
   effectiveConfig,
   mergeDelegation,
   validate,
+  withApprovalSetting,
 } from '../hooks/lib/config.mjs';
 import { diffConfigs, ownershipMoves } from '../hooks/lib/diff.mjs';
 import { CODE, importsOf, layerOf, layerProblems, targetOf } from '../hooks/lib/layers.mjs';
@@ -133,6 +142,20 @@ import { dependencyRuleProblems, npmFacts, packageOf } from '../hooks/lib/regist
 import { heldTo, laneOfBranch, verifyBranch } from '../hooks/lib/verify.mjs';
 import { skippedLine } from '../hooks/lib/checks.mjs';
 import { TESTS_APPROVAL } from '../hooks/lib/regression.mjs';
+import { laneClaim, laneClaims, releaseLane, shortSession } from '../hooks/lib/laneclaims.mjs';
+import { slicesOf } from '../hooks/lib/schedule.mjs';
+import {
+  leadSession,
+  makeLead,
+  memberOf,
+  readSession,
+  seeSession,
+  sessions,
+  setTask,
+  takeTask,
+} from '../hooks/lib/sessions.mjs';
+import { globsOverlap } from '../hooks/lib/teamfacts.mjs';
+import { decisionsFor, openDecisions } from '../hooks/lib/decisionstore.mjs';
 import {
   appliesTo,
   projectStandards,
@@ -166,6 +189,10 @@ const laneName = option('--lane');
 const intoName = option('--into');
 const via = option('--via');
 const sessionId = option('--session');
+// SESS-1: the session calling, as Claude Code tells every command an agent runs, unless --session says.
+const callerSession = sessionId ?? process.env.CLAUDE_CODE_SESSION_ID ?? null;
+// A provider's command hears which session is calling, for that session's own live link.
+if (callerSession) process.env.CODE_KIT_SESSION = callerSession;
 const minutesGiven = option('--minutes');
 const answerGiven = option('--answer');
 const leaseGiven = option('--lease');
@@ -279,6 +306,23 @@ function check() {
   }
 }
 
+/** SESS-1: which session the caller is, whether it leads the project, and its task. */
+function whoAmI() {
+  load();
+  const root = resolve('.');
+  const me = callerSession ? readSession(root, callerSession) : null;
+  if (!me)
+    return out(
+      callerSession
+        ? `Session ${shortSession(callerSession)}, which code-kit hasn't recorded yet.`
+        : 'Not run from a Claude Code session, so no member of the team.',
+    );
+  const lead = leadSession(root);
+  out(
+    `${memberOf(me)}: ${me.role === 'lead' ? 'the lead session' : `a working session${lead ? ` (${memberOf(lead)} leads)` : ' (no session leads now)'}`}${me.task ? `, working on "${me.task.title}"` : ''}.`,
+  );
+}
+
 function who(paths) {
   const { config } = load();
   for (const p of paths) {
@@ -1021,7 +1065,7 @@ function requests() {
   const open = openRequests(resolve('.')).map((r, i) => ({
     ...r,
     n: i + 1,
-    by: decidedBy(r.names, config),
+    by: decidedBy(r.names, config, r.lane ? { kind: 'lane', lane: r.lane } : { kind: 'lead' }),
   }));
   const granted = approvalsInForce(resolve('.'));
   // CARD-6: every approval given, newest first.
@@ -1045,6 +1089,159 @@ function requests() {
     );
 }
 
+/**
+ * OWN-1: the decisions waiting on the person in this session (the lead's questions, the approvals its
+ * refusals asked for), and a count of those in each other session; `--all` lists every session's.
+ */
+function decisionsCommand() {
+  const { config } = load();
+  const root = resolve('.');
+  if (rest.length) die('code-kit decisions [--json] [--all]');
+  const stories =
+    config.docs?.specs && config.docs?.plan
+      ? buildStatus('.', config, base(config, false), tracked()).stories
+      : [];
+  if (flag('--all')) {
+    const all = openDecisions(root, { stories });
+    if (flag('--json')) return out(JSON.stringify(all, null, 2));
+    if (!all.length) return out('Nothing waits on the person.');
+    for (const d of all)
+      out(
+        `${pad(d.member ?? 'any session', 30)} ${pad(d.kind, 8)} ${d.what}${d.count > 1 ? ` (asked ${d.count} times)` : ''}`,
+      );
+    return;
+  }
+  const r = decisionsFor(root, callerSession, { stories });
+  if (flag('--json')) return out(JSON.stringify(r, null, 2));
+  if (!r.mine.length) out('Nothing waits on the person in this session.');
+  for (const d of r.mine)
+    out(`${pad(d.kind, 8)} ${d.what}${d.count > 1 ? ` (asked ${d.count} times)` : ''}`);
+  for (const e of r.elsewhere)
+    out(`${e.count} decision${e.count === 1 ? '' : 's'} in session ${e.member}, answered there.`);
+}
+
+/**
+ * SESS-1, SESS-2: the sessions working the project, which one leads, and each one's task; `beat` (the mod,
+ * while a session is open) says the session is still there; `lead` makes the caller's session the lead.
+ */
+function sessionsCommand() {
+  load();
+  const root = resolve('.');
+  const [sub] = rest;
+  if (sub === 'beat' || sub === 'lead') {
+    if (!callerSession) die(`code-kit sessions ${sub} needs the session: --session <id>.`);
+    if (sub === 'beat') return seeSession(root, callerSession) && out('Seen.');
+    const was = leadSession(root);
+    makeLead(root, callerSession);
+    return out(
+      `This session (${shortSession(callerSession)}) leads the project now${was && was.id !== callerSession ? `; ${shortSession(was.id)} is a working session` : ''}.`,
+    );
+  }
+  if (sub !== undefined) die('code-kit sessions [--json] | sessions lead | sessions beat');
+  const all = sessions(root).filter((s) => s.live || s.task);
+  if (flag('--json'))
+    return out(
+      JSON.stringify(
+        all.map((s) => ({ ...s, member: memberOf(s) })),
+        null,
+        2,
+      ),
+    );
+  if (!all.length) return out('No session is working this project.');
+  for (const s of all)
+    out(
+      `${pad(memberOf(s), 30)} ${pad(s.live ? s.role : 'ended', 8)} ${s.task ? `${s.task.title}${s.task.paths?.length ? ` (${s.task.paths.join(', ')})` : ''}${s.live ? '' : ', stale'}` : '-'}${s.id === callerSession ? '  ← this session' : ''}`,
+    );
+}
+
+/**
+ * SESS-4: an ad hoc task, for a session working without a story: recorded with the paths it leases, so
+ * the other sessions' agents leave them alone; `done` ends it; `take <session>` moves a stale one here.
+ */
+function taskCommand() {
+  load();
+  const root = resolve('.');
+  const [sub] = rest;
+  if (!callerSession)
+    die(
+      'code-kit task needs the session: run it from Claude Code (CLAUDE_CODE_SESSION_ID), or pass --session <id>.',
+    );
+  if (sub === 'done') {
+    const had = readSession(root, callerSession)?.task;
+    if (!had) return out('This session has no task.');
+    setTask(root, callerSession, null);
+    return out(`Done: "${had.title}". Its paths are free for other sessions.`);
+  }
+  if (sub === 'take') {
+    if (rest.length !== 2) die('code-kit task take <session>');
+    const r = takeTask(root, rest[1], callerSession);
+    if (!r.ok) die(r.why);
+    return out(
+      `This session took over "${r.task.title}" from ${memberOf(r.from)}${r.task.paths?.length ? `, leasing ${r.task.paths.join(', ')}` : ''}.`,
+    );
+  }
+  if (sub === undefined) {
+    const s = readSession(root, callerSession);
+    if (flag('--json')) return out(JSON.stringify(s?.task ?? null));
+    return out(
+      s?.task
+        ? `"${s.task.title}"${s.task.paths?.length ? `, leasing ${s.task.paths.join(', ')}` : ''}.`
+        : 'This session has no task.',
+    );
+  }
+  if (rest.length !== 1)
+    die(
+      'code-kit task "<what you\'re doing>" --touches "<globs>" | task done | task take <session>',
+    );
+  const paths = (touchesGiven ?? '')
+    .split(',')
+    .map((g) => g.trim())
+    .filter(Boolean);
+  const clash = sessions(root).find(
+    (s) =>
+      s.live &&
+      s.id !== callerSession &&
+      s.task?.paths?.some((p) => paths.some((q) => globsOverlap(p, q))),
+  );
+  if (clash)
+    die(
+      `Another session (${memberOf(clash)}) is working on "${clash.task.title}", leasing ${clash.task.paths.join(', ')}. Pick paths it doesn't lease, or wait until it's done.`,
+    );
+  const branch = currentBranch(root) ?? null;
+  setTask(root, callerSession, { title: sub.trim(), paths, branch });
+  out(
+    `This session is working on "${sub.trim()}"${paths.length ? `, leasing ${paths.join(', ')}` : ''}. \`code-kit task done\` when it's finished.`,
+  );
+}
+
+/**
+ * SCHED-1: the lanes claimed now, one story each across every session, or one lane released: for an
+ * agent the lead saw stop without finishing, so its lane can take the next story.
+ */
+function lanesCommand() {
+  const { config } = load();
+  const root = resolve('.');
+  if (rest[0] === 'release') {
+    const lane = rest[1];
+    if (!lane || rest.length !== 2) die('code-kit lanes release <lane>');
+    if (!config.lanes[lane])
+      die(`There is no lane "${lane}". Lanes: ${Object.keys(config.lanes).join(', ')}.`);
+    const held = laneClaim(root, lane);
+    if (!releaseLane(root, lane)) return out(`The ${lane} lane isn't claimed.`);
+    return out(
+      `Released the ${lane} lane${held.story ? ` (it was running ${held.story})` : ''}. Its next story can start.`,
+    );
+  }
+  if (rest.length) die('code-kit lanes [--json] | lanes release <lane>');
+  const claims = laneClaims(root);
+  if (flag('--json')) return out(JSON.stringify(claims, null, 2));
+  if (!claims.length) return out('No lane is running a story.');
+  for (const c of claims)
+    out(
+      `${c.lane.padEnd(12)} ${(c.story ?? 'a story').padEnd(8)} session ${shortSession(c.session) ?? '?'}, since ${c.since.slice(0, 16).replace('T', ' ')} UTC${c.stale ? ' (stale: no agent seen to finish in 12 hours)' : ''}`,
+    );
+}
+
 /**
  * The harness settings (`harness` in the config): listed, or one changed as the person's own act. The
  * change is written to the config and given a kit approval with the person's reason, so the commit that
@@ -1056,33 +1253,50 @@ function settings() {
     const [, key, value] = rest;
     if (!key || value === undefined)
       die('code-kit settings set <key> <value> --reason "<why>" [--via pane]');
-    if (!(key in SETTINGS))
-      die(`${key} isn't a harness setting. They are: ${Object.keys(SETTINGS).join(', ')}.`);
+    const approvalKey = key.startsWith('approvals.');
+    if (!(key in SETTINGS) && !approvalKey)
+      die(
+        `${key} isn't a setting. They are: ${Object.keys(SETTINGS).join(', ')}, and approvals.<name> (see code-kit settings).`,
+      );
     if (!reason?.trim()) die('Give a reason with --reason "…": the approval log keeps it.');
-    const changed = withSetting(raw, key, parseSetting(key, value));
+    // WHO-3: who decides an approval is the person's setting too, written out in full.
+    const changed = approvalKey
+      ? withApprovalSetting(raw, config, key, value)
+      : withSetting(raw, key, parseSetting(key, value));
+    if (!changed)
+      die(
+        `${key} isn't an approval setting, or ${JSON.stringify(value)} isn't one of its values. See code-kit settings.`,
+      );
     const problems = validate(changed);
     if (problems.length) die(`Nothing changed: ${problems.join('; ')}`);
     writeFileSync(resolve(file), `${JSON.stringify(changed, null, 2)}\n`);
     const mark =
       via === 'pane' ? '(changed in the code-kit pane)' : '(changed with code-kit settings)';
     grantApprovals(resolve('.'), ['kit'], null, reason, { kit: mark });
+    const now = approvalKey
+      ? approvalSettings(effectiveConfig(changed, resolve('.'))).find((r) => r.key === key)?.value
+      : settingOf(changed.harness, key);
     return out(
-      `Set harness.${key} to ${JSON.stringify(settingOf(changed.harness, key))}. Commit ${file} to keep it; the approval log will carry your reason.`,
+      `Set ${approvalKey ? key : `harness.${key}`} to ${JSON.stringify(now)}. Commit ${file} to keep it; the approval log will carry your reason.`,
     );
   }
   if (rest.length) die('code-kit settings [--json] | settings set <key> <value> --reason "<why>"');
-  const rows = Object.entries(SETTINGS).map(([key, s]) => ({
-    key,
-    value: settingOf(config.harness, key),
-    default: s.default,
-    about: s.about,
-    // Chosen in the config, or the default standing in.
-    set: settingOf(raw.harness, key) !== undefined,
-  }));
+  const rows = [
+    ...Object.entries(SETTINGS).map(([key, s]) => ({
+      key,
+      value: settingOf(config.harness, key),
+      default: s.default,
+      about: s.about,
+      section: 'Harness',
+      // Chosen in the config, or the default standing in.
+      set: settingOf(raw.harness, key) !== undefined,
+    })),
+    ...approvalSettings(config),
+  ];
   if (flag('--json')) return out(JSON.stringify(rows, null, 2));
   for (const r of rows)
     out(
-      `${r.key.padEnd(26)} ${JSON.stringify(r.value).padEnd(14)} ${r.value === r.default ? '' : `(default ${JSON.stringify(r.default)}) `}${r.about}`,
+      `${r.key.padEnd(44)} ${JSON.stringify(r.value).padEnd(14)} ${r.value === r.default ? '' : `(default ${JSON.stringify(r.default)}) `}${r.about}`,
     );
 }
 
@@ -1264,7 +1478,14 @@ function status() {
   if (flag('--json')) {
     out(
       JSON.stringify(
-        { base: from, stories, requirements: byRequirement, problems, drift },
+        {
+          base: from,
+          stories,
+          slices: slicesOf(stories),
+          requirements: byRequirement,
+          problems,
+          drift,
+        },
         null,
         2,
       ),
@@ -1282,9 +1503,18 @@ function status() {
             ? s.branch
             : '';
     out(
-      `  ${pad(s.id, 7)} ${pad(s.state, 12)} ${pad(s.lane || '-', 10)} ${pad(s.requirements.join(', '), 24)} ${detail}`.trimEnd(),
+      `  ${pad(s.id, 7)} ${pad(s.state, 12)} ${pad(s.lane || '-', 10)} ${pad(s.requirements.join(', '), 24)} ${detail}${s.slice ? `${detail ? ' · ' : ''}slice ${s.slice}` : ''}`.trimEnd(),
     );
   }
+  // SCHED-2: the slices, in plan order, and which are open.
+  const slices = slicesOf(stories);
+  if (slices.length) {
+    out('\nSlices:');
+    for (const sl of slices)
+      out(
+        `  ${pad(sl.name, 24)} ${pad(sl.done ? 'done' : sl.open ? 'open' : 'not started', 12)} ${sl.stories.join(', ')}`,
+      );
+  }
   out('\nRequirements:');
   for (const r of byRequirement) {
     const tests = r.tests.length ? `tested (${r.tests.join(', ')})` : 'no test names it';
@@ -1404,7 +1634,7 @@ async function approve(given) {
     const rules = config.approvals.delegate;
     if (!rules)
       die(
-        'This project delegates no approvals to the lead ("approvals.delegate" isn\'t set). Ask the person.',
+        'This project keeps every approval for the person ("approvals.delegate" is false). Ask the person.',
       );
     // HELM-3: the lead approves a package for a story it has read, not by default.
     const packages = names.filter((n) => n.startsWith(DEPENDENCY_APPROVAL));
@@ -1421,8 +1651,16 @@ async function approve(given) {
       : null;
     const outside = [];
     for (const name of names) {
+      // WHO-2: a weakened test on a lane's branch, after the lead's review; on its own, the person's.
       if (name === TESTS_APPROVAL) {
-        outside.push(`${name}: weakening a test is the person's to allow, and is never delegated`);
+        if (!rules.tests) outside.push(`${name}: weakened tests aren't delegated`);
+        else if (!laneName)
+          outside.push(
+            `${name}: on your own branch a weakened test is the person's; you approve one only for a lane, with --lane`,
+          );
+        else if (!storyGiven)
+          outside.push(`${name}: name the story whose branch weakens the test, with --story ST-n`);
+        else marks[name] = delegatedMark(`tests, reviewed by the lead, for ${story.id}`);
         continue;
       }
       if (name.startsWith(DEPENDENCY_APPROVAL)) {
@@ -1943,6 +2181,7 @@ function askCommand() {
   if (flag('--blocks') && !storyGiven) die('--blocks holds a story: name it with --story ST-n.');
   const r = askQuestion(root, {
     by: 'lead',
+    session: callerSession,
     question,
     why: whyGiven ?? null,
     story: storyGiven ?? null,
@@ -2034,7 +2273,9 @@ function loopCommand() {
     const r = claimLead(root, sessionId, { take: flag('--take') });
     if (!r.ok)
       die(
-        `Another session (${r.lead.session}, renewed ${r.lead.at}) runs the lead loop in this project. Leave it there, or take it over with --take.`,
+        r.lead
+          ? `Another session (${shortSession(r.lead.session)}, seen ${r.lead.at}) leads this project and runs its loop. Leave it there, or lead from here with --take.`
+          : 'No session leads this project now, and this is a working session: the loop runs only in the lead session. Lead from here with --take.',
       );
     return out('This session runs the lead loop.');
   }
@@ -2043,9 +2284,11 @@ function loopCommand() {
       'code-kit loop [--json] | loop pause | loop resume | loop lead --session <id> [--take] | loop release --session <id>',
     );
   const state = readLoop(root);
+  // SESS-2: with --session, whether that session leads the project or works in it.
+  const role = sessionId ? (readSession(root, sessionId)?.role ?? null) : null;
   out(
     flag('--json')
-      ? JSON.stringify(state)
+      ? JSON.stringify({ ...state, ...(sessionId ? { role } : {}) })
       : `${state.paused ? `The lead loop is paused (since ${state.at}).` : 'The lead loop is running.'}${state.lead ? ` Session ${state.lead.session} runs it.` : ''}`,
   );
 }
@@ -2247,6 +2490,10 @@ const commands = {
   requests,
   stops,
   settings,
+  lanes: lanesCommand,
+  sessions: sessionsCommand,
+  decisions: decisionsCommand,
+  task: taskCommand,
   hold: () => (rest.length === 1 ? hold(rest[0]) : usage()),
   queue,
   team: teamCommand,
@@ -2269,7 +2516,7 @@ const commands = {
   diff,
   baseline,
   graph,
-  who: () => (rest.length ? who(rest) : usage()),
+  who: () => (rest.length ? who(rest) : whoAmI()),
 };
 function usage() {
   die(
@@ -2288,6 +2535,9 @@ function usage() {
       '              | report [--json] | report send|discard <id>\n' +
       '              | stops [--session id] [--json] | sent-back <branch> [--reason "…"]\n' +
       '              | settings [--json] | settings set <key> <value> --reason "…" [--via pane]\n' +
+      '              | lanes [--json] | lanes release <lane> | sessions [--json] | sessions lead\n' +
+      '              | who | task "<what>" --touches globs | task done | task take <session>\n' +
+      '              | decisions [--json] [--all]\n' +
       '              | hold <id> [--minutes N] | hold <id> --answer approved|refused\n' +
       '              | queue [--json] | queue add|drop <branch> | queue rules | queue merge --delegated|--person\n' +
       '              | loop [--json] | loop pause|resume | loop lead|release --session id [--take]\n' +

package/hooks/guard-agent.mjs

@@ -0,0 +1,36 @@
+#!/usr/bin/env node
+// PreToolUse on Agent (docs/specs/23-the-team.md, SCHED-1): a lane runs one story at a time, across every
+// session in the project. Starting a lane's agent claims the lane; a second agent for a claimed lane is
+// refused, naming the story and the session that has it. Any other agent starts as before.
+import { block, start } from './lib/hook.mjs';
+import { CLI } from './lib/rules.mjs';
+import { claimLane, shortSession } from './lib/laneclaims.mjs';
+import { memberOf, readSession } from './lib/sessions.mjs';
+
+const { input, project, config, error } = start();
+// A broken config is reported by the other hooks; it doesn't stop agents starting.
+if (error) process.exit(0);
+const call = input.tool_input ?? {};
+const lane = Object.entries(config.lanes).find(([, l]) => l.agent === call.subagent_type)?.[0];
+if (!lane) process.exit(0);
+const story =
+  String(call.description ?? '')
+    .match(/\bST-\d+\b/i)?.[0]
+    ?.toUpperCase() ?? null;
+const session = input.session_id ?? null;
+const claimed = claimLane(project, { lane, story, session });
+if (!claimed.ok) {
+  const c = claimed.claim;
+  // SESS-1: the session by its member and, where it has one, its task.
+  const holder = readSession(project, c.session);
+  const where =
+    c.session && c.session === session
+      ? 'in this session'
+      : c.session
+        ? `in another session (${holder ? memberOf(holder) : shortSession(c.session)}${holder?.task ? `, working on "${holder.task.title}"` : ''})`
+        : 'here';
+  block(
+    `Blocked: the ${lane} lane is already running ${c.story ?? 'a story'} ${where}, since ${c.since.slice(11, 16)} UTC. A lane runs one story at a time across the project: two agents in one lane build on the same files in their worktrees and conflict at merge.\n` +
+      `Start ${story ?? 'this story'} when ${c.story ?? 'that story'} is finished, or dispatch a ready story in another lane meanwhile. If that agent has stopped and the lane is free, release it first:\n  node "${CLI}" lanes release ${lane}`,
+  );
+}

package/hooks/guard-bash.mjs

@@ -39,6 +39,7 @@ import {
   delegatedMark,
   dependencyChange,
   dependencyGrants,
+  leadDecides,
   useApproval,
   owns,
   protectedEntry,
@@ -217,10 +218,14 @@ if (runs(cmd, new RegExp(String.raw`^${CODE_KIT}\s+loop\s+(pause|resume)\b`)))
   block(
     `Blocked: pausing or resuming the lead loop is the person's own act, from the code-kit band or their terminal. Ask them, and stop.\nCommand: ${cmd}`,
   );
-// LOOP-10: which session runs the loop is the mod's to record, and moving it the person's.
-if (runs(cmd, new RegExp(String.raw`^${CODE_KIT}\s+loop\s+(lead|release)\b`)))
+// LOOP-10, SESS-2: which session leads is recorded by code-kit's hooks and band, and choosing it is
+// the person's own act.
+if (
+  runs(cmd, new RegExp(String.raw`^${CODE_KIT}\s+loop\s+(lead|release)\b`)) ||
+  runs(cmd, new RegExp(String.raw`^${CODE_KIT}\s+sessions\s+(lead|beat)\b`))
+)
   block(
-    `Blocked: which session runs the lead loop is recorded by the code-kit band, and moving it is the person's own act (Lead from here, in the band). Carry on with your work.\nCommand: ${cmd}`,
+    `Blocked: which session leads the project is recorded by code-kit, and choosing it is the person's own act (Lead from here, in the code-kit band, or \`code-kit sessions lead\` in their terminal). Carry on with your work.\nCommand: ${cmd}`,
   );
 // TEAM-9: handing someone's claim to someone else is the tech lead's own decision too.
 if (runs(cmd, new RegExp(String.raw`^${CODE_KIT}\s+team\s+reassign\b`)))
@@ -282,7 +287,7 @@ if (delegatedMerge && !config.approvals.delegate?.merge)
 const delegating = /\s--delegated\b/.test(cmd);
 if (approves && delegating && !config.approvals.delegate)
   block(
-    `Blocked: this project doesn't delegate approvals to the lead ("approvals.delegate" isn't set). Ask the person to approve it with the \`!\` command from the refusal.\nCommand: ${cmd}`,
+    `Blocked: this project keeps every approval for the person ("approvals.delegate" is false). Ask the person to approve it with the \`!\` command from the refusal.\nCommand: ${cmd}`,
   );
 if (approves && !delegating && !forPerson)
   block(
@@ -311,7 +316,9 @@ if (packages.length) {
     // HELM-2, HELM-3: a lane asks the lead, which judges the package on its merits where it decides.
     const names = unapproved.map(dependencyApproval);
     const whose =
-      decidedBy(names, config) === 'lead' ? "is the lead's decision" : "needs a person's approval";
+      decidedBy(names, config, actor) === 'lead'
+        ? "is the lead's decision"
+        : "needs a person's approval";
     block(
       `Blocked: a new dependency (${unapproved.join(', ')}) ${whose}. ${askHowTo(names, actor, sessionIn ?? project, config, { allows: 'installing it, and the manifest and lockfile changes that makes,' })}\nCommand: ${cmd}`,
     );
@@ -520,7 +527,7 @@ function recordApprovals() {
     if (entry && !granted && actor.kind !== 'lead' && !byDependency) {
       recordRequest(root, actor, entry.approval, file, entry.why);
       block(
-        `Blocked: ${file} is ${entry.why}; committing it needs ${decidedBy(entry.approval, config) === 'lead' ? "the lead's" : "a person's"} approval in force.${noteFor(root, config, { kind: 'protected', name: entry.approval, glob: entry.glob })} ${askHowTo(entry.approval, actor, root, config)}`,
+        `Blocked: ${file} is ${entry.why}; committing it needs ${decidedBy(entry.approval, config, actor) === 'lead' ? "the lead's" : "a person's"} approval in force.${noteFor(root, config, { kind: 'protected', name: entry.approval, glob: entry.glob })} ${askHowTo(entry.approval, actor, root, config)}`,
       );
     }
     if (granted)
@@ -545,8 +552,9 @@ function recordApprovals() {
         grantedAt: null,
       });
   }
-  // REG-2: a commit that weakens a test waits for the person's `tests` approval, which nobody else can
-  // give; it's recorded in the log, so verify accepts the branch, and used up by this commit.
+  // REG-2: a commit that weakens a test waits for a `tests` approval: WHO-2, the lead's on a lane's
+  // branch where tests are delegated, otherwise the person's (always on the lead's own). It's recorded in
+  // the log, so verify accepts the branch, and used up by this commit.
   const weakened = commitWeakenings(
     root,
     files.filter((f) => !arrivesWithMerge(root, f, { staged: true })),
@@ -558,16 +566,20 @@ function recordApprovals() {
     if (!granted) {
       const [w, ...more] = weakened;
       recordRequest(root, actor, TESTS_APPROVAL, w.file, `A weakened test: ${said(w)}.`);
+      const leads = leadDecides(TESTS_APPROVAL, config, actor);
       const personOnly = { ...config, approvals: { ...config.approvals, delegate: null } };
       block(
-        `Blocked: ${w.file} is a weakened test (${said(w)}); committing it needs a person's approval in force.
+        `Blocked: ${w.file} is a weakened test (${said(w)}); committing it needs ${leads ? "the lead's" : "a person's"} approval in force.
 ` +
           (more.length
             ? `Also weakened: ${more.map((x) => `${x.file} (${said(x)})`).join('; ')}.
 `
             : '') +
-          `A weakened test can hide a regression. Fix the code so the test passes as it was. If the test itself is wrong, ask the person: neither the lead nor a lane can approve it. They run
-${approvalHowTo(TESTS_APPROVAL, actor, root, 'weakening tests in one commit', personOnly)}`,
+          `A weakened test can hide a regression. Fix the code so the test passes as it was. ` +
+          (leads
+            ? `If the test itself is wrong, the lead decides after reviewing it: ${askHowTo(TESTS_APPROVAL, actor, root, config, { allows: 'weakening tests in one commit', need: 'the test, what you weakened and why the test was wrong, and the story' })}`
+            : `If the test itself is wrong, ask the person: ${actor.kind === 'lead' ? "on your own branch nobody else reviews it, so you can't approve it." : "the lead can't approve it here."} They run
+${approvalHowTo(TESTS_APPROVAL, actor, root, 'weakening tests in one commit', personOnly)}`),
       );
     }
     for (const w of weakened)

package/hooks/guard-paths.mjs

@@ -10,6 +10,7 @@ import { brokenLayerRule, layerProblems } from './lib/layers.mjs';
 import { noteFor } from './lib/standards.mjs';
 import { block, start } from './lib/hook.mjs';
 import { teamOf, teamProvider, teamRefusal, whoami } from './lib/team.mjs';
+import { sessionWriteProblem } from './lib/sessions.mjs';
 import { spawnSync } from 'node:child_process';
 import {
   actorFor,
@@ -38,6 +39,16 @@ if (error) {
 const problem = writeProblem(actorFor(input, root, config), rel, root, config);
 if (problem) block(`Blocked: ${problem}`);
 
+// SESS-4, SESS-5: another session's task leases the path, or a working session writes where it shouldn't.
+const shared = sessionWriteProblem({
+  project,
+  root,
+  rel,
+  actor: actorFor(input, root, config),
+  session: input.session_id ?? null,
+});
+if (shared) block(`Blocked: ${shared}`);
+
 // TEAM-1, TEAM-4: in a team, the tech lead's paths, other people's lanes, claims and leases.
 const team = teamOf(config);
 if (team) {

package/hooks/hooks.json

@@ -22,6 +22,16 @@
             "timeout": 30
           }
         ]
+      },
+      {
+        "matcher": "Agent|Task",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "node \"${CLAUDE_PLUGIN_ROOT}/hooks/guard-agent.mjs\"",
+            "timeout": 10
+          }
+        ]
       }
     ],
     "PostToolUse": [
@@ -53,6 +63,11 @@
             "type": "command",
             "command": "node \"${CLAUDE_PLUGIN_ROOT}/hooks/team-session.mjs\" start",
             "timeout": 10
+          },
+          {
+            "type": "command",
+            "command": "node \"${CLAUDE_PLUGIN_ROOT}/hooks/session.mjs\" start",
+            "timeout": 10
           }
         ]
       }
@@ -64,6 +79,11 @@
             "type": "command",
             "command": "node \"${CLAUDE_PLUGIN_ROOT}/hooks/team-session.mjs\" end",
             "timeout": 10
+          },
+          {
+            "type": "command",
+            "command": "node \"${CLAUDE_PLUGIN_ROOT}/hooks/session.mjs\" end",
+            "timeout": 10
           }
         ]
       }