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

package/errata.mjs

@@ -80124,7 +80124,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.2895" : "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;
@@ -84493,6 +84493,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 +84572,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 = [];

package/package.json

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