@inerrata-corporation/errata 2.0.8-dev.2890 → 2.0.8-dev.2896

package/errata.mjs

@@ -54319,8 +54319,8 @@ var require_request = __commonJS({
 var require_dispatcher = __commonJS({
   "../../node_modules/.pnpm/undici@6.24.1/node_modules/undici/lib/dispatcher/dispatcher.js"(exports, module2) {
     "use strict";
-    var EventEmitter2 = __require("node:events");
-    var Dispatcher = class extends EventEmitter2 {
+    var EventEmitter3 = __require("node:events");
+    var Dispatcher = class extends EventEmitter3 {
       dispatch() {
         throw new Error("not implemented");
       }
@@ -70935,9 +70935,9 @@ __export(witness_ledger_exports, {
   witnessLedgerPath: () => witnessLedgerPath
 });
 import { appendFileSync as appendFileSync3, existsSync as existsSync24, readFileSync as readFileSync26, writeFileSync as writeFileSync19 } from "node:fs";
-import { join as join31 } from "node:path";
+import { join as join32 } from "node:path";
 function witnessLedgerPath(configDir) {
-  return join31(configDir, "witness-ledger.jsonl");
+  return join32(configDir, "witness-ledger.jsonl");
 }
 function appendWitnessLedger(configDir, entry) {
   const path2 = witnessLedgerPath(configDir);
@@ -71393,8 +71393,8 @@ var init_report_render = __esm({
 
 // src/cli.ts
 init_src6();
-import { closeSync as closeSync2, existsSync as existsSync34, openSync as openSync2, readFileSync as readFileSync35, renameSync as renameSync4, statSync as statSync9 } from "node:fs";
-import { join as join42, resolve as pathResolve2 } from "node:path";
+import { closeSync as closeSync2, existsSync as existsSync34, openSync as openSync2, readFileSync as readFileSync35, renameSync as renameSync4, statSync as statSync10 } from "node:fs";
+import { join as join43, resolve as pathResolve2 } from "node:path";
 import { spawn as spawn5 } from "node:child_process";
 
 // src/daemon.ts
@@ -71978,8 +71978,13 @@ init_config();
 
 // src/engine.ts
 import { execFileSync as execFileSync4 } from "node:child_process";
-import { existsSync as existsSync25, statSync as statSync7, appendFileSync as appendFileSync4, readdirSync as readdirSync10, renameSync as renameSync3, readFileSync as readFileSync28, writeFileSync as writeFileSync21 } from "node:fs";
-import { join as join33, relative as relative6, sep as sep4 } from "node:path";
+import { existsSync as existsSync25, statSync as statSync8, appendFileSync as appendFileSync4, readdirSync as readdirSync10, renameSync as renameSync3, readFileSync as readFileSync28, writeFileSync as writeFileSync21 } from "node:fs";
+import { join as join34, relative as relative6, sep as sep4 } from "node:path";
+
+// src/source-watcher.ts
+import { EventEmitter as EventEmitter2 } from "node:events";
+import { statSync as statSync5, watch as watch2 } from "node:fs";
+import { join as join19 } from "node:path";
 
 // ../../node_modules/.pnpm/chokidar@4.0.3/node_modules/chokidar/esm/index.js
 import { stat as statcb } from "fs";
@@ -73672,6 +73677,95 @@ function watch(paths, options = {}) {
 }
 var esm_default = { watch, FSWatcher };
 
+// src/source-watcher.ts
+var NATIVE_RECURSIVE_PLATFORMS = ["win32", "darwin"];
+var SETTLE_MS = 50;
+function createSourceWatcher(targets, opts) {
+  const native = opts.native ?? NATIVE_RECURSIVE_PLATFORMS.includes(process.platform);
+  return native ? new NativeSourceWatcher(targets, opts.ignored) : chokidarSourceWatcher(targets, opts.ignored);
+}
+function chokidarSourceWatcher(targets, ignored) {
+  const w = esm_default.watch([...targets], { ignored, ignoreInitial: true, persistent: true });
+  const self = {
+    on(event, listener) {
+      w.on(event, listener);
+      return self;
+    },
+    add: (p) => void w.add(p),
+    unwatch: (p) => void w.unwatch(p),
+    close: () => w.close()
+  };
+  return self;
+}
+var NativeSourceWatcher = class extends EventEmitter2 {
+  constructor(targets, ignored) {
+    super();
+    this.ignored = ignored;
+    for (const t of targets) this.add(t);
+  }
+  handles = /* @__PURE__ */ new Map();
+  pending = /* @__PURE__ */ new Map();
+  known = /* @__PURE__ */ new Set();
+  closed = false;
+  add(target) {
+    if (this.closed || this.handles.has(target)) return;
+    let isDir;
+    try {
+      isDir = statSync5(target).isDirectory();
+    } catch {
+      return;
+    }
+    try {
+      const h = watch2(target, { recursive: isDir, persistent: true }, (event, name2) => {
+        const path2 = isDir ? name2 ? join19(target, name2.toString()) : null : target;
+        if (!path2) return;
+        this.emit("raw", event, path2, { watchedPath: target });
+        if (!this.ignored(path2)) this.schedule(path2, event === "rename");
+      });
+      h.on("error", () => this.unwatch(target));
+      this.handles.set(target, h);
+    } catch {
+    }
+  }
+  unwatch(target) {
+    this.handles.get(target)?.close();
+    this.handles.delete(target);
+  }
+  async close() {
+    this.closed = true;
+    for (const h of this.handles.values()) h.close();
+    this.handles.clear();
+    for (const p of this.pending.values()) clearTimeout(p.timer);
+    this.pending.clear();
+  }
+  schedule(path2, renamed) {
+    const prev = this.pending.get(path2);
+    if (prev) clearTimeout(prev.timer);
+    const timer = setTimeout(() => {
+      this.pending.delete(path2);
+      this.classify(path2, renamed || (prev?.renamed ?? false));
+    }, SETTLE_MS);
+    this.pending.set(path2, { timer, renamed: renamed || (prev?.renamed ?? false) });
+  }
+  classify(path2, renamed) {
+    if (this.closed) return;
+    let isFile;
+    try {
+      const s = statSync5(path2);
+      if (s.isDirectory()) return;
+      isFile = s.isFile();
+    } catch {
+      this.known.delete(path2);
+      this.emit("unlink", path2);
+      return;
+    }
+    if (!isFile) return;
+    const first = !this.known.has(path2);
+    this.known.add(path2);
+    this.emit(renamed && first ? "add" : "change", path2);
+  }
+};
+
 // src/engine.ts
 init_generalize_graph();
 init_src();
@@ -73928,8 +74022,8 @@ init_review2();
 
 // src/turn.ts
 init_checkout_root();
-import { closeSync, existsSync as existsSync16, fstatSync, openSync, readdirSync as readdirSync6, readSync, realpathSync, statSync as statSync5 } from "node:fs";
-import { basename as basename5, delimiter, dirname as dirname10, join as join19, normalize as normalize3 } from "node:path";
+import { closeSync, existsSync as existsSync16, fstatSync, openSync, readdirSync as readdirSync6, readSync, realpathSync, statSync as statSync6 } from "node:fs";
+import { basename as basename5, delimiter, dirname as dirname10, join as join20, normalize as normalize3 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 import { createHash as createHash14 } from "node:crypto";
 function readFrom(path2, fromByte, maxBytes) {
@@ -74307,7 +74401,7 @@ function turnsSince(turns, mark) {
   return at >= 0 ? turns.slice(at + 1) : turns;
 }
 function claudeProjectDir(cwd, home = homedir4()) {
-  return join19(home, ".claude", "projects", cwd.replace(/[\\/:.]/g, "-"));
+  return join20(home, ".claude", "projects", cwd.replace(/[\\/:.]/g, "-"));
 }
 function recentTranscripts(cwd, opts = {}) {
   const dir = claudeProjectDir(cwd, opts.home ?? homedir4());
@@ -74322,10 +74416,10 @@ function recentTranscripts(cwd, opts = {}) {
   const refs = [];
   for (const name2 of names) {
     if (!name2.endsWith(".jsonl")) continue;
-    const path2 = join19(dir, name2);
+    const path2 = join20(dir, name2);
     let mtimeMs;
     try {
-      mtimeMs = statSync5(path2).mtimeMs;
+      mtimeMs = statSync6(path2).mtimeMs;
     } catch {
       continue;
     }
@@ -74337,7 +74431,7 @@ function recentTranscripts(cwd, opts = {}) {
 }
 function subagentTranscripts(mainTranscriptPath, sessionId) {
   if (!mainTranscriptPath || !sessionId) return [];
-  const dir = join19(dirname10(mainTranscriptPath), sessionId, "subagents");
+  const dir = join20(dirname10(mainTranscriptPath), sessionId, "subagents");
   if (!existsSync16(dir)) return [];
   let names;
   try {
@@ -74348,10 +74442,10 @@ function subagentTranscripts(mainTranscriptPath, sessionId) {
   const refs = [];
   for (const name2 of names) {
     if (!name2.endsWith(".jsonl")) continue;
-    const path2 = join19(dir, name2);
+    const path2 = join20(dir, name2);
     let mtimeMs;
     try {
-      mtimeMs = statSync5(path2).mtimeMs;
+      mtimeMs = statSync6(path2).mtimeMs;
     } catch {
       continue;
     }
@@ -74367,8 +74461,8 @@ function splitPathList(value, sep5 = delimiter) {
 function codexSessionRoots(env2 = process.env, home = homedir4()) {
   const roots = /* @__PURE__ */ new Set();
   for (const d of splitPathList(env2["ERRATA_CODEX_SESSIONS_DIRS"])) roots.add(d);
-  if (env2["CODEX_HOME"]) roots.add(join19(env2["CODEX_HOME"], "sessions"));
-  roots.add(join19(home, ".codex", "sessions"));
+  if (env2["CODEX_HOME"]) roots.add(join20(env2["CODEX_HOME"], "sessions"));
+  roots.add(join20(home, ".codex", "sessions"));
   return [...roots];
 }
 function readCodexRolloutCwd(path2) {
@@ -74426,10 +74520,10 @@ function codexRolloutsForCwd(cwd, opts = {}) {
         continue;
       }
       for (const name2 of names) {
-        const full = join19(dir, name2);
+        const full = join20(dir, name2);
         let st;
         try {
-          st = statSync5(full);
+          st = statSync6(full);
         } catch {
           continue;
         }
@@ -74458,8 +74552,8 @@ function codexRolloutsForCwd(cwd, opts = {}) {
 function geminiSessionRoots(env2 = process.env, home = homedir4()) {
   const roots = /* @__PURE__ */ new Set();
   for (const d of splitPathList(env2["ERRATA_GEMINI_SESSIONS_DIRS"])) roots.add(d);
-  if (env2["GEMINI_CLI_HOME"]) roots.add(join19(env2["GEMINI_CLI_HOME"], ".gemini", "tmp"));
-  roots.add(join19(home, ".gemini", "tmp"));
+  if (env2["GEMINI_CLI_HOME"]) roots.add(join20(env2["GEMINI_CLI_HOME"], ".gemini", "tmp"));
+  roots.add(join20(home, ".gemini", "tmp"));
   return [...roots];
 }
 function geminiProjectHash(cwd) {
@@ -74507,7 +74601,7 @@ function geminiTranscriptsForCwd(cwd, opts = {}) {
       continue;
     }
     for (const slug2 of slugs) {
-      const chats = join19(root, slug2, "chats");
+      const chats = join20(root, slug2, "chats");
       let names;
       try {
         names = readdirSync6(chats);
@@ -74516,10 +74610,10 @@ function geminiTranscriptsForCwd(cwd, opts = {}) {
       }
       for (const name2 of names) {
         if (!name2.startsWith("session-") || !name2.endsWith(".jsonl")) continue;
-        const full = join19(chats, name2);
+        const full = join20(chats, name2);
         let st;
         try {
-          st = statSync5(full);
+          st = statSync6(full);
         } catch {
           continue;
         }
@@ -74536,8 +74630,8 @@ function geminiTranscriptsForCwd(cwd, opts = {}) {
 function opencodeSessionRoots(env2 = process.env, home = homedir4()) {
   const roots = /* @__PURE__ */ new Set();
   for (const d of splitPathList(env2["ERRATA_OPENCODE_SESSIONS_DIRS"])) roots.add(d);
-  if (env2["XDG_DATA_HOME"]) roots.add(join19(env2["XDG_DATA_HOME"], "opencode", "errata"));
-  roots.add(join19(home, ".local", "share", "opencode", "errata"));
+  if (env2["XDG_DATA_HOME"]) roots.add(join20(env2["XDG_DATA_HOME"], "opencode", "errata"));
+  roots.add(join20(home, ".local", "share", "opencode", "errata"));
   return [...roots];
 }
 function readOpencodeTranscriptDirectory(path2) {
@@ -74579,10 +74673,10 @@ function opencodeTranscriptsForCwd(cwd, opts = {}) {
     }
     for (const name2 of names) {
       if (!name2.endsWith(".jsonl")) continue;
-      const full = join19(root, name2);
+      const full = join20(root, name2);
       let st;
       try {
-        st = statSync5(full);
+        st = statSync6(full);
       } catch {
         continue;
       }
@@ -75765,7 +75859,7 @@ ${conversation}` }]
 init_src5();
 init_src2();
 import { existsSync as existsSync17, readFileSync as readFileSync15, readdirSync as readdirSync7, writeFileSync as writeFileSync13 } from "node:fs";
-import { join as join20 } from "node:path";
+import { join as join21 } from "node:path";
 import { homedir as homedir5 } from "node:os";
 var BACKFILL_VERSION = 1;
 var EMPTY = {
@@ -75779,7 +75873,7 @@ var EMPTY = {
   recoverable: 0
 };
 function markerPath(configDir) {
-  return join20(configDir, "constraint-backfill.json");
+  return join21(configDir, "constraint-backfill.json");
 }
 function alreadyDone(configDir) {
   const p = markerPath(configDir);
@@ -75805,7 +75899,7 @@ function replay(root) {
   for (const f of names) {
     let lines;
     try {
-      lines = readFileSync15(join20(dir, f), "utf8").split("\n");
+      lines = readFileSync15(join21(dir, f), "utf8").split("\n");
     } catch {
       continue;
     }
@@ -75933,7 +76027,7 @@ function backfillConstraintKind(store, opts) {
 init_src();
 init_src5();
 import { existsSync as existsSync18, readFileSync as readFileSync16, writeFileSync as writeFileSync14 } from "node:fs";
-import { join as join21 } from "node:path";
+import { join as join22 } from "node:path";
 function citeEdgeId(from, type, to) {
   return `edge_${digest({ from, type, to })}`.slice(0, 24);
 }
@@ -75948,7 +76042,7 @@ var EMPTY2 = {
   byType: {}
 };
 function markerPath2(configDir) {
-  return join21(configDir, "edge-repair.json");
+  return join22(configDir, "edge-repair.json");
 }
 function alreadyDone2(configDir) {
   const p = markerPath2(configDir);
@@ -76018,7 +76112,7 @@ init_reconcile();
 
 // src/pass-ledger.ts
 import { appendFileSync as appendFileSync2, existsSync as existsSync19, readFileSync as readFileSync17, writeFileSync as writeFileSync15 } from "node:fs";
-import { join as join22 } from "node:path";
+import { join as join23 } from "node:path";
 
 // src/isolate-census.ts
 var live = 0;
@@ -76041,7 +76135,7 @@ var PER_KIND_MAX = 100;
 var TRIM_EVERY = 50;
 var appendsSinceTrim = /* @__PURE__ */ new Map();
 function passLedgerPath(configDir) {
-  return join22(configDir, "pass-ledger.jsonl");
+  return join23(configDir, "pass-ledger.jsonl");
 }
 function appendPassLedger(configDir, kind, durationMs, counts) {
   const path2 = passLedgerPath(configDir);
@@ -76468,10 +76562,10 @@ init_src9();
 init_src();
 init_src2();
 import { readFileSync as readFileSync18 } from "node:fs";
-import { join as join23 } from "node:path";
+import { join as join24 } from "node:path";
 function loadClaimIgnorePatterns(workspaceRoot) {
   try {
-    return readFileSync18(join23(workspaceRoot, ".errataignore"), "utf8").split(/\r?\n/).map((l) => l.trim()).filter((l) => l.length > 0 && !l.startsWith("#")).map((l) => l.toLowerCase());
+    return readFileSync18(join24(workspaceRoot, ".errataignore"), "utf8").split(/\r?\n/).map((l) => l.trim()).filter((l) => l.length > 0 && !l.startsWith("#")).map((l) => l.toLowerCase());
   } catch {
     return [];
   }
@@ -76834,9 +76928,9 @@ async function pullCloudTriage(shared, cloud, profile, limit = 50) {
 // src/retrieval-stack.ts
 init_src();
 import { execFileSync as execFileSync3 } from "node:child_process";
-import { existsSync as existsSync20, readFileSync as readFileSync19, statSync as statSync6 } from "node:fs";
+import { existsSync as existsSync20, readFileSync as readFileSync19, statSync as statSync7 } from "node:fs";
 import { homedir as homedir6 } from "node:os";
-import { join as join24 } from "node:path";
+import { join as join25 } from "node:path";
 var RETRIEVAL_STACK_CAP = 24;
 var MANIFEST_SCAN_CAP = 400;
 var RUNTIME_TOKENS = /* @__PURE__ */ new Set([
@@ -77133,44 +77227,44 @@ function loadRegistryPolicy(root, env2 = process.env, repoLocator) {
   };
   const texts = (...paths) => paths.map(read2).filter((t) => t !== null);
   const home = homedir6();
-  const npm = parseNpmrcPolicy(texts(join24(root, ".npmrc"), join24(home, ".npmrc")));
+  const npm = parseNpmrcPolicy(texts(join25(root, ".npmrc"), join25(home, ".npmrc")));
   const blocked = /* @__PURE__ */ new Set();
   if (!npm.defaultPublic) blocked.add("npm");
   if (pypiIndexIsPrivate(
     texts(
-      join24(root, "pip.conf"),
-      join24(root, "pip.ini"),
-      join24(root, "pyproject.toml"),
-      join24(root, "requirements.txt"),
-      join24(home, ".pip", "pip.conf"),
-      join24(home, ".config", "pip", "pip.conf"),
-      join24(env2["APPDATA"] ?? home, "pip", "pip.ini")
+      join25(root, "pip.conf"),
+      join25(root, "pip.ini"),
+      join25(root, "pyproject.toml"),
+      join25(root, "requirements.txt"),
+      join25(home, ".pip", "pip.conf"),
+      join25(home, ".config", "pip", "pip.conf"),
+      join25(env2["APPDATA"] ?? home, "pip", "pip.ini")
     )
   )) {
     blocked.add("pypi");
   }
   if (cargoRegistryIsPrivate(
     texts(
-      join24(root, ".cargo", "config.toml"),
-      join24(root, ".cargo", "config"),
-      join24(home, ".cargo", "config.toml"),
-      join24(home, ".cargo", "config")
+      join25(root, ".cargo", "config.toml"),
+      join25(root, ".cargo", "config"),
+      join25(home, ".cargo", "config.toml"),
+      join25(home, ".cargo", "config")
     )
   )) {
     blocked.add("cargo");
   }
   if (nugetSourcesArePrivate(
     texts(
-      join24(root, "NuGet.config"),
-      join24(root, "nuget.config"),
-      join24(root, "NuGet.Config"),
-      join24(env2["APPDATA"] ?? home, "NuGet", "NuGet.Config"),
-      join24(home, ".nuget", "NuGet", "NuGet.Config")
+      join25(root, "NuGet.config"),
+      join25(root, "nuget.config"),
+      join25(root, "NuGet.Config"),
+      join25(env2["APPDATA"] ?? home, "NuGet", "NuGet.Config"),
+      join25(home, ".nuget", "NuGet", "NuGet.Config")
     )
   )) {
     blocked.add("nuget");
   }
-  const goEnvFile = env2["GOENV"] ?? join24(env2["APPDATA"] ?? join24(home, ".config"), "go", "env");
+  const goEnvFile = env2["GOENV"] ?? join25(env2["APPDATA"] ?? join25(home, ".config"), "go", "env");
   const goEnvText = read2(goEnvFile) ?? "";
   const fromFile = ["GOPRIVATE", "GONOSUMDB", "GONOSUMCHECK"].map(
     (k) => new RegExp(`^${k}=(.*)$`, "m").exec(goEnvText)?.[1]
@@ -77181,10 +77275,10 @@ function loadRegistryPolicy(root, env2 = process.env, repoLocator) {
     env2["GONOSUMCHECK"],
     ...fromFile
   ]);
-  const gemfiles = texts(join24(root, "Gemfile"));
+  const gemfiles = texts(join25(root, "Gemfile"));
   if (gemSourceIsPrivate(gemfiles)) blocked.add("gem");
   if (mavenReposArePrivate(
-    texts(join24(root, "pom.xml"), join24(home, ".m2", "settings.xml"))
+    texts(join25(root, "pom.xml"), join25(home, ".m2", "settings.xml"))
   )) {
     blocked.add("maven");
   }
@@ -77351,10 +77445,10 @@ function readDirectDependencies(root) {
   const familiesSeen = /* @__PURE__ */ new Set();
   for (const c of LOCKFILES) {
     if (familiesSeen.has(c.family)) continue;
-    const p = join24(root, c.file);
+    const p = join25(root, c.file);
     if (!existsSync20(p)) continue;
     try {
-      const s = statSync6(p);
+      const s = statSync7(p);
       stamps.push(`${c.file}:${s.mtimeMs}:${s.size}`);
     } catch {
       continue;
@@ -77415,14 +77509,14 @@ function manifestPaths(root) {
     "project.godot"
   ];
   return {
-    paths: ROOT_MANIFESTS.filter((f) => existsSync20(join24(root, f))),
+    paths: ROOT_MANIFESTS.filter((f) => existsSync20(join25(root, f))),
     tracked: false,
     truncated: false
   };
 }
 var WORKSPACE_MARKERS = ["pnpm-workspace.yaml", "lerna.json", "go.work", "settings.gradle", "settings.gradle.kts"];
 function rootDeclaresWorkspace(root, texts) {
-  if (WORKSPACE_MARKERS.some((f) => existsSync20(join24(root, f)))) return true;
+  if (WORKSPACE_MARKERS.some((f) => existsSync20(join25(root, f)))) return true;
   return /"workspaces"\s*:/.test(texts.get("package.json") ?? "") || /<modules>/.test(texts.get("pom.xml") ?? "") || /^\s*\[workspace\]/m.test(texts.get("Cargo.toml") ?? "");
 }
 var EMPTY_SCAN = { deps: [], self: [], complete: true };
@@ -77436,9 +77530,9 @@ function scanManifests(root) {
   const texts = /* @__PURE__ */ new Map();
   const stamps = [];
   for (const rel of paths) {
-    const abs = join24(root, rel);
+    const abs = join25(root, rel);
     try {
-      const s = statSync6(abs);
+      const s = statSync7(abs);
       stamps.push(`${rel}:${s.mtimeMs}:${s.size}`);
       texts.set(rel, readFileSync19(abs, "utf8"));
     } catch {
@@ -77470,7 +77564,7 @@ function readManifestDependencies(root) {
 
 // src/git-sensor.ts
 import { existsSync as existsSync21, readFileSync as readFileSync20, watch as fsWatch } from "node:fs";
-import { join as join25 } from "node:path";
+import { join as join26 } from "node:path";
 function readFirstLine(path2) {
   try {
     return readFileSync20(path2, "utf8").split(/\r?\n/, 1)[0].trim();
@@ -77479,12 +77573,12 @@ function readFirstLine(path2) {
   }
 }
 function readGitRefState(gitDir) {
-  const head2 = readFirstLine(join25(gitDir, "HEAD"));
+  const head2 = readFirstLine(join26(gitDir, "HEAD"));
   const m = head2 ? /^ref:\s*refs\/heads\/(.+)$/.exec(head2) : null;
   const branch = m ? m[1] : null;
   let sha2 = null;
   if (branch) {
-    sha2 = readFirstLine(join25(gitDir, "refs", "heads", branch));
+    sha2 = readFirstLine(join26(gitDir, "refs", "heads", branch));
     if (!sha2) sha2 = shaFromPackedRefs(gitDir, `refs/heads/${branch}`);
   } else if (head2 && /^[0-9a-f]{7,40}$/i.test(head2)) {
     sha2 = head2;
@@ -77492,13 +77586,13 @@ function readGitRefState(gitDir) {
   return {
     branch,
     sha: sha2,
-    mergeHeadExists: existsSync21(join25(gitDir, "MERGE_HEAD")),
-    origHeadExists: existsSync21(join25(gitDir, "ORIG_HEAD"))
+    mergeHeadExists: existsSync21(join26(gitDir, "MERGE_HEAD")),
+    origHeadExists: existsSync21(join26(gitDir, "ORIG_HEAD"))
   };
 }
 function shaFromPackedRefs(gitDir, ref) {
   try {
-    for (const line of readFileSync20(join25(gitDir, "packed-refs"), "utf8").split(/\r?\n/)) {
+    for (const line of readFileSync20(join26(gitDir, "packed-refs"), "utf8").split(/\r?\n/)) {
       const [sha2, name2] = line.split(/\s+/);
       if (name2 === ref && sha2) return sha2;
     }
@@ -77532,7 +77626,7 @@ function startGitSensor(gitDir, onEvent, opts = {}) {
   const settle = () => {
     if (timer) clearTimeout(timer);
     timer = setTimeout(() => {
-      if (existsSync21(join25(gitDir, "index.lock"))) {
+      if (existsSync21(join26(gitDir, "index.lock"))) {
         settle();
         return;
       }
@@ -77543,7 +77637,7 @@ function startGitSensor(gitDir, onEvent, opts = {}) {
     }, debounceMs);
   };
   for (const sub of ["HEAD", "logs/HEAD", "MERGE_HEAD", "ORIG_HEAD"]) {
-    const p = join25(gitDir, sub);
+    const p = join26(gitDir, sub);
     try {
       watchers.push(fsWatch(p, settle));
     } catch {
@@ -77768,7 +77862,7 @@ var TelemetryRecorder = class {
 
 // src/file-activity.ts
 import { readFileSync as readFileSync22 } from "node:fs";
-import { join as join27 } from "node:path";
+import { join as join28 } from "node:path";
 import { createHash as createHash15 } from "node:crypto";
 
 // ../../packages/privacy/src/patterns/credentials.ts
@@ -78520,7 +78614,7 @@ init_git_remote();
 // src/history-bundle.ts
 import { execFile as execFile2 } from "node:child_process";
 import { readFileSync as readFileSync21 } from "node:fs";
-import { join as join26 } from "node:path";
+import { join as join27 } from "node:path";
 var DEFAULT_MAX_TOKENS = 6e3;
 var FILE_LIST_CAP = 60;
 var DIFF_FILE_CAP = 40;
@@ -78557,7 +78651,7 @@ function pathAllowedByFloor(path2) {
 function loadRepoIgnore(root, extraPatterns = []) {
   let source = "";
   try {
-    source = readFileSync21(join26(root, ".errataignore"), "utf8");
+    source = readFileSync21(join27(root, ".errataignore"), "utf8");
   } catch {
     source = "";
   }
@@ -78975,7 +79069,7 @@ function readActivityBranch(root) {
   try {
     const gitDir = resolveGitDir(root);
     if (!gitDir) return null;
-    const head2 = readFileSync22(join27(gitDir, "HEAD"), "utf8").trim();
+    const head2 = readFileSync22(join28(gitDir, "HEAD"), "utf8").trim();
     const branch = head2.startsWith("ref: refs/heads/") ? head2.slice(16) : /^[a-f0-9]{40,64}$/i.test(head2) ? "HEAD" : null;
     return branch && branch.length <= 256 && !/[\x00-\x1f\x7f]/.test(branch) ? branch : null;
   } catch {
@@ -79139,7 +79233,7 @@ import {
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync16
 } from "node:fs";
-import { basename as basename6, join as join28 } from "node:path";
+import { basename as basename6, join as join29 } from "node:path";
 function skillFileName(id) {
   return `${id.replace(/[^A-Za-z0-9_.-]/g, "_")}.md`;
 }
@@ -79170,7 +79264,7 @@ async function syncSkills(paths, client, seed, pins = [], techSeed) {
   for (const s of res.skills) {
     const fileName = skillFileName(s.id);
     keep.add(fileName);
-    writeFileSync16(join28(paths.skillsDir, fileName), s.markdown, "utf8");
+    writeFileSync16(join29(paths.skillsDir, fileName), s.markdown, "utf8");
     rows.push({
       id: s.id,
       title: s.title,
@@ -79183,7 +79277,7 @@ async function syncSkills(paths, client, seed, pins = [], techSeed) {
     const fileName = skillFileName(p.id);
     if (keep.has(fileName)) continue;
     keep.add(fileName);
-    writeFileSync16(join28(paths.skillsDir, fileName), p.markdown, "utf8");
+    writeFileSync16(join29(paths.skillsDir, fileName), p.markdown, "utf8");
     rows.push({
       id: p.id,
       title: p.title,
@@ -79197,7 +79291,7 @@ async function syncSkills(paths, client, seed, pins = [], techSeed) {
     if (!f.endsWith(".md")) continue;
     if (keep.has(basename6(f))) continue;
     try {
-      unlinkSync2(join28(paths.skillsDir, f));
+      unlinkSync2(join29(paths.skillsDir, f));
       pruned++;
     } catch {
     }
@@ -79224,13 +79318,13 @@ import {
   symlinkSync,
   writeFileSync as writeFileSync17
 } from "node:fs";
-import { join as join29 } from "node:path";
+import { join as join30 } from "node:path";
 var SKILL_NS = "errata-";
 var HARNESS_SKILL_DIRS = [
-  { configDir: ".claude", skillsDir: join29(".claude", "skills") },
+  { configDir: ".claude", skillsDir: join30(".claude", "skills") },
   // Cursor adopted the standard; its exact project dir is still moving — kept
   // best-effort and gated on `.cursor/` presence so we never create it blind.
-  { configDir: ".cursor", skillsDir: join29(".cursor", "skills") }
+  { configDir: ".cursor", skillsDir: join30(".cursor", "skills") }
 ];
 function skillSlug(title, id) {
   const base = title.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || id.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || "skill";
@@ -79280,7 +79374,7 @@ function reconcileNamespaced(dir, keep) {
   for (const name2 of readdirSync9(dir)) {
     if (!name2.startsWith(SKILL_NS) || keep.has(name2)) continue;
     try {
-      rmSync3(join29(dir, name2), { recursive: true, force: true });
+      rmSync3(join30(dir, name2), { recursive: true, force: true });
       pruned++;
     } catch {
     }
@@ -79310,7 +79404,7 @@ function safeLstat(p) {
   }
 }
 function emitAndProjectSkills(root, skills) {
-  const agentsSkillsDir = join29(root, ".agents", "skills");
+  const agentsSkillsDir = join30(root, ".agents", "skills");
   mkdirSync8(agentsSkillsDir, { recursive: true });
   const slugs = [];
   const keep = /* @__PURE__ */ new Set();
@@ -79327,9 +79421,9 @@ function emitAndProjectSkills(root, skills) {
     keep.add(slug2);
     slugs.push(slug2);
     const description = deriveDescription(s.title, s.layer, body2);
-    mkdirSync8(join29(agentsSkillsDir, slug2), { recursive: true });
+    mkdirSync8(join30(agentsSkillsDir, slug2), { recursive: true });
     writeFileSync17(
-      join29(agentsSkillsDir, slug2, "SKILL.md"),
+      join30(agentsSkillsDir, slug2, "SKILL.md"),
       renderSkillMd(slug2, description, body2, skillCiteHandle(s)),
       "utf8"
     );
@@ -79338,11 +79432,11 @@ function emitAndProjectSkills(root, skills) {
   reconcileNamespaced(agentsSkillsDir, keep);
   let projected = 0;
   for (const h of HARNESS_SKILL_DIRS) {
-    if (!existsSync23(join29(root, h.configDir))) continue;
-    const dir = join29(root, h.skillsDir);
+    if (!existsSync23(join30(root, h.configDir))) continue;
+    const dir = join30(root, h.skillsDir);
     mkdirSync8(dir, { recursive: true });
     for (const slug2 of slugs) {
-      linkOrCopy(join29(dir, slug2), join29(agentsSkillsDir, slug2));
+      linkOrCopy(join30(dir, slug2), join30(agentsSkillsDir, slug2));
       projected++;
     }
     reconcileNamespaced(dir, keep);
@@ -79359,7 +79453,7 @@ function emitInputsFromManifest(erretaDir, manifestPath) {
       title: s.title ?? s.id,
       layer: s.layer ?? "technique",
       confidence: s.confidence ?? 0,
-      bodyPath: join29(erretaDir, s.file)
+      bodyPath: join30(erretaDir, s.file)
     }));
   } catch {
     return [];
@@ -79373,7 +79467,7 @@ var GITIGNORE_LINES = [
   ".cursor/skills/errata-*/"
 ];
 function ensureSkillGitignore(root) {
-  const path2 = join29(root, ".gitignore");
+  const path2 = join30(root, ".gitignore");
   let current = "";
   try {
     current = existsSync23(path2) ? readFileSync24(path2, "utf8") : "";
@@ -79480,12 +79574,12 @@ init_profile2();
 
 // src/witness-queue.ts
 import { readFileSync as readFileSync25, renameSync as renameSync2, writeFileSync as writeFileSync18 } from "node:fs";
-import { dirname as dirname11, join as join30 } from "node:path";
+import { dirname as dirname11, join as join31 } from "node:path";
 var WITNESS_QUEUE_CAP = 500;
 var WITNESS_TTL_MS = 14 * 24 * 60 * 60 * 1e3;
 var WITNESS_MAX_ATTEMPTS = 5;
 function witnessQueuePath(workspaceConfigDir) {
-  return join30(workspaceConfigDir, "witness-queue.json");
+  return join31(workspaceConfigDir, "witness-queue.json");
 }
 function loadWitnessQueueWithLosses(path2) {
   let raw2;
@@ -79503,7 +79597,7 @@ function loadWitnessQueueWithLosses(path2) {
 }
 function saveWitnessQueue(path2, queue) {
   try {
-    const tmp = join30(dirname11(path2), `.${Date.now()}.witness-queue.tmp`);
+    const tmp = join31(dirname11(path2), `.${Date.now()}.witness-queue.tmp`);
     writeFileSync18(tmp, JSON.stringify(queue), "utf8");
     renameSync2(tmp, path2);
   } catch {
@@ -79812,7 +79906,7 @@ function maybeFlushDigests() {
 // src/liveness-watch.ts
 init_src5();
 import { readFileSync as readFileSync27, writeFileSync as writeFileSync20 } from "node:fs";
-import { join as join32 } from "node:path";
+import { join as join33 } from "node:path";
 
 // src/loop-lag.ts
 var HEARTBEAT_MS = 500;
@@ -79943,7 +80037,7 @@ function watchCensusLine(c = watchCensus(), now = Date.now()) {
 var LIVENESS_WATCH_INTERVAL_MS = 60 * 60 * 1e3;
 var ALARM_RENOTIFY_MS = 24 * 60 * 60 * 1e3;
 function alarmStatePath(configDir) {
-  return join32(configDir, "liveness-alarms.json");
+  return join33(configDir, "liveness-alarms.json");
 }
 function loadAlarmState(configDir) {
   try {
@@ -79982,22 +80076,22 @@ function createLivenessWatch(deps) {
         const rows = evaluateMechanisms(deps.store, invocations);
         const workspaceActive = invocations.has("capture") || invocations.has("render");
         const bad = workspaceActive ? rows.filter((r) => hasStarvedMechanism([r])) : [];
-        const watch2 = watchCensus();
+        const watch3 = watchCensus();
         const pass = passState();
         appendPassLedger(deps.configDir, "liveness-watch", Date.now() - started2, {
           mechanisms: rows.length,
           alarms: bad.length,
           ...Object.fromEntries(bad.map((r) => [`starved:${r.id}`, 1])),
           ...deps.witnessParked ? { witnessParked: deps.witnessParked() } : {},
-          watchDispatched: watch2.dispatched,
-          watchEmitted: watch2.emitted,
-          watchLogged: watch2.logged,
-          watchRejected: watch2.rejected,
+          watchDispatched: watch3.dispatched,
+          watchEmitted: watch3.emitted,
+          watchLogged: watch3.logged,
+          watchRejected: watch3.rejected,
           // HZ-watch-breaker: a recycle count trending upward across hours is a
           // handle that keeps wedging — the restart-survivable trace the 8-16
           // phantom-rename storm never left.
-          watchBreakerRecycles: watch2.breakerRecycles,
-          watchBreakerQuarantined: watch2.breakerQuarantined.length,
+          watchBreakerRecycles: watch3.breakerRecycles,
+          watchBreakerQuarantined: watch3.breakerQuarantined.length,
           // Concurrency and the longest single holder — the two readings that
           // named the 6017s zombie pass. A pass legitimately running for hours
           // and one wedged forever look identical without a trend.
@@ -80124,7 +80218,7 @@ function createWatchBreaker(deps) {
 }
 
 // src/engine.ts
-var DAEMON_VERSION = true ? "2.0.8-dev.2890" : "2.0.0-alpha.0";
+var DAEMON_VERSION = true ? "2.0.8-dev.2896" : "2.0.0-alpha.0";
 var IGNORED_PATH = /[\\/](?:\.git|node_modules|\.errata|\.claude|\.codex|\.cursor|\.turbo|\.next|dist|coverage|test-results|playwright-report|__pycache__)(?:[\\/]|$)/;
 var IGNORED_NOISE = /castalia\.db|eventlog\.sqlite|turn-cursors/;
 var GIT_OP_MUTE_MS = 4e3;
@@ -80136,7 +80230,7 @@ var CODEX_SWEEP_LOOKBACK_MS = 10 * 6e4;
 function appendIdentityAudit(path2, record2, line) {
   if (!record2.accepted && record2.score <= 0) return;
   try {
-    if (existsSync25(path2) && statSync7(path2).size >= IDENTITY_AUDIT_MAX_BYTES) {
+    if (existsSync25(path2) && statSync8(path2).size >= IDENTITY_AUDIT_MAX_BYTES) {
       renameSync3(path2, `${path2}.1`);
     }
     appendFileSync4(path2, line);
@@ -80194,7 +80288,7 @@ function gitSourceWatchTargets(root) {
         ["-C", root, "ls-files", "--others", "--ignored", "--exclude-standard", "--directory", "-z"],
         { encoding: "utf8", maxBuffer: 256 * 1024 * 1024, windowsHide: true, stdio: ["ignore", "pipe", "ignore"] }
       );
-      ignoredDirs = igOut.split("\0").filter(Boolean).map((d) => d.replace(/\/+$/, "")).filter((d) => !IGNORED_PATH.test(join33(root, d) + sep4));
+      ignoredDirs = igOut.split("\0").filter(Boolean).map((d) => d.replace(/\/+$/, "")).filter((d) => !IGNORED_PATH.test(join34(root, d) + sep4));
     } catch {
     }
     const hasIgnoredChild = (dir) => ignoredDirs.some((ig) => ig.startsWith(dir + "/"));
@@ -80206,19 +80300,19 @@ function gitSourceWatchTargets(root) {
         if (!f.startsWith(prefix)) continue;
         const rest2 = f.slice(prefix.length);
         if (rest2.includes("/")) children.add(dir === "" ? rest2.slice(0, rest2.indexOf("/")) : dir + "/" + rest2.slice(0, rest2.indexOf("/")));
-        else targets.add(join33(root, f));
+        else targets.add(join34(root, f));
       }
       for (const c of children) {
-        if (IGNORED_PATH.test(join33(root, c) + sep4)) continue;
+        if (IGNORED_PATH.test(join34(root, c) + sep4)) continue;
         if (hasIgnoredChild(c)) addUnder(c);
-        else targets.add(join33(root, c));
+        else targets.add(join34(root, c));
       }
     };
     addUnder("");
     if (targets.size > 0) return [...targets];
   } catch {
   }
-  return readdirSync10(root, { withFileTypes: true }).filter((e) => e.isDirectory() && !IGNORED_PATH.test(join33(root, String(e.name)) + sep4)).map((e) => join33(root, String(e.name)));
+  return readdirSync10(root, { withFileTypes: true }).filter((e) => e.isDirectory() && !IGNORED_PATH.test(join34(root, String(e.name)) + sep4)).map((e) => join34(root, String(e.name)));
 }
 function createWorkspaceEngine(opts) {
   const paths = workspacePaths(opts.workspaceRoot);
@@ -80278,12 +80372,10 @@ function createWorkspaceEngine(opts) {
   let flushTimer = null;
   if (!opts.skipWatchers) {
     const watchTargets = gitSourceWatchTargets(opts.workspaceRoot);
-    watcher = esm_default.watch(watchTargets, {
+    watcher = createSourceWatcher(watchTargets, {
       // Still apply the ignore as defense-in-depth: nested node_modules inside a
       // watched dir, and Windows-mangled store paths (IGNORED_NOISE), never reach us.
-      ignored: (p) => IGNORED_PATH.test(p) || IGNORED_NOISE.test(p),
-      ignoreInitial: true,
-      persistent: true
+      ignored: (p) => IGNORED_PATH.test(p) || IGNORED_NOISE.test(p)
     });
     noteWatcherOpened();
     watchBreaker = createWatchBreaker({
@@ -80311,7 +80403,7 @@ function createWorkspaceEngine(opts) {
       }
       let size = 0;
       try {
-        size = statSync7(path2).size;
+        size = statSync8(path2).size;
       } catch {
       }
       lastActivityTs = Date.now();
@@ -80426,7 +80518,7 @@ function createWorkspaceEngine(opts) {
       const srcPaths = diff.changedPaths.filter((p) => /\.(ts|tsx|js|jsx|mjs|cjs|py)$/i.test(p));
       let episodeId2;
       if (srcPaths.length > 0) {
-        const abs = srcPaths.map((p) => join33(opts.workspaceRoot, p));
+        const abs = srcPaths.map((p) => join34(opts.workspaceRoot, p));
         try {
           const r = await runReindexPass(
             `git-reindex:${profile.name} (${abs.length} files)`,
@@ -80462,7 +80554,7 @@ function createWorkspaceEngine(opts) {
         `[errata] git: ${ev.kind} ${ev.newSha.slice(0, 7)} by ${meta3.authorName} \u2014 ${diff.changedPaths.length} file(s), ${diff.renames.length} rename(s)`
       );
     };
-    const gitDir = join33(opts.workspaceRoot, ".git");
+    const gitDir = join34(opts.workspaceRoot, ".git");
     if (existsSync25(gitDir)) {
       stopGit = startGitSensor(gitDir, (ev) => {
         void handleGitEvent(ev).catch((err2) => {
@@ -80644,10 +80736,10 @@ function createWorkspaceEngine(opts) {
       console.warn("[errata] render ledger failed:", err2.message?.slice(0, 120));
     }
     writeContextFile(opts.workspaceRoot, body2);
-    const target = join33(opts.workspaceRoot, "AGENTS.md");
+    const target = join34(opts.workspaceRoot, "AGENTS.md");
     writeManagedBlock(target, { body: AGENTS_POINTER_BODY, stable: true, force: true });
     if (elicit) {
-      writePrimingHandles(join33(paths.configDir, "priming-handles.json"), [
+      writePrimingHandles(join34(paths.configDir, "priming-handles.json"), [
         ...snapshot.recentProblems.map((r) => r.node),
         // Resolved-band handles: the ✓ problem AND its Solution are citable
         // (a fix tag on an already-resolved problem no-ops idempotently; the
@@ -80989,7 +81081,7 @@ function createWorkspaceEngine(opts) {
       resultSummary: { exitCode: e.exitCode ?? 1, errorTokens: e.errorTokens }
     });
   };
-  const turnCursorPath = join33(paths.configDir, "turn-cursors.json");
+  const turnCursorPath = join34(paths.configDir, "turn-cursors.json");
   const lastTurnUuid = loadTurnCursors(turnCursorPath);
   const turnOffset = loadTurnOffsets(turnCursorPath);
   const readLosses = { parseFailures: 0, ioFailures: 0, bytesUnreachable: 0, sliceGuardHits: 0 };
@@ -81044,7 +81136,7 @@ function createWorkspaceEngine(opts) {
     let processedTurns = 0;
     const seqAtStart = store.currentIngestSeq();
     const elicit = isEdgeElicitationEnabled();
-    const handleMap = elicit ? readPrimingHandles(join33(paths.configDir, "priming-handles.json")) : {};
+    const handleMap = elicit ? readPrimingHandles(join34(paths.configDir, "priming-handles.json")) : {};
     const wsRoot = (opts.workspaceRoot ?? "").replace(/\\/g, "/");
     const toRel = (abs) => {
       const p = abs.replace(/\\/g, "/");
@@ -81336,10 +81428,10 @@ function createWorkspaceEngine(opts) {
                 let enclosing = {};
                 if (p.location?.line !== void 0) {
                   try {
-                    const headSha = readGitRefState(join33(opts.workspaceRoot, ".git")).sha ?? void 0;
+                    const headSha = readGitRefState(join34(opts.workspaceRoot, ".git")).sha ?? void 0;
                     enclosing = {
                       line: p.location.line,
-                      fileText: readFileSync28(join33(opts.workspaceRoot, anchorPath), "utf8"),
+                      fileText: readFileSync28(join34(opts.workspaceRoot, anchorPath), "utf8"),
                       ...headSha ? { headSha } : {}
                     };
                   } catch {
@@ -82102,7 +82194,7 @@ B: ${b}`,
     try {
       const inputs = emitInputsFromManifest(paths.configDir, paths.skillsManifest);
       emitAndProjectSkills(opts.workspaceRoot, inputs);
-      writePrimingHandles(join33(paths.configDir, "priming-handles.json"), skillHandleNodes(inputs));
+      writePrimingHandles(join34(paths.configDir, "priming-handles.json"), skillHandleNodes(inputs));
     } catch (err2) {
       console.warn("[skills] agent-skills projection failed (non-fatal):", err2 instanceof Error ? err2.message : err2);
     }
@@ -82605,7 +82697,7 @@ init_reconcile();
 // src/lockfile-auto.ts
 init_src();
 import { existsSync as existsSync27, readFileSync as readFileSync29 } from "node:fs";
-import { join as join34 } from "node:path";
+import { join as join35 } from "node:path";
 
 // src/package-index.ts
 init_src();
@@ -82754,7 +82846,7 @@ function runLockfilePass(opts) {
     { file: "package-lock.json", parse: parsePackageLockJson }
   ];
   for (const c of candidates) {
-    const p = join34(opts.root, c.file);
+    const p = join35(opts.root, c.file);
     if (!existsSync27(p)) continue;
     let sbom;
     try {
@@ -82819,7 +82911,7 @@ init_profile2();
 
 // src/public-symbols.ts
 import { readFileSync as readFileSync30, readdirSync as readdirSync11, existsSync as existsSync28 } from "node:fs";
-import { join as join35 } from "node:path";
+import { join as join36 } from "node:path";
 var HEAD_BYTES = 8 * 1024;
 var INDEX_TTL_MS = 10 * 60 * 1e3;
 var MIN_SYMBOL_LEN = 4;
@@ -82852,7 +82944,7 @@ function bindingNames(clause) {
 function internalPackageNames(workspaceRoot) {
   const names = /* @__PURE__ */ new Set();
   const tryRead = (dir) => {
-    const pj = join35(dir, "package.json");
+    const pj = join36(dir, "package.json");
     if (!existsSync28(pj)) return;
     try {
       const name2 = JSON.parse(readFileSync30(pj, "utf8")).name;
@@ -82862,10 +82954,10 @@ function internalPackageNames(workspaceRoot) {
   };
   tryRead(workspaceRoot);
   for (const group of ["packages", "apps"]) {
-    const groupDir = join35(workspaceRoot, group);
+    const groupDir = join36(workspaceRoot, group);
     if (!existsSync28(groupDir)) continue;
     try {
-      for (const entry of readdirSync11(groupDir)) tryRead(join35(groupDir, entry));
+      for (const entry of readdirSync11(groupDir)) tryRead(join36(groupDir, entry));
     } catch {
     }
   }
@@ -82904,7 +82996,7 @@ function publicSymbolIndex(store, workspaceRoot, deps = {}) {
   }
   const symbols = /* @__PURE__ */ new Set();
   for (const rel of files) {
-    const head2 = readHead(join35(workspaceRoot, rel));
+    const head2 = readHead(join36(workspaceRoot, rel));
     if (!head2) continue;
     for (const re of [NAMED_IMPORT_RE, REQUIRE_RE]) {
       re.lastIndex = 0;
@@ -84341,7 +84433,7 @@ init_src7();
 init_src();
 import { execFile as execFile4 } from "node:child_process";
 import { readFileSync as readFileSync32 } from "node:fs";
-import { join as join36 } from "node:path";
+import { join as join37 } from "node:path";
 import { promisify as promisify2 } from "node:util";
 
 // src/history-walk.ts
@@ -84493,6 +84585,57 @@ async function mergeSide(root, p1, p2) {
     return { sha: sha2, parents };
   });
 }
+async function commitGraph(root, branch) {
+  const out2 = await git(root, [...GIT_OPTS, "rev-list", "--parents", branch]);
+  const graph = /* @__PURE__ */ new Map();
+  for (const l of out2.split(/\r?\n/)) {
+    const [sha2, ...parents] = l.trim().split(" ");
+    if (sha2) graph.set(sha2, parents);
+  }
+  return graph;
+}
+function mergeSidesFromGraph(line, start2, graph) {
+  const seen = /* @__PURE__ */ new Set();
+  const reach = (from, into) => {
+    const stack = [from];
+    while (stack.length > 0) {
+      const sha2 = stack.pop();
+      if (seen.has(sha2) || into.has(sha2)) continue;
+      into.add(sha2);
+      for (const p of graph.get(sha2) ?? []) stack.push(p);
+    }
+  };
+  if (start2 > 0) {
+    const base = /* @__PURE__ */ new Set();
+    reach(line[start2 - 1].sha, base);
+    for (const sha2 of base) seen.add(sha2);
+  }
+  const sides = /* @__PURE__ */ new Map();
+  for (let i2 = start2; i2 < line.length; i2++) {
+    const { sha: sha2, parents } = line[i2];
+    if (parents.length >= 2) {
+      const side = /* @__PURE__ */ new Set();
+      reach(parents[1], side);
+      const chain2 = [];
+      let at = side.has(parents[1]) ? parents[1] : void 0;
+      let linear = true;
+      while (at) {
+        const ps = graph.get(at) ?? [];
+        chain2.push({ sha: at, parents: [...ps] });
+        const inSide = ps.filter((p) => side.has(p));
+        if (inSide.length > 1) {
+          linear = false;
+          break;
+        }
+        at = inSide[0];
+      }
+      sides.set(sha2, linear && chain2.length === side.size ? chain2.reverse() : null);
+      for (const s of side) seen.add(s);
+    }
+    seen.add(sha2);
+  }
+  return sides;
+}
 async function tagsByCommit(root) {
   const out2 = await git(root, [...GIT_OPTS, "for-each-ref", "--format=%(refname:short)%00%(objectname)%00%(*objectname)", "refs/tags"]);
   const map2 = /* @__PURE__ */ new Map();
@@ -84521,8 +84664,10 @@ async function enumerateUnits(root, opts = {}) {
   if (start2 >= line.length) return [];
   const commits = await readCommitsBulk(root, branch, start2 > 0 ? line[start2 - 1].sha : null);
   const commit = async (sha2) => commits.get(sha2) ?? await readCommit(root, sha2);
-  const merges = line.slice(start2).filter((c) => c.parents.length >= 2);
+  const fromGraph = mergeSidesFromGraph(line, start2, await commitGraph(root, branch));
   const sides = /* @__PURE__ */ new Map();
+  for (const [sha2, side] of fromGraph) if (side) sides.set(sha2, side);
+  const merges = line.slice(start2).filter((c) => c.parents.length >= 2 && !sides.has(c.sha));
   const sideLists = await mapBounded(merges, MERGE_SIDE_CONCURRENCY, (m) => mergeSide(root, m.parents[0], m.parents[1]));
   merges.forEach((m, i2) => sides.set(m.sha, sideLists[i2]));
   const units = [];
@@ -84729,7 +84874,7 @@ async function defaultGit(root, args2) {
 function readIgnoreLines(root, profile) {
   let lines = [];
   try {
-    lines = readFileSync32(join36(root, ".errataignore"), "utf8").split("\n");
+    lines = readFileSync32(join37(root, ".errataignore"), "utf8").split("\n");
   } catch {
   }
   return [...lines, ...profile.ignoreExtra ?? []].map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
@@ -85152,7 +85297,7 @@ init_cloud_auth();
 import { createHash as createHash16 } from "node:crypto";
 import { execFileSync as execFileSync5 } from "node:child_process";
 import { existsSync as existsSync30, writeFileSync as writeFileSync23 } from "node:fs";
-import { join as join37 } from "node:path";
+import { join as join38 } from "node:path";
 
 // src/device-poll.ts
 var THROTTLED_POLL_MIN_WAIT_MS = 11e3;
@@ -85610,7 +85755,7 @@ function applyLinkDecision(root, profile, config2, decision, now = Date.now) {
   delete nextProfile.projectLinkHold;
   let wroteIgnore = false;
   if (decision.writeIgnoreStarter !== false) {
-    const target = join37(root, ".errataignore");
+    const target = join38(root, ".errataignore");
     if (!existsSync30(target)) {
       writeFileSync23(target, IGNORE_STARTER, "utf8");
       wroteIgnore = true;
@@ -85626,11 +85771,11 @@ init_registry();
 // src/adopt.ts
 init_git_remote();
 import { existsSync as existsSync31 } from "node:fs";
-import { dirname as dirname12, join as join38 } from "node:path";
+import { dirname as dirname12, join as join39 } from "node:path";
 function findGitRoot(absPath) {
   let dir = absPath;
   for (let depth = 0; depth < 64; depth++) {
-    if (existsSync31(join38(dir, ".git"))) return dir;
+    if (existsSync31(join39(dir, ".git"))) return dir;
     const parent = dirname12(dir);
     if (parent === dir) return null;
     dir = parent;
@@ -88014,15 +88159,15 @@ function shouldUseOAuthLogin(flags2, env2 = process.env) {
 import { spawnSync } from "node:child_process";
 
 // src/codex-runtime.ts
-import { readdirSync as readdirSync12, statSync as statSync8 } from "node:fs";
-import { join as join39 } from "node:path";
+import { readdirSync as readdirSync12, statSync as statSync9 } from "node:fs";
+import { join as join40 } from "node:path";
 function resolveCodexExecutable(options = {}) {
   const platform = options.platform ?? process.platform;
   const env2 = options.env ?? process.env;
   if (platform !== "win32") return "codex";
   const fileTime = (path2) => {
     try {
-      const s = statSync8(path2);
+      const s = statSync9(path2);
       return s.isFile() ? s.mtimeMs : null;
     } catch {
       return null;
@@ -88030,13 +88175,13 @@ function resolveCodexExecutable(options = {}) {
   };
   for (const dir of (env2["PATH"] ?? env2["Path"] ?? "").split(";")) {
     if (!dir.trim()) continue;
-    const path2 = join39(dir.trim().replace(/^"|"$/g, ""), "codex.exe");
+    const path2 = join40(dir.trim().replace(/^"|"$/g, ""), "codex.exe");
     if (fileTime(path2) !== null) return path2;
   }
   if (!env2["LOCALAPPDATA"]) return "codex";
-  const root = join39(env2["LOCALAPPDATA"], "OpenAI", "Codex", "bin");
+  const root = join40(env2["LOCALAPPDATA"], "OpenAI", "Codex", "bin");
   try {
-    const candidates = readdirSync12(root, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join39(root, entry.name, "codex.exe")).map((path2) => ({ path: path2, mtime: fileTime(path2) })).filter((candidate) => candidate.mtime !== null).sort((a, b) => b.mtime - a.mtime || a.path.localeCompare(b.path));
+    const candidates = readdirSync12(root, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => join40(root, entry.name, "codex.exe")).map((path2) => ({ path: path2, mtime: fileTime(path2) })).filter((candidate) => candidate.mtime !== null).sort((a, b) => b.mtime - a.mtime || a.path.localeCompare(b.path));
     return candidates[0]?.path ?? "codex";
   } catch {
     return "codex";
@@ -88157,7 +88302,7 @@ import { createInterface } from "node:readline";
 // src/codex-hooks.ts
 import { existsSync as existsSync33, mkdirSync as mkdirSync9, readFileSync as readFileSync34, writeFileSync as writeFileSync25 } from "node:fs";
 import { homedir as homedir7 } from "node:os";
-import { join as join40 } from "node:path";
+import { join as join41 } from "node:path";
 
 // src/hook-commands.ts
 function hookCurlCommand(port, path2 = "/api/hook") {
@@ -88233,8 +88378,8 @@ try {
 
 // src/codex-hooks.ts
 var CODEX_HOOK_REVIEW_HELP = "Codex desktop: Settings > Hooks, select this project, expand each event and Trust the Errata hook. CLI users can use /hooks.";
-function hasCodexConfig(root, codexHome = process.env["CODEX_HOME"] || join40(homedir7(), ".codex")) {
-  return existsSync33(join40(root, ".codex")) || existsSync33(codexHome);
+function hasCodexConfig(root, codexHome = process.env["CODEX_HOME"] || join41(homedir7(), ".codex")) {
+  return existsSync33(join41(root, ".codex")) || existsSync33(codexHome);
 }
 function replaceCodexHooks(existing, block) {
   const begin = existing.indexOf(CODEX_HOOKS_BEGIN);
@@ -88250,12 +88395,12 @@ function replaceCodexHooks(existing, block) {
   return existing.trimEnd() + (existing.trim() ? "\n\n" : "") + block;
 }
 function writeCodexHooks(root, port, nodePath = process.execPath) {
-  const dir = join40(root, ".codex");
-  const file2 = join40(dir, "config.toml");
-  const relay = join40(dir, "hooks", "errata-relay.mjs");
+  const dir = join41(root, ".codex");
+  const file2 = join41(dir, "config.toml");
+  const relay = join41(dir, "hooks", "errata-relay.mjs");
   const block = buildCodexHooksToml(port, { nodePath, relayPath: relay });
   const final = replaceCodexHooks(existsSync33(file2) ? readFileSync34(file2, "utf8") : "", block);
-  mkdirSync9(join40(dir, "hooks"), { recursive: true });
+  mkdirSync9(join41(dir, "hooks"), { recursive: true });
   writeFileSync25(relay, CODEX_RELAY_SOURCE, "utf8");
   writeFileSync25(file2, final, "utf8");
   return file2;
@@ -88422,7 +88567,7 @@ function consolidationGapMs(lastPassMs, policy) {
 
 // src/claude-statusline.ts
 import { mkdirSync as mkdirSync10, writeFileSync as writeFileSync26 } from "node:fs";
-import { join as join41 } from "node:path";
+import { join as join42 } from "node:path";
 var STATUSLINE_RELAY_SOURCE = String.raw`// errata-managed: regenerated by errata install-hooks claude
 import { readFileSync } from 'node:fs';
 
@@ -88451,8 +88596,8 @@ function isErrataStatusLine(value) {
 }
 function installStatusLine(settings, root, port, nodePath = process.execPath) {
   if (settings["statusLine"] !== void 0 && !isErrataStatusLine(settings["statusLine"])) return false;
-  const dir = join41(root, ".claude", "hooks");
-  const relay = join41(dir, STATUSLINE_RELAY_FILE);
+  const dir = join42(root, ".claude", "hooks");
+  const relay = join42(dir, STATUSLINE_RELAY_FILE);
   mkdirSync10(dir, { recursive: true });
   writeFileSync26(relay, STATUSLINE_RELAY_SOURCE, "utf8");
   settings["statusLine"] = buildStatusLine(port, nodePath, relay);
@@ -88865,13 +89010,13 @@ async function cmdInit() {
     console.log("");
     console.log("installing harness hooks...");
     const { existsSync: existsSync35 } = await import("node:fs");
-    const { join: join43 } = await import("node:path");
+    const { join: join44 } = await import("node:path");
     try {
       await installClaudeHooks(port);
     } catch (err2) {
       console.warn(`  \u26A0\uFE0F  Claude hook install failed: ${err2 instanceof Error ? err2.message : err2}`);
     }
-    if (existsSync35(join43(ROOT, ".cursor"))) {
+    if (existsSync35(join44(ROOT, ".cursor"))) {
       try {
         await installCursorMcpConfig();
       } catch (err2) {
@@ -90758,8 +90903,8 @@ async function cmdReport(args2) {
   const outDir = workspacePaths(ROOT).configDir;
   mkdirSync11(outDir, { recursive: true });
   const files = renderReport2(data, { includeFutureVerbs });
-  for (const f of files) writeFileSync27(join42(outDir, f.name), f.html, "utf8");
-  const indexPath = join42(outDir, "report.html");
+  for (const f of files) writeFileSync27(join43(outDir, f.name), f.html, "utf8");
+  const indexPath = join43(outDir, "report.html");
   console.log(`report \u2192 ${indexPath}`);
   console.log(
     `  ${data.repos.length} repo(s) \xB7 ${files.length} file(s) \xB7 ${data.rollup.nodes.toLocaleString("en-US")} nodes`
@@ -90814,7 +90959,7 @@ function spawnDaemonDetached(options = {}) {
   try {
     const logPath = daemonLogPath();
     try {
-      if (statSync9(logPath).size > 5 * 1024 * 1024) renameSync4(logPath, `${logPath}.1`);
+      if (statSync10(logPath).size > 5 * 1024 * 1024) renameSync4(logPath, `${logPath}.1`);
     } catch {
     }
     out2 = openSync2(logPath, "a");
@@ -90880,10 +91025,10 @@ async function cmdInstallHooks(args2) {
 }
 async function installOpencodePlugin(port) {
   const { mkdirSync: mkdirSync11, existsSync: existsSync35, readFileSync: readFileSync36, writeFileSync: writeFileSync27 } = await import("node:fs");
-  const { join: join43 } = await import("node:path");
-  const dir = join43(ROOT, ".opencode", "plugin");
+  const { join: join44 } = await import("node:path");
+  const dir = join44(ROOT, ".opencode", "plugin");
   if (!existsSync35(dir)) mkdirSync11(dir, { recursive: true });
-  const file2 = join43(dir, "inerrata.js");
+  const file2 = join44(dir, "inerrata.js");
   if (existsSync35(file2)) {
     const head2 = readFileSync36(file2, "utf8").split("\n")[0] ?? "";
     if (head2.trim() !== OPENCODE_PLUGIN_MARKER) {
@@ -90892,7 +91037,7 @@ async function installOpencodePlugin(port) {
     }
   }
   writeFileSync27(file2, buildOpencodePluginSource(port, { version: DAEMON_VERSION }), "utf8");
-  const cfgFile = join43(ROOT, "opencode.json");
+  const cfgFile = join44(ROOT, "opencode.json");
   let cfg = { $schema: "https://opencode.ai/config.json" };
   if (existsSync35(cfgFile)) {
     try {
@@ -90928,10 +91073,10 @@ function errataMcpInvocation() {
 }
 async function installClaudeHooks(port) {
   const { mkdirSync: mkdirSync11, existsSync: existsSync35, readFileSync: readFileSync36, writeFileSync: writeFileSync27 } = await import("node:fs");
-  const { join: join43 } = await import("node:path");
-  const dir = join43(ROOT, ".claude");
+  const { join: join44 } = await import("node:path");
+  const dir = join44(ROOT, ".claude");
   if (!existsSync35(dir)) mkdirSync11(dir, { recursive: true });
-  const file2 = join43(dir, "settings.json");
+  const file2 = join44(dir, "settings.json");
   let settings = {};
   if (existsSync35(file2)) {
     try {
@@ -90985,7 +91130,7 @@ async function installClaudeHooks(port) {
   const { homedir: homedir8 } = await import("node:os");
   let userStatusLine;
   try {
-    userStatusLine = JSON.parse(readFileSync36(join43(homedir8(), ".claude", "settings.json"), "utf8"))["statusLine"];
+    userStatusLine = JSON.parse(readFileSync36(join44(homedir8(), ".claude", "settings.json"), "utf8"))["statusLine"];
   } catch {
   }
   const statusLineInstalled = (userStatusLine === void 0 || isErrataStatusLine(userStatusLine)) && installStatusLine(settings, ROOT, port);
@@ -90995,7 +91140,7 @@ async function installClaudeHooks(port) {
     statusLineInstalled ? "  status line: errata recall card in colour (daemon env ERRATA_RECALL_CARD=off hides the cards)" : "  status line: kept your own \u2014 errata's recall card shows inline only"
   );
   await installClaudeMcpConfig();
-  const claudeMd = join43(ROOT, "CLAUDE.md");
+  const claudeMd = join44(ROOT, "CLAUDE.md");
   const recall = writeManagedBlock(claudeMd, { body: RECALL_FIRST_BLOCK });
   if (recall.kind === "collision") {
     console.warn(
@@ -91008,8 +91153,8 @@ async function installClaudeHooks(port) {
 }
 async function installClaudeMcpConfig() {
   const { mkdirSync: mkdirSync11, existsSync: existsSync35, readFileSync: readFileSync36, writeFileSync: writeFileSync27 } = await import("node:fs");
-  const { join: join43, dirname: dirname13 } = await import("node:path");
-  const file2 = join43(ROOT, ".mcp.json");
+  const { join: join44, dirname: dirname13 } = await import("node:path");
+  const file2 = join44(ROOT, ".mcp.json");
   const dir = dirname13(file2);
   if (!existsSync35(dir)) mkdirSync11(dir, { recursive: true });
   let cfg = {};
@@ -91030,10 +91175,10 @@ async function installClaudeMcpConfig() {
 }
 async function installCursorMcpConfig() {
   const { mkdirSync: mkdirSync11, existsSync: existsSync35, readFileSync: readFileSync36, writeFileSync: writeFileSync27 } = await import("node:fs");
-  const { join: join43 } = await import("node:path");
-  const dir = join43(ROOT, ".cursor");
+  const { join: join44 } = await import("node:path");
+  const dir = join44(ROOT, ".cursor");
   if (!existsSync35(dir)) mkdirSync11(dir, { recursive: true });
-  const file2 = join43(dir, "mcp.json");
+  const file2 = join44(dir, "mcp.json");
   let cfg = {};
   if (existsSync35(file2)) {
     try {
@@ -91056,7 +91201,7 @@ async function installCodexHooks(port) {
   const gitRoot = nearestGitRoot(process.cwd());
   const hookRoot = gitRoot && mainCheckoutOfWorktree(gitRoot) ? gitRoot : ROOT;
   const file2 = writeCodexHooks(hookRoot, port);
-  const instructions = writeManagedBlock(join42(hookRoot, "AGENTS.md"), {
+  const instructions = writeManagedBlock(join43(hookRoot, "AGENTS.md"), {
     body: AGENTS_POINTER_BODY,
     stable: true
   });
@@ -91460,7 +91605,7 @@ async function cmdDash(args2) {
       await yieldToLoop2();
       try {
         const items = selectDurableMemory(handle2.sharedStore, r.engine.profile);
-        const res = bleedRules(join42(r.root, ".claude", "rules"), items);
+        const res = bleedRules(join43(r.root, ".claude", "rules"), items);
         if (res.written || res.pruned) {
           console.log(
             `[rules:${r.entry.name}] ${res.written} collective principle(s) \u2192 .claude/rules` + (res.pruned ? `, ${res.pruned} pruned` : "")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inerrata-corporation/errata",
-  "version": "2.0.8-dev.2890",
+  "version": "2.0.8-dev.2896",
   "description": "errata - local-first observation engine for AI coding agents",
   "type": "module",
   "bin": {