@inerrata-corporation/errata 2.0.17-dev.3464 → 2.0.17-dev.3465

package/consolidate-worker.mjs

@@ -15656,9 +15656,6 @@ function projectSymbolId(projectSalt, projectId, relPath, qname, kind) {
   const path = normalizeSymbolPath(relPath);
   return `sym_${createHmac("sha256", projectSalt).update(`${projectId}:${path}:${qname}:${kind}`).digest("hex").slice(0, 24)}`;
 }
-function isMembraneSaltedId(id) {
-  return typeof id === "string" && /^(orgn_|teamn_|projn_)/.test(id);
-}
 var init_project_symbol = __esm({
   "../../packages/shared/src/project-symbol.ts"() {
     "use strict";
@@ -18584,6 +18581,18 @@ init_src();
 // src/instance-receipts.ts
 var INSTANCE_SEMANTIC_EDGE_TYPES = ["CAUSED_BY", "SOLVED_BY"];
 var INSTANCE_ANCHOR_EDGE_TYPES = ["OCCURS_IN", "DEPENDS_ON", "PERTAIN_TO", "CONCERNS"];
+function instanceCloudWithdrawal(n, destination, getMeta) {
+  const id = n.attrs["source"] === "cloud" ? n.attrs["cloudNodeId"] ?? n.id : instanceReceipt(n, destination)["cloudNodeId"];
+  if (typeof id !== "string") return false;
+  const raw = getMeta(`history-correction:${id}`);
+  if (!raw) return false;
+  try {
+    const correction = JSON.parse(raw);
+    return correction.nodeId === id && correction.action === "quarantine" && correction.sourceSupport !== "supported";
+  } catch {
+    return false;
+  }
+}
 function receiptMap(attrs) {
   const value = attrs["instanceReceipts"];
   return value && typeof value === "object" && !Array.isArray(value) ? value : {};
@@ -19474,7 +19483,7 @@ function stripCodebaseScope(scope) {
 }
 function contributedWireId(n, destinationKey) {
   const cloudId = instanceReceipt(n, destinationKey)["cloudNodeId"];
-  return isMembraneSaltedId(cloudId) ? cloudId : n.id;
+  return typeof cloudId === "string" && cloudId ? cloudId : n.id;
 }
 var WIRE_CANONICAL_ID_MIN = 6;
 var SHIP_TERMINAL_REFUSALS = 3;
@@ -19482,7 +19491,7 @@ function refusalFingerprint(reason, description) {
   return digest(`${reason}\0${description}`);
 }
 function isRetryableRefusal(reason) {
-  return /\bretry\b/i.test(reason);
+  return reason === "blocked" || /\bretry\b/i.test(reason);
 }
 function isTerminallyRefused(n) {
   const reason = String(n.attrs["shipRefusedReason"] ?? "");
@@ -19602,6 +19611,8 @@ function buildInstanceIngest(store, profile, daemonVersion, ignorePatterns = [],
   const semanticEndpoints = /* @__PURE__ */ new Map();
   const includedByLabel = /* @__PURE__ */ new Map();
   const composition = {
+    cloudWithdrawn: 0,
+    withdrawnAnchorTargets: 0,
     privateTargetMissing: 0,
     candidates: 0,
     shipped: 0,
@@ -19670,6 +19681,10 @@ function buildInstanceIngest(store, profile, daemonVersion, ignorePatterns = [],
         composition.ignored++;
         continue;
       }
+      if (instanceCloudWithdrawal(n, opts.destinationKey, (key) => store.getMeta?.(key) ?? opts.sharedStore?.getMeta?.(key))) {
+        composition.cloudWithdrawn++;
+        continue;
+      }
       const contributedAtSeq = instanceReceipt(n, opts.destinationKey)["contributedAtSeq"];
       if (typeof contributedAtSeq === "number" && (n.lastReinforcedAtSeq ?? 0) <= contributedAtSeq) {
         composition.watermarked++;
@@ -19718,6 +19733,10 @@ function buildInstanceIngest(store, profile, daemonVersion, ignorePatterns = [],
     for (const e of store.outEdges(sourceId, [...ANCHOR_EDGES])) {
       const t = nodeOf(e.to);
       if (!t || !ANCHOR_TARGET_LABELS.includes(t.label)) continue;
+      if (instanceCloudWithdrawal(t, opts.destinationKey, (key) => store.getMeta?.(key) ?? opts.sharedStore?.getMeta?.(key))) {
+        composition.withdrawnAnchorTargets++;
+        continue;
+      }
       if (e.type === "OCCURS_IN" && t.label !== "Language") continue;
       if (e.type === "DEPENDS_ON" && t.label !== "Package") continue;
       if (e.type === "PERTAIN_TO" && t.label !== "Domain") continue;

package/errata.mjs

@@ -26155,6 +26155,8 @@ var init_oauth = __esm({
 
 // ../../packages/cloud-client/src/client.ts
 import { randomUUID } from "node:crypto";
+import { gzip } from "node:zlib";
+import { promisify } from "node:util";
 function wirePerContext(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return null;
   const out2 = {};
@@ -26406,7 +26408,7 @@ function parseRestErrorEnvelope(text) {
     return null;
   }
 }
-var asWireCount, INGEST_NODE_CHUNK, INGEST_EDGE_CHUNK, E6B_PUBLIC_CONTEXT_SENTINEL, CloudClient, CloudError;
+var asWireCount, INGEST_NODE_CHUNK, INGEST_EDGE_CHUNK, E6B_PUBLIC_CONTEXT_SENTINEL, gzipAsync, CloudClient, CloudError;
 var init_client = __esm({
   "../../packages/cloud-client/src/client.ts"() {
     "use strict";
@@ -26416,7 +26418,9 @@ var init_client = __esm({
     INGEST_NODE_CHUNK = 8;
     INGEST_EDGE_CHUNK = 32;
     E6B_PUBLIC_CONTEXT_SENTINEL = "00000000-0000-4e6b-8000-000000000e6b";
+    gzipAsync = promisify(gzip);
     CloudClient = class {
+      compressedRoutes = /* @__PURE__ */ new Set();
       baseUrl;
       apiKey;
       accessToken;
@@ -26648,7 +26652,7 @@ var init_client = __esm({
           merged.nodes.push(...r.nodes);
           merged.edges.push(...r.edges);
           for (const rn of r.nodes) {
-            if (rn.nodeId && rn.nodeId !== rn.canonicalId && isMembraneSaltedId(rn.nodeId)) {
+            if (rn.nodeId && rn.nodeId !== rn.canonicalId && rn.decision !== "rejected") {
               echoedCloudId.set(rn.canonicalId, rn.nodeId);
             }
           }
@@ -27080,12 +27084,23 @@ var init_client = __esm({
         const ac = new AbortController();
         const tid = setTimeout(() => ac.abort(), this.timeoutMs);
         try {
-          const res = await this.fetchFn(url2, {
+          const serialized = body2 === void 0 ? void 0 : JSON.stringify(body2);
+          const compressible = method === "POST" && (path2 === "/v2/ingest" || /^\/v2\/projects\/[^/]+\/history\/units$/.test(path2));
+          const send = async (compressed2) => this.fetchFn(url2, {
             method,
-            headers,
-            body: body2 === void 0 ? void 0 : JSON.stringify(body2),
+            headers: compressed2 ? { ...headers, "content-encoding": "gzip" } : headers,
+            body: compressed2 && serialized !== void 0 ? new Uint8Array(await gzipAsync(serialized)) : serialized,
             signal: ac.signal
           });
+          let compressed = compressible && this.compressedRoutes.has(path2);
+          let res = await send(compressed);
+          if (!res.ok && compressible && !compressed && serialized !== void 0) {
+            const text = await res.clone().text();
+            if (isIntermediaryRejection(new CloudError(`HTTP ${res.status} ${text.slice(0, 200)}`, res.status))) {
+              compressed = true;
+              res = await send(true);
+            }
+          }
           if (!res.ok) {
             const text = await res.text();
             const envelope = parseRestErrorEnvelope(text);
@@ -27095,6 +27110,7 @@ var init_client = __esm({
               envelope?.code
             );
           }
+          if (compressed) this.compressedRoutes.add(path2);
           return await res.json();
         } finally {
           clearTimeout(tid);
@@ -64914,7 +64930,7 @@ var require_mock_interceptor = __commonJS({
 var require_mock_client = __commonJS({
   "../../node_modules/.pnpm/undici@6.24.1/node_modules/undici/lib/mock/mock-client.js"(exports, module2) {
     "use strict";
-    var { promisify: promisify4 } = __require("node:util");
+    var { promisify: promisify5 } = __require("node:util");
     var Client = require_client();
     var { buildMockDispatch } = require_mock_utils();
     var {
@@ -64954,7 +64970,7 @@ var require_mock_client = __commonJS({
         return new MockInterceptor(opts, this[kDispatches]);
       }
       async [kClose]() {
-        await promisify4(this[kOriginalClose])();
+        await promisify5(this[kOriginalClose])();
         this[kConnected] = 0;
         this[kMockAgent][Symbols.kClients].delete(this[kOrigin]);
       }
@@ -64967,7 +64983,7 @@ var require_mock_client = __commonJS({
 var require_mock_pool = __commonJS({
   "../../node_modules/.pnpm/undici@6.24.1/node_modules/undici/lib/mock/mock-pool.js"(exports, module2) {
     "use strict";
-    var { promisify: promisify4 } = __require("node:util");
+    var { promisify: promisify5 } = __require("node:util");
     var Pool = require_pool();
     var { buildMockDispatch } = require_mock_utils();
     var {
@@ -65007,7 +65023,7 @@ var require_mock_pool = __commonJS({
         return new MockInterceptor(opts, this[kDispatches]);
       }
       async [kClose]() {
-        await promisify4(this[kOriginalClose])();
+        await promisify5(this[kOriginalClose])();
         this[kConnected] = 0;
         this[kMockAgent][Symbols.kClients].delete(this[kOrigin]);
       }
@@ -73728,6 +73744,46 @@ import { execFileSync as execFileSync5 } from "node:child_process";
 import { existsSync as existsSync28, statSync as statSync8, appendFileSync as appendFileSync4, readdirSync as readdirSync10, renameSync as renameSync4, readFileSync as readFileSync32, writeFileSync as writeFileSync23 } from "node:fs";
 import { basename as basename7, join as join35, relative as relative6, sep as sep4 } from "node:path";
 
+// src/coalesced-file-pass.ts
+function createCoalescedFilePass(delayMs, run3, onError) {
+  const pending = /* @__PURE__ */ new Set();
+  let timer;
+  let running = false;
+  let stopped = false;
+  const clear = () => {
+    if (timer) clearTimeout(timer);
+    timer = void 0;
+    pending.clear();
+  };
+  const schedule = () => {
+    if (stopped || running || !pending.size) return;
+    if (timer) clearTimeout(timer);
+    timer = setTimeout(() => {
+      timer = void 0;
+      const paths = [...pending];
+      pending.clear();
+      running = true;
+      void Promise.resolve().then(() => run3(paths)).catch(onError).finally(() => {
+        running = false;
+        schedule();
+      });
+    }, delayMs);
+  };
+  return {
+    add(path2) {
+      if (!stopped) {
+        pending.add(path2);
+        schedule();
+      }
+    },
+    clear,
+    stop() {
+      stopped = true;
+      clear();
+    }
+  };
+}
+
 // src/source-watcher.ts
 import { EventEmitter as EventEmitter2 } from "node:events";
 import { statSync as statSync5, watch as watch2 } from "node:fs";
@@ -82176,7 +82232,7 @@ function createWatchBreaker(deps) {
 }
 
 // src/engine.ts
-var DAEMON_VERSION = true ? "2.0.17-dev.3464" : "2.0.0-alpha.0";
+var DAEMON_VERSION = true ? "2.0.17-dev.3465" : "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;
@@ -82327,7 +82383,8 @@ function createWorkspaceEngine(opts) {
   let watchBreaker = null;
   let lastActivityTs = Date.now();
   let stopGit = null;
-  let flushTimer = null;
+  let fsReindex;
+  let stopping = false;
   if (!opts.skipWatchers) {
     const watchTargets = gitSourceWatchTargets(opts.workspaceRoot);
     watcher = createSourceWatcher(watchTargets, {
@@ -82387,6 +82444,7 @@ function createWorkspaceEngine(opts) {
           for (const e of identityEvaluations) auditIdentity(t, e);
           return r;
         } catch (err2) {
+          if (stopping) throw err2;
           console.warn(
             "[errata] reindex worker unavailable, running inline:",
             err2 instanceof Error ? err2.message : err2
@@ -82403,51 +82461,46 @@ function createWorkspaceEngine(opts) {
         done();
       }
     };
-    const dirty = /* @__PURE__ */ new Set();
     let gitOpMuteUntil = 0;
-    const scheduleFlush = () => {
-      if (flushTimer) clearTimeout(flushTimer);
-      flushTimer = setTimeout(() => {
-        const changed = [...dirty];
-        dirty.clear();
-        if (changed.length === 0) return;
-        const t = Date.now();
-        const relChanged = changed.map((p) => relative6(opts.workspaceRoot, p).split(sep4).join("/"));
-        const causal = causalBuffer.correlate(relChanged, t) ?? void 0;
-        void runReindexPass(
-          `fs-reindex:${profile.name} (${changed.length} files)`,
-          changed,
-          t,
-          causal?.declaredRenames
-        ).then((r) => {
-          if (r.filesReindexed > 0) {
+    fsReindex = createCoalescedFilePass(REINDEX_DEBOUNCE_MS, async (changed) => {
+      if (stopping) return;
+      const t = Date.now();
+      const relChanged = changed.map((p) => relative6(opts.workspaceRoot, p).split(sep4).join("/"));
+      const causal = causalBuffer.correlate(relChanged, t) ?? void 0;
+      await runReindexPass(
+        `fs-reindex:${profile.name} (${changed.length} files)`,
+        changed,
+        t,
+        causal?.declaredRenames
+      ).then((r) => {
+        if (stopping) return;
+        if (r.filesReindexed > 0) {
+          console.log(
+            `[errata] incremental reindex: ${r.filesReindexed} file(s), +${r.nodesEmitted} nodes / +${r.edgesEmitted} edges`
+          );
+          if (r.continuations.length > 0) {
             console.log(
-              `[errata] incremental reindex: ${r.filesReindexed} file(s), +${r.nodesEmitted} nodes / +${r.edgesEmitted} edges`
+              `[errata] identity: ${r.continuations.map((c) => `${c.kind}(${c.confidence.toFixed(2)})`).join(", ")}`
             );
-            if (r.continuations.length > 0) {
-              console.log(
-                `[errata] identity: ${r.continuations.map((c) => `${c.kind}(${c.confidence.toFixed(2)})`).join(", ")}`
-              );
-            }
-            const epId = recordEpisode(store, profile.id, t, r.delta, causal);
-            if (epId) {
-              const d = r.delta;
-              console.log(
-                `[errata] ${epId}: +${d.symbolsAdded} ~${d.symbolsChanged} -${d.symbolsRemoved} symbols, +${d.edgesAdded}/-${d.edgesRemoved} edges` + (causal ? ` \xB7 causal[${causal.tool}${causal.intentHints.length ? ":" + causal.intentHints.join(",") : ""}]` : "")
-              );
-            }
           }
-        }).catch((err2) => {
-          console.warn("[errata] incremental reindex failed:", err2);
-        });
-      }, REINDEX_DEBOUNCE_MS);
-    };
+          const epId = recordEpisode(store, profile.id, t, r.delta, causal);
+          if (epId) {
+            const d = r.delta;
+            console.log(
+              `[errata] ${epId}: +${d.symbolsAdded} ~${d.symbolsChanged} -${d.symbolsRemoved} symbols, +${d.edgesAdded}/-${d.edgesRemoved} edges` + (causal ? ` \xB7 causal[${causal.tool}${causal.intentHints.length ? ":" + causal.intentHints.join(",") : ""}]` : "")
+            );
+          }
+        }
+      });
+    }, (err2) => {
+      if (stopping) return;
+      console.warn("[errata] incremental reindex failed:", err2);
+    });
     const markDirty = (p) => {
       if (Date.now() < gitOpMuteUntil) return;
       if (IGNORED_PATH.test(p)) return;
       if (!/\.(ts|tsx|js|jsx|mjs|cjs|py)$/i.test(p)) return;
-      dirty.add(p);
-      scheduleFlush();
+      fsReindex.add(p);
     };
     watcher.on("add", markDirty);
     watcher.on("change", markDirty);
@@ -82455,11 +82508,7 @@ function createWorkspaceEngine(opts) {
     const handleGitEvent = async (ev) => {
       if (ev.kind !== "commit") {
         gitOpMuteUntil = Date.now() + GIT_OP_MUTE_MS;
-        dirty.clear();
-        if (flushTimer) {
-          clearTimeout(flushTimer);
-          flushTimer = null;
-        }
+        fsReindex.clear();
       }
       if (!ev.oldSha || !ev.newSha || ev.oldSha === ev.newSha) return;
       const t = Date.now();
@@ -84805,6 +84854,8 @@ B: ${b}`,
       }
     },
     async stop() {
+      stopping = true;
+      fsReindex?.stop();
       clearInterval(fileActivityTimer);
       fileActivity.stop();
       if (stopGit) stopGit();
@@ -84814,7 +84865,6 @@ B: ${b}`,
         await watcher.close();
         noteWatcherClosed();
       }
-      if (flushTimer) clearTimeout(flushTimer);
       for (const tmr of diagTimers.values()) clearTimeout(tmr);
       diagTimers.clear();
       if (ctxRefreshTimer) clearTimeout(ctxRefreshTimer);
@@ -84925,8 +84975,8 @@ init_profile2();
 // src/project-link.ts
 init_profile2();
 import { execFile as execFile3 } from "node:child_process";
-import { promisify } from "node:util";
-var execFileAsync = promisify(execFile3);
+import { promisify as promisify2 } from "node:util";
+var execFileAsync = promisify2(execFile3);
 function isClaimedElsewhere(err2) {
   if (!err2 || typeof err2 !== "object") return false;
   const e = err2;
@@ -85095,6 +85145,18 @@ function instanceEdgeReceipts(sent, received, cloudIds) {
   ).map(([group]) => group));
   return { complete: (source, kind) => complete.has(groupKey(source, kind)) };
 }
+function instanceCloudWithdrawal(n, destination, getMeta) {
+  const id = n.attrs["source"] === "cloud" ? n.attrs["cloudNodeId"] ?? n.id : instanceReceipt(n, destination)["cloudNodeId"];
+  if (typeof id !== "string") return false;
+  const raw2 = getMeta(`history-correction:${id}`);
+  if (!raw2) return false;
+  try {
+    const correction = JSON.parse(raw2);
+    return correction.nodeId === id && correction.action === "quarantine" && correction.sourceSupport !== "supported";
+  } catch {
+    return false;
+  }
+}
 var FIELDS = ["contributedAtSeq", "cloudNodeId", "anchorsContributedDigest", "projectAnchorsContributedDigest", "semanticEdgesContributedDigest", "shipRefusedSinceSeq", "shipRefusedCount", "shipRefusedReason", "shipRefusedFingerprint"];
 function instanceDestinationKey(input) {
   return createHash18("sha256").update(JSON.stringify([
@@ -85139,7 +85201,6 @@ function acceptedInstanceReceipt(current, sent, decision, destination, mirrorLeg
 }
 
 // src/multi.ts
-init_src();
 init_dist();
 init_src5();
 import { existsSync as existsSync34, readFileSync as readFileSync36, unlinkSync as unlinkSync5, writeFileSync as writeFileSync26 } from "node:fs";
@@ -85546,7 +85607,7 @@ function compositionCounters(c) {
 }
 function contributedWireId(n, destinationKey) {
   const cloudId = instanceReceipt(n, destinationKey)["cloudNodeId"];
-  return isMembraneSaltedId(cloudId) ? cloudId : n.id;
+  return typeof cloudId === "string" && cloudId ? cloudId : n.id;
 }
 var WIRE_CANONICAL_ID_MIN = 6;
 var SHIP_TERMINAL_REFUSALS = 3;
@@ -85554,7 +85615,7 @@ function refusalFingerprint(reason, description) {
   return digest(`${reason}\0${description}`);
 }
 function isRetryableRefusal(reason) {
-  return /\bretry\b/i.test(reason);
+  return reason === "blocked" || /\bretry\b/i.test(reason);
 }
 function isTerminallyRefused(n) {
   const reason = String(n.attrs["shipRefusedReason"] ?? "");
@@ -85674,6 +85735,8 @@ function buildInstanceIngest(store, profile, daemonVersion, ignorePatterns = [],
   const semanticEndpoints = /* @__PURE__ */ new Map();
   const includedByLabel = /* @__PURE__ */ new Map();
   const composition = {
+    cloudWithdrawn: 0,
+    withdrawnAnchorTargets: 0,
     privateTargetMissing: 0,
     candidates: 0,
     shipped: 0,
@@ -85742,6 +85805,10 @@ function buildInstanceIngest(store, profile, daemonVersion, ignorePatterns = [],
         composition.ignored++;
         continue;
       }
+      if (instanceCloudWithdrawal(n, opts.destinationKey, (key) => store.getMeta?.(key) ?? opts.sharedStore?.getMeta?.(key))) {
+        composition.cloudWithdrawn++;
+        continue;
+      }
       const contributedAtSeq = instanceReceipt(n, opts.destinationKey)["contributedAtSeq"];
       if (typeof contributedAtSeq === "number" && (n.lastReinforcedAtSeq ?? 0) <= contributedAtSeq) {
         composition.watermarked++;
@@ -85790,6 +85857,10 @@ function buildInstanceIngest(store, profile, daemonVersion, ignorePatterns = [],
     for (const e of store.outEdges(sourceId, [...ANCHOR_EDGES])) {
       const t = nodeOf(e.to);
       if (!t || !ANCHOR_TARGET_LABELS.includes(t.label)) continue;
+      if (instanceCloudWithdrawal(t, opts.destinationKey, (key) => store.getMeta?.(key) ?? opts.sharedStore?.getMeta?.(key))) {
+        composition.withdrawnAnchorTargets++;
+        continue;
+      }
       if (e.type === "OCCURS_IN" && t.label !== "Language") continue;
       if (e.type === "DEPENDS_ON" && t.label !== "Package") continue;
       if (e.type === "PERTAIN_TO" && t.label !== "Domain") continue;
@@ -86921,10 +86992,10 @@ async function hydrateProject(opts) {
 init_src11();
 init_src();
 import { execFile as execFile4 } from "node:child_process";
-import { promisify as promisify2 } from "node:util";
+import { promisify as promisify3 } from "node:util";
 import { extname as extname3 } from "node:path";
 init_profile2();
-var exec = promisify2(execFile4);
+var exec = promisify3(execFile4);
 var KINDS = { function: "Function", class: "Class", method: "Method", interface: "Interface", const: "Const", enum: "Enum", typealias: "TypeAlias", namespace: "Namespace", property: "Property" };
 var inFlight = /* @__PURE__ */ new Map();
 async function syncHistoryRevision(opts) {
@@ -87044,7 +87115,7 @@ init_src();
 import { execFile as execFile5 } from "node:child_process";
 import { readFileSync as readFileSync35 } from "node:fs";
 import { join as join39 } from "node:path";
-import { promisify as promisify3 } from "node:util";
+import { promisify as promisify4 } from "node:util";
 
 // src/history-walk.ts
 var LOCKFILE_NAMES = /* @__PURE__ */ new Set([
@@ -87578,11 +87649,12 @@ async function historicalAnchors(input) {
 
 // src/project-history.ts
 init_profile2();
-var execFileAsync2 = promisify3(execFile5);
+var execFileAsync2 = promisify4(execFile5);
 var HISTORY_EXTRACTOR_VERSION = "history-2";
 var LEASE_POLL_MS = 2e4;
 var RECOVERY_DEADLINE_MS = 15 * 6e4;
 var DEFAULT_LOOKAHEAD = 2;
+var CONTENT_TRANSPORT_VERSION = 1;
 async function defaultGit(root, args2) {
   const { stdout } = await execFileAsync2("git", ["-C", root, ...args2], { maxBuffer: 64 * 1024 * 1024, windowsHide: true });
   return stdout;
@@ -87725,8 +87797,13 @@ async function walk10(root, input, client, opts, readBlob) {
   const dryRun = !consents.contributeHistory;
   const headSha = (await git3(root, ["rev-parse", "HEAD"])).trim();
   const since = profile.historyStage?.watermarkSha ?? null;
-  const units = await (opts.enumerate ?? enumerateUnits)(root, since ? { since } : {});
-  const total = (profile.historyStage?.unitsDone ?? 0) + units.length;
+  const enumerate = opts.enumerate ?? enumerateUnits;
+  const pendingUnits = await enumerate(root, since ? { since } : {});
+  const unitKey = (u) => `${u.sha}/${u.subIndex}`;
+  const recoveryKeys = new Set(dryRun ? [] : (profile.historyStage?.coverageGaps ?? []).filter((g) => g.reason === "edge-blocked" && (g.transportVersion ?? 0) < CONTENT_TRANSPORT_VERSION).map(unitKey));
+  const oldUnits = recoveryKeys.size ? (await enumerate(root)).filter((u) => recoveryKeys.has(unitKey(u))) : [];
+  const units = [...oldUnits, ...pendingUnits.filter((u) => !oldUnits.some((old) => unitKey(old) === unitKey(u)))];
+  const total = (profile.historyStage?.unitsDone ?? 0) + pendingUnits.filter((u) => !recoveryKeys.has(unitKey(u))).length;
   const anchor = profile.historyStage?.backfillAnchor ? { ...profile.historyStage.backfillAnchor } : { index: Number((await git3(root, ["rev-list", "--first-parent", "--count", headSha])).trim()) - 1 };
   profile = stage(profile, { state: "scanning", unitsTotal: total, headSha, lastError: void 0, backfillAnchor: anchor }, now);
   persist(profile);
@@ -87760,7 +87837,7 @@ async function walk10(root, input, client, opts, readBlob) {
   const launched = /* @__PURE__ */ new Map();
   const cap = opts.maxUnits;
   const edgeParked = /* @__PURE__ */ new Set();
-  const parkedEarlier = new Set((profile.historyStage?.coverageGaps ?? []).filter((g) => g.reason === "edge-blocked").map((g) => `${g.sha}/${g.subIndex}`));
+  const parkedEarlier = new Set((profile.historyStage?.coverageGaps ?? []).filter((g) => g.reason === "edge-blocked" && !recoveryKeys.has(unitKey(g))).map(unitKey));
   units.forEach((u, j) => {
     if (parkedEarlier.has(`${u.sha}/${u.subIndex}`)) edgeParked.add(j);
   });
@@ -87838,12 +87915,14 @@ async function walk10(root, input, client, opts, readBlob) {
     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 recovering = recoveryKeys.has(unitKey(u));
+    const walkIncrement = recovering ? 0 : 1;
+    const doneSoFar = (profile.historyStage?.unitsDone ?? 0) + walkIncrement;
     const group = byIndex.get(u.index) ?? [u];
     const positionSha = u.groupSha ?? u.sha;
-    const lastInPosition = group[group.length - 1] === u;
+    const lastInPosition = !recovering && group[group.length - 1] === u;
     if (u.skip) {
-      counts = addCounts(counts, { commitsWalked: 1 });
+      counts = addCounts(counts, { commitsWalked: walkIncrement });
       profile = stage(profile, { state: dryRun ? "extracting" : "contributing", unitsDone: doneSoFar, counts, ...lastInPosition ? { watermarkSha: positionSha } : {} }, now);
       persist(profile);
       processed += 1;
@@ -87858,7 +87937,7 @@ async function walk10(root, input, client, opts, readBlob) {
       continue;
     }
     const { body: body2, prepMs } = await prepare(k);
-    profile = stage(profile, { state: dryRun ? "extracting" : "contributing", unitsDone: doneSoFar - 1, lastError: void 0 }, now);
+    profile = stage(profile, { state: dryRun ? "extracting" : "contributing", unitsDone: doneSoFar - walkIncrement, lastError: void 0 }, now);
     persist(profile);
     response = await reportHistoryStage(client, profile, log);
     if (response?.stopRequested) {
@@ -87936,8 +88015,10 @@ async function walk10(root, input, client, opts, readBlob) {
       const runId = `edge-blocked:${u.sha}/${u.subIndex}`;
       const gaps = [...profile.historyStage?.coverageGaps ?? []];
       const known = gaps.some((g) => g.runId === runId);
-      counts = addCounts(counts, { commitsWalked: 1, deferredUnits: known ? 0 : 1 });
-      if (!known) gaps.push({ sha: u.sha, subIndex: u.subIndex, runId, reason: "edge-blocked" });
+      counts = addCounts(counts, { commitsWalked: walkIncrement, deferredUnits: known ? 0 : 1 });
+      const gap = { sha: u.sha, subIndex: u.subIndex, runId, reason: "edge-blocked", transportVersion: CONTENT_TRANSPORT_VERSION };
+      if (!known) gaps.push(gap);
+      else gaps[gaps.findIndex((g) => g.runId === runId)] = gap;
       profile = stage(profile, { coverageGaps: gaps.slice(-1e3), unitsDone: doneSoFar, counts, ...lastInPosition ? { watermarkSha: positionSha } : {} }, now);
       persist(profile);
       processed += 1;
@@ -87954,18 +88035,18 @@ async function walk10(root, input, client, opts, readBlob) {
           return { profile, processed, state: "paused" };
         }
         const packages = new Set(outcome.result.nodes.filter((n) => n.decision !== "rejected" && n.canonicalId.startsWith("pkg:")).map((n) => n.canonicalId)).size;
-        counts = addCounts(counts, { commitsWalked: 1, changesExtracted: 1, pairs: outcome.receipt.keptPairs, claims: outcome.receipt.claims, anchors: outcome.receipt.anchors, packages });
+        counts = addCounts(counts, { commitsWalked: walkIncrement, changesExtracted: 1, pairs: outcome.receipt.keptPairs, claims: outcome.receipt.claims, anchors: outcome.receipt.anchors, packages });
         log(`[errata] history ${label}: ${outcome.result.nodes.length} nodes, ${outcome.result.edges.length} edges (${outcome.receipt.keptPairs} pairs, ${outcome.receipt.claims} claims)${unitDecisions(outcome.receipt)}${unitTiming(started2, prepMs, outcome.receipt)}`);
         break;
       }
       case "replayed": {
-        counts = addCounts(counts, { commitsWalked: 1, changesExtracted: 1, pairs: outcome.receipt.keptPairs, claims: outcome.receipt.claims, anchors: outcome.receipt.anchors });
+        counts = addCounts(counts, { commitsWalked: walkIncrement, changesExtracted: 1, pairs: outcome.receipt.keptPairs, claims: outcome.receipt.claims, anchors: outcome.receipt.anchors });
         log(`[errata] history ${label}: replayed (${outcome.result.nodes.length} nodes already in)`);
         break;
       }
       case "empty":
       case "dry-run":
-        counts = addCounts(counts, { commitsWalked: 1, changesExtracted: outcome.status === "dry-run" ? 1 : 0, pairs: outcome.receipt.keptPairs, claims: outcome.receipt.claims });
+        counts = addCounts(counts, { commitsWalked: walkIncrement, changesExtracted: outcome.status === "dry-run" ? 1 : 0, pairs: outcome.receipt.keptPairs, claims: outcome.receipt.claims });
         log(`[errata] history ${label}: ${outcome.status} (${outcome.receipt.keptPairs} pairs, dropped ${outcome.receipt.droppedByEvidence} by evidence, ${outcome.receipt.droppedByAnchor} by anchor)${unitDecisions(outcome.receipt)}${unitTiming(started2, prepMs, outcome.receipt)}`);
         break;
       case "refused":
@@ -87977,8 +88058,10 @@ async function walk10(root, input, client, opts, readBlob) {
       case "error":
         if (outcome.status === "error" && outcome.parked && outcome.runId && ["deferred-context", "deferred-budget"].includes(outcome.errorCode ?? "")) {
           const gaps = [...profile.historyStage?.coverageGaps ?? []];
+          const recoveredGap = recovering ? gaps.findIndex((g) => g.reason === "edge-blocked" && unitKey(g) === unitKey(u)) : -1;
+          if (recoveredGap >= 0) gaps.splice(recoveredGap, 1);
           const known = gaps.some((g) => g.runId === outcome.runId);
-          counts = addCounts(counts, { commitsWalked: 1, deferredUnits: known ? 0 : 1 });
+          counts = addCounts(counts, { commitsWalked: walkIncrement, deferredUnits: known || recoveredGap >= 0 ? 0 : 1 });
           if (!known) gaps.push({ sha: u.sha, subIndex: u.subIndex, runId: outcome.runId, reason: outcome.errorCode });
           profile = stage(profile, { coverageGaps: gaps.slice(-1e3) }, now);
           log(`[errata] history ${label}: deferred (${outcome.errorCode}); coverage gap retained as ${outcome.runId}`);
@@ -87989,6 +88072,12 @@ async function walk10(root, input, client, opts, readBlob) {
         await reportHistoryStage(client, profile, log);
         return { profile, processed, state: "paused" };
     }
+    if (recovering && ["completed", "replayed", "empty"].includes(outcome.status)) {
+      const gaps = (profile.historyStage?.coverageGaps ?? []).filter((g) => !(g.reason === "edge-blocked" && unitKey(g) === unitKey(u)));
+      counts.deferredUnits = Math.max(0, (counts.deferredUnits ?? 0) - 1);
+      profile = stage(profile, { coverageGaps: gaps }, now);
+      log(`[errata] history ${label}: recovered retained edge-blocked source`);
+    }
     profile = stage(profile, { unitsDone: doneSoFar, counts, ...lastInPosition ? { watermarkSha: positionSha } : {} }, now);
     persist(profile);
     processed += 1;
@@ -90403,7 +90492,7 @@ async function startMultiDaemon(opts = {}) {
             const rejectedEdges = res.result.edges.filter((re) => re.decision === "rejected");
             const cloudIds = /* @__PURE__ */ new Map();
             for (const node2 of res.result.nodes) {
-              if (isMembraneSaltedId(node2.nodeId)) cloudIds.set(node2.canonicalId, node2.nodeId);
+              if (node2.nodeId && node2.decision !== "rejected") cloudIds.set(node2.canonicalId, node2.nodeId);
             }
             for (const localId of /* @__PURE__ */ new Set([
               ...Object.keys(instances.anchorDigests),
@@ -90412,7 +90501,7 @@ async function startMultiDaemon(opts = {}) {
             ])) {
               const owner = owningStore(localId);
               const cloudId = owner && instanceReceipt(owner.n, destinationKey)["cloudNodeId"];
-              if (isMembraneSaltedId(cloudId)) cloudIds.set(localId, cloudId);
+              if (typeof cloudId === "string" && cloudId) cloudIds.set(localId, cloudId);
             }
             const edgeReceipts = instanceEdgeReceipts(instances.edges, res.result.edges, cloudIds);
             if (rejectedEdges.length > 0) {
@@ -90454,7 +90543,7 @@ async function startMultiDaemon(opts = {}) {
                 nowHeld.push({ id, reason });
               }
             };
-            for (const id of blocked) noteRefused(id, "blocked", () => blockedRepeat++);
+            for (const id of blocked) noteRefused(id, "blocked-gzip", () => blockedRepeat++);
             for (const [id, why] of rejected) noteRefused(id, why, () => rejectedRepeat++);
             if (nowHeld.length > 0) {
               console.warn(

package/package.json

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