@open-tomato/rafa 0.35.0 → 0.36.0

package/dist/{index-ckqfhynj.js → index-qvbeqrx3.js}

@@ -1,43 +1,49 @@
 // @bun
 import {
+  CONFIG_DEFAULTS,
+  CONFIG_FILE,
+  ConfigError,
+  FINDING_DOMAINS,
+  FINDING_KINDS,
+  FINDING_SIGNALS,
+  activeOutput,
+  activeOutputMode,
+  configFilePath,
+  createTextOutput,
+  hubContextOf,
+  isStampableStub,
+  parseConfigText,
+  readRafaBlocks,
+  resolveConfig
+} from "./index-jfas157k.js";
+import {
+  bless,
+  merge
+} from "./index-d6d0942q.js";
+import {
+  CommandExit,
+  commandSpelling
+} from "./index-3mzw3kzh.js";
+import {
+  BUSY_TIMEOUT_MAX_MS,
+  BUSY_TIMEOUT_MIN_MS,
   RAFA_INSTINCTS_PATH,
-  bundledBinDirectory,
-  resolveInstinctScopes,
-  tierExists,
+  STORE_BACKENDS,
+  SYNC_STRATEGIES,
   TEST_SCOPES,
-  isMapping,
+  bundledBinDirectory,
   describeValue,
-  messageOf,
-  STORE_BACKENDS2,
-  SYNC_STRATEGIES2,
-  BUSY_TIMEOUT_MIN_MS,
-  BUSY_TIMEOUT_MAX_MS,
   isBusyTimeoutMs,
   isGitHubLogin,
-  hubContextOf,
-  CONFIG_FILE2,
-  CONFIG_DEFAULTS2,
-  ConfigError2,
-  configFilePath2,
-  parseConfigText2,
-  resolveConfig2,
-  isStampableStub,
-  createTextOutput,
-  activeOutput,
-  activeOutputMode,
-  readRafaBlocks2,
-  FINDING_KINDS2,
-  FINDING_SIGNALS2,
-  FINDING_DOMAINS
-} from "./index-2tjmxwvp.js";
-import {
-  bless2,
-  merge2
-} from "./index-hgcvjke7.js";
+  isMapping,
+  messageOf,
+  resolveInstinctScopes,
+  tierExists
+} from "./index-fzhd3d4y.js";
 import {
-  actionHash2,
-  triggerKey2
-} from "./index-21jcfatr.js";
+  actionHash,
+  triggerKey
+} from "./index-wp8c28fd.js";
 
 // src/adapters/registry.ts
 import { homedir } from "os";
@@ -211,7 +217,7 @@ function guardTestProcess(path, probe = currentProbe()) {
 function keyOrNull(value) {
   return typeof value === "string" && value.length > 0 ? value : null;
 }
-var EFFORT_KEY_PROJECTIONS2 = {
+var EFFORT_KEY_PROJECTIONS = {
   sessions: (row) => keyOrNull(row.sessionId),
   commits: (row) => keyOrNull(row.sha)
 };
@@ -230,13 +236,13 @@ function readKind(repoRoot, kind) {
 }
 function keysOfKind(repoRoot, kind) {
   const path = openedKindPath(repoRoot, kind);
-  return collectedKeys(path, EFFORT_KEY_PROJECTIONS2[kind]);
+  return collectedKeys(path, EFFORT_KEY_PROJECTIONS[kind]);
 }
 function appendKind(repoRoot, kind, rows) {
   const path = openedKindPath(repoRoot, kind);
-  return appendRows(path, rows, EFFORT_KEY_PROJECTIONS2[kind]);
+  return appendRows(path, rows, EFFORT_KEY_PROJECTIONS[kind]);
 }
-function openNdjsonStore2(repoRoot) {
+function openNdjsonStore(repoRoot) {
   return {
     append: (kind, rows) => appendKind(repoRoot, kind, rows),
     keys: (kind) => keysOfKind(repoRoot, kind),
@@ -253,7 +259,7 @@ import { Database as Database2 } from "bun:sqlite";
 
 // package.json
 var name = "@open-tomato/rafa";
-var version = "0.35.0";
+var version = "0.36.0";
 
 // src/cli/version.ts
 var RAFA_VERSION = version;
@@ -346,36 +352,36 @@ function mainCheckoutOf(dir, seams = {}) {
 }
 
 // src/project/scope.ts
-var SCOPE_DIR2 = dirname3(CONFIG_FILE2);
-var INIT_COMMAND2 = "rafa init";
-var DISK_FILE_SYSTEM2 = Object.freeze({
+var SCOPE_DIR = dirname3(CONFIG_FILE);
+var INIT_COMMAND = "rafa init";
+var DISK_FILE_SYSTEM = Object.freeze({
   exists: (path) => existsSync3(path),
   realpath: (path) => realpathSync2(path)
 });
 
-class ScopeError2 extends Error {
+class ScopeError extends Error {
   constructor(message, options) {
     super(`rafa scope: ${message}`, options);
     this.name = "ScopeError";
   }
 }
-function scopeAt2(base) {
-  return { dir: join4(base, SCOPE_DIR2), configFile: configFilePath2(base) };
+function scopeAt(base) {
+  return { dir: join4(base, SCOPE_DIR), configFile: configFilePath(base) };
 }
-function initHint2(start, passedUserConfig = null, probedMainCheckout = null) {
+function initHint(start, passedUserConfig = null, probedMainCheckout = null) {
   const passed = passedUserConfig === null ? [] : [`${passedUserConfig} is the user scope's config and marks no project`];
   const main = probedMainCheckout === null ? [] : [`nor in ${probedMainCheckout}, the main checkout of the repository holding it`];
   return [
-    `not inside a rafa project: no ${CONFIG_FILE2} in ${start} or any directory above it`,
+    `not inside a rafa project: no ${CONFIG_FILE} in ${start} or any directory above it`,
     ...main,
     ...passed,
-    `run \`${INIT_COMMAND2}\` to set one up`
+    `run \`${INIT_COMMAND}\` to set one up`
   ].join(`
 `);
 }
 function requireAbsolute(label, path) {
   if (!isAbsolute3(path)) {
-    throw new ScopeError2(`${label} is ${describeValue(path)}, expected an absolute path`);
+    throw new ScopeError(`${label} is ${describeValue(path)}, expected an absolute path`);
   }
 }
 function realStartOf(start, fs) {
@@ -383,7 +389,7 @@ function realStartOf(start, fs) {
     return fs.realpath(start);
   } catch (error) {
     const message = `start directory ${start} does not resolve (${messageOf(error)})`;
-    throw new ScopeError2(message, { cause: error });
+    throw new ScopeError(message, { cause: error });
   }
 }
 function realHomeOf(home, fs) {
@@ -393,15 +399,15 @@ function realHomeOf(home, fs) {
     return null;
   }
 }
-function selfAndAncestors2(path) {
+function selfAndAncestors(path) {
   const parent = dirname3(path);
-  return parent === path ? [path] : [path, ...selfAndAncestors2(parent)];
+  return parent === path ? [path] : [path, ...selfAndAncestors(parent)];
 }
 var GIT_MARKER = ".git";
 function walkUp(dirs, realHome, fs, stopAtTopLevel) {
   let passedUserConfig = false;
   for (const dir of dirs) {
-    if (fs.exists(configFilePath2(dir))) {
+    if (fs.exists(configFilePath(dir))) {
       if (dir !== realHome)
         return { root: dir, passedUserConfig, topLevel: null };
       passedUserConfig = true;
@@ -418,39 +424,39 @@ function mainCheckoutAt(realStart, mainCheckout) {
   } catch (error) {
     if (!(error instanceof WorktreeRootError))
       throw error;
-    throw new ScopeError2(`cannot read the main checkout of ${realStart} (${error.message})`, { cause: error });
+    throw new ScopeError(`cannot read the main checkout of ${realStart} (${error.message})`, { cause: error });
   }
 }
 function fallBack(realStart, realHome, fs, mainCheckout) {
   const main = mainCheckoutAt(realStart, mainCheckout);
-  if (main === null || main === realHome || selfAndAncestors2(realStart).includes(main)) {
+  if (main === null || main === realHome || selfAndAncestors(realStart).includes(main)) {
     return { root: null, probed: null };
   }
-  return fs.exists(configFilePath2(main)) ? { root: main, probed: main } : { root: null, probed: main };
+  return fs.exists(configFilePath(main)) ? { root: main, probed: main } : { root: null, probed: main };
 }
 function walkAbove(lower, realHome, fs) {
   if (lower.topLevel === null)
     return lower;
-  const above = selfAndAncestors2(lower.topLevel).slice(1);
+  const above = selfAndAncestors(lower.topLevel).slice(1);
   const upper = walkUp(above, realHome, fs, false);
   return { ...upper, passedUserConfig: lower.passedUserConfig || upper.passedUserConfig };
 }
-function resolveScope2(start, seams) {
-  const { home, fs = DISK_FILE_SYSTEM2, mainCheckout = mainCheckoutOf } = seams;
+function resolveScope(start, seams) {
+  const { home, fs = DISK_FILE_SYSTEM, mainCheckout = mainCheckoutOf } = seams;
   requireAbsolute("start directory", start);
   requireAbsolute("home directory", home);
-  const user = scopeAt2(home);
+  const user = scopeAt(home);
   const realStart = realStartOf(start, fs);
   const realHome = realHomeOf(home, fs);
-  const lower = walkUp(selfAndAncestors2(realStart), realHome, fs, true);
+  const lower = walkUp(selfAndAncestors(realStart), realHome, fs, true);
   const fallback = lower.root === null ? fallBack(realStart, realHome, fs, mainCheckout) : { root: lower.root, probed: null };
   const walk = fallback.root === null ? walkAbove(lower, realHome, fs) : lower;
   const root = fallback.root ?? walk.root;
   if (root === null) {
     const passed = walk.passedUserConfig ? user.configFile : null;
-    return { found: false, start, home, user, hint: initHint2(start, passed, fallback.probed) };
+    return { found: false, start, home, user, hint: initHint(start, passed, fallback.probed) };
   }
-  return { found: true, root, home, project: scopeAt2(root), user };
+  return { found: true, root, home, project: scopeAt(root), user };
 }
 
 // src/loop/session-record-parse.ts
@@ -467,7 +473,7 @@ import { mkdirSync as mkdirSync2, readFileSync as readFileSync2, renameSync, rmS
 import { dirname as dirname4, join as join5 } from "path";
 var POSITION_FILE = "position.json";
 function positionFilePath(root) {
-  return join5(scopeAt2(root).dir, POSITION_FILE);
+  return join5(scopeAt(root).dir, POSITION_FILE);
 }
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -544,7 +550,7 @@ var HOP_FILE = "hop.json";
 var HOP_KINDS = ["blocker", "dry"];
 var HOP_STATES = ["away", "waiting", "merged", "halted"];
 function hopFilePath(root) {
-  return join6(scopeAt2(root).dir, HOP_FILE);
+  return join6(scopeAt(root).dir, HOP_FILE);
 }
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -650,6 +656,7 @@ var DEFAULT_PHASE = "task";
 var RECORD_EXTENSION = ".json";
 var SESSION_ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
 var SESSION_STEP_KINDS = Object.freeze(["baseline", "task", "stage", "pre-wrap-up"]);
+var SESSION_STEP_REASONS = Object.freeze(["declared", "trigger", "fallback", "no-module-tests", "stage"]);
 
 class SessionRecordError extends Error {
   file;
@@ -690,8 +697,8 @@ function taskProblem(task) {
 function hopProblem(fields) {
   if (!Object.hasOwn(fields, "hop"))
     return null;
-  const hop = field(fields, "hop");
-  return asHopRecord(hop) === null ? `hop is ${describeValue2(hop)}, expected a hop record` : null;
+  const hop2 = field(fields, "hop");
+  return asHopRecord(hop2) === null ? `hop is ${describeValue2(hop2)}, expected a hop record` : null;
 }
 function worktreeProblem(fields) {
   if (!Object.hasOwn(fields, "worktree"))
@@ -793,16 +800,23 @@ function phaseEntry(phase) {
   return isSessionPhase(phase) ? { phase } : {};
 }
 function freezeHop(value) {
-  const hop = asHopRecord(value);
-  return Object.freeze({ ...hop, home: Object.freeze(hop.home), from: Object.freeze(hop.from) });
+  const hop2 = asHopRecord(value);
+  return Object.freeze({ ...hop2, home: Object.freeze(hop2.home), from: Object.freeze(hop2.from) });
 }
 function freezeFailures(failures) {
   return Object.freeze(failures.map((failure) => Object.freeze({ file: failure.file, name: failure.name })));
 }
+function isSessionStepReason(value) {
+  return SESSION_STEP_REASONS.includes(value);
+}
+function reasonEntry(reason) {
+  return isSessionStepReason(reason) ? { reason } : {};
+}
 function freezeStep(step) {
   return Object.freeze({
     kind: step.kind,
     scope: typeof step.scope === "string" ? step.scope : Object.freeze([...step.scope]),
+    ...reasonEntry(field(step, "reason")),
     command: Object.freeze([...step.command]),
     exitCode: step.exitCode,
     summary: step.summary,
@@ -818,7 +832,7 @@ function stepsEntry(steps) {
 }
 function freezeRecord(fields) {
   const task = field(fields, "task");
-  const hop = field(fields, "hop");
+  const hop2 = field(fields, "hop");
   const worktree = field(fields, "worktree");
   return Object.freeze({
     sessionId: field(fields, "sessionId"),
@@ -830,7 +844,7 @@ function freezeRecord(fields) {
     state: field(fields, "state"),
     task: isObject(task) ? Object.freeze({ line: field(task, "line"), text: field(task, "text") }) : null,
     ...phaseEntry(field(fields, "phase")),
-    ...hop === undefined ? {} : { hop: freezeHop(hop) },
+    ...hop2 === undefined ? {} : { hop: freezeHop(hop2) },
     ...worktree === undefined ? {} : { worktree },
     ...stepsEntry(field(fields, "steps"))
   });
@@ -881,7 +895,7 @@ class SessionStateError extends Error {
   }
 }
 function runsDir(root) {
-  return join7(scopeAt2(root).dir, RUNS_DIR);
+  return join7(scopeAt(root).dir, RUNS_DIR);
 }
 function sessionFilePath(root, sessionId) {
   if (!isSessionId(sessionId)) {
@@ -931,7 +945,7 @@ function byStart(a, b) {
 function readSessions(root, seams = {}) {
   const dir = runsDir(root);
   const isAlive = seams.isAlive ?? isPidAlive;
-  const records = recordNames(dir).filter((name) => name.endsWith(RECORD_EXTENSION)).map((name) => readRecordFile(join7(dir, name))).map((record) => Object.freeze({ ...record, state: readState(record, isAlive) }));
+  const records = recordNames(dir).filter((name2) => name2.endsWith(RECORD_EXTENSION)).map((name2) => readRecordFile(join7(dir, name2))).map((record) => Object.freeze({ ...record, state: readState(record, isAlive) }));
   return Object.freeze(records.sort(byStart));
 }
 function readSession(root, sessionId, seams = {}) {
@@ -1017,8 +1031,8 @@ function manifestName(file) {
   }
   if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed))
     return null;
-  const name = parsed["name"];
-  return typeof name === "string" ? name : null;
+  const name2 = parsed["name"];
+  return typeof name2 === "string" ? name2 : null;
 }
 function nearestRafaPackage(start) {
   let dir = start;
@@ -1063,7 +1077,7 @@ class DevelopmentBuildRefusedError extends Error {
 function storeProjectRoot(path) {
   const storeDir = dirname8(path);
   const scopeDir = dirname8(storeDir);
-  if (basename3(storeDir) !== EFFORT_DIR_NAME || basename3(scopeDir) !== SCOPE_DIR2)
+  if (basename3(storeDir) !== EFFORT_DIR_NAME || basename3(scopeDir) !== SCOPE_DIR)
     return null;
   return dirname8(scopeDir);
 }
@@ -1470,6 +1484,13 @@ var SQLITE_MIGRATIONS = [
     sql: `
   ALTER TABLE store_meta ADD COLUMN generation TEXT CHECK (generation <> '');
   `
+  },
+  {
+    id: "session-worktree",
+    breaks: [],
+    sql: `
+  ALTER TABLE sessions ADD COLUMN worktree TEXT;
+  `
   }
 ];
 var SQLITE_SCHEMA_VERSION = SQLITE_MIGRATIONS.length;
@@ -1683,7 +1704,7 @@ function stampedValues(table) {
 
 // src/effort/store/settings.ts
 var DEFAULT_STORE_SETTINGS = Object.freeze({
-  busyTimeoutMs: CONFIG_DEFAULTS2.effortBusyTimeoutMs
+  busyTimeoutMs: CONFIG_DEFAULTS.effortBusyTimeoutMs
 });
 var active = DEFAULT_STORE_SETTINGS;
 function setActiveStoreSettings(settings) {
@@ -2008,8 +2029,12 @@ function sqliteStorePath(repoRoot) {
   return join9(effortStoreDir(repoRoot), SQLITE_STORE_FILE_NAME);
 }
 var KIND_TABLES = {
-  sessions: { name: "sessions", keyColumn: "session_id" },
-  commits: { name: "commits", keyColumn: "sha" }
+  sessions: {
+    name: "sessions",
+    keyColumn: "session_id",
+    fieldColumns: [{ column: "worktree", value: (row) => row.worktree ?? null }]
+  },
+  commits: { name: "commits", keyColumn: "sha", fieldColumns: [] }
 };
 var LONE_SURROGATE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/;
 function hasKey(entry) {
@@ -2019,7 +2044,8 @@ function refused(index, length, reason) {
   return new Error(`effort store: row ${index} of ${length} ${reason}; batch refused`);
 }
 function batchEntries(kind, rows) {
-  const keyOf = EFFORT_KEY_PROJECTIONS2[kind];
+  const keyOf = EFFORT_KEY_PROJECTIONS[kind];
+  const fieldColumns = KIND_TABLES[kind].fieldColumns;
   const projected = rows.map((row) => ({ key: keyOf(row), row }));
   const keyed = projected.filter(hasKey);
   if (keyed.length < projected.length) {
@@ -2031,7 +2057,11 @@ function batchEntries(kind, rows) {
     const reason = "carries a key with a lone UTF-16 surrogate," + " which SQLite text cannot hold";
     throw refused(unholdableAt, rows.length, reason);
   }
-  return keyed.map(({ key, row }) => ({ key, body: JSON.stringify(row) }));
+  return keyed.map(({ key, row }) => ({
+    key,
+    body: JSON.stringify(row),
+    fields: fieldColumns.map(({ value }) => value(row))
+  }));
 }
 function withSqliteStore(path, access, create, use, identity = {}) {
   guardTestProcess(path);
@@ -2048,8 +2078,11 @@ function withSqliteStore(path, access, create, use, identity = {}) {
   }
 }
 function insertBatch(db, table, entries) {
-  const insert = db.query(`INSERT INTO ${table.name} (${table.keyColumn}, row_json, ${STAMPED_COLUMNS})` + ` VALUES (?, ?, ${stampedValues(table.name)})` + ` ON CONFLICT (${table.keyColumn}) DO NOTHING`);
-  const insertAll = db.transaction(() => entries.reduce((appended, { key, body }) => appended + insert.run(key, body).changes, 0));
+  const fieldNames = table.fieldColumns.map(({ column }) => column);
+  const columns = [table.keyColumn, "row_json", ...fieldNames].join(", ");
+  const placeholders = ["?", "?", ...fieldNames.map(() => "?")].join(", ");
+  const insert = db.query(`INSERT INTO ${table.name} (${columns}, ${STAMPED_COLUMNS})` + ` VALUES (${placeholders}, ${stampedValues(table.name)})` + ` ON CONFLICT (${table.keyColumn}) DO NOTHING`);
+  const insertAll = db.transaction(() => entries.reduce((appended, { key, body, fields }) => appended + insert.run(key, body, ...fields).changes, 0));
   return insertAll.immediate();
 }
 function writeSqliteStore(path, rowCount, empty, insert) {
@@ -2071,8 +2104,8 @@ function appendKind2(path, kind, rows) {
 function keysOfKind2(path, kind) {
   if (!existsSync5(path))
     return new Set;
-  const { name, keyColumn } = KIND_TABLES[kind];
-  const keys = withSqliteStore(path, "read", false, (db) => db.query(`SELECT ${keyColumn} AS key FROM ${name} ORDER BY seq`).all());
+  const { name: name2, keyColumn } = KIND_TABLES[kind];
+  const keys = withSqliteStore(path, "read", false, (db) => db.query(`SELECT ${keyColumn} AS key FROM ${name2} ORDER BY seq`).all());
   return new Set(keys.map(({ key }) => key));
 }
 function parsedObject(body) {
@@ -2093,11 +2126,11 @@ function rowOf(body, where) {
 function readKind2(path, kind) {
   if (!existsSync5(path))
     return [];
-  const { name } = KIND_TABLES[kind];
-  const stored = withSqliteStore(path, "read", false, (db) => db.query(`SELECT seq, row_json AS body FROM ${name} ORDER BY seq`).all());
-  return stored.map(({ seq, body }) => rowOf(body, `${path}: ${name} row ${seq}`));
+  const { name: name2 } = KIND_TABLES[kind];
+  const stored = withSqliteStore(path, "read", false, (db) => db.query(`SELECT seq, row_json AS body FROM ${name2} ORDER BY seq`).all());
+  return stored.map(({ seq, body }) => rowOf(body, `${path}: ${name2} row ${seq}`));
 }
-function openSqliteStore2(repoRoot) {
+function openSqliteStore(repoRoot) {
   const path = sqliteStorePath(repoRoot);
   return {
     append: (kind, rows) => appendKind2(path, kind, rows),
@@ -2111,129 +2144,6 @@ function openSqliteStore2(repoRoot) {
 import { existsSync as existsSync12 } from "fs";
 import { join as join12, resolve as resolve5 } from "path";
 
-// src/cli/spends.ts
-var SPENDS_GLYPH = "\uD83E\uDE99";
-var SPENDS_WHEN = ["always", "with", "unless", "through"];
-var FLAGGED = ["with", "unless"];
-var FLAG_SPELLING = /^--[^\s-]\S*$/;
-function flagProblem(when, flag) {
-  if (FLAGGED.includes(when)) {
-    return typeof flag === "string" && FLAG_SPELLING.test(flag) ? null : `spends.flag is ${describeValue(flag)}, expected a flag as typed, starting with --`;
-  }
-  return flag === undefined ? null : `spends.flag is ${describeValue(flag)}, expected absent when spends.when is "${when}"`;
-}
-function spendsProblem(value) {
-  if (value === undefined)
-    return null;
-  if (typeof value !== "object" || value === null || Array.isArray(value)) {
-    return `spends is ${describeValue(value)}, expected absent or a mapping`;
-  }
-  const { when, what, flag } = value;
-  if (!SPENDS_WHEN.includes(when)) {
-    return `spends.when is ${describeValue(when)}, expected one of ${SPENDS_WHEN.join(", ")}`;
-  }
-  if (typeof what !== "string") {
-    return `spends.what is ${describeValue(what)}, expected a string`;
-  }
-  return flagProblem(when, flag);
-}
-
-// src/cli/command.ts
-var COMMAND_OUTPUTS = ["text", "json", "events", "tui"];
-var MAX_EXIT_CODE = 255;
-
-class CommandExit extends Error {
-  exitCode;
-  constructor(exitCode, message = "") {
-    super(message);
-    if (!Number.isInteger(exitCode) || exitCode < 0 || exitCode > MAX_EXIT_CODE) {
-      throw new TypeError(`CommandExit: exit code is ${describeValue(exitCode)}, expected a whole number from 0 to ${MAX_EXIT_CODE}`);
-    }
-    this.name = "CommandExit";
-    this.exitCode = exitCode;
-  }
-}
-function isListOf(value, check) {
-  return Array.isArray(value) && value.every(check);
-}
-function hasStrings(value, keys) {
-  if (typeof value !== "object" || value === null)
-    return false;
-  const record = value;
-  return keys.every((key) => typeof record[key] === "string");
-}
-function isRoutingWord(value) {
-  return typeof value === "string" && /^[^\s/-][^\s/]*$/.test(value);
-}
-function isFlag(item) {
-  if (!hasStrings(item, ["name"]))
-    return false;
-  const { deprecated } = item;
-  return deprecated === undefined || hasStrings(deprecated, ["use"]);
-}
-function fieldProblem(fields) {
-  const checks = [
-    ["subject", isRoutingWord(fields.subject), "a word with no space, no slash and no leading dash"],
-    ["action", isRoutingWord(fields.action), "a word with no space, no slash and no leading dash"],
-    ["name", typeof fields.name === "string", "a string"],
-    ["summary", typeof fields.summary === "string", "a string"],
-    ["description", typeof fields.description === "string", "a string"],
-    ["args", isListOf(fields.args, (item) => hasStrings(item, ["name"])), "a list of named arguments"],
-    ["flags", isListOf(fields.flags, isFlag), "a list of named flags, each deprecation naming its use"],
-    ["examples", isListOf(fields.examples, (item) => hasStrings(item, ["cmd", "note"])), "a list of examples"],
-    [
-      "outputs",
-      isListOf(fields.outputs, (item) => COMMAND_OUTPUTS.includes(item)),
-      `a list of ${COMMAND_OUTPUTS.join(", ")}`
-    ],
-    [
-      "aliases",
-      fields.aliases === undefined || isListOf(fields.aliases, (item) => typeof item === "string"),
-      "absent or a list of strings"
-    ],
-    [
-      "lastingAliases",
-      fields.lastingAliases === undefined || isListOf(fields.lastingAliases, (item) => typeof item === "string"),
-      "absent or a list of strings"
-    ],
-    [
-      "deprecated",
-      fields.deprecated === undefined || hasStrings(fields.deprecated, ["since", "use"]),
-      "absent or a mapping of since and use"
-    ],
-    ["hidden", fields.hidden === undefined || typeof fields.hidden === "boolean", "absent or a boolean"],
-    [
-      "needsProject",
-      fields.needsProject === undefined || typeof fields.needsProject === "boolean",
-      "absent or a boolean"
-    ],
-    ["exec", fields.exec === undefined || fields.exec === true, "absent or true"],
-    ["run", typeof fields.run === "function", "a function"]
-  ];
-  const failed = checks.find(([, passes]) => !passes);
-  if (failed === undefined)
-    return null;
-  const [key, , expected] = failed;
-  return `${key} is ${describeValue(fields[key])}, expected ${expected}`;
-}
-function commandProblem(value) {
-  if (typeof value !== "object" || value === null || Array.isArray(value)) {
-    return `a command is ${describeValue(value)}, expected a mapping`;
-  }
-  const fields = value;
-  const problem = fieldProblem(fields) ?? spendsProblem(fields.spends);
-  if (problem === null)
-    return null;
-  const named = isRoutingWord(fields.subject) && isRoutingWord(fields.action) ? `command "${commandSpelling(fields)}"` : "a command";
-  return `${named}: ${problem}`;
-}
-function isTopLevel(command) {
-  return command.subject === command.action;
-}
-function commandSpelling(command) {
-  return isTopLevel(command) ? command.subject : `${command.subject} ${command.action}`;
-}
-
 // src/effort/store/fix-schema.ts
 import { existsSync as existsSync8 } from "fs";
 import { Database as Database4 } from "bun:sqlite";
@@ -2285,18 +2195,18 @@ function vacuumInto(source, target) {
     db.close();
   }
 }
-function copyOne(name, source, target) {
-  if (name === SQLITE_STORE_FILE_NAME) {
-    vacuumInto(join10(source, name), join10(target, name));
+function copyOne(name2, source, target) {
+  if (name2 === SQLITE_STORE_FILE_NAME) {
+    vacuumInto(join10(source, name2), join10(target, name2));
     return;
   }
-  copyFileSync(join10(source, name), join10(target, name), constants.COPYFILE_EXCL);
+  copyFileSync(join10(source, name2), join10(target, name2), constants.COPYFILE_EXCL);
 }
 function undo(target, written, madeDir) {
   try {
     if (madeDir === undefined) {
-      for (const name of written)
-        rmSync5(join10(target, name), { force: true });
+      for (const name2 of written)
+        rmSync5(join10(target, name2), { force: true });
     } else {
       rmSync5(madeDir, { recursive: true, force: true });
     }
@@ -2310,7 +2220,7 @@ function copyEffortStore(request) {
   const target = resolve3(request.target);
   guardTestProcess(source);
   guardTestProcess(target);
-  const files = EFFORT_COPY_FILE_NAMES.filter((name) => existsSync6(join10(source, name)));
+  const files = EFFORT_COPY_FILE_NAMES.filter((name2) => existsSync6(join10(source, name2)));
   if (files.length === 0) {
     throw new EffortCopyRefusal(`no effort store at ${source}: it holds none of ${EFFORT_COPY_FILE_NAMES.join(", ")}. Nothing to copy.`);
   }
@@ -2319,9 +2229,9 @@ function copyEffortStore(request) {
   let madeDir;
   try {
     madeDir = mkdirSync6(target, { recursive: true });
-    for (const name of files) {
-      written.push(name);
-      copyOne(name, source, target);
+    for (const name2 of files) {
+      written.push(name2);
+      copyOne(name2, source, target);
     }
   } catch (error) {
     const left = undo(target, written, madeDir);
@@ -2337,8 +2247,8 @@ class RebuildRefusal extends Error {
     this.name = "RebuildRefusal";
   }
 }
-function quoted(name) {
-  return `"${name.replaceAll('"', '""')}"`;
+function quoted(name2) {
+  return `"${name2.replaceAll('"', '""')}"`;
 }
 function count(db, sql) {
   return db.query(sql).get()?.n ?? 0;
@@ -2544,8 +2454,8 @@ function buildParallel(path, parallelPath, migrations, stamp) {
     db.close();
   }
 }
-function asidePaths(path, version, stamp) {
-  return { parallelPath: `${path}.fix-${stamp}`, backupPath: `${path}.v${String(version)}-${stamp}.bak` };
+function asidePaths(path, version2, stamp) {
+  return { parallelPath: `${path}.fix-${stamp}`, backupPath: `${path}.v${String(version2)}-${stamp}.bak` };
 }
 function isRepairable(reason) {
   return REPAIRABLE_REASONS.includes(reason);
@@ -2578,8 +2488,8 @@ function fixStoreSchema(options) {
   const plan = planSchema(store, sqliteCatalogue(migrations), "write", "open");
   if (plan.verdict === "use") {
     const pending = writeNames(plan);
-    const status = pending.length === 0 ? "current" : "behind";
-    return { ...found, ...nothing, status, reason: null, refusal: null, pending };
+    const status2 = pending.length === 0 ? "current" : "behind";
+    return { ...found, ...nothing, status: status2, reason: null, refusal: null, pending };
   }
   if (!isRepairable(plan.reason)) {
     throw new RebuildRefusal(`a rebuild at this rafa's migrations does not repair ${plan.reason}. ${plan.message}`);
@@ -2611,8 +2521,8 @@ import { resolve as resolve4 } from "path";
 // src/config-load.ts
 import { existsSync as existsSync9, readFileSync as readFileSync8, realpathSync as realpathSync5 } from "fs";
 import { isAbsolute as isAbsolute6 } from "path";
-function readConfigFile2(root) {
-  const path = configFilePath2(root);
+function readConfigFile(root) {
+  const path = configFilePath(root);
   if (!existsSync9(path))
     return null;
   let text;
@@ -2620,9 +2530,9 @@ function readConfigFile2(root) {
     text = readFileSync8(path, "utf8");
   } catch (error) {
     const problem = `${path}: cannot be read (${messageOf(error)})`;
-    throw new ConfigError2([problem], { cause: error });
+    throw new ConfigError([problem], { cause: error });
   }
-  return parseConfigText2(text, path);
+  return parseConfigText(text, path);
 }
 function isSameDirectory(first, second) {
   try {
@@ -2633,19 +2543,19 @@ function isSameDirectory(first, second) {
 }
 function readUserConfigFile({ root, home }) {
   if (!isAbsolute6(home)) {
-    throw new ConfigError2([
+    throw new ConfigError([
       `home directory is ${describeValue(home)}, expected an absolute path`
     ]);
   }
-  return isSameDirectory(root, home) ? null : readConfigFile2(home);
+  return isSameDirectory(root, home) ? null : readConfigFile(home);
 }
 function printWarning(message) {
   activeOutput().warn(message);
 }
-function loadConfig2(roots, cli = {}, warn = printWarning) {
+function loadConfig(roots, cli = {}, warn = printWarning) {
   const user = readUserConfigFile(roots);
-  const file = readConfigFile2(roots.root);
-  const resolved = resolveConfig2({ cli, file, user });
+  const file = readConfigFile(roots.root);
+  const resolved = resolveConfig({ cli, file, user });
   for (const warning of resolved.warnings)
     warn(warning);
   setActiveStoreSettings({ busyTimeoutMs: resolved.config.effortBusyTimeoutMs });
@@ -2666,9 +2576,9 @@ function resolvePlansDir(project, command, warn) {
 }
 function resolveProjectConfig(project, command, warn) {
   try {
-    return loadConfig2({ root: project.root, home: project.home }, {}, warn).config;
+    return loadConfig({ root: project.root, home: project.home }, {}, warn).config;
   } catch (error) {
-    if (!(error instanceof ConfigError2))
+    if (!(error instanceof ConfigError))
       throw error;
     throw new CommandExit(1, [
       `\u274C ${command}: the config cannot be used:`,
@@ -2696,8 +2606,8 @@ function checkbox(status) {
 function planFileName(stub, tracker) {
   return tracker ? `PLAN_TRACKER-${stub}.md` : `PLAN-${stub}.md`;
 }
-function stubOfPlanFile(name) {
-  const stub = /^PLAN-(.+)\.md$/.exec(name)?.[1];
+function stubOfPlanFile(name2) {
+  const stub = /^PLAN-(.+)\.md$/.exec(name2)?.[1];
   return stub !== undefined && isStampableStub(stub) ? stub : null;
 }
 function isFile(path) {
@@ -2706,8 +2616,8 @@ function isFile(path) {
 function issueLine(file, issue) {
   return `${file}:${issue.line}: ${issue.reason}: ${issue.text}`;
 }
-function plural(count, noun) {
-  return count === 1 ? `${count} ${noun}` : `${count} ${noun}s`;
+function plural(count2, noun) {
+  return count2 === 1 ? `${count2} ${noun}` : `${count2} ${noun}s`;
 }
 function expectNoArgument(args, usage) {
   if (args.length === 0)
@@ -2732,12 +2642,12 @@ function expectAtMostOneArgument(args, usage) {
   throw new CommandExit(1, `\u274C Expected at most one argument, got ${args.length}: ${args.join(" ")}
 Usage: ${usage}`);
 }
-function readSwitch(name, value, hint) {
+function readSwitch(name2, value, hint) {
   if (value === undefined || value === false || value === "false")
     return false;
   if (value === true || value === "true")
     return true;
-  throw new CommandExit(1, `\u274C --${name} takes no value, and read "${value}" as one. ${hint}`);
+  throw new CommandExit(1, `\u274C --${name2} takes no value, and read "${value}" as one. ${hint}`);
 }
 
 // src/commands/effort/fix-schema.ts
@@ -2899,8 +2809,8 @@ function normaliseBranch(source) {
     return null;
   return source.startsWith("refs/heads/") ? source.slice("refs/heads/".length) : source;
 }
-function parseStatCount(field) {
-  return /^\d+$/.test(field) ? Number(field) : null;
+function parseStatCount(field2) {
+  return /^\d+$/.test(field2) ? Number(field2) : null;
 }
 function parseCommitHeader(line) {
   const parts = line.split(FIELD_SEPARATOR);
@@ -3128,7 +3038,7 @@ function mergedTables() {
   return Object.entries(MERGE_RULES).flatMap(([table, rule]) => rule.scope === "merged" ? [{ table, identity: rule.identity }] : []);
 }
 function carriedColumns(db, table) {
-  return db.query(`PRAGMA table_info(${quoted(table)})`).all().map(({ name }) => name).filter((name) => name !== "seq");
+  return db.query(`PRAGMA table_info(${quoted(table)})`).all().map(({ name: name2 }) => name2).filter((name2) => name2 !== "seq");
 }
 function refuseColumnMismatch(local, other, tables) {
   const faults = tables.flatMap(({ table }) => {
@@ -3219,29 +3129,29 @@ function sameValue(left, right) {
     return Buffer.from(left).equals(right);
   return (left ?? null) === (right ?? null);
 }
-function fillStatement(table, field) {
-  const statement = SET_ONCE_FILLS[`${table}.${field}`];
+function fillStatement(table, field2) {
+  const statement = SET_ONCE_FILLS[`${table}.${field2}`];
   if (statement === undefined) {
-    throw new Error(`${table}.${field} is set-once in MERGE_RULES and has no statement in SET_ONCE_FILLS`);
+    throw new Error(`${table}.${field2} is set-once in MERGE_RULES and has no statement in SET_ONCE_FILLS`);
   }
   return statement;
 }
-function settleSetOnce(local, table, field, here, there) {
-  const incoming = there[field] ?? null;
+function settleSetOnce(local, table, field2, here, there) {
+  const incoming = there[field2] ?? null;
   if (incoming === null)
     return { skipped: true, filled: [], conflictFields: [] };
-  if ((here[field] ?? null) !== null)
-    return { skipped: false, filled: [], conflictFields: [field] };
-  local.query(fillStatement(table, field)).run(incoming, Number(here.seq));
-  return { skipped: true, filled: [field], conflictFields: [] };
+  if ((here[field2] ?? null) !== null)
+    return { skipped: false, filled: [], conflictFields: [field2] };
+  local.query(fillStatement(table, field2)).run(incoming, Number(here.seq));
+  return { skipped: true, filled: [field2], conflictFields: [] };
 }
-function settleRecomputed(table, field, here, there) {
-  const comparable = RECOMPUTED_COMPARISONS[`${table}.${field}`];
+function settleRecomputed(table, field2, here, there) {
+  const comparable = RECOMPUTED_COMPARISONS[`${table}.${field2}`];
   if (comparable === undefined) {
-    throw new Error(`${table}.${field} is recomputed in MERGE_RULES and has no entry in RECOMPUTED_COMPARISONS`);
+    throw new Error(`${table}.${field2} is recomputed in MERGE_RULES and has no entry in RECOMPUTED_COMPARISONS`);
   }
-  const hereValue = here[field];
-  const thereValue = there[field];
+  const hereValue = here[field2];
+  const thereValue = there[field2];
   const same = typeof hereValue === "string" && typeof thereValue === "string" && comparable(hereValue) === comparable(thereValue);
   return same ? { skipped: true, filled: [], conflictFields: [] } : { skipped: false, filled: [], conflictFields: [null] };
 }
@@ -3251,12 +3161,12 @@ function settlePair(local, table, edited, here, there) {
     return { skipped: true, filled: [], conflictFields: [] };
   if (differing.some((column) => !Object.hasOwn(edited, column)))
     return { skipped: false, filled: [], conflictFields: [null] };
-  const outcomes = differing.map((field) => {
-    if (edited[field] === SET_ONCE)
-      return settleSetOnce(local, table, field, here, there);
-    if (edited[field] === RECOMPUTED)
-      return settleRecomputed(table, field, here, there);
-    throw new Error(`${table}.${field} has the rule ${edited[field]}, which the merge does not apply`);
+  const outcomes = differing.map((field2) => {
+    if (edited[field2] === SET_ONCE)
+      return settleSetOnce(local, table, field2, here, there);
+    if (edited[field2] === RECOMPUTED)
+      return settleRecomputed(table, field2, here, there);
+    throw new Error(`${table}.${field2} has the rule ${edited[field2]}, which the merge does not apply`);
   });
   return {
     skipped: outcomes.every((outcome) => outcome.skipped),
@@ -3273,16 +3183,16 @@ function settleTable(local, other, union, trail) {
     const here = rowAt(local, union.table, columns, match.localSeq, "here");
     const there = rowAt(other, union.table, columns, match.incomingSeq, "in the other store");
     const outcome = settlePair(local, union.table, rule.edited, here, there);
-    const conflicts = outcome.conflictFields.map((field) => {
-      local.query(INSERT_CONFLICT).run(trail.mergeId, union.table, match.localSeq, field, JSON.stringify(there), trail.recordedAt);
-      return { localSeq: match.localSeq, incomingSeq: match.incomingSeq, field };
+    const conflicts = outcome.conflictFields.map((field2) => {
+      local.query(INSERT_CONFLICT).run(trail.mergeId, union.table, match.localSeq, field2, JSON.stringify(there), trail.recordedAt);
+      return { localSeq: match.localSeq, incomingSeq: match.incomingSeq, field: field2 };
     });
     return { match, outcome, conflicts };
   });
   return {
     table: union.table,
     skipped: settled.flatMap(({ match, outcome }) => outcome.skipped ? [match.localSeq] : []),
-    filled: settled.flatMap(({ match, outcome }) => outcome.filled.map((field) => ({ localSeq: match.localSeq, field }))),
+    filled: settled.flatMap(({ match, outcome }) => outcome.filled.map((field2) => ({ localSeq: match.localSeq, field: field2 }))),
     conflicts: settled.flatMap(({ conflicts }) => conflicts)
   };
 }
@@ -3492,7 +3402,7 @@ function mergeInto(db, other, mergeId, otherStore, mergedAt) {
         collided: union.collided.length
       };
     });
-    const sum = (field) => tables.reduce((total, entry) => total + entry[field], 0);
+    const sum = (field2) => tables.reduce((total, entry) => total + entry[field2], 0);
     const totals = { rowsAdded: sum("added"), rowsSkipped: sum("skipped"), rowsInConflict: sum("inConflict") };
     db.query(INSERT_MERGE).run(mergeId, otherStore, mergedAt, totals.rowsAdded, totals.rowsSkipped, totals.rowsInConflict);
     return { tables, ...totals, gapsRewritten: gaps.length };
@@ -3505,18 +3415,18 @@ function addedRows(merged) {
     merge_conflicts: merged.rowsInConflict
   };
 }
-function buildMerged(path, parallelPath, other, merge) {
+function buildMerged(path, parallelPath, other, merge2) {
   vacuumInto(path, parallelPath);
   const db = new Database6(parallelPath, { readwrite: true });
   try {
-    bringForward(db, parallelPath, "write", "open", { ...merge.stamp, builtAside: true });
-    const merged = mergeInto(db, other, merge.id, merge.otherStore, merge.stamp.now().toISOString());
+    bringForward(db, parallelPath, "write", "open", { ...merge2.stamp, builtAside: true });
+    const merged = mergeInto(db, other, merge2.id, merge2.otherStore, merge2.stamp.now().toISOString());
     db.run(`ATTACH DATABASE ? AS ${LIVE3}`, [path]);
     const live = new Set(tableNames(db, LIVE3));
     checkedCounts(db, tableNames(db, "main").filter((table) => live.has(table)), LIVE3, addedRows(merged));
     db.run(`DETACH DATABASE ${LIVE3}`);
     refuseCorrupt(db);
-    refuseUnusable(db, parallelPath, merge.stamp.migrations);
+    refuseUnusable(db, parallelPath, merge2.stamp.migrations);
     return merged;
   } finally {
     db.close();
@@ -3539,7 +3449,7 @@ function refuseUnmergeable(options, migrations) {
   }
   return { otherPlan, otherStore };
 }
-function mergeStore2(options) {
+function mergeStore(options) {
   const { path, otherPath, dryRun, stamp } = options;
   guardTestProcess(path);
   guardTestProcess(otherPath);
@@ -3574,10 +3484,10 @@ var NOTHING_COPIED = "Nothing was copied.";
 class FileSyncRefusal extends Error {
   name = "FileSyncRefusal";
 }
-function requirePath(field, value) {
+function requirePath(field2, value) {
   if (typeof value === "string" && value !== "")
     return value;
-  throw new TypeError(`${REFUSAL}: ${field} is ${describeValue(value)}, expected a path`);
+  throw new TypeError(`${REFUSAL}: ${field2} is ${describeValue(value)}, expected a path`);
 }
 function refuseUncarriable(backend, source) {
   if (backend === "ndjson") {
@@ -3607,8 +3517,8 @@ function createFileSync(options) {
     const otherPath = resolve5(repoRoot, requirePath("from", from));
     const path = join12(storeDir(), SQLITE_STORE_FILE_NAME);
     const stamp = fileStamp(now());
-    const merge = mergeStore2({ ...mergeSeams(options), path, otherPath, backend, dryRun, stamp, now, sessionId });
-    return Object.freeze({ status: "pulled", merge });
+    const merge2 = mergeStore({ ...mergeSeams(options), path, otherPath, backend, dryRun, stamp, now, sessionId });
+    return Object.freeze({ status: "pulled", merge: merge2 });
   };
   return Object.freeze({ kind: "file", push, pull });
 }
@@ -3659,7 +3569,7 @@ function contextOf(repoRoot, config) {
     ...hub === undefined ? {} : { hub }
   };
 }
-function selectSync(repoRoot, config, registry = CORE_ADAPTER_REGISTRY2) {
+function selectSync(repoRoot, config, registry = CORE_ADAPTER_REGISTRY) {
   const kind = config.effortSync;
   const adapter = typeof kind === "string" ? registry.find("sync", kind) : undefined;
   if (adapter !== undefined)
@@ -3667,8 +3577,8 @@ function selectSync(repoRoot, config, registry = CORE_ADAPTER_REGISTRY2) {
   const registered = registry.kinds("sync");
   if (isModuleStrategy(kind))
     throw new SyncModuleMissing(kind, registered);
-  const known = SYNC_STRATEGIES2.includes(kind);
-  const expected = known ? `registered: ${listed(registered)}` : `expected one of: ${SYNC_STRATEGIES2.join(", ")}`;
+  const known = SYNC_STRATEGIES.includes(kind);
+  const expected = known ? `registered: ${listed(registered)}` : `expected one of: ${SYNC_STRATEGIES.join(", ")}`;
   throw new TypeError(`${REFUSAL2}: effort.sync is ${describeValue(kind)}, and no sync adapter is registered under it; ${expected}`);
 }
 
@@ -3683,7 +3593,7 @@ import { join as join14 } from "path";
 // src/check/layout.ts
 import { readdirSync as readdirSync3, statSync as statSync4 } from "fs";
 import { join as join13, relative as relative2 } from "path";
-var SKILL_FILE2 = "SKILL.md";
+var SKILL_FILE = "SKILL.md";
 var MARKDOWN_EXTENSION = ".md";
 var LAYOUT_SEVERITY = Object.freeze({
   "flat-grouped-layout": "failure",
@@ -3711,13 +3621,13 @@ function entryKind(path) {
   }
 }
 function visibleNames(dir) {
-  return readdirSync3(dir).filter((name) => !name.startsWith(".")).sort((left, right) => left.localeCompare(right));
+  return readdirSync3(dir).filter((name2) => !name2.startsWith(".")).sort((left, right) => left.localeCompare(right));
 }
-function isMarkdown(name) {
-  return name.endsWith(MARKDOWN_EXTENSION);
+function isMarkdown(name2) {
+  return name2.endsWith(MARKDOWN_EXTENSION);
 }
-function markdownStem(name) {
-  return name.slice(0, -MARKDOWN_EXTENSION.length);
+function markdownStem(name2) {
+  return name2.slice(0, -MARKDOWN_EXTENSION.length);
 }
 function shown(root, path) {
   return relative2(root, path) || ".";
@@ -3742,37 +3652,37 @@ function unreadableEntry(kind, root, path) {
     issues: [layoutIssue("unreadable-entry", `${shown(root, path)} cannot be read (a broken symlink, or a path stat refuses)`)]
   };
 }
-function skillFileEntry(path, name) {
-  return { kind: "skill", path, isFile: true, shape: "skill-file", name, issues: [] };
+function skillFileEntry(path, name2) {
+  return { kind: "skill", path, isFile: true, shape: "skill-file", name: name2, issues: [] };
 }
-function flatGroupedEntry(root, path, name) {
+function flatGroupedEntry(root, path, name2) {
   return {
     kind: "skill",
     path,
     isFile: true,
     shape: "flat-grouped",
-    name,
-    issues: [layoutIssue("flat-grouped-layout", `${shown(root, path)} is the flat grouped layout <dir>/<group>/<name>.md,` + ` which does not register; move it to <dir>/${name}/${SKILL_FILE2}`)]
+    name: name2,
+    issues: [layoutIssue("flat-grouped-layout", `${shown(root, path)} is the flat grouped layout <dir>/<group>/<name>.md,` + ` which does not register; move it to <dir>/${name2}/${SKILL_FILE}`)]
   };
 }
-function nestedGroupEntry(root, path, name) {
+function nestedGroupEntry(root, path, name2) {
   return {
     kind: "skill",
     path,
     isFile: true,
     shape: "nested-group",
-    name,
-    issues: [layoutIssue("nested-group-layout", `${shown(root, path)} is the nested layout <dir>/<group>/<name>/${SKILL_FILE2},` + ` which does not register; move it to <dir>/${name}/${SKILL_FILE2}`)]
+    name: name2,
+    issues: [layoutIssue("nested-group-layout", `${shown(root, path)} is the nested layout <dir>/<group>/<name>/${SKILL_FILE},` + ` which does not register; move it to <dir>/${name2}/${SKILL_FILE}`)]
   };
 }
-function looseFileEntry(root, path, name) {
+function looseFileEntry(root, path, name2) {
   return {
     kind: "skill",
     path,
     isFile: true,
     shape: "loose-file",
-    name,
-    issues: [layoutIssue("loose-file", `${shown(root, path)} sits directly under the skills directory, which registers` + ` only <dir>/<name>/${SKILL_FILE2}; move it to <dir>/${name}/${SKILL_FILE2}`)]
+    name: name2,
+    issues: [layoutIssue("loose-file", `${shown(root, path)} sits directly under the skills directory, which registers` + ` only <dir>/<name>/${SKILL_FILE}; move it to <dir>/${name2}/${SKILL_FILE}`)]
   };
 }
 function noSkillFileEntry(root, dir) {
@@ -3782,26 +3692,26 @@ function noSkillFileEntry(root, dir) {
     isFile: false,
     shape: "no-skill-file",
     name: null,
-    issues: [layoutIssue("missing-skill-file", `${shown(root, dir)}/ holds no ${SKILL_FILE2}, so it registers no skill`)]
+    issues: [layoutIssue("missing-skill-file", `${shown(root, dir)}/ holds no ${SKILL_FILE}, so it registers no skill`)]
   };
 }
-function nestedInstinctEntry(root, path, name) {
+function nestedInstinctEntry(root, path, name2) {
   return {
     kind: "instinct",
     path,
     isFile: true,
     shape: "nested-instinct",
-    name,
-    issues: [layoutIssue("nested-instinct-file", `${shown(root, path)} sits below the instincts directory, which is flat;` + ` move it to <dir>/${name}${MARKDOWN_EXTENSION}`)]
+    name: name2,
+    issues: [layoutIssue("nested-instinct-file", `${shown(root, path)} sits below the instincts directory, which is flat;` + ` move it to <dir>/${name2}${MARKDOWN_EXTENSION}`)]
   };
 }
-function scanGroupMember(root, dir, name) {
+function scanGroupMember(root, dir, name2) {
   const children = visibleNames(dir);
   if (children.length === 0)
     return [dotfileOnlyEntry("skill", root, dir)];
-  const skillPath = join13(dir, SKILL_FILE2);
-  if (children.includes(SKILL_FILE2) && entryKind(skillPath) === "file") {
-    return [nestedGroupEntry(root, skillPath, name)];
+  const skillPath = join13(dir, SKILL_FILE);
+  if (children.includes(SKILL_FILE) && entryKind(skillPath) === "file") {
+    return [nestedGroupEntry(root, skillPath, name2)];
   }
   return [noSkillFileEntry(root, dir)];
 }
@@ -3825,31 +3735,31 @@ function scanSkillGroup(root, dir, children) {
     return [noSkillFileEntry(root, dir)];
   return entries;
 }
-function scanSkillDirectory(root, dir, name) {
+function scanSkillDirectory(root, dir, name2) {
   const children = visibleNames(dir);
   if (children.length === 0)
     return [dotfileOnlyEntry("skill", root, dir)];
-  const skillPath = join13(dir, SKILL_FILE2);
-  if (children.includes(SKILL_FILE2) && entryKind(skillPath) === "file") {
-    return [skillFileEntry(skillPath, name)];
+  const skillPath = join13(dir, SKILL_FILE);
+  if (children.includes(SKILL_FILE) && entryKind(skillPath) === "file") {
+    return [skillFileEntry(skillPath, name2)];
   }
   return scanSkillGroup(root, dir, children);
 }
 function scanSkillRoot(root) {
   const entries = [];
-  for (const name of visibleNames(root)) {
-    const path = join13(root, name);
+  for (const name2 of visibleNames(root)) {
+    const path = join13(root, name2);
     const found = entryKind(path);
     if (found === null) {
       entries.push(unreadableEntry("skill", root, path));
       continue;
     }
     if (found === "directory") {
-      entries.push(...scanSkillDirectory(root, path, name));
+      entries.push(...scanSkillDirectory(root, path, name2));
       continue;
     }
-    if (isMarkdown(name))
-      entries.push(looseFileEntry(root, path, markdownStem(name)));
+    if (isMarkdown(name2))
+      entries.push(looseFileEntry(root, path, markdownStem(name2)));
   }
   return entries;
 }
@@ -3876,8 +3786,8 @@ function scanInstinctSubdirectory(root, dir) {
 }
 function scanInstinctRoot(root) {
   const entries = [];
-  for (const name of visibleNames(root)) {
-    const path = join13(root, name);
+  for (const name2 of visibleNames(root)) {
+    const path = join13(root, name2);
     const found = entryKind(path);
     if (found === null) {
       entries.push(unreadableEntry("instinct", root, path));
@@ -3887,14 +3797,14 @@ function scanInstinctRoot(root) {
       entries.push(...scanInstinctSubdirectory(root, path));
       continue;
     }
-    if (!isMarkdown(name))
+    if (!isMarkdown(name2))
       continue;
     entries.push({
       kind: "instinct",
       path,
       isFile: true,
       shape: "instinct-file",
-      name: markdownStem(name),
+      name: markdownStem(name2),
       issues: []
     });
   }
@@ -3914,9 +3824,9 @@ function scanLayout(root, kind) {
 function declaredNameIssue(entry, declared) {
   if (entry.name === null || declared === null || declared === entry.name)
     return null;
-  const field = entry.kind === "skill" ? "name" : "id";
+  const field2 = entry.kind === "skill" ? "name" : "id";
   const source = entry.kind === "skill" ? "directory name" : "file name";
-  return layoutIssue("name-mismatch", `frontmatter ${field} "${declared}" is not the ${source} "${entry.name}"`);
+  return layoutIssue("name-mismatch", `frontmatter ${field2} "${declared}" is not the ${source} "${entry.name}"`);
 }
 
 // src/schema/frontmatter.ts
@@ -4005,8 +3915,8 @@ function writeFrontmatter(document, data) {
 }
 
 // src/schema/instinct.ts
-var INSTINCT_KINDS = FINDING_KINDS2;
-var INSTINCT_SIGNALS = FINDING_SIGNALS2;
+var INSTINCT_KINDS = FINDING_KINDS;
+var INSTINCT_SIGNALS = FINDING_SIGNALS;
 var INSTINCT_DOMAINS = FINDING_DOMAINS;
 var INSTINCT_SCOPES = ["project", "user"];
 var INSTINCT_SOURCES = ["task-report", "loop-observed", "imported", "demoted"];
@@ -4036,8 +3946,8 @@ var INSTINCT_KEY_ORDER = [
   "created_at",
   "updated_at"
 ];
-function issue(code, field, message) {
-  return { code, field, message };
+function issue(code, field2, message) {
+  return { code, field: field2, message };
 }
 function typeName(value) {
   if (value === null)
@@ -4052,25 +3962,25 @@ function typeName(value) {
     return "a number";
   return `a ${typeof value}`;
 }
-function requiredString(data, field) {
-  const value = data[field];
+function requiredString(data, field2) {
+  const value = data[field2];
   if (value === undefined || value === null) {
-    return [issue("missing-field", field, `${field} is required and is absent`)];
+    return [issue("missing-field", field2, `${field2} is required and is absent`)];
   }
   if (typeof value !== "string") {
-    return [issue("wrong-type", field, `${field} must be a string, not ${typeName(value)}`)];
+    return [issue("wrong-type", field2, `${field2} must be a string, not ${typeName(value)}`)];
   }
   if (value.trim() === "") {
-    return [issue("missing-field", field, `${field} is required and is empty`)];
+    return [issue("missing-field", field2, `${field2} is required and is empty`)];
   }
   return [];
 }
-function requiredChoice(data, field, allowed, code) {
-  const issues = requiredString(data, field);
+function requiredChoice(data, field2, allowed, code) {
+  const issues = requiredString(data, field2);
   if (issues.length > 0)
     return issues;
-  const value = data[field];
-  return allowed.includes(value) ? [] : [issue(code, field, `${field} "${value}" is not one of ${allowed.join(", ")}`)];
+  const value = data[field2];
+  return allowed.includes(value) ? [] : [issue(code, field2, `${field2} "${value}" is not one of ${allowed.join(", ")}`)];
 }
 function checkId(data) {
   const issues = requiredString(data, "id");
@@ -4106,11 +4016,11 @@ function checkSources(data) {
     return [issue("wrong-type", "sources", `sources must be a list, not ${typeName(value)}`)];
   }
   return value.flatMap((entry, index) => {
-    const field = `sources[${index}]`;
+    const field2 = `sources[${index}]`;
     if (typeof entry !== "string") {
-      return [issue("wrong-type", field, `sources entries must be strings, and this one is ${typeName(entry)}`)];
+      return [issue("wrong-type", field2, `sources entries must be strings, and this one is ${typeName(entry)}`)];
     }
-    return entry.trim() === "" ? [issue("wrong-type", field, "sources entries must name a source, and this one is blank")] : [];
+    return entry.trim() === "" ? [issue("wrong-type", field2, "sources entries must name a source, and this one is blank")] : [];
   });
 }
 function checkPromotedTo(data) {
@@ -4139,26 +4049,26 @@ function checkProjectId(data) {
   }
   return PROJECT_ID_PATTERN.test(value) ? [] : [issue("invalid-project-id", "project_id", `project_id "${value}" is not ${PROJECT_ID_LENGTH} lowercase hex characters`)];
 }
-function checkTimestamp(data, field) {
-  const issues = requiredString(data, field);
+function checkTimestamp(data, field2) {
+  const issues = requiredString(data, field2);
   if (issues.length > 0)
     return issues;
-  const value = data[field];
-  return TIMESTAMP_PATTERN.test(value) && !Number.isNaN(Date.parse(value)) ? [] : [issue("invalid-timestamp", field, `${field} "${value}" is not an ISO 8601 instant such as 2026-09-11T10:00:00Z`)];
+  const value = data[field2];
+  return TIMESTAMP_PATTERN.test(value) && !Number.isNaN(Date.parse(value)) ? [] : [issue("invalid-timestamp", field2, `${field2} "${value}" is not an ISO 8601 instant such as 2026-09-11T10:00:00Z`)];
 }
 function isScalar(value) {
   return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
 }
 function checkEvidenceEntry(entry, index) {
-  const field = `evidence[${index}]`;
+  const field2 = `evidence[${index}]`;
   if (typeof entry !== "object" || entry === null || Array.isArray(entry)) {
-    return [issue("wrong-type", field, `evidence entries must be mappings, and this one is ${typeName(entry)}`)];
+    return [issue("wrong-type", field2, `evidence entries must be mappings, and this one is ${typeName(entry)}`)];
   }
   const entries = Object.entries(entry);
   if (entries.length === 0) {
-    return [issue("wrong-type", field, "evidence entries must say something, and this one is empty")];
+    return [issue("wrong-type", field2, "evidence entries must say something, and this one is empty")];
   }
-  return entries.flatMap(([key, value]) => isScalar(value) ? [] : [issue("wrong-type", `${field}.${key}`, `evidence values must be text, numbers or booleans, and this one is ${typeName(value)}`)]);
+  return entries.flatMap(([key, value]) => isScalar(value) ? [] : [issue("wrong-type", `${field2}.${key}`, `evidence values must be text, numbers or booleans, and this one is ${typeName(value)}`)]);
 }
 function checkEvidence(data) {
   const value = data["evidence"];
@@ -4271,7 +4181,7 @@ function buildInstinct(data, body) {
     updatedAt: data["updated_at"],
     action,
     cause: sectionText(body, CAUSE_HEADING) ?? "",
-    actionHash: actionHash2(action)
+    actionHash: actionHash(action)
   };
 }
 function instinctFrontmatter(instinct) {
@@ -4318,11 +4228,11 @@ function writeInstinct(instinct, newline = `
 }
 
 // src/commands/instinct/instinct-records.ts
-function isRecordFile(name) {
-  return !name.startsWith(".") && name.endsWith(MARKDOWN_EXTENSION) && name !== MARKDOWN_EXTENSION;
+function isRecordFile(name2) {
+  return !name2.startsWith(".") && name2.endsWith(MARKDOWN_EXTENSION) && name2 !== MARKDOWN_EXTENSION;
 }
-function recordId(name) {
-  return name.slice(0, -MARKDOWN_EXTENSION.length);
+function recordId(name2) {
+  return name2.slice(0, -MARKDOWN_EXTENSION.length);
 }
 function unreadableIssue(message) {
   return { code: "missing-frontmatter", field: "file", message: `the file could not be read: ${message}` };
@@ -4346,7 +4256,7 @@ function isFile2(path) {
   }
 }
 function recordFiles(dir) {
-  return readdirSync4(dir).filter((name) => isRecordFile(name) && isFile2(join14(dir, name))).sort((left, right) => left.localeCompare(right));
+  return readdirSync4(dir).filter((name2) => isRecordFile(name2) && isFile2(join14(dir, name2))).sort((left, right) => left.localeCompare(right));
 }
 function readScope(scope, dir) {
   if (!tierExists(dir))
@@ -4355,7 +4265,7 @@ function readScope(scope, dir) {
     scope,
     dir,
     exists: true,
-    records: recordFiles(dir).map((name) => readRecord(join14(dir, name), scope, recordId(name)))
+    records: recordFiles(dir).map((name2) => readRecord(join14(dir, name2), scope, recordId(name2)))
   };
 }
 function readScopes(seams) {
@@ -4367,9 +4277,9 @@ function allRecords(listings) {
 function findRecords(listings, id) {
   return allRecords(listings).filter((entry) => entry.id === id);
 }
-function instinctProject(context, name) {
+function instinctProject(context, name2) {
   if (context.project === null)
-    throw new Error(`${name} runs inside a project, and was handed none`);
+    throw new Error(`${name2} runs inside a project, and was handed none`);
   return context.project;
 }
 
@@ -4406,17 +4316,17 @@ function toHeldRecord(instinct) {
 function toHeldRecords(held) {
   const actions = new Map;
   for (const instinct of held) {
-    const key = triggerKey2(instinct.trigger);
+    const key = triggerKey(instinct.trigger);
     actions.set(key, (actions.get(key) ?? new Set).add(instinct.actionHash));
   }
   return held.map((instinct) => {
     const record = toHeldRecord(instinct);
-    return actions.get(triggerKey2(instinct.trigger)).size > 1 ? { ...record, status: "flagged" } : record;
+    return actions.get(triggerKey(instinct.trigger)).size > 1 ? { ...record, status: "flagged" } : record;
   });
 }
 function earliestHeldMember(record, held) {
-  const key = triggerKey2(record.trigger);
-  const members = held.filter((instinct) => instinct.actionHash === record.action_hash && triggerKey2(instinct.trigger) === key);
+  const key = triggerKey(record.trigger);
+  const members = held.filter((instinct) => instinct.actionHash === record.action_hash && triggerKey(instinct.trigger) === key);
   return [...members].sort(byAge)[0] ?? null;
 }
 function toHeldInstinct(record, held, fallback) {
@@ -4443,7 +4353,7 @@ function toHeldInstinct(record, held, fallback) {
     updatedAt: record.updated_at,
     action: record.action,
     cause: description.cause,
-    actionHash: actionHash2(record.action)
+    actionHash: actionHash(record.action)
   };
 }
 
@@ -4525,7 +4435,7 @@ function recordProblem(record, index) {
   if (problem !== null)
     return problem;
   const { action, action_hash: hash, description } = record;
-  if (hash !== actionHash2(action)) {
+  if (hash !== actionHash(action)) {
     return `action_hash is ${describeValue(hash)} in ${at}, expected the sha256 of its trimmed, lower-cased action`;
   }
   return description === undefined ? null : fieldsProblem(description, DESCRIPTION_CHECKS, `${at}.description`);
@@ -4537,7 +4447,7 @@ function payloadProblem(payload) {
   const { instincts } = payload;
   return instincts.map(recordProblem).find((found) => found !== null) ?? null;
 }
-function flagProblem2(value) {
+function flagProblem(value) {
   return fieldsProblem(value, FLAG_CHECKS, "the flag");
 }
 function copyInstinct(record) {
@@ -4614,9 +4524,9 @@ function unflagged(records, flagged) {
   return records.filter((record) => !flagged.has(record.id));
 }
 function userAdditions(userBlessed, projectHeld, flagged) {
-  const heldTriggers = new Set(projectHeld.map((record) => triggerKey2(record.trigger)));
+  const heldTriggers = new Set(projectHeld.map((record) => triggerKey(record.trigger)));
   const heldIds = new Set(projectHeld.map((record) => record.id));
-  return unflagged(userBlessed, flagged).filter((record) => !heldTriggers.has(triggerKey2(record.trigger)) && !heldIds.has(record.id));
+  return unflagged(userBlessed, flagged).filter((record) => !heldTriggers.has(triggerKey(record.trigger)) && !heldIds.has(record.id));
 }
 function byAge2(left, right) {
   if (left.created_at !== right.created_at) {
@@ -4627,8 +4537,8 @@ function byAge2(left, right) {
   return left.id < right.id ? -1 : 1;
 }
 function payloadDescription(record, described) {
-  const key = triggerKey2(record.trigger);
-  const members = described.filter((candidate) => candidate.description !== undefined && candidate.action_hash === record.action_hash && triggerKey2(candidate.trigger) === key);
+  const key = triggerKey(record.trigger);
+  const members = described.filter((candidate) => candidate.description !== undefined && candidate.action_hash === record.action_hash && triggerKey(candidate.trigger) === key);
   return [...members].sort(byAge2)[0]?.description;
 }
 function producedRecords(result) {
@@ -4654,35 +4564,35 @@ function heldChanges(dir, held, result, described) {
       throw new Error(`${PUSH_REFUSAL}: ${file} has no held member and no payload description to be written with`);
     }
     const text = writeInstinct(instinct);
-    const [issue] = parseInstinct(text).issues;
-    if (issue !== undefined) {
-      throw new Error(`${PUSH_REFUSAL}: ${file} would not read back: ${issue.field}: ${issue.message}`);
+    const [issue2] = parseInstinct(text).issues;
+    if (issue2 !== undefined) {
+      throw new Error(`${PUSH_REFUSAL}: ${file} would not read back: ${issue2.field}: ${issue2.message}`);
     }
     const path = join15(dir, file);
     if (held.unreadable.has(path)) {
       throw new Error(`${PUSH_REFUSAL}: it would overwrite ${path}, which could not be read`);
     }
     const before = heldAt.get(path);
-    if (before !== undefined && triggerKey2(before.trigger) !== triggerKey2(record.trigger)) {
+    if (before !== undefined && triggerKey(before.trigger) !== triggerKey(record.trigger)) {
       throw new Error(`${PUSH_REFUSAL}: it would overwrite ${path}, which holds another trigger`);
     }
     kept.add(path);
     if (before === undefined || writeInstinct(before) !== text)
       writes.push({ path, text });
   }
-  const touched = new Set(result.decisions.map((decision) => triggerKey2(decision.incoming.trigger)));
-  const removals = held.files.filter((file) => touched.has(triggerKey2(file.instinct.trigger)) && !kept.has(file.path)).map((file) => file.path);
+  const touched = new Set(result.decisions.map((decision) => triggerKey(decision.incoming.trigger)));
+  const removals = held.files.filter((file) => touched.has(triggerKey(file.instinct.trigger)) && !kept.has(file.path)).map((file) => file.path);
   return { writes, removals };
 }
 function pushLogLines(sourceId, described, result) {
   return result.decisions.map((decision, index) => {
-    const key = triggerKey2(decision.incoming.trigger);
+    const key = triggerKey(decision.incoming.trigger);
     const line = {
       source_id: sourceId,
       rule: decision.rule,
       incoming: loggedIncoming(described[index]),
       produced: decision.produced.map((record) => record.id),
-      discarded: result.discarded.filter((record) => triggerKey2(record.trigger) === key).map((record) => record.id)
+      discarded: result.discarded.filter((record) => triggerKey(record.trigger) === key).map((record) => record.id)
     };
     return JSON.stringify(line);
   });
@@ -4707,7 +4617,7 @@ function createLocalLearning(options) {
     for (const entry of records) {
       if (entry.instinct === null) {
         unreadable.add(entry.path);
-        const problems = entry.issues.map((issue) => `${issue.field}: ${issue.message}`).join("; ");
+        const problems = entry.issues.map((issue2) => `${issue2.field}: ${issue2.message}`).join("; ");
         warn(`${PREFIX}: ${entry.path} is not a held instinct, so it was skipped: ${problems}`);
       } else {
         files.push({ path: entry.path, instinct: entry.instinct });
@@ -4724,7 +4634,7 @@ function createLocalLearning(options) {
   async function flaggedIds() {
     const lines = numberedLines(await readIfPresent(flagsPath));
     return new Set(lines.map(([number, line]) => {
-      const reading = readLine(line, flagProblem2);
+      const reading = readLine(line, flagProblem);
       if (reading.ok)
         return reading.value.id;
       throw new Error(`${PREFIX}: line ${number} of ${flagsPath} is not a flag,` + ` and a bundle skipping it could hold an instinct it flags: ${reading.problem}`);
@@ -4738,7 +4648,7 @@ function createLocalLearning(options) {
       }
       const described = payload.instincts;
       const held = heldSet();
-      const result = merge2(toHeldRecords(held.files.map((file) => file.instinct)), { source_id: payload.source_id, instincts: described.map(copyInstinct) }, now());
+      const result = merge(toHeldRecords(held.files.map((file) => file.instinct)), { source_id: payload.source_id, instincts: described.map(copyInstinct) }, now());
       const changes = heldChanges(instinctsDir, held, result, described);
       const lines = pushLogLines(payload.source_id, described, result);
       if (lines.length > 0) {
@@ -4756,13 +4666,13 @@ function createLocalLearning(options) {
     pullBlessed: async () => {
       const flagged = await flaggedIds();
       const projectHeld = heldRecords(heldSet());
-      const project = bless2(unflagged(projectHeld, flagged), { minConfidence }).instincts;
-      const user = bless2(heldRecords(readHeld("user", userDir)), { minConfidence }).instincts;
+      const project = bless(unflagged(projectHeld, flagged), { minConfidence }).instincts;
+      const user = bless(heldRecords(readHeld("user", userDir)), { minConfidence }).instincts;
       return { version: now(), instincts: [...project, ...userAdditions(user, projectHeld, flagged)] };
     },
     flag: async (id, reason) => {
       const flag = { id, reason, flagged_at: now() };
-      const problem = flagProblem2(flag);
+      const problem = flagProblem(flag);
       if (problem !== null) {
         throw new TypeError(`${PREFIX}: refused to write an invalid flag: ${problem}`);
       }
@@ -4882,8 +4792,8 @@ function describeValue3(value) {
 function messageOf2(error) {
   return error instanceof Error ? error.message : String(error);
 }
-function counted(count, noun) {
-  return count === 1 ? `1 ${noun}` : `${String(count)} ${noun}s`;
+function counted(count2, noun) {
+  return count2 === 1 ? `1 ${noun}` : `${String(count2)} ${noun}s`;
 }
 function valueAt(mapping, key) {
   return Object.hasOwn(mapping, key) ? mapping[key] ?? null : null;
@@ -4901,39 +4811,39 @@ function verdictOf(value) {
   const word = spelled.replace(VERDICT_BREAK, "-");
   return SPEC_REVIEW_VERDICTS.includes(word) ? word : null;
 }
-function issueAt(field, text) {
-  return { field, text };
+function issueAt(field2, text) {
+  return { field: field2, text };
 }
-function readBlocking(item, field, issues) {
+function readBlocking(item, field2, issues) {
   const value = valueAt(item, "blocking");
   if (typeof value === "boolean")
     return value;
-  const text = `${field}.blocking is ${describeValue3(value)}, not true or false; ` + "the gap is read as blocking";
-  issues.push(issueAt(`${field}.blocking`, text));
+  const text = `${field2}.blocking is ${describeValue3(value)}, not true or false; ` + "the gap is read as blocking";
+  issues.push(issueAt(`${field2}.blocking`, text));
   return true;
 }
-function readGap(item, field, issues) {
+function readGap(item, field2, issues) {
   if (!isMapping2(item)) {
-    const text = `${field} is ${describeValue3(item)}, not a mapping of heading and what; dropped`;
-    issues.push(issueAt(field, text));
+    const text = `${field2} is ${describeValue3(item)}, not a mapping of heading and what; dropped`;
+    issues.push(issueAt(field2, text));
     return null;
   }
   const what = stringAt(item, "what");
   if (what === null) {
-    const text = `${field}.what is ${describeValue3(valueAt(item, "what"))}, ` + "not a sentence; the gap is dropped";
-    issues.push(issueAt(`${field}.what`, text));
+    const text = `${field2}.what is ${describeValue3(valueAt(item, "what"))}, ` + "not a sentence; the gap is dropped";
+    issues.push(issueAt(`${field2}.what`, text));
     return null;
   }
   const heading = stringAt(item, "heading");
   if (heading === null) {
-    const text = `${field}.heading is ${describeValue3(valueAt(item, "heading"))}, ` + `not a heading; the gap is filed under ${REVIEW_HEADING}`;
-    issues.push(issueAt(`${field}.heading`, text));
+    const text = `${field2}.heading is ${describeValue3(valueAt(item, "heading"))}, ` + `not a heading; the gap is filed under ${REVIEW_HEADING}`;
+    issues.push(issueAt(`${field2}.heading`, text));
   }
-  const blocking = readBlocking(item, field, issues);
+  const blocking = readBlocking(item, field2, issues);
   const assumption = stringAt(item, "assumption");
   if (!blocking && assumption === null) {
-    const text = `${field}.assumption is ${describeValue3(valueAt(item, "assumption"))}, ` + "not what a non-blocking gap would be planned under; the gap is read as blocking";
-    issues.push(issueAt(`${field}.assumption`, text));
+    const text = `${field2}.assumption is ${describeValue3(valueAt(item, "assumption"))}, ` + "not what a non-blocking gap would be planned under; the gap is read as blocking";
+    issues.push(issueAt(`${field2}.assumption`, text));
     return { heading: heading ?? REVIEW_HEADING, what, blocking: true, assumption: null };
   }
   return { heading: heading ?? REVIEW_HEADING, what, blocking, assumption };
@@ -4982,7 +4892,7 @@ function judged(verdict, gaps, block, issues) {
   };
 }
 function parseSpecReview(output) {
-  const reviews = readRafaBlocks2(output).filter((found) => found.kind === SPEC_REVIEW_KIND);
+  const reviews = readRafaBlocks(output).filter((found) => found.kind === SPEC_REVIEW_KIND);
   const block = reviews.at(-1);
   if (block === undefined) {
     return unreadable("absent", null, "the session output holds no rafa:spec-review block");
@@ -5051,16 +4961,16 @@ class UndeclaredSpendError extends Error {
   name = "UndeclaredSpendError";
 }
 function carriesFlag(flags, flag) {
-  const name = flag.replace(/^--/, "");
-  const value = flags[name];
+  const name2 = flag.replace(/^--/, "");
+  const value = flags[name2];
   if (value !== undefined && value !== false)
     return true;
-  return name.startsWith("no-") && flags[name.slice(3)] === false;
+  return name2.startsWith("no-") && flags[name2.slice(3)] === false;
 }
-function spendRefusal(running) {
-  if (running === null)
+function spendRefusal(running2) {
+  if (running2 === null)
     return null;
-  const { command, flags } = running;
+  const { command, flags } = running2;
   const spend = command.spends;
   const named = `rafa ${commandSpelling(command)}`;
   const remedy = "declare spends on the command to cover this run";
@@ -5218,7 +5128,8 @@ var TYPE_MEMBERS = {
   adr: true,
   chore: true,
   "package-api": true,
-  epic: true
+  epic: true,
+  spec: true
 };
 var PRIORITY_MEMBERS = {
   urgent: true,
@@ -5246,7 +5157,8 @@ var GITHUB_LABELS = Object.freeze({
   typePrefix: "type:",
   priorityPrefix: "priority:",
   needsTriage: "needs-triage",
-  blockedByPrefix: "blocked-by:OPT-"
+  blockedByPrefix: "blocked-by:OPT-",
+  specBlocked: "spec:blocked"
 });
 var VIEW_FIELDS = "number,title,body,state,stateReason,labels,url";
 var LIST_COMMAND = "gh issue list";
@@ -5305,8 +5217,8 @@ async function withDeadline(work, timeoutMs) {
   if (timeoutMs === undefined)
     return work;
   let timer;
-  const deadline = new Promise((resolve) => {
-    timer = setTimeout(() => resolve(TIMED_OUT), timeoutMs);
+  const deadline = new Promise((resolve7) => {
+    timer = setTimeout(() => resolve7(TIMED_OUT), timeoutMs);
   });
   try {
     return await Promise.race([work, deadline]);
@@ -5333,8 +5245,8 @@ function isRepoName(value) {
 function isLabelPart(value) {
   return typeof value === "string" && !value.includes(",");
 }
-function optionalFlag(name, value) {
-  return value === undefined ? [] : [name, value];
+function optionalFlag(name2, value) {
+  return value === undefined ? [] : [name2, value];
 }
 function detailOf(result) {
   return result.stderr.trim() || result.stdout.trim() || "it exited non-zero and wrote nothing";
@@ -5355,7 +5267,8 @@ var DRAFT_CHECKS = [
     "blockedBy",
     (value) => Array.isArray(value) && value.every((item) => Number.isSafeInteger(item) && item > 0),
     "a list of positive whole numbers"
-  ]
+  ],
+  ["specBlocked", (value) => value === undefined || typeof value === "boolean", "absent or a boolean"]
 ];
 function draftProblem(draft) {
   if (!isMapping(draft))
@@ -5369,6 +5282,7 @@ function labelsFor(draft) {
     `${GITHUB_LABELS.modulePrefix}${draft.module}`,
     `${GITHUB_LABELS.typePrefix}${draft.type}`,
     ...draft.blockedBy.map((opt) => `${GITHUB_LABELS.blockedByPrefix}${opt}`),
+    ...draft.specBlocked === true ? [GITHUB_LABELS.specBlocked] : [],
     priority
   ];
 }
@@ -5397,7 +5311,7 @@ function labelNames(value) {
   if (!Array.isArray(value))
     return null;
   const names = value.map((label) => isMapping(label) && typeof label["name"] === "string" ? label["name"] : null);
-  return names.every((name) => name !== null) ? names : null;
+  return names.every((name2) => name2 !== null) ? names : null;
 }
 function viewProblem(payload, number) {
   if (!isMapping(payload))
@@ -5455,13 +5369,13 @@ function listedIssues(stdout) {
 }
 function listedOpenIssues(stdout) {
   return listedRows(stdout).map((row, index) => {
-    const listed = listedRow(row, index);
+    const listed2 = listedRow(row, index);
     const { title, body } = row;
     if (typeof title !== "string")
       throw rowRefusal(index, `with title ${describeValue(title)}, expected a string`);
     if (typeof body !== "string")
       throw rowRefusal(index, `with body ${describeValue(body)}, expected a string`);
-    return { ...listed, title, body };
+    return { ...listed2, title, body };
   });
 }
 function refOfRow(row) {
@@ -5519,9 +5433,9 @@ function createGithubTracker(options) {
     return result.stdout;
   }
   async function ensureLabels(names) {
-    const missing = [...new Set(names)].filter((name) => !knownLabels.has(name));
-    for (const name of missing) {
-      await run(["label", "create", name, "--force"], `gh label create ${describeValue(name)}`);
+    const missing = [...new Set(names)].filter((name2) => !knownLabels.has(name2));
+    for (const name2 of missing) {
+      await run(["label", "create", name2, "--force"], `gh label create ${describeValue(name2)}`);
     }
     knownLabels = new Set([...knownLabels, ...missing]);
   }
@@ -5664,6 +5578,12 @@ function oneOf2(members) {
 function orNull(accepts) {
   return (value) => value === null || accepts(value);
 }
+function orAbsent(accepts) {
+  return (value) => value === undefined || accepts(value);
+}
+function isBoolean(value) {
+  return typeof value === "boolean";
+}
 function listOf(accepts) {
   return (value) => Array.isArray(value) && value.every(accepts);
 }
@@ -5675,6 +5595,7 @@ var FIELD_CHECKS = {
   project: [orNull(isString2), "a string or null"],
   title: [isString2, "a string"],
   blockedBy: [listOf(isFiniteNumber), "a list of numbers"],
+  specBlocked: [orAbsent(isBoolean), "absent or a boolean"],
   state: [oneOf2(ISSUE_STATES), `one of: ${ISSUE_STATES.join(", ")}`],
   fallbackReason: [orNull(isString2), "a string or null"],
   capturedAt: [isString2, "a string"],
@@ -5700,8 +5621,8 @@ function parseIssueNumber(text) {
   const number = Number(text);
   return Number.isSafeInteger(number) ? number : null;
 }
-function issueNumberOfFile(name) {
-  return name.endsWith(ISSUE_EXTENSION) ? parseIssueNumber(name.slice(0, -ISSUE_EXTENSION.length)) : null;
+function issueNumberOfFile(name2) {
+  return name2.endsWith(ISSUE_EXTENSION) ? parseIssueNumber(name2.slice(0, -ISSUE_EXTENSION.length)) : null;
 }
 function issuePath(issuesDir, number) {
   return join16(issuesDir, `${number}${ISSUE_EXTENSION}`);
@@ -5730,6 +5651,7 @@ function renderLocalIssue(record) {
     project: draft.project,
     title: draft.title,
     blockedBy: draft.blockedBy,
+    ...draft.specBlocked === undefined ? {} : { specBlocked: draft.specBlocked },
     state: record.state,
     fallbackReason: record.fallbackReason,
     capturedAt: record.capturedAt,
@@ -5771,7 +5693,8 @@ function parseLocalIssue(contents, sourcePath) {
       module: fields.module,
       priority: fields.priority,
       project: fields.project,
-      blockedBy: fields.blockedBy
+      blockedBy: fields.blockedBy,
+      ...fields.specBlocked === undefined ? {} : { specBlocked: fields.specBlocked }
     },
     fallbackReason: fields.fallbackReason,
     capturedAt: fields.capturedAt,
@@ -5906,7 +5829,7 @@ function createLocalTracker(options) {
 
 // src/adapters/registry.ts
 var REFUSAL3 = "adapter registry";
-var PORT_VERSIONS2 = Object.freeze({
+var PORT_VERSIONS = Object.freeze({
   tracker: 1,
   store: 1,
   learning: 1,
@@ -5914,7 +5837,7 @@ var PORT_VERSIONS2 = Object.freeze({
   planner: 1,
   sync: 1
 });
-var SERVED_VERSIONS = new Map(Object.entries(PORT_VERSIONS2));
+var SERVED_VERSIONS = new Map(Object.entries(PORT_VERSIONS));
 var PORT_TYPE_LIST = [...SERVED_VERSIONS.keys()].join(", ");
 function checkPortType(port) {
   if (!SERVED_VERSIONS.has(port)) {
@@ -5954,11 +5877,11 @@ function indexByPort(adapters) {
     sync: only("sync")
   };
 }
-function createAdapterRegistry2(adapters = []) {
+function createAdapterRegistry(adapters = []) {
   const held = adapters.reduce((accepted, adapter) => [...accepted, accept(adapter, accepted)], []);
   const byPort = indexByPort(held);
   const registry = {
-    register: (adapter) => createAdapterRegistry2([...held, adapter]),
+    register: (adapter) => createAdapterRegistry([...held, adapter]),
     find: (port, kind) => SERVED_VERSIONS.has(port) ? byPort[port].get(kind) : undefined,
     resolve: (port, kind) => {
       checkPortType(port);
@@ -5966,8 +5889,8 @@ function createAdapterRegistry2(adapters = []) {
       if (adapter !== undefined)
         return adapter;
       const registered = [...byPort[port].keys()];
-      const listed = registered.length === 0 ? "none" : registered.join(", ");
-      throw new Error(`${REFUSAL3}: no ${port} adapter is registered as ${describeValue(kind)};` + ` registered: ${listed}`);
+      const listed2 = registered.length === 0 ? "none" : registered.join(", ");
+      throw new Error(`${REFUSAL3}: no ${port} adapter is registered as ${describeValue(kind)};` + ` registered: ${listed2}`);
     },
     kinds: (port) => {
       checkPortType(port);
@@ -5977,38 +5900,38 @@ function createAdapterRegistry2(adapters = []) {
   return Object.freeze(registry);
 }
 var STORE_OPENERS = {
-  sqlite: openSqliteStore2,
-  ndjson: openNdjsonStore2
+  sqlite: openSqliteStore,
+  ndjson: openNdjsonStore
 };
 var CORE_ADAPTERS = [
-  ...STORE_BACKENDS2.map((backend) => ({
+  ...STORE_BACKENDS.map((backend) => ({
     port: "store",
     kind: backend,
-    portVersion: PORT_VERSIONS2.store,
+    portVersion: PORT_VERSIONS.store,
     create: ({ repoRoot }) => STORE_OPENERS[backend](repoRoot)
   })),
   {
     port: "output",
     kind: "text",
-    portVersion: PORT_VERSIONS2.output,
+    portVersion: PORT_VERSIONS.output,
     create: ({ stream = process.stdout, verbosity = 0 }) => createTextOutput({ verbosity, stream })
   },
   {
     port: "output",
     kind: "json",
-    portVersion: PORT_VERSIONS2.output,
+    portVersion: PORT_VERSIONS.output,
     create: ({ stream = process.stdout }) => createJsonOutput({ stream })
   },
   {
     port: "output",
     kind: "events",
-    portVersion: PORT_VERSIONS2.output,
+    portVersion: PORT_VERSIONS.output,
     create: ({ stream = process.stdout }) => createEventsOutput({ stream })
   },
   {
     port: "tracker",
     kind: "local",
-    portVersion: PORT_VERSIONS2.tracker,
+    portVersion: PORT_VERSIONS.tracker,
     create: ({ repoRoot, fallbackReason = null }) => createLocalTracker({
       issuesDir: localIssuesDir(repoRoot),
       fallbackReason
@@ -6017,17 +5940,17 @@ var CORE_ADAPTERS = [
   {
     port: "tracker",
     kind: "github",
-    portVersion: PORT_VERSIONS2.tracker,
+    portVersion: PORT_VERSIONS.tracker,
     create: ({ repoRoot, gh }) => createGithubTracker({ gh: gh ?? createGhRunner({ cwd: repoRoot }) })
   },
   {
     port: "learning",
     kind: "local",
-    portVersion: PORT_VERSIONS2.learning,
+    portVersion: PORT_VERSIONS.learning,
     create: ({
       repoRoot,
       home = homedir(),
-      learningBlessMinConfidence = CONFIG_DEFAULTS2.learningBlessMinConfidence
+      learningBlessMinConfidence = CONFIG_DEFAULTS.learningBlessMinConfidence
     }) => createLocalLearning({
       instinctsDir: localInstinctsDir(repoRoot),
       home,
@@ -6037,7 +5960,7 @@ var CORE_ADAPTERS = [
   {
     port: "planner",
     kind: "claude",
-    portVersion: PORT_VERSIONS2.planner,
+    portVersion: PORT_VERSIONS.planner,
     create: ({ repoRoot, settingSources, planPrompt, planDir, claude }) => {
       if (!Array.isArray(settingSources)) {
         throw new TypeError(`${REFUSAL3}: planner/claude has settingSources ${describeValue(settingSources)} in its context,` + " expected a list of setting sources");
@@ -6054,26 +5977,26 @@ var CORE_ADAPTERS = [
   {
     port: "sync",
     kind: "local",
-    portVersion: PORT_VERSIONS2.sync,
+    portVersion: PORT_VERSIONS.sync,
     create: () => createLocalSync()
   },
   {
     port: "sync",
     kind: "file",
-    portVersion: PORT_VERSIONS2.sync,
+    portVersion: PORT_VERSIONS.sync,
     create: ({ repoRoot, store }) => {
-      if (!STORE_BACKENDS2.includes(store)) {
-        throw new TypeError(`${REFUSAL3}: sync/file has store ${describeValue(store)} in its context,` + ` expected one of: ${STORE_BACKENDS2.join(", ")}`);
+      if (!STORE_BACKENDS.includes(store)) {
+        throw new TypeError(`${REFUSAL3}: sync/file has store ${describeValue(store)} in its context,` + ` expected one of: ${STORE_BACKENDS.join(", ")}`);
       }
       return createFileSync({ repoRoot, backend: store });
     }
   }
 ];
-var CORE_ADAPTER_REGISTRY2 = createAdapterRegistry2(CORE_ADAPTERS);
+var CORE_ADAPTER_REGISTRY = createAdapterRegistry(CORE_ADAPTERS);
 
 // src/board/trust.ts
 var REPO_PATH = "{owner}/{repo}";
-var TRUSTED_PERMISSIONS2 = ["admin", "maintain", "write"];
+var TRUSTED_PERMISSIONS = ["admin", "maintain", "write"];
 var TRUST_REFUSAL_EXIT = 2;
 var REMEDY = Object.freeze({
   issue: "a member must open the spec",
@@ -6085,7 +6008,7 @@ function failureDetail(reading) {
   return detail === "" ? UNREPORTED : detail;
 }
 function isTrustedPermission(value) {
-  return TRUSTED_PERMISSIONS2.some((permission) => permission === value);
+  return TRUSTED_PERMISSIONS.some((permission) => permission === value);
 }
 function stringOrNull(value) {
   return typeof value === "string" ? value : null;
@@ -6135,8 +6058,8 @@ async function readAuthorTrust(options) {
     };
   }
   const wanted = login.toLowerCase();
-  const listed = trustedAuthors.some((author) => author.toLowerCase() === wanted);
-  if (listed) {
+  const listed2 = trustedAuthors.some((author) => author.toLowerCase() === wanted);
+  if (listed2) {
     return { login, trusted: true, source: "allow-list", refusal: null, permission: null };
   }
   const permission = await permissions(login);
@@ -6192,14 +6115,14 @@ import { existsSync as existsSync14, mkdtempSync as mkdtempSync2, rmSync as rmSy
 import { tmpdir as tmpdir4 } from "os";
 import { join as join17 } from "path";
 import { Database as Database7, SQLiteError as SQLiteError3 } from "bun:sqlite";
-var WIRE_FORMAT2 = "rafa-effort-wire";
-var WIRE_VERSION2 = 1;
+var WIRE_FORMAT = "rafa-effort-wire";
+var WIRE_VERSION = 1;
 
-class WireFormatError2 extends Error {
+class WireFormatError extends Error {
   name = "WireFormatError";
 }
 
-class WireExportRefusal2 extends Error {
+class WireExportRefusal extends Error {
   name = "WireExportRefusal";
 }
 var MERGED_TABLES = Object.entries(MERGE_RULES).filter(([, rule]) => rule.scope === "merged").map(([table]) => table);
@@ -6210,17 +6133,17 @@ function isRecord4(value) {
 function isCount(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
 }
-function isMergedTable(name) {
-  return MERGED_TABLES.includes(name);
+function isMergedTable(name2) {
+  return MERGED_TABLES.includes(name2);
 }
 function checkCursor(value) {
   if (!isRecord4(value))
-    throw new WireFormatError2("wire: cursor is not an object");
+    throw new WireFormatError("wire: cursor is not an object");
   const entries = Object.entries(value).map(([table, seq]) => {
     if (!isMergedTable(table))
-      throw new WireFormatError2(`wire: cursor names ${JSON.stringify(table)}, which is no merged table`);
+      throw new WireFormatError(`wire: cursor names ${JSON.stringify(table)}, which is no merged table`);
     if (!isCount(seq))
-      throw new WireFormatError2(`wire: cursor for ${table} is ${JSON.stringify(seq)}, expected a whole number of 0 or more`);
+      throw new WireFormatError(`wire: cursor for ${table} is ${JSON.stringify(seq)}, expected a whole number of 0 or more`);
     return [table, seq];
   });
   return Object.freeze(Object.fromEntries(entries));
@@ -6228,67 +6151,67 @@ function checkCursor(value) {
 function checkRow(table, value, index) {
   const where = `wire: ${table} row ${String(index)}`;
   if (!isRecord4(value))
-    throw new WireFormatError2(`${where} is not an object`);
+    throw new WireFormatError(`${where} is not an object`);
   for (const [column, cell] of Object.entries(value)) {
     const carried = cell === null || typeof cell === "string" || typeof cell === "number" && Number.isFinite(cell);
     if (!carried)
-      throw new WireFormatError2(`${where} holds ${JSON.stringify(cell) ?? typeof cell} in ${column}, expected a string, a number or null`);
+      throw new WireFormatError(`${where} holds ${JSON.stringify(cell) ?? typeof cell} in ${column}, expected a string, a number or null`);
   }
   const seq = value.seq;
   if (!isCount(seq) || seq === 0)
-    throw new WireFormatError2(`${where} has seq ${JSON.stringify(seq) ?? "undefined"}, expected a whole number above 0`);
+    throw new WireFormatError(`${where} has seq ${JSON.stringify(seq) ?? "undefined"}, expected a whole number above 0`);
   return Object.freeze({ ...value });
 }
 function checkMigrations(value) {
   if (!Array.isArray(value))
-    throw new WireFormatError2("wire: migrations is not a list");
+    throw new WireFormatError("wire: migrations is not a list");
   const ids = value.map((id) => {
     if (typeof id !== "string" || id === "")
-      throw new WireFormatError2(`wire: migration id ${JSON.stringify(id)} is not a name`);
+      throw new WireFormatError(`wire: migration id ${JSON.stringify(id)} is not a name`);
     return id;
   });
   const twice = ids.filter((id, index) => ids.indexOf(id) !== index);
   if (twice.length > 0)
-    throw new WireFormatError2(`wire: migrations name ${twice.join(", ")} more than once`);
+    throw new WireFormatError(`wire: migrations name ${twice.join(", ")} more than once`);
   return Object.freeze(ids);
 }
 function checkTables(value) {
   if (!isRecord4(value))
-    throw new WireFormatError2("wire: tables is not an object");
+    throw new WireFormatError("wire: tables is not an object");
   const entries = Object.entries(value).map(([table, rows]) => {
     if (!isMergedTable(table))
-      throw new WireFormatError2(`wire: tables names ${JSON.stringify(table)}, which is no merged table`);
+      throw new WireFormatError(`wire: tables names ${JSON.stringify(table)}, which is no merged table`);
     if (!Array.isArray(rows))
-      throw new WireFormatError2(`wire: tables.${table} is not a list`);
+      throw new WireFormatError(`wire: tables.${table} is not a list`);
     return [table, Object.freeze(rows.map((row, index) => checkRow(table, row, index)))];
   });
   return Object.freeze(Object.fromEntries(entries));
 }
 function checkPayload(value) {
   if (!isRecord4(value))
-    throw new WireFormatError2("wire: the payload is not an object");
-  if (value.format !== WIRE_FORMAT2)
-    throw new WireFormatError2(`wire: format is ${JSON.stringify(value.format) ?? "undefined"}, expected ${JSON.stringify(WIRE_FORMAT2)}`);
-  if (value.version !== WIRE_VERSION2)
-    throw new WireFormatError2(`wire: version is ${JSON.stringify(value.version) ?? "undefined"}; this rafa reads version ${String(WIRE_VERSION2)}`);
+    throw new WireFormatError("wire: the payload is not an object");
+  if (value.format !== WIRE_FORMAT)
+    throw new WireFormatError(`wire: format is ${JSON.stringify(value.format) ?? "undefined"}, expected ${JSON.stringify(WIRE_FORMAT)}`);
+  if (value.version !== WIRE_VERSION)
+    throw new WireFormatError(`wire: version is ${JSON.stringify(value.version) ?? "undefined"}; this rafa reads version ${String(WIRE_VERSION)}`);
   return Object.freeze({
-    format: WIRE_FORMAT2,
-    version: WIRE_VERSION2,
+    format: WIRE_FORMAT,
+    version: WIRE_VERSION,
     migrations: checkMigrations(value.migrations),
     tables: checkTables(value.tables),
     cursor: checkCursor(value.cursor)
   });
 }
-function encodeWirePayload2(payload) {
+function encodeWirePayload(payload) {
   return JSON.stringify(payload);
 }
-function decodeWirePayload2(text) {
+function decodeWirePayload(text) {
   let parsed;
   try {
     parsed = JSON.parse(text);
   } catch (error) {
     const reason = error instanceof Error ? error.message : String(error);
-    throw new WireFormatError2(`wire: the payload is not JSON (${reason})`);
+    throw new WireFormatError(`wire: the payload is not JSON (${reason})`);
   }
   return checkPayload(parsed);
 }
@@ -6299,17 +6222,17 @@ function readLoggedIds(db) {
   return db.query(`SELECT id FROM ${MIGRATION_LOG_TABLE} ORDER BY seq`).all().map(({ id }) => id);
 }
 function columnsOf(db, table) {
-  return db.query(`PRAGMA table_info(${quoted(table)})`).all().map(({ name }) => name);
+  return db.query(`PRAGMA table_info(${quoted(table)})`).all().map(({ name: name2 }) => name2);
 }
 function wireValue(value, where) {
   if (typeof value === "bigint") {
     const number = Number(value);
     if (Number.isSafeInteger(number))
       return number;
-    throw new WireExportRefusal2(`wire: ${where} holds ${String(value)}, past the whole numbers JSON carries exactly`);
+    throw new WireExportRefusal(`wire: ${where} holds ${String(value)}, past the whole numbers JSON carries exactly`);
   }
   if (value instanceof Uint8Array)
-    throw new WireExportRefusal2(`wire: ${where} holds a BLOB, which the wire does not carry`);
+    throw new WireExportRefusal(`wire: ${where} holds a BLOB, which the wire does not carry`);
   return value;
 }
 function readRows(db, table, columns, after, path) {
@@ -6322,7 +6245,7 @@ function readRows(db, table, columns, after, path) {
 function readPayload(db, path, cursor) {
   const migrations = readLoggedIds(db);
   if (migrations === null) {
-    throw new WireExportRefusal2(`wire: ${path} has no migration log; any rafa command that writes the store brings it forward`);
+    throw new WireExportRefusal(`wire: ${path} has no migration log; any rafa command that writes the store brings it forward`);
   }
   const tables = {};
   const next = { ...cursor };
@@ -6332,7 +6255,7 @@ function readPayload(db, path, cursor) {
       continue;
     const missing = ORIGIN_COLUMNS.filter((column) => !columns.includes(column));
     if (missing.length > 0) {
-      throw new WireExportRefusal2(`wire: ${path} holds no ${missing.map((column) => `${table}.${column}`).join(", ")}, so its rows carry no origin pair`);
+      throw new WireExportRefusal(`wire: ${path} holds no ${missing.map((column) => `${table}.${column}`).join(", ")}, so its rows carry no origin pair`);
     }
     const rows = readRows(db, table, columns, cursor[table] ?? 0, path);
     tables[table] = Object.freeze(rows);
@@ -6340,19 +6263,19 @@ function readPayload(db, path, cursor) {
     next[table] = last === undefined ? cursor[table] ?? 0 : Number(last.seq);
   }
   return Object.freeze({
-    format: WIRE_FORMAT2,
-    version: WIRE_VERSION2,
+    format: WIRE_FORMAT,
+    version: WIRE_VERSION,
     migrations: Object.freeze([...migrations]),
     tables: Object.freeze(tables),
     cursor: Object.freeze(next)
   });
 }
-function exportWirePayload2(options) {
+function exportWirePayload(options) {
   const { path } = options;
   const cursor = checkCursor(options.cursor ?? {});
   guardTestProcess(path);
   if (!existsSync14(path))
-    throw new WireExportRefusal2(`wire: ${path} is not there`);
+    throw new WireExportRefusal(`wire: ${path} is not there`);
   const db = new Database7(path, { readonly: true, safeIntegers: true });
   try {
     db.run(`PRAGMA busy_timeout = ${String(activeStoreSettings().busyTimeoutMs)}`);
@@ -6365,28 +6288,28 @@ function namedMigrations(ids, catalogue) {
   const known = new Set(catalogue.map(({ id }) => id));
   const unknown = ids.filter((id) => !known.has(id));
   if (unknown.length > 0) {
-    throw new WireFormatError2(`wire: the payload's store holds migration ${unknown.join(", ")}, which this rafa does not know; update rafa to take its rows`);
+    throw new WireFormatError(`wire: the payload's store holds migration ${unknown.join(", ")}, which this rafa does not know; update rafa to take its rows`);
   }
   return catalogue.filter(({ id }) => ids.includes(id));
 }
 function insertRows(db, table, rows) {
   const columns = columnsOf(db, table);
   if (columns.length === 0)
-    throw new WireFormatError2(`wire: the payload carries ${table}, which its migrations do not make`);
+    throw new WireFormatError(`wire: the payload carries ${table}, which its migrations do not make`);
   const statement = db.query(`INSERT INTO ${quoted(table)} (${columns.map(quoted).join(", ")}) VALUES (${columns.map(() => "?").join(", ")})`);
   const expected = [...columns].sort().join(",");
   rows.forEach((row, index) => {
     const where = `wire: ${table} row ${String(index)}`;
     const held = Object.keys(row);
     if ([...held].sort().join(",") !== expected) {
-      throw new WireFormatError2(`${where} holds columns ${held.join(", ")}; its migrations make ${columns.join(", ")}`);
+      throw new WireFormatError(`${where} holds columns ${held.join(", ")}; its migrations make ${columns.join(", ")}`);
     }
     try {
       statement.run(...columns.map((column) => row[column] ?? null));
     } catch (error) {
       if (!(error instanceof SQLiteError3))
         throw error;
-      throw new WireFormatError2(`${where} (seq ${String(row.seq)}) is refused by the table: ${error.message}`);
+      throw new WireFormatError(`${where} (seq ${String(row.seq)}) is refused by the table: ${error.message}`);
     }
   });
 }
@@ -6408,7 +6331,7 @@ function buildStore(path, payload, options) {
     db.close();
   }
 }
-function materialiseWirePayload2(payload, options = {}) {
+function materialiseWirePayload(payload, options = {}) {
   const checked = checkPayload(payload);
   const directory = mkdtempSync2(join17(options.tempDir ?? tmpdir4(), "rafa-wire-"));
   const release = () => rmSync8(directory, { recursive: true, force: true });
@@ -6431,13 +6354,13 @@ function describeValue4(value) {
     return "an object";
   return String(value);
 }
-function selectEffortStore2(repoRoot, config) {
-  const adapter = CORE_ADAPTER_REGISTRY2.find("store", config.store);
+function selectEffortStore(repoRoot, config) {
+  const adapter = CORE_ADAPTER_REGISTRY.find("store", config.store);
   if (adapter === undefined) {
-    const expected = CORE_ADAPTER_REGISTRY2.kinds("store").join(", ");
+    const expected = CORE_ADAPTER_REGISTRY.kinds("store").join(", ");
     throw new TypeError(`effort store: store is ${describeValue4(config.store)},` + ` expected one of: ${expected}`);
   }
   return adapter.create({ repoRoot });
 }
 
-export { EFFORT_STORE_DIR, effortStoreFileName, EFFORT_DIR_VARIABLE, effortStoreDir, guardTestProcess, EFFORT_KEY_PROJECTIONS2, openNdjsonStore2, name, version, RAFA_VERSION, versionLine, createGitRunner, gitSaid, NOT_A_REPOSITORY, mainCheckoutOf, SCOPE_DIR2, INIT_COMMAND2, DISK_FILE_SYSTEM2, ScopeError2, scopeAt2, initHint2, selfAndAncestors2, resolveScope2, POSITION_FILE, positionFilePath, readPositionFile, writePositionFile, positionAt, rehome, hop, goHome, HOP_FILE, hopFilePath, readHopRecord, writeHopRecord, staleAgainst, SessionRecordError, isSessionId, sessionPhase, SessionConflictError, SessionStateError, runsDir, sessionFilePath, errorCode, isPidAlive, readSessions, readSession, beginSession, updateSession, DEVELOPMENT_NEXT_STEP, DEVELOPMENT_MARK, DevelopmentBuildRefusedError, refuseUnownedDevelopmentWrite, LEGACY_GATE_OPEN, LEGACY_GATE_CLOSED, SQLITE_MIGRATIONS, sqliteCatalogue, planSchema, SchemaRefusedError, readStoreSchema, writeNames, ACROSS_STORES_ORDER, STAMPED_COLUMNS, stampedValues, activeStoreSettings, normalizeRemote, gitRemoteUrl, readStoreMeta, SQLITE_STORE_FILE_NAME, sqliteStorePath, LONE_SURROGATE, withSqliteStore, writeSqliteStore, openSqliteStore2, SPENDS_GLYPH, CommandExit, isRoutingWord, commandProblem, isTopLevel, commandSpelling, EffortCopyRefusal, EffortCopyFailure, copyEffortStore, RebuildRefusal, readConfigFile2, loadConfig2, plansDirAt, requireProject, resolvePlansDir, resolveProjectConfig, countTasks, formatCounts, checkbox, planFileName, stubOfPlanFile, isFile, issueLine, plural, expectNoArgument, expectOneArgument, expectAtMostOneArgument, readSwitch, fileStamp, keepsIdLine, fix_schema_default, minutesBetween, readCommitLog, UnionSchemaMismatch, migrateStore, MOVE_TO_SQLITE, MergeRefusal, mergeStore2, createFileSync, SyncModuleMissing, selectSync, SKILL_FILE2, MARKDOWN_EXTENSION, scanLayout, declaredNameIssue, readFrontmatterDocument, readFrontmatter, renderFrontmatter, mergeFrontmatter, writeFrontmatter, ACTION_HEADING, CAUSE_HEADING, parseInstinct, writeInstinct, readScopes, allRecords, findRecords, instinctProject, toHeldRecords, padKind, oneLine, sessionSpawnEnv, CLAUDE_BIN, claudeArgs, interruptClaudeSessions, spawnClaude, runClaude, spawnClaudeCaptured, runClaudeCaptured, planFilePath, ClaudePlannerError, ISSUE_TYPES, ISSUE_PRIORITIES, ISSUE_STATES, GITHUB_LABELS, createGhRunner, typeOfLabels, moduleOfLabels, createLocalTracker, PORT_VERSIONS2, createAdapterRegistry2, CORE_ADAPTER_REGISTRY2, TRUSTED_PERMISSIONS2, createGhPermissions, readAuthorTrust, ghBoardTrust, readBoardTrust, requireTrustedBoardAuthor, trustRefusalClause, requireTrustedAuthor, WIRE_FORMAT2, WIRE_VERSION2, WireFormatError2, WireExportRefusal2, encodeWirePayload2, decodeWirePayload2, exportWirePayload2, materialiseWirePayload2, selectEffortStore2 };
+export { EFFORT_STORE_DIR, effortStoreFileName, EFFORT_DIR_VARIABLE, effortStoreDir, guardTestProcess, EFFORT_KEY_PROJECTIONS, openNdjsonStore, name, version, RAFA_VERSION, versionLine, createGitRunner, gitSaid, NOT_A_REPOSITORY, mainCheckoutOf, SCOPE_DIR, INIT_COMMAND, DISK_FILE_SYSTEM, ScopeError, scopeAt, initHint, selfAndAncestors, resolveScope, POSITION_FILE, positionFilePath, readPositionFile, writePositionFile, positionAt, rehome, hop, goHome, HOP_FILE, hopFilePath, readHopRecord, writeHopRecord, staleAgainst, SessionRecordError, isSessionId, sessionPhase, SessionConflictError, SessionStateError, runsDir, sessionFilePath, errorCode, isPidAlive, readSessions, readSession, beginSession, updateSession, DEVELOPMENT_NEXT_STEP, DEVELOPMENT_MARK, DevelopmentBuildRefusedError, refuseUnownedDevelopmentWrite, LEGACY_GATE_OPEN, LEGACY_GATE_CLOSED, SQLITE_MIGRATIONS, sqliteCatalogue, planSchema, SchemaRefusedError, readStoreSchema, writeNames, ACROSS_STORES_ORDER, STAMPED_COLUMNS, stampedValues, activeStoreSettings, normalizeRemote, gitRemoteUrl, readStoreMeta, SQLITE_STORE_FILE_NAME, sqliteStorePath, LONE_SURROGATE, withSqliteStore, writeSqliteStore, openSqliteStore, EffortCopyRefusal, EffortCopyFailure, copyEffortStore, RebuildRefusal, readConfigFile, loadConfig, plansDirAt, requireProject, resolvePlansDir, resolveProjectConfig, countTasks, formatCounts, checkbox, planFileName, stubOfPlanFile, isFile, issueLine, plural, expectNoArgument, expectOneArgument, expectAtMostOneArgument, readSwitch, fileStamp, keepsIdLine, fix_schema_default, minutesBetween, readCommitLog, UnionSchemaMismatch, migrateStore, MOVE_TO_SQLITE, MergeRefusal, mergeStore, createFileSync, SyncModuleMissing, selectSync, SKILL_FILE, MARKDOWN_EXTENSION, scanLayout, declaredNameIssue, readFrontmatterDocument, readFrontmatter, renderFrontmatter, mergeFrontmatter, writeFrontmatter, ACTION_HEADING, CAUSE_HEADING, parseInstinct, writeInstinct, readScopes, allRecords, findRecords, instinctProject, toHeldRecords, EVENT_PREFIX, padKind, oneLine, sessionSpawnEnv, CLAUDE_BIN, claudeArgs, interruptClaudeSessions, spawnClaude, runClaude, spawnClaudeCaptured, runClaudeCaptured, planFilePath, ClaudePlannerError, ISSUE_TYPES, ISSUE_PRIORITIES, ISSUE_STATES, GITHUB_LABELS, createGhRunner, typeOfLabels, moduleOfLabels, createLocalTracker, PORT_VERSIONS, createAdapterRegistry, CORE_ADAPTER_REGISTRY, TRUSTED_PERMISSIONS, createGhPermissions, readAuthorTrust, ghBoardTrust, readBoardTrust, requireTrustedBoardAuthor, trustRefusalClause, requireTrustedAuthor, WIRE_FORMAT, WIRE_VERSION, WireFormatError, WireExportRefusal, encodeWirePayload, decodeWirePayload, exportWirePayload, materialiseWirePayload, selectEffortStore };