@open-tomato/rafa 0.42.0 → 0.44.0

package/dist/{index-q0dmfp8m.js → index-6q30dtgm.js}

@@ -4,7 +4,6 @@ import {
   BUSY_TIMEOUT_MIN_MS,
   CONFIG_DEFAULTS,
   CONFIG_FILE,
-  ConfigError,
   FINDING_DOMAINS,
   FINDING_KINDS,
   FINDING_SIGNALS,
@@ -12,6 +11,7 @@ import {
   STORE_BACKENDS,
   SYNC_STRATEGIES,
   TEST_SCOPES,
+  activeLoggerSettings,
   activeOutput,
   activeOutputMode,
   bundledBinDirectory,
@@ -23,13 +23,12 @@ import {
   isGitHubLogin,
   isMapping,
   isStampableStub,
+  levelEnabled,
   messageOf,
-  parseConfigText,
   readRafaBlocks,
-  resolveConfig,
   resolveInstinctScopes,
   tierExists
-} from "./index-bceachy6.js";
+} from "./index-cknayrpc.js";
 import {
   bless,
   merge
@@ -253,7 +252,7 @@ import { Database as Database2 } from "bun:sqlite";
 
 // package.json
 var name = "@open-tomato/rafa";
-var version = "0.42.0";
+var version = "0.44.0";
 
 // src/cli/version.ts
 var RAFA_VERSION = version;
@@ -832,8 +831,37 @@ function freezeHop(value) {
   const hop = asHopRecord(value);
   return Object.freeze({ ...hop, home: Object.freeze(hop.home), from: Object.freeze(hop.from) });
 }
+function errorLinesEntry(errorLines) {
+  const kept = Array.isArray(errorLines) && errorLines.length > 0 && errorLines.every((line) => typeof line === "string");
+  return kept ? { errorLines: Object.freeze([...errorLines]) } : {};
+}
 function freezeFailures(failures) {
-  return Object.freeze(failures.map((failure) => Object.freeze({ file: failure.file, name: failure.name })));
+  return Object.freeze(failures.map((failure) => Object.freeze({
+    file: failure.file,
+    name: failure.name,
+    ...errorLinesEntry(field(failure, "errorLines"))
+  })));
+}
+function isStringList(value) {
+  return Array.isArray(value) && value.every((entry) => typeof entry === "string");
+}
+function isStepOnly(value) {
+  if (!isObject(value))
+    return false;
+  const position = field(value, "position");
+  return isText(field(value, "file")) && isTextList(field(value, "tests")) && isStringList(field(value, "errorLines")) && (position === null || isPositiveWhole(position)) && isTextList(field(value, "before"));
+}
+function stepOnlyEntry(stepOnly) {
+  const whole = Array.isArray(stepOnly) ? stepOnly.filter(isStepOnly) : [];
+  if (whole.length === 0)
+    return {};
+  return { stepOnly: Object.freeze(whole.map((entry) => Object.freeze({
+    file: entry.file,
+    tests: Object.freeze([...entry.tests]),
+    errorLines: Object.freeze([...entry.errorLines]),
+    position: entry.position,
+    before: Object.freeze([...entry.before])
+  }))) };
 }
 function isSessionStepReason(value) {
   return SESSION_STEP_REASONS.includes(value);
@@ -851,6 +879,7 @@ function freezeStep(step) {
     summary: step.summary,
     failures: freezeFailures(step.failures),
     newFailures: freezeFailures(step.newFailures),
+    ...stepOnlyEntry(field(step, "stepOnly")),
     ...step.interrupted === true ? { interrupted: true } : {}
   });
 }
@@ -1542,6 +1571,16 @@ var SQLITE_MIGRATIONS = [
     sql: `
   ALTER TABLE sessions ADD COLUMN worktree TEXT;
   `
+  },
+  {
+    id: "store-replaced",
+    breaks: [],
+    sql: `
+  CREATE TABLE store_replaced (
+    store_id    TEXT NOT NULL PRIMARY KEY CHECK (store_id <> ''),
+    replaced_at TEXT NOT NULL CHECK (replaced_at <> '')
+  );
+  `
   }
 ];
 var SQLITE_SCHEMA_VERSION = SQLITE_MIGRATIONS.length;
@@ -1940,8 +1979,33 @@ function readProjectIdentity(dir, git = createGitRunner(dir)) {
   return { rootCommit: smallestRootCommit(git), remote: normalisedRemote(git) };
 }
 
+// src/effort/store/store-replaced.ts
+var STORE_REPLACED_TABLE = "store_replaced";
+function hasStoreReplacedTable(db) {
+  return db.query("SELECT count(*) AS n FROM sqlite_master WHERE type = 'table' AND name = ?").get(STORE_REPLACED_TABLE)?.n === 1;
+}
+function readReplacedStoreIds(db) {
+  if (!hasStoreReplacedTable(db))
+    return [];
+  return db.query("SELECT store_id, replaced_at FROM store_replaced ORDER BY replaced_at, store_id").all().map((row) => ({ storeId: row.store_id, replacedAt: row.replaced_at }));
+}
+function recordReplacedStoreId(db, storeId, replacedAt) {
+  if (storeId === "")
+    throw new Error("replaced store id must be non-empty");
+  if (Number.isNaN(replacedAt.getTime())) {
+    throw new Error(`replaced time of store ${storeId} is not a valid date`);
+  }
+  db.query("INSERT INTO store_replaced (store_id, replaced_at) VALUES (?, ?) ON CONFLICT (store_id) DO NOTHING").run(storeId, replacedAt.toISOString());
+}
+function clearReplacedStoreIds(db) {
+  if (!hasStoreReplacedTable(db))
+    return;
+  db.run("DELETE FROM store_replaced");
+}
+
 // src/effort/store/store-meta.ts
 var STORED_INTEGER_BITS = 64;
+var COPY_REASONS = ["host", "path"];
 function toStoredInteger(value) {
   return BigInt.asIntN(STORED_INTEGER_BITS, value);
 }
@@ -1976,12 +2040,20 @@ function projectFor(storePath, recorded, seams) {
     return null;
   return { rootCommit: recorded.projectRootCommit, remote: recorded.projectRemote };
 }
-function writeStoreMeta(db, facts, project, generation, seams) {
+function writeStoreMeta(db, facts, project, generation, mintedAt, seams) {
   const storeId = (seams.newStoreId ?? randomUUID4)();
-  const mintedAt = (seams.now?.() ?? new Date).toISOString();
-  db.query("INSERT OR REPLACE INTO store_meta (id, store_id, project_root_commit, project_remote," + " host_id, store_path, file_dev, file_ino, minted_at, generation) VALUES (1, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run(storeId, project.rootCommit, project.remote, facts.hostId, facts.storePath, toStoredInteger(facts.fileDev), toStoredInteger(facts.fileIno), mintedAt, generation);
+  db.query("INSERT OR REPLACE INTO store_meta (id, store_id, project_root_commit, project_remote," + " host_id, store_path, file_dev, file_ino, minted_at, generation) VALUES (1, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run(storeId, project.rootCommit, project.remote, facts.hostId, facts.storePath, toStoredInteger(facts.fileDev), toStoredInteger(facts.fileIno), mintedAt.toISOString(), generation);
   return storeId;
 }
+function settleReplacedIds(db, outgoing, reasons, mintedAt) {
+  if (reasons.some((reason) => COPY_REASONS.includes(reason))) {
+    clearReplacedStoreIds(db);
+    return;
+  }
+  if (outgoing === null)
+    return;
+  recordReplacedStoreId(db, outgoing.storeId, mintedAt);
+}
 function settleUnderLock(db, observe, prefetched, seams) {
   const current = readStoreMeta(db);
   const facts = observe();
@@ -1997,7 +2069,9 @@ function settleUnderLock(db, observe, prefetched, seams) {
   const project = prefetched ?? projectFor(facts.storePath, current, seams);
   if (project === null)
     return { action: "no-project", reasons: decision.reasons };
-  const storeId = writeStoreMeta(db, facts, project, generation, seams);
+  const mintedAt = seams.now?.() ?? new Date;
+  settleReplacedIds(db, current, decision.reasons, mintedAt);
+  const storeId = writeStoreMeta(db, facts, project, generation, mintedAt, seams);
   writeStoreGeneration(facts.storePath, generation);
   return { action: "mint", storeId, reasons: decision.reasons };
 }
@@ -2193,40 +2267,14 @@ function openSqliteStore(repoRoot) {
 }
 
 // src/effort/sync/file.ts
-import { existsSync as existsSync11 } from "fs";
-import { join as join13, resolve as resolve5 } from "path";
+import { existsSync as existsSync9 } from "fs";
+import { join as join12, resolve as resolve4 } from "path";
 
-// src/cli/spends.ts
-var SPENDS_GLYPH = "\uD83E\uDE99";
-
-// src/cli/command.ts
-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 isTopLevel(command) {
-  return command.subject === command.action;
-}
-function commandSpelling(command) {
-  return isTopLevel(command) ? command.subject : `${command.subject} ${command.action}`;
+// src/effort/file-stamp.ts
+function fileStamp(date) {
+  return date.toISOString().replace(/[-:]/g, "").replace(/\.\d{3}Z$/, "Z");
 }
 
-// src/effort/store/fix-schema.ts
-import { existsSync as existsSync8 } from "fs";
-import { Database as Database4 } from "bun:sqlite";
-
-// src/effort/store/rebuild-aside.ts
-import { closeSync, existsSync as existsSync7, fsyncSync, openSync, renameSync as renameSync5, rmSync as rmSync6 } from "fs";
-
 // src/effort/store/copy.ts
 import { copyFileSync, constants, existsSync as existsSync6, mkdirSync as mkdirSync6, readdirSync as readdirSync2, rmSync as rmSync5, statSync as statSync2 } from "fs";
 import { join as join10, resolve as resolve3 } from "path";
@@ -2316,7 +2364,18 @@ function copyEffortStore(request) {
   return Object.freeze({ source, directory: target, files: Object.freeze(files) });
 }
 
+// src/effort/store/merge-store.ts
+import { randomUUID as randomUUID5 } from "crypto";
+import { existsSync as existsSync8, mkdtempSync, rmSync as rmSync7 } from "fs";
+import { tmpdir as tmpdir3 } from "os";
+import { dirname as dirname11, join as join11 } from "path";
+import { Database as Database5, SQLiteError as SQLiteError2 } from "bun:sqlite";
+
+// src/effort/store/fix-schema.ts
+import { Database as Database4 } from "bun:sqlite";
+
 // src/effort/store/rebuild-aside.ts
+import { closeSync, existsSync as existsSync7, fsyncSync, openSync, renameSync as renameSync5, rmSync as rmSync6 } from "fs";
 class RebuildRefusal extends Error {
   constructor(message, options) {
     super(message, options);
@@ -2447,22 +2506,10 @@ function rebuildAside(options) {
   swapIn(path, parallelPath, backupPath);
   return { built, backupPath };
 }
-
 // src/effort/store/fix-schema.ts
-var REPAIRABLE_REASONS = [
-  "pre-log-unreleased",
-  "gate-mismatch",
-  "edited",
-  "unknown-breaks-readers",
-  "unknown-breaks-writers"
-];
-var LIVE = "live";
 function tableNames(db, schema) {
   return db.query(`SELECT name FROM ${schema}.sqlite_master WHERE type = 'table' AND name NOT LIKE 'sqlite_%' AND name <> ? ORDER BY name`).all(MIGRATION_LOG_TABLE).map((row) => row.name);
 }
-function columnNames(db, schema, table) {
-  return db.query("SELECT name FROM pragma_table_info(?, ?)").all(table, schema).map((row) => row.name);
-}
 function readOnlySchema(path) {
   const db = new Database4(path, { readonly: true });
   try {
@@ -2471,38 +2518,6 @@ function readOnlySchema(path) {
     db.close();
   }
 }
-function refuseRemoved(db, known, live) {
-  for (const table of known) {
-    if (!live.has(table)) {
-      throw new RebuildRefusal(`the store holds no table ${table}, which this rafa writes; its newer schema is not additive`);
-    }
-    const liveColumns = new Set(columnNames(db, LIVE, table));
-    const missing = columnNames(db, "main", table).filter((column) => !liveColumns.has(column));
-    if (missing.length > 0) {
-      throw new RebuildRefusal(`the store holds no column ${missing.map((column) => `${table}.${column}`).join(", ")}, which this rafa` + " writes; its newer schema is not additive");
-    }
-  }
-}
-function copyKnown(db, known) {
-  db.transaction(() => {
-    for (const table of known) {
-      const columns = columnNames(db, "main", table).map(quoted).join(", ");
-      db.run(`INSERT INTO main.${quoted(table)} (${columns}) SELECT ${columns} FROM ${LIVE}.${quoted(table)}`);
-    }
-  })();
-}
-function leftBehind(db, known, live) {
-  const leftTables = live.filter((table) => !known.has(table)).map((table) => ({ table, rows: count(db, `SELECT count(*) AS n FROM ${LIVE}.${quoted(table)}`) }));
-  const leftColumns = live.filter((table) => known.has(table)).flatMap((table) => {
-    const kept = new Set(columnNames(db, "main", table));
-    return columnNames(db, LIVE, table).filter((column) => !kept.has(column)).map((column) => ({
-      table,
-      column,
-      values: count(db, `SELECT count(*) AS n FROM ${LIVE}.${quoted(table)} WHERE ${quoted(column)} IS NOT NULL`)
-    }));
-  });
-  return { leftTables, leftColumns };
-}
 function refuseUnusable(db, parallelPath, migrations) {
   const plan = planSchema(readStoreSchema(db, parallelPath), sqliteCatalogue(migrations), "write", "open");
   if (plan.verdict === "refuse")
@@ -2511,351 +2526,6 @@ function refuseUnusable(db, parallelPath, migrations) {
   if (needs.length > 0)
     throw new RebuildRefusal(`the rebuilt store still needs ${needs.join(", ")}`);
 }
-function buildParallel(path, parallelPath, migrations, stamp) {
-  const db = new Database4(parallelPath, { create: true, readwrite: true });
-  try {
-    bringForward(db, parallelPath, "write", "open", { migrations, ...stamp, builtAside: true });
-    db.run(`ATTACH DATABASE ? AS ${LIVE}`, [path]);
-    const known = tableNames(db, "main");
-    const live = tableNames(db, LIVE);
-    refuseRemoved(db, known, new Set(live));
-    copyKnown(db, known);
-    const kept = checkedCounts(db, known, LIVE);
-    const left = leftBehind(db, new Set(known), live);
-    db.run(`DETACH DATABASE ${LIVE}`);
-    refuseCorrupt(db);
-    refuseUnusable(db, parallelPath, migrations);
-    return { kept, ...left };
-  } finally {
-    db.close();
-  }
-}
-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);
-}
-function refuseDevelopmentSwap(path, reason, identity) {
-  if (identity.kind !== "development")
-    return;
-  throw new RebuildRefusal(`${path} needs a rebuild (${reason}), and this rafa is a development build (${identity.checkout}), whose` + " migrations may be a branch's; a development build never swaps a rebuild in. Nothing was changed, and" + " --dry-run runs from here. Run the swap from an installed rafa. Next safe step: rafa effort fix-schema");
-}
-function fixStoreSchema(options) {
-  const { path, dryRun, stamp } = options;
-  guardTestProcess(path);
-  const migrations = options.migrations ?? SQLITE_MIGRATIONS;
-  const identity = options.identity ?? readRuntimeIdentity();
-  const appliedBy = appliedByName(identity);
-  const known = migrations.map(({ id }) => id);
-  const nothing = { known, appliedBy, pending: [], kept: [], leftTables: [], leftColumns: [], backupPath: null };
-  if (!existsSync8(path)) {
-    return { path, status: "missing", storeVersion: null, logged: false, reason: null, refusal: null, unknown: [], ...nothing };
-  }
-  refuseInFlight(path);
-  const store = readOnlySchema(path);
-  const knownIds = new Set(known);
-  const found = {
-    path,
-    storeVersion: store.userVersion,
-    logged: store.log !== null,
-    unknown: (store.log ?? []).filter(({ id }) => !knownIds.has(id))
-  };
-  const plan = planSchema(store, sqliteCatalogue(migrations), "write", "open");
-  if (plan.verdict === "use") {
-    const pending = writeNames(plan);
-    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}`);
-  }
-  if (!dryRun)
-    refuseDevelopmentSwap(path, plan.reason, identity);
-  const { built, backupPath } = rebuildAside({
-    path,
-    ...asidePaths(path, store.userVersion, stamp),
-    dryRun,
-    build: (parallelPath) => buildParallel(path, parallelPath, migrations, {
-      appliedBy,
-      now: options.now ?? (() => new Date)
-    })
-  });
-  const status = dryRun ? "would-rebuild" : "rebuilt";
-  const refusal = withoutWayOut(plan.message, plan.nextStep);
-  return { ...found, ...nothing, status, reason: plan.reason, refusal, ...built, backupPath };
-}
-function withoutWayOut(message, nextStep) {
-  const ending = ` Next safe step: ${nextStep}`;
-  return message.endsWith(ending) ? message.slice(0, -ending.length) : message;
-}
-
-// src/commands/plan/plan-files.ts
-import { statSync as statSync3 } from "fs";
-import { basename as basename4, dirname as dirname11, join as join11, 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 readConfigFile(root) {
-  const path = configFilePath(root);
-  if (!existsSync9(path))
-    return null;
-  let text;
-  try {
-    text = readFileSync8(path, "utf8");
-  } catch (error) {
-    const problem = `${path}: cannot be read (${messageOf(error)})`;
-    throw new ConfigError([problem], { cause: error });
-  }
-  return parseConfigText(text, path);
-}
-function isSameDirectory(first, second) {
-  try {
-    return realpathSync5(first) === realpathSync5(second);
-  } catch {
-    return false;
-  }
-}
-function readUserConfigFile({ root, home }) {
-  if (!isAbsolute6(home)) {
-    throw new ConfigError([
-      `home directory is ${describeValue(home)}, expected an absolute path`
-    ]);
-  }
-  return isSameDirectory(root, home) ? null : readConfigFile(home);
-}
-function printWarning(message) {
-  activeOutput().warn(message);
-}
-function loadConfig(roots, cli = {}, warn = printWarning) {
-  const user = readUserConfigFile(roots);
-  const file = readConfigFile(roots.root);
-  const resolved = resolveConfig({ cli, file, user });
-  for (const warning of resolved.warnings)
-    warn(warning);
-  setActiveStoreSettings({ busyTimeoutMs: resolved.config.effortBusyTimeoutMs });
-  return resolved;
-}
-
-// src/commands/plan/plan-files.ts
-function plansDirAt(root, planDir) {
-  return { label: planDir, path: resolve4(root, planDir) };
-}
-function requireProject(context, command) {
-  if (context.project === null)
-    throw new Error(`${command} runs inside a project, and was handed none`);
-  return context.project;
-}
-function resolvePlansDir(project, command, warn) {
-  return plansDirAt(project.root, resolveProjectConfig(project, command, warn).planDir);
-}
-function resolveProjectConfig(project, command, warn) {
-  try {
-    return loadConfig({ root: project.root, home: project.home }, {}, warn).config;
-  } catch (error) {
-    if (!(error instanceof ConfigError))
-      throw error;
-    throw new CommandExit(1, [
-      `\u274C ${command}: the config cannot be used:`,
-      ...error.problems.map((problem) => `   ${problem}`)
-    ].join(`
-`));
-  }
-}
-function countTasks(tasks) {
-  const done = tasks.filter((task) => task.status === "done").length;
-  const blocked = tasks.filter((task) => task.status === "blocked").length;
-  return { total: tasks.length, done, blocked, open: tasks.length - done - blocked };
-}
-function formatCounts(counts) {
-  return `${counts.done}/${counts.total} done, ${counts.blocked} blocked, ${counts.open} open`;
-}
-function planFileName(stub, tracker) {
-  return tracker ? `PLAN_TRACKER-${stub}.md` : `PLAN-${stub}.md`;
-}
-function stubOfPlanFile(name2) {
-  const stub = /^PLAN-(.+)\.md$/.exec(name2)?.[1];
-  return stub !== undefined && isStampableStub(stub) ? stub : null;
-}
-function isFile(path) {
-  return statSync3(path, { throwIfNoEntry: false })?.isFile() ?? false;
-}
-var REJECTED_DIR = "rejected";
-function rejectedPath(path) {
-  const parent = dirname11(path);
-  return parent === "." ? join11(REJECTED_DIR, basename4(path)) : join11(parent, REJECTED_DIR, basename4(path));
-}
-function issueLine(file, issue) {
-  return `${file}:${issue.line}: ${issue.reason}: ${issue.text}`;
-}
-function plural(count2, noun) {
-  return count2 === 1 ? `${count2} ${noun}` : `${count2} ${noun}s`;
-}
-function expectNoArgument(args, usage) {
-  if (args.length === 0)
-    return;
-  throw new CommandExit(1, `\u274C Expected no argument, got ${args.length}: ${args.join(" ")}
-Usage: ${usage}`);
-}
-function expectOneArgument(args, usage) {
-  const [only] = args;
-  if (args.length === 1 && only !== undefined)
-    return only;
-  const got = args.length === 0 ? "none" : `${args.length}: ${args.join(" ")}`;
-  throw new CommandExit(1, `\u274C Expected one argument, got ${got}
-Usage: ${usage}`);
-}
-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 --${name2} takes no value, and read "${value}" as one. ${hint}`);
-}
-
-// src/commands/effort/fix-schema.ts
-var COMMAND_NAME = "rafa effort fix-schema";
-var FIX_SCHEMA_USAGE = "rafa effort fix-schema [--dry-run]";
-var DRY_RUN_FLAG = "dry-run";
-function fileStamp(date) {
-  return date.toISOString().replace(/[-:]/g, "").replace(/\.\d{3}Z$/, "Z");
-}
-function keepsIdLine(swapped) {
-  return `The ${swapped} keeps the store's id; the backup is a copy, so renamed back it takes a new id on its` + " next write.";
-}
-function refuseLiveLoop(root, isAlive) {
-  let records;
-  try {
-    records = readSessions(root, isAlive === undefined ? {} : { isAlive });
-  } catch (error) {
-    throw new CommandExit(1, `\u274C ${COMMAND_NAME}: the loop's run records cannot be read, so a live loop cannot be ruled out: ${String(error)}`);
-  }
-  const live = records.find((record) => record.state === "running" || record.state === "paused");
-  if (live === undefined)
-    return;
-  throw new CommandExit(1, `\u274C ${COMMAND_NAME}: loop session ${live.sessionId} on ${live.branch} is ${live.state} and writes the store;` + ` stop it with \`rafa loop stop -s ${live.sessionId}\` first. \`--dry-run\` runs beside it.`);
-}
-function migrationNames(result) {
-  return result.unknown.map(({ id, appliedBy }) => `${id} (applied by ${appliedBy})`).join(", ");
-}
-function rebuildLines(result) {
-  const rows = result.kept.reduce((sum, table) => sum + table.rows, 0);
-  const kept = result.kept.map((table) => `${table.table} ${String(table.rows)}`).join(", ");
-  const left = [
-    ...result.unknown.map(({ id, appliedBy }) => `migration ${id} (applied by ${appliedBy})`),
-    ...result.leftTables.map((table) => `table ${table.table} (${String(table.rows)} rows)`),
-    ...result.leftColumns.map((column) => `column ${column.table}.${column.column} (${String(column.values)} values)`)
-  ];
-  const newer = result.unknown.length === 0 ? [] : [`A rafa that knows ${result.unknown.map(({ id }) => id).join(", ")} uses the store as it is and keeps that data` + " in it; install one instead where you can."];
-  return [
-    `Refused as ${String(result.reason)}: ${String(result.refusal)}`,
-    `Rebuilds it at the ${String(result.known.length)} migrations this rafa knows, logged as applied by ${result.appliedBy}.`,
-    `Keeps ${String(result.kept.length)} tables, ${String(rows)} rows: ${kept}.`,
-    left.length === 0 ? "Leaves nothing behind." : `Leaves behind, kept only in the backup: ${left.join("; ")}.`,
-    ...newer
-  ];
-}
-function unknownAdditiveLines(result) {
-  return result.unknown.length === 0 ? [] : [`It logs ${migrationNames(result)}, which this rafa does not know; each is additive, so this rafa uses the store` + " through them."];
-}
-function renderFixSchema(result) {
-  switch (result.status) {
-    case "missing":
-      return [`No effort store at ${result.path}: nothing to repair.`];
-    case "current":
-      return [
-        `\u2705 ${result.path} is current: this rafa reads and writes it as it is. Nothing to repair.`,
-        ...unknownAdditiveLines(result)
-      ];
-    case "behind":
-      return [
-        `${result.path} is behind this rafa's migrations; the next command that opens it records` + ` ${result.pending.join(", ")}. Nothing to repair.`,
-        ...unknownAdditiveLines(result)
-      ];
-    case "would-rebuild":
-      return [
-        ...rebuildLines(result),
-        "\uD83D\uDD0D Dry run: the rebuild was built, checked (row counts, integrity_check, this rafa's schema plan) and" + " deleted. Run without `--dry-run` to swap it in."
-      ];
-    case "rebuilt":
-      return [
-        ...rebuildLines(result),
-        `\u2705 Rebuilt at this rafa's migrations. Every row the original held is copied to ${String(result.backupPath)}.` + ` ${keepsIdLine("rebuild")}`
-      ];
-  }
-}
-function runFixSchema(context, seams) {
-  expectNoArgument(context.args, FIX_SCHEMA_USAGE);
-  const dryRun = readSwitch(DRY_RUN_FLAG, context.flags[DRY_RUN_FLAG], `Usage: ${FIX_SCHEMA_USAGE}`);
-  if (context.project === null)
-    throw new Error(`${COMMAND_NAME} runs inside a project, and was handed none`);
-  const root = context.project.root;
-  if (!dryRun)
-    refuseLiveLoop(root, seams.isAlive);
-  const now = seams.now ?? (() => new Date);
-  let result;
-  try {
-    result = fixStoreSchema({
-      path: sqliteStorePath(root),
-      dryRun,
-      stamp: fileStamp(now()),
-      now,
-      ...seams.identity === undefined ? {} : { identity: seams.identity }
-    });
-  } catch (error) {
-    if (error instanceof RebuildRefusal)
-      throw new CommandExit(1, `\u274C ${COMMAND_NAME}: ${error.message}`);
-    throw error;
-  }
-  if (context.outputMode === "json") {
-    context.output.result(result);
-    return;
-  }
-  for (const line of renderFixSchema(result))
-    context.output.info(line);
-}
-function createFixSchemaCommand(seams = {}) {
-  const command = {
-    name: "effort fix-schema",
-    subject: "effort",
-    action: "fix-schema",
-    summary: "rebuild an effort store this rafa refuses at the migrations it knows, keeping the original",
-    description: "Repairs `.rafa/effort/effort.sqlite`, or the store under `RAFA_EFFORT_DIR`, when this rafa refuses" + " it for a reason a rebuild repairs: no migration log past the legacy entries (pre-log-unreleased), a log" + " with a schema version it does not match (gate-mismatch), a logged checksum this rafa holds otherwise" + " (edited), or a logged migration this rafa does not know that breaks older readers or writers" + " (unknown-breaks-readers, unknown-breaks-writers). Installing a rafa that knows the store's migrations" + " comes first where one exists. It builds a parallel store beside it at this rafa's migrations, with a" + " migration log naming this rafa, copies every table and column this rafa knows, checks the row counts," + " SQLite's integrity_check and the schema plan, and lists what only the newer schema holds, unknown" + " migrations included. Then it writes the original to `effort.sqlite.v<user_version>-<stamp>.bak`," + " whole, and moves the rebuild into its place. The rebuild keeps the store's id; the backup is a copy," + " so renamed back it takes a new id on its next write. A store this rafa uses, current or behind, or no store, is" + " left alone. It refuses, changing nothing, while a loop session under the project is running or paused," + " from a development build, while a journal beside the store shows a write in flight, when the newer" + " schema lacks a table or column this rafa writes, and on a refusal a rebuild does not repair. With" + " `--output=json` the outcome is the data of the terminal result event. Starts no session.",
-    args: [],
-    flags: [
-      {
-        name: DRY_RUN_FLAG,
-        description: "Build and check the rebuild, print what it keeps and leaves behind, then delete it. The" + " live store is only read, so this runs beside a live loop and from a development build, and can be" + " repeated.",
-        type: "boolean"
-      }
-    ],
-    examples: [
-      {
-        cmd: "rafa effort fix-schema --dry-run",
-        note: "Prints what a rebuild would keep and leave behind, changing nothing."
-      },
-      {
-        cmd: "rafa effort fix-schema",
-        note: "Swaps the rebuild in and prints where the original was kept."
-      }
-    ],
-    outputs: ["text", "json"],
-    run: async (context) => {
-      runFixSchema(context, seams);
-      await Promise.resolve();
-    }
-  };
-  return Object.freeze(command);
-}
-var fix_schema_default = createFixSchemaCommand();
-
-// src/effort/store/merge-store.ts
-import { randomUUID as randomUUID5 } from "crypto";
-import { existsSync as existsSync10, mkdtempSync, rmSync as rmSync7 } from "fs";
-import { tmpdir as tmpdir3 } from "os";
-import { dirname as dirname12, join as join12 } from "path";
-import { Database as Database5, SQLiteError as SQLiteError2 } from "bun:sqlite";
 
 // src/effort/commits.ts
 import { execFileSync } from "child_process";
@@ -3085,6 +2755,7 @@ var MERGE_RULES = {
   plan_ci: appendOnly("pr", "head_sha", "read_at"),
   schema_migrations: { scope: "local" },
   store_meta: { scope: "local" },
+  store_replaced: { scope: "local" },
   merges: { scope: "local" },
   merge_conflicts: { scope: "local" }
 };
@@ -3288,7 +2959,7 @@ class MergeRefusal extends RebuildRefusal {
     this.reason = reason;
   }
 }
-var LIVE2 = "live";
+var LIVE = "live";
 var MERGES_TABLE = "merges";
 var INSERT_MERGE = `INSERT INTO merges (id, other_store, merged_at, rows_added, rows_skipped, rows_in_conflict)
   VALUES (?, ?, ?, ?, ?, ?)`;
@@ -3299,7 +2970,7 @@ function refuseNdjson(backend) {
   throw new MergeRefusal("ndjson", `REFUSED \u2014 this project keeps its sessions and commits as NDJSON (store: ndjson), and a merge needs the SQLite store. ${NOTHING_MERGED}` + ` Next safe step: ${MOVE_TO_SQLITE}`);
 }
 function refuseMissing(path, which) {
-  if (existsSync10(path))
+  if (existsSync8(path))
     return;
   throw new MergeRefusal("missing", `REFUSED \u2014 ${which} ${path} is not there. ${NOTHING_MERGED}`);
 }
@@ -3338,14 +3009,14 @@ function recordedMeta(path) {
 }
 function refuseOtherProject(options) {
   const other = recordedMeta(options.otherPath);
-  const here = recordedMeta(options.path)?.projectRootCommit ?? (options.readProject ?? readProjectIdentity)(dirname12(options.path)).rootCommit;
+  const here = recordedMeta(options.path)?.projectRootCommit ?? (options.readProject ?? readProjectIdentity)(dirname11(options.path)).rootCommit;
   const there = other?.projectRootCommit ?? null;
   if (here !== null && there !== null && here !== there) {
     throw new MergeRefusal("other-project", `REFUSED \u2014 ${options.otherPath} is the effort store of another project (root commit ${there});` + ` this store's project has root commit ${here}. ${NOTHING_MERGED}`);
   }
   return other?.storeId ?? null;
 }
-function refuseLiveLoop2(path, options, sessionId) {
+function refuseLiveLoop(path, options, sessionId) {
   const loop = liveLoop(path, options, NOTHING_MERGED, sessionId);
   if (loop === undefined)
     return;
@@ -3357,13 +3028,13 @@ function openOther(otherPath, plan, stamp) {
     const db = new Database5(otherPath, { readonly: true });
     return { db, broughtForward: [], release: () => db.close() };
   }
-  const dir = mkdtempSync(join12(tmpdir3(), "rafa-merge-other-"));
+  const dir = mkdtempSync(join11(tmpdir3(), "rafa-merge-other-"));
   const release = (db) => {
     db?.close();
     rmSync7(dir, { recursive: true, force: true });
   };
   try {
-    const copyPath = join12(dir, "other.sqlite");
+    const copyPath = join11(dir, "other.sqlite");
     vacuumInto(otherPath, copyPath);
     const db = new Database5(copyPath, { readwrite: true });
     try {
@@ -3413,10 +3084,10 @@ function buildMerged(path, parallelPath, other, merge2) {
   try {
     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 ${LIVE2}`, [path]);
-    const live = new Set(tableNames(db, LIVE2));
-    checkedCounts(db, tableNames(db, "main").filter((table) => live.has(table)), LIVE2, addedRows(merged));
-    db.run(`DETACH DATABASE ${LIVE2}`);
+    db.run(`ATTACH DATABASE ? AS ${LIVE}`, [path]);
+    const live = new Set(tableNames(db, LIVE));
+    checkedCounts(db, tableNames(db, "main").filter((table) => live.has(table)), LIVE, addedRows(merged));
+    db.run(`DETACH DATABASE ${LIVE}`);
     refuseCorrupt(db);
     refuseUnusable(db, parallelPath, merge2.stamp.migrations);
     return merged;
@@ -3437,7 +3108,7 @@ function refuseUnmergeable(options, migrations) {
   const otherStore = refuseOtherProject(options);
   if (!options.dryRun) {
     refuseUnownedDevelopmentWrite(path, [...writeNames(localPlan), MERGES_TABLE], options);
-    refuseLiveLoop2(path, options, options.sessionId ?? null);
+    refuseLiveLoop(path, options, options.sessionId ?? null);
   }
   return { otherPlan, otherStore };
 }
@@ -3485,7 +3156,7 @@ function refuseUncarriable(backend, source) {
   if (backend === "ndjson") {
     throw new FileSyncRefusal(`${REFUSAL}: this project keeps its sessions and commits as NDJSON (store: ndjson), and the file carried` + ` is effort.sqlite, which would hold none of them. ${NOTHING_COPIED} Next safe step: ${MOVE_TO_SQLITE}`);
   }
-  if (!existsSync11(join13(source, SQLITE_STORE_FILE_NAME))) {
+  if (!existsSync9(join12(source, SQLITE_STORE_FILE_NAME))) {
     throw new FileSyncRefusal(`${REFUSAL}: no ${SQLITE_STORE_FILE_NAME} in ${source}. ${NOTHING_COPIED}`);
   }
 }
@@ -3499,15 +3170,15 @@ function createFileSync(options) {
   const now = options.now ?? (() => new Date);
   const storeDir = () => effortStoreDir(repoRoot, options.env);
   const push = async ({ to }) => {
-    const target = resolve5(repoRoot, requirePath("to", to));
+    const target = resolve4(repoRoot, requirePath("to", to));
     const source = storeDir();
     refuseUncarriable(backend, source);
     const copied = copyEffortStore({ source, target });
-    return Object.freeze({ status: "pushed", path: join13(copied.directory, SQLITE_STORE_FILE_NAME) });
+    return Object.freeze({ status: "pushed", path: join12(copied.directory, SQLITE_STORE_FILE_NAME) });
   };
   const pull = async ({ from, dryRun, sessionId = null }) => {
-    const otherPath = resolve5(repoRoot, requirePath("from", from));
-    const path = join13(storeDir(), SQLITE_STORE_FILE_NAME);
+    const otherPath = resolve4(repoRoot, requirePath("from", from));
+    const path = join12(storeDir(), SQLITE_STORE_FILE_NAME);
     const stamp = fileStamp(now());
     const merge2 = mergeStore({ ...mergeSeams(options), path, otherPath, backend, dryRun, stamp, now, sessionId });
     return Object.freeze({ status: "pulled", merge: merge2 });
@@ -3576,304 +3247,61 @@ function selectSync(repoRoot, config, registry = CORE_ADAPTER_REGISTRY) {
 
 // src/adapters/learning/local.ts
 import { appendFile, mkdir, readFile, rm, writeFile } from "fs/promises";
-import { join as join16 } from "path";
-
-// src/commands/instinct/instinct-records.ts
-import { readdirSync as readdirSync4, readFileSync as readFileSync9, statSync as statSync5 } from "fs";
 import { join as join15 } from "path";
 
-// src/check/layout.ts
-import { readdirSync as readdirSync3, statSync as statSync4 } from "fs";
-import { join as join14, relative as relative2 } from "path";
-var SKILL_FILE = "SKILL.md";
-var MARKDOWN_EXTENSION = ".md";
-var LAYOUT_SEVERITY = Object.freeze({
-  "flat-grouped-layout": "failure",
-  "nested-group-layout": "failure",
-  "loose-file": "failure",
-  "missing-skill-file": "failure",
-  "nested-instinct-file": "failure",
-  "unreadable-entry": "failure",
-  "name-mismatch": "failure",
-  "dotfile-only-directory": "warning"
-});
-function layoutIssue(code, message) {
-  return { code, severity: LAYOUT_SEVERITY[code], message };
+// src/schema/frontmatter.ts
+var FRONTMATTER_FENCE = "---";
+var FRONTMATTER_INDENT = 2;
+function scanLine(text, offset) {
+  const index = text.indexOf(`
+`, offset);
+  if (index === -1) {
+    return { line: text.slice(offset), newline: "", next: text.length };
+  }
+  const carriage = index > offset && text[index - 1] === "\r";
+  const end = carriage ? index - 1 : index;
+  return {
+    line: text.slice(offset, end),
+    newline: text.slice(end, index + 1),
+    next: index + 1
+  };
 }
-function entryKind(path) {
+function isRecord3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseBlock(yaml) {
+  let parsed;
   try {
-    const stats = statSync4(path);
-    if (stats.isFile())
-      return "file";
-    if (stats.isDirectory())
-      return "directory";
-    return null;
+    parsed = Bun.YAML.parse(yaml.replace(/\r\n/g, `
+`));
   } catch {
     return null;
   }
+  return isRecord3(parsed) ? parsed : null;
 }
-function visibleNames(dir) {
-  return readdirSync3(dir).filter((name2) => !name2.startsWith(".")).sort((left, right) => left.localeCompare(right));
-}
-function isMarkdown(name2) {
-  return name2.endsWith(MARKDOWN_EXTENSION);
+function readFrontmatterDocument(text) {
+  const opening = scanLine(text, 0);
+  if (opening.line !== FRONTMATTER_FENCE || opening.newline === "")
+    return null;
+  let offset = opening.next;
+  while (offset < text.length) {
+    const scanned = scanLine(text, offset);
+    if (scanned.line === FRONTMATTER_FENCE) {
+      const data = parseBlock(text.slice(opening.next, offset));
+      return data === null ? null : {
+        data,
+        yaml: text.slice(opening.next, offset),
+        body: text.slice(scanned.next),
+        newline: opening.newline,
+        closingNewline: scanned.newline
+      };
+    }
+    offset = scanned.next;
+  }
+  return null;
 }
-function markdownStem(name2) {
-  return name2.slice(0, -MARKDOWN_EXTENSION.length);
-}
-function shown(root, path) {
-  return relative2(root, path) || ".";
-}
-function dotfileOnlyEntry(kind, root, dir) {
-  return {
-    kind,
-    path: dir,
-    isFile: false,
-    shape: "dotfile-only",
-    name: null,
-    issues: [layoutIssue("dotfile-only-directory", `${shown(root, dir)}/ holds nothing but dotfiles, so it registers nothing`)]
-  };
-}
-function unreadableEntry(kind, root, path) {
-  return {
-    kind,
-    path,
-    isFile: false,
-    shape: "unreadable",
-    name: null,
-    issues: [layoutIssue("unreadable-entry", `${shown(root, path)} cannot be read (a broken symlink, or a path stat refuses)`)]
-  };
-}
-function skillFileEntry(path, name2) {
-  return { kind: "skill", path, isFile: true, shape: "skill-file", name: name2, issues: [] };
-}
-function flatGroupedEntry(root, path, name2) {
-  return {
-    kind: "skill",
-    path,
-    isFile: true,
-    shape: "flat-grouped",
-    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, name2) {
-  return {
-    kind: "skill",
-    path,
-    isFile: true,
-    shape: "nested-group",
-    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, name2) {
-  return {
-    kind: "skill",
-    path,
-    isFile: true,
-    shape: "loose-file",
-    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) {
-  return {
-    kind: "skill",
-    path: dir,
-    isFile: false,
-    shape: "no-skill-file",
-    name: null,
-    issues: [layoutIssue("missing-skill-file", `${shown(root, dir)}/ holds no ${SKILL_FILE}, so it registers no skill`)]
-  };
-}
-function nestedInstinctEntry(root, path, name2) {
-  return {
-    kind: "instinct",
-    path,
-    isFile: true,
-    shape: "nested-instinct",
-    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, name2) {
-  const children = visibleNames(dir);
-  if (children.length === 0)
-    return [dotfileOnlyEntry("skill", root, dir)];
-  const skillPath = join14(dir, SKILL_FILE);
-  if (children.includes(SKILL_FILE) && entryKind(skillPath) === "file") {
-    return [nestedGroupEntry(root, skillPath, name2)];
-  }
-  return [noSkillFileEntry(root, dir)];
-}
-function scanSkillGroup(root, dir, children) {
-  const entries = [];
-  for (const child of children) {
-    const path = join14(dir, child);
-    const found = entryKind(path);
-    if (found === null) {
-      entries.push(unreadableEntry("skill", root, path));
-      continue;
-    }
-    if (found === "directory") {
-      entries.push(...scanGroupMember(root, path, child));
-      continue;
-    }
-    if (isMarkdown(child))
-      entries.push(flatGroupedEntry(root, path, markdownStem(child)));
-  }
-  if (entries.length === 0)
-    return [noSkillFileEntry(root, dir)];
-  return entries;
-}
-function scanSkillDirectory(root, dir, name2) {
-  const children = visibleNames(dir);
-  if (children.length === 0)
-    return [dotfileOnlyEntry("skill", root, dir)];
-  const skillPath = join14(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 name2 of visibleNames(root)) {
-    const path = join14(root, name2);
-    const found = entryKind(path);
-    if (found === null) {
-      entries.push(unreadableEntry("skill", root, path));
-      continue;
-    }
-    if (found === "directory") {
-      entries.push(...scanSkillDirectory(root, path, name2));
-      continue;
-    }
-    if (isMarkdown(name2))
-      entries.push(looseFileEntry(root, path, markdownStem(name2)));
-  }
-  return entries;
-}
-function scanInstinctSubdirectory(root, dir) {
-  const children = visibleNames(dir);
-  if (children.length === 0)
-    return [dotfileOnlyEntry("instinct", root, dir)];
-  const entries = [];
-  for (const child of children) {
-    const path = join14(dir, child);
-    const found = entryKind(path);
-    if (found === null) {
-      entries.push(unreadableEntry("instinct", root, path));
-      continue;
-    }
-    if (found === "directory") {
-      entries.push(...scanInstinctSubdirectory(root, path));
-      continue;
-    }
-    if (isMarkdown(child))
-      entries.push(nestedInstinctEntry(root, path, markdownStem(child)));
-  }
-  return entries;
-}
-function scanInstinctRoot(root) {
-  const entries = [];
-  for (const name2 of visibleNames(root)) {
-    const path = join14(root, name2);
-    const found = entryKind(path);
-    if (found === null) {
-      entries.push(unreadableEntry("instinct", root, path));
-      continue;
-    }
-    if (found === "directory") {
-      entries.push(...scanInstinctSubdirectory(root, path));
-      continue;
-    }
-    if (!isMarkdown(name2))
-      continue;
-    entries.push({
-      kind: "instinct",
-      path,
-      isFile: true,
-      shape: "instinct-file",
-      name: markdownStem(name2),
-      issues: []
-    });
-  }
-  return entries;
-}
-function scanLayout(root, kind) {
-  if (entryKind(root) !== "directory") {
-    throw new Error(`check layout: no ${kind} directory at ${root}`);
-  }
-  const entries = kind === "skill" ? scanSkillRoot(root) : scanInstinctRoot(root);
-  return {
-    kind,
-    root,
-    entries: entries.sort((left, right) => left.path.localeCompare(right.path))
-  };
-}
-function declaredNameIssue(entry, declared) {
-  if (entry.name === null || declared === null || declared === entry.name)
-    return null;
-  const field2 = entry.kind === "skill" ? "name" : "id";
-  const source = entry.kind === "skill" ? "directory name" : "file name";
-  return layoutIssue("name-mismatch", `frontmatter ${field2} "${declared}" is not the ${source} "${entry.name}"`);
-}
-
-// src/schema/frontmatter.ts
-var FRONTMATTER_FENCE = "---";
-var FRONTMATTER_INDENT = 2;
-function scanLine(text, offset) {
-  const index = text.indexOf(`
-`, offset);
-  if (index === -1) {
-    return { line: text.slice(offset), newline: "", next: text.length };
-  }
-  const carriage = index > offset && text[index - 1] === "\r";
-  const end = carriage ? index - 1 : index;
-  return {
-    line: text.slice(offset, end),
-    newline: text.slice(end, index + 1),
-    next: index + 1
-  };
-}
-function isRecord3(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function parseBlock(yaml) {
-  let parsed;
-  try {
-    parsed = Bun.YAML.parse(yaml.replace(/\r\n/g, `
-`));
-  } catch {
-    return null;
-  }
-  return isRecord3(parsed) ? parsed : null;
-}
-function readFrontmatterDocument(text) {
-  const opening = scanLine(text, 0);
-  if (opening.line !== FRONTMATTER_FENCE || opening.newline === "")
-    return null;
-  let offset = opening.next;
-  while (offset < text.length) {
-    const scanned = scanLine(text, offset);
-    if (scanned.line === FRONTMATTER_FENCE) {
-      const data = parseBlock(text.slice(opening.next, offset));
-      return data === null ? null : {
-        data,
-        yaml: text.slice(opening.next, offset),
-        body: text.slice(scanned.next),
-        newline: opening.newline,
-        closingNewline: scanned.newline
-      };
-    }
-    offset = scanned.next;
-  }
-  return null;
-}
-function readFrontmatter(text) {
-  return readFrontmatterDocument(text)?.data ?? null;
+function readFrontmatter(text) {
+  return readFrontmatterDocument(text)?.data ?? null;
 }
 function renderFrontmatter(data, newline = `
 `) {
@@ -4103,123 +3531,366 @@ function checkInstinctFrontmatter(data) {
     ...checkStoredHash(data)
   ];
 }
-function isFence(line) {
-  return /^\s*(?:```|~~~)/.test(line);
+function isFence(line) {
+  return /^\s*(?:```|~~~)/.test(line);
+}
+function sectionText(body, heading) {
+  const lines = body.split(`
+`).map((line) => line.replace(/\r$/, ""));
+  const collected = [];
+  let fenced = false;
+  let inside = false;
+  for (const line of lines) {
+    if (isFence(line))
+      fenced = !fenced;
+    else if (!fenced && /^##\s/.test(line)) {
+      if (inside)
+        break;
+      inside = line.trim() === heading;
+      continue;
+    }
+    if (inside)
+      collected.push(line);
+  }
+  return inside ? collected.join(`
+`).trim() : null;
+}
+function checkSection(body, heading) {
+  const text = sectionText(body, heading);
+  if (text === null) {
+    return [issue("missing-section", heading, `the body carries no ${heading} section`)];
+  }
+  return text === "" ? [issue("missing-section", heading, `the ${heading} section is empty`)] : [];
+}
+function checkInstinctBody(body) {
+  return [...checkSection(body, ACTION_HEADING), ...checkSection(body, CAUSE_HEADING)];
+}
+function parseInstinct(text) {
+  const document = readFrontmatterDocument(text);
+  if (document === null) {
+    return {
+      issues: [issue("missing-frontmatter", "frontmatter", "the file opens with no --- block holding a YAML mapping")],
+      instinct: null
+    };
+  }
+  const issues = [
+    ...checkInstinctFrontmatter(document.data),
+    ...checkInstinctBody(document.body)
+  ];
+  return issues.length > 0 ? { issues, instinct: null } : { issues, instinct: buildInstinct(document.data, document.body) };
+}
+function buildInstinct(data, body) {
+  const action = sectionText(body, ACTION_HEADING) ?? "";
+  const artifact = typeof data["artifact"] === "string" && data["artifact"].trim() !== "" ? data["artifact"] : null;
+  return {
+    id: data["id"],
+    trigger: data["trigger"],
+    kind: data["kind"],
+    domain: data["domain"],
+    confidence: data["confidence"],
+    usageCount: typeof data["usage_count"] === "number" ? data["usage_count"] : DEFAULT_USAGE_COUNT,
+    sources: Array.isArray(data["sources"]) ? data["sources"] : [],
+    artifact,
+    signal: data["signal"],
+    scope: data["scope"],
+    projectId: typeof data["project_id"] === "string" ? data["project_id"] : null,
+    source: data["source"],
+    evidence: Array.isArray(data["evidence"]) ? data["evidence"] : [],
+    promotedTo: typeof data["promoted_to"] === "string" ? data["promoted_to"] : null,
+    createdAt: data["created_at"],
+    updatedAt: data["updated_at"],
+    action,
+    cause: sectionText(body, CAUSE_HEADING) ?? "",
+    actionHash: actionHash(action)
+  };
+}
+function instinctFrontmatter(instinct) {
+  const written = {
+    id: instinct.id,
+    trigger: instinct.trigger,
+    kind: instinct.kind,
+    domain: instinct.domain,
+    confidence: instinct.confidence,
+    usage_count: instinct.usageCount,
+    signal: instinct.signal,
+    scope: instinct.scope,
+    source: instinct.source,
+    created_at: instinct.createdAt,
+    updated_at: instinct.updatedAt
+  };
+  if (instinct.artifact !== null)
+    written["artifact"] = instinct.artifact;
+  if (instinct.projectId !== null)
+    written["project_id"] = instinct.projectId;
+  if (instinct.evidence.length > 0)
+    written["evidence"] = instinct.evidence;
+  if (instinct.sources.length > 0)
+    written["sources"] = instinct.sources;
+  if (instinct.promotedTo !== null)
+    written["promoted_to"] = instinct.promotedTo;
+  return Object.fromEntries(INSTINCT_KEY_ORDER.filter((key) => Object.hasOwn(written, key)).map((key) => [key, written[key]]));
+}
+function writeInstinct(instinct, newline = `
+`) {
+  const block = renderFrontmatter(instinctFrontmatter(instinct), newline);
+  return [
+    "---",
+    block,
+    "---",
+    "",
+    ACTION_HEADING,
+    instinct.action,
+    "",
+    CAUSE_HEADING,
+    instinct.cause,
+    ""
+  ].join(newline);
+}
+
+// src/schema/scope-records.ts
+import { readdirSync as readdirSync4, readFileSync as readFileSync8, statSync as statSync4 } from "fs";
+import { join as join14 } from "path";
+
+// src/check/layout.ts
+import { readdirSync as readdirSync3, statSync as statSync3 } from "fs";
+import { join as join13, relative as relative2 } from "path";
+var SKILL_FILE = "SKILL.md";
+var MARKDOWN_EXTENSION = ".md";
+var LAYOUT_SEVERITY = Object.freeze({
+  "flat-grouped-layout": "failure",
+  "nested-group-layout": "failure",
+  "loose-file": "failure",
+  "missing-skill-file": "failure",
+  "nested-instinct-file": "failure",
+  "unreadable-entry": "failure",
+  "name-mismatch": "failure",
+  "dotfile-only-directory": "warning"
+});
+function layoutIssue(code, message) {
+  return { code, severity: LAYOUT_SEVERITY[code], message };
+}
+function entryKind(path) {
+  try {
+    const stats = statSync3(path);
+    if (stats.isFile())
+      return "file";
+    if (stats.isDirectory())
+      return "directory";
+    return null;
+  } catch {
+    return null;
+  }
+}
+function visibleNames(dir) {
+  return readdirSync3(dir).filter((name2) => !name2.startsWith(".")).sort((left, right) => left.localeCompare(right));
+}
+function isMarkdown(name2) {
+  return name2.endsWith(MARKDOWN_EXTENSION);
+}
+function markdownStem(name2) {
+  return name2.slice(0, -MARKDOWN_EXTENSION.length);
+}
+function shown(root, path) {
+  return relative2(root, path) || ".";
+}
+function dotfileOnlyEntry(kind, root, dir) {
+  return {
+    kind,
+    path: dir,
+    isFile: false,
+    shape: "dotfile-only",
+    name: null,
+    issues: [layoutIssue("dotfile-only-directory", `${shown(root, dir)}/ holds nothing but dotfiles, so it registers nothing`)]
+  };
+}
+function unreadableEntry(kind, root, path) {
+  return {
+    kind,
+    path,
+    isFile: false,
+    shape: "unreadable",
+    name: null,
+    issues: [layoutIssue("unreadable-entry", `${shown(root, path)} cannot be read (a broken symlink, or a path stat refuses)`)]
+  };
+}
+function skillFileEntry(path, name2) {
+  return { kind: "skill", path, isFile: true, shape: "skill-file", name: name2, issues: [] };
+}
+function flatGroupedEntry(root, path, name2) {
+  return {
+    kind: "skill",
+    path,
+    isFile: true,
+    shape: "flat-grouped",
+    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, name2) {
+  return {
+    kind: "skill",
+    path,
+    isFile: true,
+    shape: "nested-group",
+    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, name2) {
+  return {
+    kind: "skill",
+    path,
+    isFile: true,
+    shape: "loose-file",
+    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) {
+  return {
+    kind: "skill",
+    path: dir,
+    isFile: false,
+    shape: "no-skill-file",
+    name: null,
+    issues: [layoutIssue("missing-skill-file", `${shown(root, dir)}/ holds no ${SKILL_FILE}, so it registers no skill`)]
+  };
+}
+function nestedInstinctEntry(root, path, name2) {
+  return {
+    kind: "instinct",
+    path,
+    isFile: true,
+    shape: "nested-instinct",
+    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, name2) {
+  const children = visibleNames(dir);
+  if (children.length === 0)
+    return [dotfileOnlyEntry("skill", root, dir)];
+  const skillPath = join13(dir, SKILL_FILE);
+  if (children.includes(SKILL_FILE) && entryKind(skillPath) === "file") {
+    return [nestedGroupEntry(root, skillPath, name2)];
+  }
+  return [noSkillFileEntry(root, dir)];
+}
+function scanSkillGroup(root, dir, children) {
+  const entries = [];
+  for (const child of children) {
+    const path = join13(dir, child);
+    const found = entryKind(path);
+    if (found === null) {
+      entries.push(unreadableEntry("skill", root, path));
+      continue;
+    }
+    if (found === "directory") {
+      entries.push(...scanGroupMember(root, path, child));
+      continue;
+    }
+    if (isMarkdown(child))
+      entries.push(flatGroupedEntry(root, path, markdownStem(child)));
+  }
+  if (entries.length === 0)
+    return [noSkillFileEntry(root, dir)];
+  return entries;
+}
+function scanSkillDirectory(root, dir, name2) {
+  const children = visibleNames(dir);
+  if (children.length === 0)
+    return [dotfileOnlyEntry("skill", root, dir)];
+  const skillPath = join13(dir, SKILL_FILE);
+  if (children.includes(SKILL_FILE) && entryKind(skillPath) === "file") {
+    return [skillFileEntry(skillPath, name2)];
+  }
+  return scanSkillGroup(root, dir, children);
 }
-function sectionText(body, heading) {
-  const lines = body.split(`
-`).map((line) => line.replace(/\r$/, ""));
-  const collected = [];
-  let fenced = false;
-  let inside = false;
-  for (const line of lines) {
-    if (isFence(line))
-      fenced = !fenced;
-    else if (!fenced && /^##\s/.test(line)) {
-      if (inside)
-        break;
-      inside = line.trim() === heading;
+function scanSkillRoot(root) {
+  const entries = [];
+  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 (inside)
-      collected.push(line);
+    if (found === "directory") {
+      entries.push(...scanSkillDirectory(root, path, name2));
+      continue;
+    }
+    if (isMarkdown(name2))
+      entries.push(looseFileEntry(root, path, markdownStem(name2)));
   }
-  return inside ? collected.join(`
-`).trim() : null;
+  return entries;
 }
-function checkSection(body, heading) {
-  const text = sectionText(body, heading);
-  if (text === null) {
-    return [issue("missing-section", heading, `the body carries no ${heading} section`)];
+function scanInstinctSubdirectory(root, dir) {
+  const children = visibleNames(dir);
+  if (children.length === 0)
+    return [dotfileOnlyEntry("instinct", root, dir)];
+  const entries = [];
+  for (const child of children) {
+    const path = join13(dir, child);
+    const found = entryKind(path);
+    if (found === null) {
+      entries.push(unreadableEntry("instinct", root, path));
+      continue;
+    }
+    if (found === "directory") {
+      entries.push(...scanInstinctSubdirectory(root, path));
+      continue;
+    }
+    if (isMarkdown(child))
+      entries.push(nestedInstinctEntry(root, path, markdownStem(child)));
   }
-  return text === "" ? [issue("missing-section", heading, `the ${heading} section is empty`)] : [];
-}
-function checkInstinctBody(body) {
-  return [...checkSection(body, ACTION_HEADING), ...checkSection(body, CAUSE_HEADING)];
+  return entries;
 }
-function parseInstinct(text) {
-  const document = readFrontmatterDocument(text);
-  if (document === null) {
-    return {
-      issues: [issue("missing-frontmatter", "frontmatter", "the file opens with no --- block holding a YAML mapping")],
-      instinct: null
-    };
+function scanInstinctRoot(root) {
+  const entries = [];
+  for (const name2 of visibleNames(root)) {
+    const path = join13(root, name2);
+    const found = entryKind(path);
+    if (found === null) {
+      entries.push(unreadableEntry("instinct", root, path));
+      continue;
+    }
+    if (found === "directory") {
+      entries.push(...scanInstinctSubdirectory(root, path));
+      continue;
+    }
+    if (!isMarkdown(name2))
+      continue;
+    entries.push({
+      kind: "instinct",
+      path,
+      isFile: true,
+      shape: "instinct-file",
+      name: markdownStem(name2),
+      issues: []
+    });
   }
-  const issues = [
-    ...checkInstinctFrontmatter(document.data),
-    ...checkInstinctBody(document.body)
-  ];
-  return issues.length > 0 ? { issues, instinct: null } : { issues, instinct: buildInstinct(document.data, document.body) };
+  return entries;
 }
-function buildInstinct(data, body) {
-  const action = sectionText(body, ACTION_HEADING) ?? "";
-  const artifact = typeof data["artifact"] === "string" && data["artifact"].trim() !== "" ? data["artifact"] : null;
+function scanLayout(root, kind) {
+  if (entryKind(root) !== "directory") {
+    throw new Error(`check layout: no ${kind} directory at ${root}`);
+  }
+  const entries = kind === "skill" ? scanSkillRoot(root) : scanInstinctRoot(root);
   return {
-    id: data["id"],
-    trigger: data["trigger"],
-    kind: data["kind"],
-    domain: data["domain"],
-    confidence: data["confidence"],
-    usageCount: typeof data["usage_count"] === "number" ? data["usage_count"] : DEFAULT_USAGE_COUNT,
-    sources: Array.isArray(data["sources"]) ? data["sources"] : [],
-    artifact,
-    signal: data["signal"],
-    scope: data["scope"],
-    projectId: typeof data["project_id"] === "string" ? data["project_id"] : null,
-    source: data["source"],
-    evidence: Array.isArray(data["evidence"]) ? data["evidence"] : [],
-    promotedTo: typeof data["promoted_to"] === "string" ? data["promoted_to"] : null,
-    createdAt: data["created_at"],
-    updatedAt: data["updated_at"],
-    action,
-    cause: sectionText(body, CAUSE_HEADING) ?? "",
-    actionHash: actionHash(action)
-  };
-}
-function instinctFrontmatter(instinct) {
-  const written = {
-    id: instinct.id,
-    trigger: instinct.trigger,
-    kind: instinct.kind,
-    domain: instinct.domain,
-    confidence: instinct.confidence,
-    usage_count: instinct.usageCount,
-    signal: instinct.signal,
-    scope: instinct.scope,
-    source: instinct.source,
-    created_at: instinct.createdAt,
-    updated_at: instinct.updatedAt
+    kind,
+    root,
+    entries: entries.sort((left, right) => left.path.localeCompare(right.path))
   };
-  if (instinct.artifact !== null)
-    written["artifact"] = instinct.artifact;
-  if (instinct.projectId !== null)
-    written["project_id"] = instinct.projectId;
-  if (instinct.evidence.length > 0)
-    written["evidence"] = instinct.evidence;
-  if (instinct.sources.length > 0)
-    written["sources"] = instinct.sources;
-  if (instinct.promotedTo !== null)
-    written["promoted_to"] = instinct.promotedTo;
-  return Object.fromEntries(INSTINCT_KEY_ORDER.filter((key) => Object.hasOwn(written, key)).map((key) => [key, written[key]]));
 }
-function writeInstinct(instinct, newline = `
-`) {
-  const block = renderFrontmatter(instinctFrontmatter(instinct), newline);
-  return [
-    "---",
-    block,
-    "---",
-    "",
-    ACTION_HEADING,
-    instinct.action,
-    "",
-    CAUSE_HEADING,
-    instinct.cause,
-    ""
-  ].join(newline);
+function declaredNameIssue(entry, declared) {
+  if (entry.name === null || declared === null || declared === entry.name)
+    return null;
+  const field2 = entry.kind === "skill" ? "name" : "id";
+  const source = entry.kind === "skill" ? "directory name" : "file name";
+  return layoutIssue("name-mismatch", `frontmatter ${field2} "${declared}" is not the ${source} "${entry.name}"`);
 }
 
-// src/commands/instinct/instinct-records.ts
+// src/schema/scope-records.ts
 function isRecordFile(name2) {
   return !name2.startsWith(".") && name2.endsWith(MARKDOWN_EXTENSION) && name2 !== MARKDOWN_EXTENSION;
 }
@@ -4232,7 +3903,7 @@ function unreadableIssue(message) {
 function readRecord(path, scope, id) {
   let text;
   try {
-    text = readFileSync9(path, "utf8");
+    text = readFileSync8(path, "utf8");
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     return { scope, path, id, instinct: null, issues: [unreadableIssue(message)] };
@@ -4240,15 +3911,15 @@ function readRecord(path, scope, id) {
   const parsed = parseInstinct(text);
   return { scope, path, id, instinct: parsed.instinct, issues: parsed.issues };
 }
-function isFile2(path) {
+function isFile(path) {
   try {
-    return statSync5(path).isFile();
+    return statSync4(path).isFile();
   } catch {
     return false;
   }
 }
 function recordFiles(dir) {
-  return readdirSync4(dir).filter((name2) => isRecordFile(name2) && isFile2(join15(dir, name2))).sort((left, right) => left.localeCompare(right));
+  return readdirSync4(dir).filter((name2) => isRecordFile(name2) && isFile(join14(dir, name2))).sort((left, right) => left.localeCompare(right));
 }
 function readScope(scope, dir) {
   if (!tierExists(dir))
@@ -4257,7 +3928,7 @@ function readScope(scope, dir) {
     scope,
     dir,
     exists: true,
-    records: recordFiles(dir).map((name2) => readRecord(join15(dir, name2), scope, recordId(name2)))
+    records: recordFiles(dir).map((name2) => readRecord(join14(dir, name2), scope, recordId(name2)))
   };
 }
 function readScopes(seams) {
@@ -4549,7 +4220,7 @@ function heldChanges(dir, held, result, described) {
     if (issue2 !== undefined) {
       throw new Error(`${PUSH_REFUSAL}: ${file} would not read back: ${issue2.field}: ${issue2.message}`);
     }
-    const path = join16(dir, file);
+    const path = join15(dir, file);
     if (held.unreadable.has(path)) {
       throw new Error(`${PUSH_REFUSAL}: it would overwrite ${path}, which could not be read`);
     }
@@ -4579,18 +4250,18 @@ function pushLogLines(sourceId, described, result) {
   });
 }
 function localInstinctsDir(repoRoot) {
-  return join16(repoRoot, RAFA_INSTINCTS_PATH);
+  return join15(repoRoot, RAFA_INSTINCTS_PATH);
 }
 function userInstinctsDir(home) {
-  return join16(home, RAFA_INSTINCTS_PATH);
+  return join15(home, RAFA_INSTINCTS_PATH);
 }
 function createLocalLearning(options) {
   const { instinctsDir, minConfidence } = options;
   const userDir = userInstinctsDir(options.home);
   const now = options.now ?? (() => new Date().toISOString());
   const warn = options.warn ?? warnThroughActiveOutput;
-  const instinctsPath = join16(instinctsDir, INSTINCTS_FILE);
-  const flagsPath = join16(instinctsDir, FLAGS_FILE);
+  const instinctsPath = join15(instinctsDir, INSTINCTS_FILE);
+  const flagsPath = join15(instinctsDir, FLAGS_FILE);
   function readHeld(scope, dir) {
     const { records } = readScope(scope, dir);
     const unreadable = new Set;
@@ -4666,6 +4337,203 @@ function createLocalLearning(options) {
   return Object.freeze(learning);
 }
 
+// src/adapters/logger/console.ts
+import { basename as basename4 } from "path";
+
+// src/adapters/logger/api-filter.ts
+var REDACTED = "[redacted]";
+var UNREADABLE_URL = "[unreadable url]";
+var API_HEADER_ALLOW_LIST = Object.freeze([
+  "content-type",
+  "content-length",
+  "retry-after",
+  "x-request-id",
+  "x-ratelimit-limit",
+  "x-ratelimit-remaining",
+  "x-ratelimit-reset"
+]);
+var SENSITIVE_NAME = /token|key|secret|sig|passw|pwd|auth|code|jwt|session|credential/i;
+var QUERY_SEPARATOR = /([&;])/;
+var URL_IN_TEXT = /https?:\/\/[^\s"'<>)]+/gi;
+var READ_PROTOCOLS = ["http:", "https:"];
+function decodedName(name2) {
+  try {
+    return decodeURIComponent(name2.replace(/\+/g, " "));
+  } catch {
+    return null;
+  }
+}
+function filterQueryPart(part) {
+  if (part === "" || QUERY_SEPARATOR.test(part))
+    return part;
+  const equals = part.indexOf("=");
+  if (equals === -1)
+    return REDACTED;
+  const name2 = part.slice(0, equals);
+  const plain = decodedName(name2);
+  return plain === null || SENSITIVE_NAME.test(plain) ? `${name2}=${REDACTED}` : part;
+}
+function filterUrl(url) {
+  if (!URL.canParse(url))
+    return UNREADABLE_URL;
+  const parsed = new URL(url);
+  if (!READ_PROTOCOLS.includes(parsed.protocol))
+    return UNREADABLE_URL;
+  const parts = parsed.search.slice(1).split(QUERY_SEPARATOR).map(filterQueryPart);
+  const query = parsed.search === "" ? "" : `?${parts.join("")}`;
+  return `${parsed.protocol}//${parsed.host}${parsed.pathname}${query}`;
+}
+function filterHeaders(headers) {
+  return Object.freeze(Object.fromEntries(Object.entries(headers).map(([name2, value]) => [name2.toLowerCase(), value]).filter(([name2]) => API_HEADER_ALLOW_LIST.includes(name2))));
+}
+function scrubUrls(text) {
+  return text.replace(URL_IN_TEXT, (url) => filterUrl(url));
+}
+function filterExchange(exchange) {
+  const optional = Object.fromEntries(Object.entries({
+    status: exchange.status,
+    durationMs: exchange.durationMs,
+    requestBytes: exchange.requestBytes,
+    responseBytes: exchange.responseBytes,
+    requestId: exchange.requestId,
+    headers: exchange.headers === undefined ? undefined : filterHeaders(exchange.headers)
+  }).filter(([, value]) => value !== undefined));
+  return Object.freeze({
+    service: exchange.service,
+    method: exchange.method,
+    url: filterUrl(exchange.url),
+    ...optional
+  });
+}
+function exchangeLine(exchange) {
+  const outcome = exchange.status === undefined ? "no response" : String(exchange.status);
+  const took = exchange.durationMs === undefined ? "" : ` in ${Math.round(exchange.durationMs)} ms`;
+  return `${exchange.service} ${exchange.method.toUpperCase()} ${filterUrl(exchange.url)} \u2192 ${outcome}${took}`;
+}
+
+// src/adapters/logger/colour.ts
+var LEVEL_CODES = Object.freeze({
+  error: 31,
+  warn: 33,
+  debug: 2,
+  api: 36
+});
+var RESET = "\x1B[0m";
+function paint(level, text, theme, colour) {
+  const code = LEVEL_CODES[level];
+  return colour && theme === "default" && code !== undefined ? `\x1B[${code}m${text}${RESET}` : text;
+}
+
+// src/adapters/logger/console.ts
+var FRAME_LOCATION = /\(?([^()\s]+):(\d+):\d+\)?$/;
+var NATIVE_FRAME = "native";
+var FRAME_OPENING = "at ";
+var API_EVENT_LEVEL = "debug";
+function labelOf(entry) {
+  return [entry.module, entry.action].filter((part) => part !== undefined && part !== "").join(" ");
+}
+function messageIn(entry) {
+  return entry.level === "api" ? scrubUrls(entry.message) : entry.message;
+}
+function bodyOf2(entry) {
+  const message = messageIn(entry);
+  if (entry.api === undefined)
+    return message;
+  return message === "" ? exchangeLine(entry.api) : `${exchangeLine(entry.api)} \u2014 ${message}`;
+}
+function errorIn(entry) {
+  if (entry.error === undefined)
+    return;
+  return entry.level === "api" ? scrubUrls(messageOf(entry.error)) : messageOf(entry.error);
+}
+function writableAsJson(value) {
+  try {
+    JSON.stringify(value);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function labelled(entry) {
+  const label = labelOf(entry);
+  return label === "" ? bodyOf2(entry) : `${label}: ${bodyOf2(entry)}`;
+}
+function textLine(entry, site, theme, colour) {
+  const code = entry.code === undefined ? "" : ` [${entry.code}]`;
+  const where = site === null ? "" : ` (${site})`;
+  return `${paint(entry.level, `${entry.level}:`, theme, colour)} ${labelled(entry)}${code}${where}`;
+}
+function fieldsOf(entry, site) {
+  const dataWritable = entry.data === undefined || writableAsJson(entry.data);
+  const known = [
+    ["type", entry.level === "api" ? "api" : undefined],
+    ["module", entry.module],
+    ["action", entry.action],
+    ["code", entry.code],
+    ["hint", entry.hint],
+    ["data", dataWritable ? entry.data : undefined],
+    ["dataUnwritable", dataWritable ? undefined : true],
+    ["error", errorIn(entry)],
+    ["api", entry.api === undefined ? undefined : filterExchange(entry.api)],
+    ["site", site ?? undefined]
+  ].filter(([, value]) => value !== undefined);
+  return known.length === 0 ? null : Object.freeze(Object.fromEntries(known));
+}
+function eventOf(entry, site) {
+  const fields = fieldsOf(entry, site);
+  return {
+    type: "log",
+    level: entry.level === "api" ? API_EVENT_LEVEL : entry.level,
+    message: labelled(entry),
+    ...fields === null ? {} : { fields },
+    ts: new Date().toISOString()
+  };
+}
+function callSiteOf(below) {
+  const holder = {};
+  Error.captureStackTrace(holder, below);
+  const located = (holder.stack ?? "").split(`
+`).map((line) => line.trim()).filter((line) => line.startsWith(FRAME_OPENING)).map((line) => FRAME_LOCATION.exec(line)).find((match) => match !== null && match[1] !== NATIVE_FRAME);
+  return located === undefined || located === null ? null : `${basename4(located[1] ?? "")}:${located[2] ?? ""}`;
+}
+function write(env, entry, settings, site) {
+  const output = env.output();
+  if (env.mode() !== "text") {
+    output.emit(eventOf(entry, site));
+    return;
+  }
+  output.info(textLine(entry, site, settings.theme, env.colour));
+  if (entry.hint !== undefined)
+    output.info(`  hint: ${entry.hint}`);
+}
+function definedOf(entry) {
+  return Object.fromEntries(Object.entries(entry).filter(([, value]) => value !== undefined));
+}
+function loggerWith(env, bindings) {
+  const log = (given) => {
+    const entry = { ...bindings, ...definedOf(given) };
+    const settings = env.settings();
+    if (!levelEnabled(entry.level, entry.module, settings, env.verbosity))
+      return;
+    const site = settings.callSite && entry.level === "debug" ? callSiteOf(log) : null;
+    write(env, entry, settings, site);
+  };
+  return Object.freeze({
+    log,
+    child: (more) => loggerWith(env, { ...bindings, ...more }),
+    enabled: (level, module = bindings.module) => levelEnabled(level, module, env.settings(), env.verbosity)
+  });
+}
+function createConsoleLogger(options = {}) {
+  return loggerWith({
+    verbosity: options.verbosity ?? 0,
+    colour: options.colour ?? false,
+    settings: options.settings ?? activeLoggerSettings,
+    output: options.output ?? activeOutput,
+    mode: options.mode ?? activeOutputMode
+  }, {});
+}
+
 // src/adapters/output/events.ts
 var EVENT_PREFIX = "rafa\xB7 ";
 var KIND_COLUMN = 17;
@@ -4735,9 +4603,9 @@ function createJsonOutput({
 }
 
 // src/adapters/planner/claude.ts
-import { existsSync as existsSync12 } from "fs";
+import { existsSync as existsSync10 } from "fs";
 import { mkdir as mkdir2, readFile as readFile2 } from "fs/promises";
-import { posix, resolve as resolve6 } from "path";
+import { posix, resolve as resolve5 } from "path";
 
 // src/board/spec-review.ts
 var SPEC_REVIEW_KIND = "spec-review";
@@ -4902,10 +4770,36 @@ function parseSpecReview(output) {
   return judged(verdict, readGaps(document, issues), block, issues);
 }
 
+// src/cli/spends.ts
+var SPENDS_GLYPH = "\uD83E\uDE99";
+
+// src/cli/command.ts
+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 isTopLevel(command) {
+  return command.subject === command.action;
+}
+function commandSpelling(command) {
+  return isTopLevel(command) ? command.subject : `${command.subject} ${command.action}`;
+}
+
 // src/cli/running.ts
+import { AsyncLocalStorage } from "async_hooks";
+var scopes = new AsyncLocalStorage;
 var running = null;
 function runningCommand() {
-  return running;
+  return scopes.getStore() ?? running;
 }
 
 // src/utils/session-env.ts
@@ -4997,12 +4891,12 @@ function runClaude(prompt, settingSources, flags = [], spawn = spawnClaude, serv
 function cwdOption(options) {
   return options.cwd === undefined ? {} : { cwd: options.cwd };
 }
-function writeWholeLines(text, write) {
+function writeWholeLines(text, write2) {
   const lines = text.split(`
 `);
   const rest = lines.pop() ?? "";
   for (const line of lines)
-    write(line);
+    write2(line);
   return rest;
 }
 async function teeToOperator(stream) {
@@ -5073,24 +4967,26 @@ class ClaudePlannerError extends Error {
 }
 function createClaudePlanner(options) {
   const { repoRoot, planDir, settingSources, buildPrompt, spawn = spawnClaudeCaptured } = options;
-  const root = resolve6(repoRoot);
+  const root = resolve5(repoRoot);
   const create = async ({ specPath, stub }) => {
     const planPath = planFilePath(planDir, `PLAN-${stub}.md`);
     const prerequisitesPath = planFilePath(planDir, `PREREQUISITES-${stub}.md`);
-    const isWritten = (path) => existsSync12(resolve6(root, path));
+    const isWritten = (path) => existsSync10(resolve5(root, path));
     if (isWritten(planPath)) {
       throw new ClaudePlannerError(`${planPath} already exists`, FAILURE_EXIT_CODE);
     }
-    const specContent = await readFile2(resolve6(root, specPath), "utf8");
-    await mkdir2(resolve6(root, planDir), { recursive: true });
-    const session = await spawn(claudeArgs(settingSources), buildPrompt(specContent, stub), { cwd: root });
+    const specContent = await readFile2(resolve5(root, specPath), "utf8");
+    const absolutePlanDir = resolve5(root, planDir);
+    await mkdir2(absolutePlanDir, { recursive: true });
+    const prompt = buildPrompt(specContent, stub, absolutePlanDir);
+    const session = await spawn(claudeArgs(settingSources), prompt, { cwd: root });
     const review = parseSpecReview(session.stdout);
     const { exitCode } = session;
     if (exitCode !== 0) {
       throw new ClaudePlannerError(`Plan generation failed (exit ${exitCode}).`, exitCode, review);
     }
     if (!isWritten(planPath)) {
-      throw new ClaudePlannerError(`The session finished but ${planPath} was not created under ${root} \u2014 inspect the output above.`, FAILURE_EXIT_CODE, review);
+      throw new ClaudePlannerError(`The session finished but ${planPath} was not created under ${root}: no file at` + ` ${resolve5(root, planPath)} \u2014 inspect the output above.`, FAILURE_EXIT_CODE, review);
     }
     return {
       planPath,
@@ -5195,8 +5091,11 @@ var GITHUB_LABELS = Object.freeze({
   priorityPrefix: "priority:",
   needsTriage: "needs-triage",
   blockedByPrefix: "blocked-by:OPT-",
-  specBlocked: "spec:blocked"
+  specBlocked: "spec:blocked",
+  causePrefix: "cause:"
 });
+var GITHUB_LABEL_MAX_LENGTH = 50;
+var CAUSE_MAX_LENGTH = GITHUB_LABEL_MAX_LENGTH - GITHUB_LABELS.causePrefix.length;
 var VIEW_FIELDS = "number,title,body,state,stateReason,labels,url";
 var LIST_COMMAND = "gh issue list";
 var LIST_FIELDS = "number,url,labels";
@@ -5254,8 +5153,8 @@ async function withDeadline(work, timeoutMs) {
   if (timeoutMs === undefined)
     return work;
   let timer;
-  const deadline = new Promise((resolve7) => {
-    timer = setTimeout(() => resolve7(TIMED_OUT), timeoutMs);
+  const deadline = new Promise((resolve6) => {
+    timer = setTimeout(() => resolve6(TIMED_OUT), timeoutMs);
   });
   try {
     return await Promise.race([work, deadline]);
@@ -5282,6 +5181,9 @@ function isRepoName(value) {
 function isLabelPart(value) {
   return typeof value === "string" && !value.includes(",");
 }
+function isCauseLabelPart(value) {
+  return value === undefined || isLabelPart(value) && value.length <= CAUSE_MAX_LENGTH;
+}
 function optionalFlag2(name2, value) {
   return value === undefined ? [] : [name2, value];
 }
@@ -5305,7 +5207,8 @@ var DRAFT_CHECKS = [
     (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"]
+  ["specBlocked", (value) => value === undefined || typeof value === "boolean", "absent or a boolean"],
+  ["cause", isCauseLabelPart, `absent or a string holding no comma, at most ${CAUSE_MAX_LENGTH} characters`]
 ];
 function draftProblem(draft) {
   if (!isMapping(draft))
@@ -5320,6 +5223,7 @@ function labelsFor(draft) {
     `${GITHUB_LABELS.typePrefix}${draft.type}`,
     ...draft.blockedBy.map((opt) => `${GITHUB_LABELS.blockedByPrefix}${opt}`),
     ...draft.specBlocked === true ? [GITHUB_LABELS.specBlocked] : [],
+    ...draft.cause === undefined ? [] : [`${GITHUB_LABELS.causePrefix}${draft.cause}`],
     priority
   ];
 }
@@ -5598,7 +5502,7 @@ function createGithubTracker(options) {
 
 // src/adapters/tracker/local.ts
 import { mkdir as mkdir3, readdir, readFile as readFile3, writeFile as writeFile2 } from "fs/promises";
-import { join as join17 } from "path";
+import { join as join16 } from "path";
 var PREFIX4 = "local tracker";
 var FRONTMATTER = /^---\n([\s\S]*?)\n---\n([\s\S]*)$/;
 var ISSUE_NUMBER2 = /^[1-9]\d*$/;
@@ -5634,6 +5538,7 @@ var FIELD_CHECKS = {
   title: [isString2, "a string"],
   blockedBy: [listOf(isFiniteNumber), "a list of numbers"],
   specBlocked: [orAbsent(isBoolean), "absent or a boolean"],
+  cause: [orAbsent(isString2), "absent or a string"],
   state: [oneOf2(ISSUE_STATES), `one of: ${ISSUE_STATES.join(", ")}`],
   fallbackReason: [orNull(isString2), "a string or null"],
   capturedAt: [isString2, "a string"],
@@ -5663,7 +5568,7 @@ function issueNumberOfFile(name2) {
   return name2.endsWith(ISSUE_EXTENSION) ? parseIssueNumber(name2.slice(0, -ISSUE_EXTENSION.length)) : null;
 }
 function issuePath(issuesDir, number) {
-  return join17(issuesDir, `${number}${ISSUE_EXTENSION}`);
+  return join16(issuesDir, `${number}${ISSUE_EXTENSION}`);
 }
 async function issueNumbers(issuesDir) {
   let names;
@@ -5677,7 +5582,7 @@ async function issueNumbers(issuesDir) {
   return names.map(issueNumberOfFile).filter((number) => number !== null).sort((a, b) => a - b);
 }
 function localIssuesDir(repoRoot) {
-  return join17(repoRoot, ".rafa", "issues");
+  return join16(repoRoot, ".rafa", "issues");
 }
 function renderLocalIssue(record) {
   const { draft } = record;
@@ -5690,6 +5595,7 @@ function renderLocalIssue(record) {
     title: draft.title,
     blockedBy: draft.blockedBy,
     ...draft.specBlocked === undefined ? {} : { specBlocked: draft.specBlocked },
+    ...draft.cause === undefined ? {} : { cause: draft.cause },
     state: record.state,
     fallbackReason: record.fallbackReason,
     capturedAt: record.capturedAt,
@@ -5732,7 +5638,8 @@ function parseLocalIssue(contents, sourcePath) {
       priority: fields.priority,
       project: fields.project,
       blockedBy: fields.blockedBy,
-      ...fields.specBlocked === undefined ? {} : { specBlocked: fields.specBlocked }
+      ...fields.specBlocked === undefined ? {} : { specBlocked: fields.specBlocked },
+      ...fields.cause === undefined ? {} : { cause: fields.cause }
     },
     fallbackReason: fields.fallbackReason,
     capturedAt: fields.capturedAt,
@@ -5896,7 +5803,8 @@ var PORT_VERSIONS = Object.freeze({
   learning: 1,
   output: 1,
   planner: 1,
-  sync: 1
+  sync: 1,
+  logger: 1
 });
 var SERVED_VERSIONS = new Map(Object.entries(PORT_VERSIONS));
 var PORT_TYPE_LIST = [...SERVED_VERSIONS.keys()].join(", ");
@@ -5935,7 +5843,8 @@ function indexByPort(adapters) {
     learning: only("learning"),
     output: only("output"),
     planner: only("planner"),
-    sync: only("sync")
+    sync: only("sync"),
+    logger: only("logger")
   };
 }
 function createAdapterRegistry(adapters = []) {
@@ -5989,6 +5898,12 @@ var CORE_ADAPTERS = [
     portVersion: PORT_VERSIONS.output,
     create: ({ stream = process.stdout }) => createEventsOutput({ stream })
   },
+  {
+    port: "logger",
+    kind: "console",
+    portVersion: PORT_VERSIONS.logger,
+    create: ({ verbosity = 0, colour = false }) => createConsoleLogger({ verbosity, colour })
+  },
   {
     port: "tracker",
     kind: "local",
@@ -6172,9 +6087,9 @@ function requireTrustedAuthor(item, reading) {
   throw new CommandExit(TRUST_REFUSAL_EXIT, trustRefusalMessage(item, reading));
 }
 // src/effort/sync/wire.ts
-import { existsSync as existsSync13, mkdtempSync as mkdtempSync2, rmSync as rmSync8 } from "fs";
+import { existsSync as existsSync11, mkdtempSync as mkdtempSync2, rmSync as rmSync8 } from "fs";
 import { tmpdir as tmpdir4 } from "os";
-import { join as join18 } from "path";
+import { join as join17 } from "path";
 import { Database as Database6, SQLiteError as SQLiteError3 } from "bun:sqlite";
 var WIRE_FORMAT = "rafa-effort-wire";
 var WIRE_VERSION = 1;
@@ -6335,7 +6250,7 @@ function exportWirePayload(options) {
   const { path } = options;
   const cursor = checkCursor(options.cursor ?? {});
   guardTestProcess(path);
-  if (!existsSync13(path))
+  if (!existsSync11(path))
     throw new WireExportRefusal(`wire: ${path} is not there`);
   const db = new Database6(path, { readonly: true, safeIntegers: true });
   try {
@@ -6394,9 +6309,9 @@ function buildStore(path, payload, options) {
 }
 function materialiseWirePayload(payload, options = {}) {
   const checked = checkPayload(payload);
-  const directory = mkdtempSync2(join18(options.tempDir ?? tmpdir4(), "rafa-wire-"));
+  const directory = mkdtempSync2(join17(options.tempDir ?? tmpdir4(), "rafa-wire-"));
   const release = () => rmSync8(directory, { recursive: true, force: true });
-  const path = join18(directory, SQLITE_STORE_FILE_NAME);
+  const path = join17(directory, SQLITE_STORE_FILE_NAME);
   try {
     guardTestProcess(path);
     buildStore(path, checked, options);
@@ -6424,4 +6339,4 @@ function selectEffortStore(repoRoot, config) {
   return adapter.create({ repoRoot });
 }
 
-export { EFFORT_DIR_VARIABLE, effortStoreDir, guardTestProcess, EFFORT_KEY_PROJECTIONS, openNdjsonStore, name, version, RAFA_VERSION, createGitRunner, gitSaid, NOT_A_REPOSITORY, mainCheckoutOf, SCOPE_DIR, INIT_COMMAND, DISK_FILE_SYSTEM, ScopeError, scopeAt, initHint, selfAndAncestors, resolveScope, positionFilePath, readPositionFile, writePositionFile, positionAt, goHome, hopFilePath, readHopRecord, writeHopRecord, staleAgainst, SessionRecordError, isSessionId, sessionDecisions, SessionConflictError, runsDir, sessionFilePath, errorCode, isPidAlive, readSessions, readSession, samePlan, beginSession, updateSession, DEVELOPMENT_NEXT_STEP, DevelopmentBuildRefusedError, refuseUnownedDevelopmentWrite, SQLITE_MIGRATIONS, sqliteCatalogue, planSchema, readStoreSchema, writeNames, ACROSS_STORES_ORDER, STAMPED_COLUMNS, stampedValues, activeStoreSettings, normalizeRemote, gitRemoteUrl, readStoreMeta, SQLITE_STORE_FILE_NAME, sqliteStorePath, LONE_SURROGATE, withSqliteStore, writeSqliteStore, openSqliteStore, SPENDS_GLYPH, CommandExit, commandSpelling, readConfigFile, loadConfig, plansDirAt, requireProject, resolvePlansDir, countTasks, formatCounts, planFileName, stubOfPlanFile, isFile, rejectedPath, issueLine, plural, expectNoArgument, expectOneArgument, readSwitch, minutesBetween, readCommitLog, MOVE_TO_SQLITE, mergeStore, SyncModuleMissing, selectSync, SKILL_FILE, MARKDOWN_EXTENSION, scanLayout, declaredNameIssue, readFrontmatterDocument, readFrontmatter, mergeFrontmatter, writeFrontmatter, parseInstinct, readScopes, padKind, oneLine, interruptClaudeSessions, spawnClaude, runClaude, runClaudeCaptured, planFilePath, ClaudePlannerError, GITHUB_LABELS, createGhRunner, typeOfLabels, moduleOfLabels, createLocalTracker, PORT_VERSIONS, createAdapterRegistry, CORE_ADAPTER_REGISTRY, TRUSTED_PERMISSIONS, ghBoardTrust, readBoardTrust, requireTrustedBoardAuthor, trustRefusalClause, WIRE_FORMAT, WIRE_VERSION, WireFormatError, WireExportRefusal, encodeWirePayload, decodeWirePayload, exportWirePayload, materialiseWirePayload, selectEffortStore };
+export { EFFORT_DIR_VARIABLE, effortStoreDir, guardTestProcess, EFFORT_KEY_PROJECTIONS, openNdjsonStore, version, RAFA_VERSION, createGitRunner, gitSaid, NOT_A_REPOSITORY, mainCheckoutOf, SCOPE_DIR, INIT_COMMAND, DISK_FILE_SYSTEM, ScopeError, scopeAt, initHint, selfAndAncestors, resolveScope, positionFilePath, readPositionFile, writePositionFile, positionAt, goHome, hopFilePath, readHopRecord, writeHopRecord, staleAgainst, SessionRecordError, isSessionId, sessionSteps, sessionDecisions, SessionConflictError, runsDir, sessionFilePath, errorCode, isPidAlive, readSessions, readSession, samePlan, beginSession, updateSession, DEVELOPMENT_NEXT_STEP, DevelopmentBuildRefusedError, refuseUnownedDevelopmentWrite, SQLITE_MIGRATIONS, sqliteCatalogue, planSchema, readStoreSchema, writeNames, ACROSS_STORES_ORDER, STAMPED_COLUMNS, stampedValues, setActiveStoreSettings, activeStoreSettings, normalizeRemote, gitRemoteUrl, readReplacedStoreIds, readStoreMeta, SQLITE_STORE_FILE_NAME, sqliteStorePath, LONE_SURROGATE, withSqliteStore, writeSqliteStore, openSqliteStore, minutesBetween, readCommitLog, MOVE_TO_SQLITE, mergeStore, SyncModuleMissing, selectSync, readFrontmatterDocument, readFrontmatter, mergeFrontmatter, writeFrontmatter, parseInstinct, SKILL_FILE, MARKDOWN_EXTENSION, scanLayout, declaredNameIssue, readScopes, createConsoleLogger, padKind, oneLine, SPENDS_GLYPH, CommandExit, commandSpelling, interruptClaudeSessions, spawnClaude, runClaude, runClaudeCaptured, planFilePath, ClaudePlannerError, GITHUB_LABELS, createGhRunner, typeOfLabels, moduleOfLabels, createLocalTracker, PORT_VERSIONS, createAdapterRegistry, CORE_ADAPTER_REGISTRY, TRUSTED_PERMISSIONS, ghBoardTrust, readBoardTrust, requireTrustedBoardAuthor, trustRefusalClause, WIRE_FORMAT, WIRE_VERSION, WireFormatError, WireExportRefusal, encodeWirePayload, decodeWirePayload, exportWirePayload, materialiseWirePayload, selectEffortStore };