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

package/consolidate-worker.mjs

@@ -16146,6 +16146,9 @@ CREATE INDEX IF NOT EXISTS nodes_relpath ON nodes(json_extract(attrs_json, '$.re
 -- Live rows by name, for looking up the few symbols a statement mentions
 -- instead of hydrating every code symbol per minted problem.
 CREATE INDEX IF NOT EXISTS nodes_live_description ON nodes(description, label) WHERE valid_to IS NULL;
+-- Problems by the file their anchor hint names: the harvest upgrades hints for
+-- every edited file of every turn, and a scan parses every Problem's attrs.
+CREATE INDEX IF NOT EXISTS nodes_anchor_hint_path ON nodes(json_extract(attrs_json, '$.anchorHint.path')) WHERE valid_to IS NULL;
 `;
 function encodeEmbedding(emb) {
   if (!emb || emb.length === 0) return null;
@@ -17004,6 +17007,13 @@ var SqliteGraphStore = class {
     ).all(...relPaths);
     return rows.map(rowToNode);
   }
+  findLiveNodesByAttr(label, attrPath, value) {
+    if (!/^[A-Za-z0-9_]+(\.[A-Za-z0-9_]+)*$/.test(attrPath)) throw new Error(`invalid attr path: ${attrPath}`);
+    const rows = this.db.prepare(
+      `SELECT * FROM nodes WHERE json_extract(attrs_json, '$.${attrPath}') = ? AND valid_to IS NULL AND label = ?`
+    ).all(value, label);
+    return rows.map(rowToNode);
+  }
   // ── Bi-temporal versioning ───────────────────────────────────────────
   // NOTE: the adapter's transaction() is non-reentrant (raw BEGIN/COMMIT), and
   // the indexer calls freezeNode inside its own store.transaction(). So this

package/errata.mjs

@@ -17568,6 +17568,9 @@ CREATE INDEX IF NOT EXISTS nodes_relpath ON nodes(json_extract(attrs_json, '$.re
 -- Live rows by name, for looking up the few symbols a statement mentions
 -- instead of hydrating every code symbol per minted problem.
 CREATE INDEX IF NOT EXISTS nodes_live_description ON nodes(description, label) WHERE valid_to IS NULL;
+-- Problems by the file their anchor hint names: the harvest upgrades hints for
+-- every edited file of every turn, and a scan parses every Problem's attrs.
+CREATE INDEX IF NOT EXISTS nodes_anchor_hint_path ON nodes(json_extract(attrs_json, '$.anchorHint.path')) WHERE valid_to IS NULL;
 `;
     SqliteGraphStore = class {
       db;
@@ -18369,6 +18372,13 @@ CREATE INDEX IF NOT EXISTS nodes_live_description ON nodes(description, label) W
         ).all(...relPaths);
         return rows.map(rowToNode);
       }
+      findLiveNodesByAttr(label, attrPath, value) {
+        if (!/^[A-Za-z0-9_]+(\.[A-Za-z0-9_]+)*$/.test(attrPath)) throw new Error(`invalid attr path: ${attrPath}`);
+        const rows = this.db.prepare(
+          `SELECT * FROM nodes WHERE json_extract(attrs_json, '$.${attrPath}') = ? AND valid_to IS NULL AND label = ?`
+        ).all(value, label);
+        return rows.map(rowToNode);
+      }
       // ── Bi-temporal versioning ───────────────────────────────────────────
       // NOTE: the adapter's transaction() is non-reentrant (raw BEGIN/COMMIT), and
       // the indexer calls freezeNode inside its own store.transaction(). So this
@@ -20645,7 +20655,7 @@ function consumeAnchorHint(store, p, ts) {
 }
 function upgradeAnchorHintsForFile(store, relPath, workspaceId2, ts) {
   let upgraded = 0;
-  for (const p of store.findNodesByLabel("Problem")) {
+  for (const p of store.findLiveNodesByAttr("Problem", "anchorHint.path", relPath)) {
     if (p.validTo != null || p.attrs["resolvedAt"]) continue;
     const hint = openAnchorHint(p);
     if (!hint || hint.path !== relPath) continue;
@@ -80114,7 +80124,7 @@ function createWatchBreaker(deps) {
 }
 
 // src/engine.ts
-var DAEMON_VERSION = true ? "2.0.8-dev.2889" : "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;
@@ -84483,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();
@@ -84511,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.2889",
+  "version": "2.0.8-dev.2895",
   "description": "errata - local-first observation engine for AI coding agents",
   "type": "module",
   "bin": {

package/pass-worker.mjs

@@ -24528,6 +24528,9 @@ CREATE INDEX IF NOT EXISTS nodes_relpath ON nodes(json_extract(attrs_json, '$.re
 -- Live rows by name, for looking up the few symbols a statement mentions
 -- instead of hydrating every code symbol per minted problem.
 CREATE INDEX IF NOT EXISTS nodes_live_description ON nodes(description, label) WHERE valid_to IS NULL;
+-- Problems by the file their anchor hint names: the harvest upgrades hints for
+-- every edited file of every turn, and a scan parses every Problem's attrs.
+CREATE INDEX IF NOT EXISTS nodes_anchor_hint_path ON nodes(json_extract(attrs_json, '$.anchorHint.path')) WHERE valid_to IS NULL;
 `;
 function encodeEmbedding(emb) {
   if (!emb || emb.length === 0) return null;
@@ -25386,6 +25389,13 @@ var SqliteGraphStore = class {
     ).all(...relPaths);
     return rows.map(rowToNode);
   }
+  findLiveNodesByAttr(label, attrPath, value) {
+    if (!/^[A-Za-z0-9_]+(\.[A-Za-z0-9_]+)*$/.test(attrPath)) throw new Error(`invalid attr path: ${attrPath}`);
+    const rows = this.db.prepare(
+      `SELECT * FROM nodes WHERE json_extract(attrs_json, '$.${attrPath}') = ? AND valid_to IS NULL AND label = ?`
+    ).all(value, label);
+    return rows.map(rowToNode);
+  }
   // ── Bi-temporal versioning ───────────────────────────────────────────
   // NOTE: the adapter's transaction() is non-reentrant (raw BEGIN/COMMIT), and
   // the indexer calls freezeNode inside its own store.transaction(). So this