@inerrata-corporation/errata 2.0.6-dev.2674 → 2.0.6-dev.2687

package/errata.mjs

@@ -78536,7 +78536,7 @@ function createWatchBreaker(deps) {
 }
 
 // src/engine.ts
-var DAEMON_VERSION = true ? "2.0.6-dev.2674" : "2.0.0-alpha.0";
+var DAEMON_VERSION = true ? "2.0.6-dev.2687" : "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;
@@ -84228,6 +84228,7 @@ var HISTORY_EXTRACTOR_VERSION = "history-2";
 var LEASE_POLL_MS = 2e4;
 var RECOVERY_DEADLINE_MS = 15 * 6e4;
 var MAX_ANCHORS_PER_TOKEN = 20;
+var DEFAULT_LOOKAHEAD = 2;
 async function defaultGit(root, args2) {
   const { stdout } = await execFileAsync("git", ["-C", root, ...args2], { maxBuffer: 64 * 1024 * 1024, windowsHide: true });
   return stdout;
@@ -84327,7 +84328,11 @@ function unitTiming(postStarted, prepMs, receipt) {
   const g = receipt.gate;
   if (g) parts2.push(g.pRoutine === null ? `jev ${g.error ?? "n/a"}` : `jev ${s(g.ms)} p=${g.pRoutine}${g.skipped ? " skipped" : ""}`);
   if (receipt.timing?.modelMs !== void 0) parts2.push(`model ${s(receipt.timing.modelMs)}`);
-  if (receipt.timing?.ingestMs !== void 0) parts2.push(`ingest ${s(receipt.timing.ingestMs)}`);
+  if (receipt.timing?.orderWaitMs) parts2.push(`waited ${s(receipt.timing.orderWaitMs)} for the previous write`);
+  if (receipt.timing?.ingestMs !== void 0) {
+    const top = Object.entries(receipt.timing.ingestStages ?? {}).slice(0, 4).map(([k, v]) => `${k} ${v}`);
+    parts2.push(`ingest ${s(receipt.timing.ingestMs)}${top.length ? ` [${top.join(", ")}]` : ""}`);
+  }
   return ` in ${s(Date.now() - postStarted + prepMs)} (${parts2.join(", ")})`;
 }
 function addCounts(a, b) {
@@ -84383,8 +84388,77 @@ async function walk10(root, input, client, opts, readBlob) {
   let processed = 0;
   const byIndex = /* @__PURE__ */ new Map();
   for (const u of units) byIndex.set(u.index, [...byIndex.get(u.index) ?? [], u]);
-  for (const u of units) {
-    if (opts.maxUnits !== void 0 && processed >= opts.maxUnits) break;
+  const lookahead = dryRun ? 0 : Math.max(0, opts.lookahead ?? DEFAULT_LOOKAHEAD);
+  let doorOrders = false;
+  const settle = (p) => p.then((res) => ({ res }), (err2) => ({ err: err2 }));
+  const prepared = /* @__PURE__ */ new Map();
+  const launched = /* @__PURE__ */ new Map();
+  const cap = opts.maxUnits;
+  const predecessor = (k) => {
+    for (let j = k - 1; j >= 0; j--) if (!units[j].skip) return units[j];
+    return void 0;
+  };
+  const prepare = (k) => {
+    const hit = prepared.get(k);
+    if (hit) return hit;
+    const p = (async () => {
+      const u = units[k];
+      const prepStarted = Date.now();
+      const group = byIndex.get(u.index) ?? [u];
+      const bundle = await buildUnitBundle(root, u, {
+        ignorePatterns: ignoreLines,
+        narrative: narrative(u, u.isMerge ? group : void 0)
+      });
+      const prev = dryRun ? void 0 : predecessor(k);
+      const body2 = {
+        unit: {
+          sha: u.sha,
+          index: u.index,
+          subIndex: u.subIndex,
+          isMerge: u.isMerge,
+          ...u.groupSha ? { groupSha: u.groupSha } : {},
+          ...u.authorDate ? { authorDate: u.authorDate } : {}
+        },
+        narrative: bundle.narrative,
+        fileList: bundle.fileList,
+        diff: bundle.diff,
+        pathTokens: Object.keys(bundle.pathTokens),
+        extractorVersion: HISTORY_EXTRACTOR_VERSION,
+        ...opts.frame ? { frame: opts.frame } : {},
+        ...dryRun ? { dryRun: true } : {},
+        ...prev ? { after: { sha: prev.sha, subIndex: prev.subIndex } } : {}
+      };
+      const spine = await spineForUnit(git3, root, u, readBlob);
+      if (spine) body2.spine = spine;
+      const anchors = anchorsFor(bundle.pathTokens, ignoreLines, projectId, opts.anchors);
+      if (anchors) {
+        body2.anchors = anchors;
+        body2.observedAtCommit = headSha;
+      }
+      return { body: body2, prepMs: Date.now() - prepStarted };
+    })();
+    prepared.set(k, p);
+    return p;
+  };
+  const launch = async (k) => {
+    if (launched.has(k)) return;
+    const { body: body2 } = await prepare(k);
+    if (launched.has(k)) return;
+    launched.set(k, { at: Date.now(), settled: settle(Promise.resolve().then(() => post(projectId, body2))) });
+  };
+  const launchAhead = async (k) => {
+    if (!doorOrders || lookahead === 0) return;
+    let ahead = 0;
+    for (let j = k + 1; j < units.length && ahead < lookahead; j++) {
+      if (cap !== void 0 && processed + (j - k) >= cap) break;
+      if (units[j].skip) continue;
+      ahead += 1;
+      await launch(j);
+    }
+  };
+  for (let k = 0; k < units.length; k++) {
+    const u = units[k];
+    if (cap !== void 0 && processed >= cap) break;
     const label = `${u.sha.slice(0, 12)}${u.subIndex ? `/${u.subIndex}` : ""}`;
     const doneSoFar = (profile.historyStage?.unitsDone ?? 0) + 1;
     const group = byIndex.get(u.index) ?? [u];
@@ -84398,35 +84472,7 @@ async function walk10(root, input, client, opts, readBlob) {
       log(`[errata] history ${label} skipped (${u.skip})`);
       continue;
     }
-    const prepStarted = Date.now();
-    const bundle = await buildUnitBundle(root, u, {
-      ignorePatterns: ignoreLines,
-      narrative: narrative(u, u.isMerge ? group : void 0)
-    });
-    const body2 = {
-      unit: {
-        sha: u.sha,
-        index: u.index,
-        subIndex: u.subIndex,
-        isMerge: u.isMerge,
-        ...u.groupSha ? { groupSha: u.groupSha } : {},
-        ...u.authorDate ? { authorDate: u.authorDate } : {}
-      },
-      narrative: bundle.narrative,
-      fileList: bundle.fileList,
-      diff: bundle.diff,
-      pathTokens: Object.keys(bundle.pathTokens),
-      extractorVersion: HISTORY_EXTRACTOR_VERSION,
-      ...opts.frame ? { frame: opts.frame } : {},
-      ...dryRun ? { dryRun: true } : {}
-    };
-    const spine = await spineForUnit(git3, root, u, readBlob);
-    if (spine) body2.spine = spine;
-    const anchors = anchorsFor(bundle.pathTokens, ignoreLines, projectId, opts.anchors);
-    if (anchors) {
-      body2.anchors = anchors;
-      body2.observedAtCommit = headSha;
-    }
+    const { body: body2, prepMs } = await prepare(k);
     profile = stage(profile, { state: dryRun ? "extracting" : "contributing", unitsDone: doneSoFar - 1, lastError: void 0 }, now);
     persist(profile);
     response = await reportHistoryStage(client, profile, log);
@@ -84436,16 +84482,21 @@ async function walk10(root, input, client, opts, readBlob) {
       await reportHistoryStage(client, profile, log);
       return { profile, processed, state: "refused" };
     }
-    const prepMs = Date.now() - prepStarted;
-    const started2 = Date.now();
+    await launch(k);
+    await launchAhead(k);
+    const head2 = launched.get(k);
+    launched.delete(k);
+    prepared.delete(k);
+    const started2 = head2.at;
+    let first = head2.settled;
     let outcome = null;
     let attempt = 0;
     while (outcome === null) {
       attempt += 1;
-      let res;
-      try {
-        res = await post(projectId, body2);
-      } catch (err2) {
+      const settled = await (first ?? settle(Promise.resolve().then(() => post(projectId, body2))));
+      first = null;
+      if ("err" in settled) {
+        const err2 = settled.err;
         const status = err2 instanceof CloudError ? err2.status : 0;
         const elapsed = Math.round((Date.now() - started2) / 1e3);
         if (Date.now() - started2 > RECOVERY_DEADLINE_MS) {
@@ -84458,6 +84509,8 @@ async function walk10(root, input, client, opts, readBlob) {
         await sleep(attempt === 1 ? 1e4 : Math.min(3e4 * attempt, 12e4));
         continue;
       }
+      const res = settled.res;
+      if (res.ordered) doorOrders = true;
       if (res.status === "in_progress") {
         const retryAt = new Date(Date.now() + res.retryAfterMs).toISOString();
         if (Date.now() - started2 > RECOVERY_DEADLINE_MS) {
@@ -84466,12 +84519,14 @@ async function walk10(root, input, client, opts, readBlob) {
           await reportHistoryStage(client, profile, log);
           return { profile, processed, state: "paused" };
         }
-        log(`[errata] history ${label}: run held by the door (lease), polling in ${Math.min(LEASE_POLL_MS, res.retryAfterMs) / 1e3}s`);
+        const why = res.waitingOn === "predecessor" ? `sent ahead, its predecessor ${res.predecessor === "failed" ? "failed" : "had not landed"} \u2014 re-POSTing in turn` : "run held by the door (lease)";
+        log(`[errata] history ${label}: ${why}, polling in ${Math.min(LEASE_POLL_MS, res.retryAfterMs) / 1e3}s`);
         await sleep(Math.min(LEASE_POLL_MS, Math.max(1e3, res.retryAfterMs)));
         continue;
       }
       outcome = res;
     }
+    await launchAhead(k);
     switch (outcome.status) {
       case "completed": {
         if (outcome.result.nodes.length !== outcome.counts.nodes || outcome.result.edges.length !== outcome.counts.edges) {

package/package.json

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