@optimystic/db-core 0.14.1 → 0.16.3

package/dist/src/transform/atomic-proxy.d.ts

@@ -1,4 +1,16 @@
-import type { IBlock, BlockId, BlockStore, BlockType, BlockHeader, BlockOperation } from '../index.js';
+import type { IBlock, BlockId, BlockStore, BlockType, BlockHeader, BlockOperation, ReadPurpose } from '../index.js';
+/**
+ * Opaque handle to an in-flight atomic scope.
+ *
+ * A method that opens a scope (via {@link AtomicProxy.atomic}) receives the scope as its
+ * callback argument. To make a *nested* call reuse the enclosing scope — rather than open
+ * (and separately commit) a second one — pass that handle back as the `parent` argument of
+ * the nested `atomic()` call. This is how genuine nesting is distinguished from a second,
+ * unrelated concurrent scope, portably (no `AsyncLocalStorage`, which is Node-only).
+ */
+export interface AtomicScope {
+    readonly __atomicScope: unique symbol;
+}
 /**
  * A BlockStore proxy that enables scoped atomic operations.
  * Operations normally delegate directly to the underlying store,
@@ -8,19 +20,37 @@ import type { IBlock, BlockId, BlockStore, BlockType, BlockHeader, BlockOperatio
  * Both the BTree and its trunk should share the same AtomicProxy instance
  * so that all mutations (including root pointer updates) are part of the
  * same atomic batch.
+ *
+ * Concurrency model: top-level `atomic()` calls are *serialized* through a promise queue,
+ * so a second, un-awaited scope started while the first is still in flight waits for the
+ * first to commit/roll back before opening its own tracker — it never shares the first's
+ * tracker. A genuinely nested call (one that hands back its enclosing scope) bypasses the
+ * queue and reuses that scope, so it neither deadlocks on itself nor double-commits.
  */
 export declare class AtomicProxy<T extends IBlock> implements BlockStore<T> {
     private _base;
     private _active;
+    /** Tail of the serialization queue; each new top-level scope awaits the prior one. */
+    private _tail;
+    /** The scope currently executing, or undefined between scopes. Serialization guarantees
+     *  at most one is active at a time, so identity against `parent` cleanly separates a
+     *  nested call (parent === current) from a foreign concurrent one (parent absent/stale). */
+    private _current?;
     constructor(store: BlockStore<T>);
-    tryGet(id: BlockId): Promise<T | undefined>;
+    tryGet(id: BlockId, purpose?: ReadPurpose): Promise<T | undefined>;
+    /** Forward a leaf-value upgrade to the active store (duck-typed; the Tracker/CacheSource chain
+     *  implements it). Keeps navigation-read filtering working for a B-tree bound to this proxy. */
+    markReadValue(id: BlockId): void;
     insert(block: T): void;
     update(blockId: BlockId, op: BlockOperation): void;
     delete(blockId: BlockId): void;
     generateId(): BlockId;
     createBlockHeader(type: BlockType, newId?: BlockId): BlockHeader;
-    /** Execute fn within an atomic scope. All store mutations are collected
-     *  and committed on success, or discarded on error. Re-entrant safe. */
-    atomic<R>(fn: () => Promise<R>): Promise<R>;
+    /** Execute fn within an atomic scope. All store mutations are collected and committed on
+     *  success, or discarded on error. `fn` receives a scope handle; pass it as the `parent`
+     *  of any nested `atomic()` call that should join this scope instead of opening its own.
+     *  Re-entrant safe (nesting reuses the parent scope) and concurrency safe (unrelated
+     *  overlapping scopes serialize rather than sharing a tracker). */
+    atomic<R>(fn: (scope: AtomicScope) => Promise<R>, parent?: AtomicScope): Promise<R>;
 }
 //# sourceMappingURL=atomic-proxy.d.ts.map

package/dist/src/transform/atomic-proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"atomic-proxy.d.ts","sourceRoot":"","sources":["../../../src/transform/atomic-proxy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAEvG;;;;;;;;;GASG;AACH,qBAAa,WAAW,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,UAAU,CAAC,CAAC,CAAC;IAClE,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,OAAO,CAAgB;gBAEnB,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;IAK1B,MAAM,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IACjD,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;IACtB,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,cAAc,GAAG,IAAI;IAClD,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAC9B,UAAU,IAAI,OAAO;IACrB,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW;IAEhE;4EACwE;IAClE,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAiBjD"}
+{"version":3,"file":"atomic-proxy.d.ts","sourceRoot":"","sources":["../../../src/transform/atomic-proxy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEpH;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAW;IAAG,QAAQ,CAAC,aAAa,EAAE,OAAO,MAAM,CAAC;CAAE;AAEvE;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,WAAW,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,UAAU,CAAC,CAAC,CAAC;IAClE,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,OAAO,CAAgB;IAC/B,sFAAsF;IACtF,OAAO,CAAC,KAAK,CAAoC;IACjD;;gGAE4F;IAC5F,OAAO,CAAC,QAAQ,CAAC,CAAc;gBAEnB,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;IAK1B,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IACxE;oGACgG;IAChG,aAAa,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI;IAChC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;IACtB,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,cAAc,GAAG,IAAI;IAClD,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAC9B,UAAU,IAAI,OAAO;IACrB,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW;IAEhE;;;;uEAImE;IAC7D,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC;CA+BzF"}

package/dist/src/transform/atomic-proxy.js

@@ -8,30 +8,60 @@ import { Atomic } from './atomic.js';
  * Both the BTree and its trunk should share the same AtomicProxy instance
  * so that all mutations (including root pointer updates) are part of the
  * same atomic batch.
+ *
+ * Concurrency model: top-level `atomic()` calls are *serialized* through a promise queue,
+ * so a second, un-awaited scope started while the first is still in flight waits for the
+ * first to commit/roll back before opening its own tracker — it never shares the first's
+ * tracker. A genuinely nested call (one that hands back its enclosing scope) bypasses the
+ * queue and reuses that scope, so it neither deadlocks on itself nor double-commits.
  */
 export class AtomicProxy {
     _base;
     _active;
+    /** Tail of the serialization queue; each new top-level scope awaits the prior one. */
+    _tail = Promise.resolve();
+    /** The scope currently executing, or undefined between scopes. Serialization guarantees
+     *  at most one is active at a time, so identity against `parent` cleanly separates a
+     *  nested call (parent === current) from a foreign concurrent one (parent absent/stale). */
+    _current;
     constructor(store) {
         this._base = store;
         this._active = store;
     }
-    async tryGet(id) { return this._active.tryGet(id); }
+    async tryGet(id, purpose) { return this._active.tryGet(id, purpose); }
+    /** Forward a leaf-value upgrade to the active store (duck-typed; the Tracker/CacheSource chain
+     *  implements it). Keeps navigation-read filtering working for a B-tree bound to this proxy. */
+    markReadValue(id) { this._active.markReadValue?.(id); }
     insert(block) { this._active.insert(block); }
     update(blockId, op) { this._active.update(blockId, op); }
     delete(blockId) { this._active.delete(blockId); }
     generateId() { return this._active.generateId(); }
     createBlockHeader(type, newId) { return this._active.createBlockHeader(type, newId); }
-    /** Execute fn within an atomic scope. All store mutations are collected
-     *  and committed on success, or discarded on error. Re-entrant safe. */
-    async atomic(fn) {
-        if (this._active !== this._base) {
-            return fn(); // Already in atomic context
+    /** Execute fn within an atomic scope. All store mutations are collected and committed on
+     *  success, or discarded on error. `fn` receives a scope handle; pass it as the `parent`
+     *  of any nested `atomic()` call that should join this scope instead of opening its own.
+     *  Re-entrant safe (nesting reuses the parent scope) and concurrency safe (unrelated
+     *  overlapping scopes serialize rather than sharing a tracker). */
+    async atomic(fn, parent) {
+        // Genuine nesting: the caller handed back the scope it is already inside. Reuse it —
+        // no second tracker, no second commit — and skip the queue, since waiting on the very
+        // scope we are running inside would deadlock.
+        if (parent !== undefined && parent === this._current) {
+            return fn(parent);
         }
+        // Top-level scope (first, or a foreign call that overlapped one in flight): take a
+        // place in the serialization queue so it runs against its own tracker only after the
+        // prior scope has committed/rolled back.
+        const prior = this._tail;
+        let release;
+        this._tail = new Promise(resolve => { release = resolve; });
+        await prior;
         const atomic = new Atomic(this._base);
+        const scope = atomic;
+        this._current = scope;
         this._active = atomic;
         try {
-            const result = await fn();
+            const result = await fn(scope);
             atomic.commit();
             return result;
         }
@@ -41,6 +71,8 @@ export class AtomicProxy {
         }
         finally {
             this._active = this._base;
+            this._current = undefined;
+            release();
         }
     }
 }

package/dist/src/transform/atomic-proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"atomic-proxy.js","sourceRoot":"","sources":["../../../src/transform/atomic-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC;;;;;;;;;GASG;AACH,MAAM,OAAO,WAAW;IACf,KAAK,CAAgB;IACrB,OAAO,CAAgB;IAE/B,YAAY,KAAoB;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAW,IAA4B,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACrF,MAAM,CAAC,KAAQ,IAAU,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtD,MAAM,CAAC,OAAgB,EAAE,EAAkB,IAAU,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACxF,MAAM,CAAC,OAAgB,IAAU,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAChE,UAAU,KAAc,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC3D,iBAAiB,CAAC,IAAe,EAAE,KAAe,IAAiB,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAExH;4EACwE;IACxE,KAAK,CAAC,MAAM,CAAI,EAAoB;QACnC,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YACjC,OAAO,EAAE,EAAE,CAAC,CAAC,4BAA4B;QAC1C,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,EAAE,EAAE,CAAC;YAC1B,MAAM,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO,MAAM,CAAC;QACf,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,CAAC;QACT,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC;QAC3B,CAAC;IACF,CAAC;CACD"}
+{"version":3,"file":"atomic-proxy.js","sourceRoot":"","sources":["../../../src/transform/atomic-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAcrC;;;;;;;;;;;;;;;GAeG;AACH,MAAM,OAAO,WAAW;IACf,KAAK,CAAgB;IACrB,OAAO,CAAgB;IAC/B,sFAAsF;IAC9E,KAAK,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IACjD;;gGAE4F;IACpF,QAAQ,CAAe;IAE/B,YAAY,KAAoB;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAW,EAAE,OAAqB,IAA4B,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACrH;oGACgG;IAChG,aAAa,CAAC,EAAW,IAAW,IAAI,CAAC,OAAqD,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACrH,MAAM,CAAC,KAAQ,IAAU,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtD,MAAM,CAAC,OAAgB,EAAE,EAAkB,IAAU,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACxF,MAAM,CAAC,OAAgB,IAAU,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAChE,UAAU,KAAc,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC3D,iBAAiB,CAAC,IAAe,EAAE,KAAe,IAAiB,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAExH;;;;uEAImE;IACnE,KAAK,CAAC,MAAM,CAAI,EAAsC,EAAE,MAAoB;QAC3E,qFAAqF;QACrF,sFAAsF;QACtF,8CAA8C;QAC9C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;YACtD,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;QACnB,CAAC;QACD,mFAAmF;QACnF,qFAAqF;QACrF,yCAAyC;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,OAAoB,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,GAAG,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAClE,MAAM,KAAK,CAAC;QACZ,MAAM,MAAM,GAAG,IAAI,MAAM,CAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,MAAgC,CAAC;QAC/C,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;YAC/B,MAAM,CAAC,MAAM,EAAE,CAAC;YAChB,OAAO,MAAM,CAAC;QACf,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,CAAC;QACT,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC;YAC1B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC1B,OAAO,EAAE,CAAC;QACX,CAAC;IACF,CAAC;CACD"}

package/dist/src/transform/cache-source.d.ts

@@ -1,14 +1,45 @@
-import type { IBlock, BlockHeader, BlockId, BlockSource, BlockType, Transforms } from "../index.js";
+import type { IBlock, BlockHeader, BlockId, BlockSource, BlockType, ReadPurpose, Transforms } from "../index.js";
 import { LruMap } from "../utility/lru-map.js";
+import type { ReadDependencyCollector } from "../transaction/read-dependency-collector.js";
 export declare class CacheSource<T extends IBlock> implements BlockSource<T> {
     protected readonly source: BlockSource<T>;
+    /** Shared per-transaction read-dependency accumulator (same instance the collection's
+     *  TransactorSource holds). Optional: log-walk caches that never form a transaction omit it. */
+    private readonly collector?;
     protected cache: LruMap<BlockId, T>;
-    constructor(source: BlockSource<T>, maxSize?: number);
-    tryGet(id: BlockId): Promise<T | undefined>;
+    /** Per-id monotonic counter, bumped whenever the cached content for an id changes.
+     * Consumers (e.g. {@link Tracker}'s materialized-block memo) read it via
+     * {@link getGeneration} to detect that a cached "source + ops" result has gone stale.
+     * Over-bumping is safe (it only forces a re-materialize); under-bumping is a correctness
+     * bug, so every content-changing site bumps. A benign LRU evict + reload also bumps. */
+    private generations;
+    /** Per-id committed revision of the content currently cached for that id. Learned from the
+     *  source on a miss-load, advanced by {@link transformCache} when a commit folds new content
+     *  in, and dropped alongside the cached block on delete/clear. Re-emitted on every cache HIT
+     *  so a hit records a read dependency at the right revision — the whole point of this map, since
+     *  the underlying source is never consulted on a hit. */
+    private revisions;
+    constructor(source: BlockSource<T>, maxSize?: number, 
+    /** Shared per-transaction read-dependency accumulator (same instance the collection's
+     *  TransactorSource holds). Optional: log-walk caches that never form a transaction omit it. */
+    collector?: ReadDependencyCollector | undefined);
+    private bump;
+    /** The current generation for an id — advances every time this cache's content for
+     * the id changes (miss-load, clear, or transformCache). Stable across pure cache hits. */
+    getGeneration(id: BlockId): number;
+    tryGet(id: BlockId, purpose?: ReadPurpose): Promise<T | undefined>;
+    /** Upgrade an already-captured read of `id` to a `value` read in the shared collector,
+     *  retaining it in the conflict set. The B-tree point-lookup descent calls this (through the
+     *  Tracker, which forwards) to pin the terminal leaf after recording the interior nodes as
+     *  `navigation`. No-op when no collector is wired (log-walk caches) or the id was never
+     *  recorded. Duck-typed by the Tracker; keep the name in sync with Tracker.markReadValue. */
+    markReadValue(id: BlockId): void;
     generateId(): BlockId;
     createBlockHeader(type: BlockType, newId?: BlockId): BlockHeader;
     clear(blockIds?: BlockId[] | undefined): void;
-    /** Mutates the cache without affecting the source */
-    transformCache(transform: Transforms): void;
+    /** Mutates the cache without affecting the source. `revision` is the committed revision this
+     *  transform lands at; the stored per-id revision advances to it so a later read records a
+     *  dependency at the NEW revision (recording the old one would spuriously fail validation). */
+    transformCache(transform: Transforms, revision: number): void;
 }
 //# sourceMappingURL=cache-source.d.ts.map

package/dist/src/transform/cache-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache-source.d.ts","sourceRoot":"","sources":["../../../src/transform/cache-source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEpG,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAO/C,qBAAa,WAAW,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;IAIlE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IAH1C,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBAGhB,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,EACzC,OAAO,SAAiB;IAKnB,MAAM,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAgBjD,UAAU,IAAI,OAAO;IAIrB,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW;IAIhE,KAAK,CAAC,QAAQ,GAAE,OAAO,EAAE,GAAG,SAAqB;IAUjD,qDAAqD;IACrD,cAAc,CAAC,SAAS,EAAE,UAAU;CAgBpC"}
+{"version":3,"file":"cache-source.d.ts","sourceRoot":"","sources":["../../../src/transform/cache-source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEjH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AAc3F,qBAAa,WAAW,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;IAuBlE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IAEzC;oGACgG;IAChG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;IA1B5B,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpC;;;;4FAIwF;IAKxF,OAAO,CAAC,WAAW,CAA8B;IACjD;;;;6DAIyD;IAIzD,OAAO,CAAC,SAAS,CAA8B;gBAG3B,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,EACzC,OAAO,SAAiB;IACxB;oGACgG;IAC/E,SAAS,CAAC,EAAE,uBAAuB,YAAA;IAKrD,OAAO,CAAC,IAAI;IAIZ;8FAC0F;IAC1F,aAAa,CAAC,EAAE,EAAE,OAAO,GAAG,MAAM;IAI5B,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,GAAE,WAAqB,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IA8BjF;;;;iGAI6F;IAC7F,aAAa,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI;IAIhC,UAAU,IAAI,OAAO;IAIrB,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW;IAIhE,KAAK,CAAC,QAAQ,GAAE,OAAO,EAAE,GAAG,SAAqB;IAgBjD;;mGAE+F;IAC/F,cAAc,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM;CAsBtD"}

package/dist/src/transform/cache-source.js

@@ -3,30 +3,92 @@ import { LruMap } from "../utility/lru-map.js";
 import { createLogger } from "../logger.js";
 const log = createLogger('cache');
 const DefaultMaxSize = 128;
+/** The revision a source reports for an id, or undefined if the source can't report one.
+ *  Duck-typed exactly like {@link Tracker}'s getGeneration probe — CacheSource layers over
+ *  arbitrary BlockSources (including test doubles) that need not implement it. */
+function sourceReadRevision(source, id) {
+    const src = source;
+    return typeof src.getReadRevision === 'function' ? src.getReadRevision(id) : undefined;
+}
 export class CacheSource {
     source;
+    collector;
     cache;
-    constructor(source, maxSize = DefaultMaxSize) {
+    /** Per-id monotonic counter, bumped whenever the cached content for an id changes.
+     * Consumers (e.g. {@link Tracker}'s materialized-block memo) read it via
+     * {@link getGeneration} to detect that a cached "source + ops" result has gone stale.
+     * Over-bumping is safe (it only forces a re-materialize); under-bumping is a correctness
+     * bug, so every content-changing site bumps. A benign LRU evict + reload also bumps. */
+    // NOTE: generations is never pruned — it retains one small (id → number) entry per distinct id
+    // ever touched, even after LRU eviction from `cache`. Bounded by the number of distinct blocks a
+    // collection sees over its lifetime; if that ever grows large enough to matter, evict alongside
+    // the LRU (dropping a generation is safe — a reload re-bumps from 0/absent, forcing re-materialize).
+    generations = new Map();
+    /** Per-id committed revision of the content currently cached for that id. Learned from the
+     *  source on a miss-load, advanced by {@link transformCache} when a commit folds new content
+     *  in, and dropped alongside the cached block on delete/clear. Re-emitted on every cache HIT
+     *  so a hit records a read dependency at the right revision — the whole point of this map, since
+     *  the underlying source is never consulted on a hit. */
+    // NOTE: an LRU-evicted id can leave a stale `revisions` entry (eviction drops `cache` but not
+    // this map — see clear()/the LruMap eviction). Benign: the next read of that id is a cache MISS
+    // that re-learns the revision from the source and overwrites the entry before recording anything.
+    revisions = new Map();
+    constructor(source, maxSize = DefaultMaxSize, 
+    /** Shared per-transaction read-dependency accumulator (same instance the collection's
+     *  TransactorSource holds). Optional: log-walk caches that never form a transaction omit it. */
+    collector) {
         this.source = source;
+        this.collector = collector;
         this.cache = new LruMap(maxSize);
     }
-    async tryGet(id) {
+    bump(id) {
+        this.generations.set(id, (this.generations.get(id) ?? 0) + 1);
+    }
+    /** The current generation for an id — advances every time this cache's content for
+     * the id changes (miss-load, clear, or transformCache). Stable across pure cache hits. */
+    getGeneration(id) {
+        return this.generations.get(id) ?? 0;
+    }
+    async tryGet(id, purpose = 'value') {
         let block = this.cache.get(id);
         if (block) {
+            // Cache hit: the source is never consulted, so re-emit the revision we learned when this
+            // id was first loaded/folded. Without this a block served from cache records NO read
+            // dependency (the original bug), so its stale-read check could never fire. Carry the
+            // caller's purpose so a navigation-only cache hit stays droppable from the conflict set.
+            const rev = this.revisions.get(id);
+            if (rev !== undefined)
+                this.collector?.record(id, rev, purpose);
             log('hit id=%s', id);
         }
         else {
-            block = await this.source.tryGet(id);
+            block = await this.source.tryGet(id, purpose);
             if (block) {
                 this.cache.set(id, block);
+                this.bump(id);
+                // Learn the revision from the source (which just served it) and record it. On a miss the
+                // underlying TransactorSource already recorded the same id@rev/purpose into the shared
+                // collector; max-wins (revision) + value-wins (purpose) collapse the two to one entry.
+                const rev = sourceReadRevision(this.source, id) ?? 0;
+                this.revisions.set(id, rev);
+                this.collector?.record(id, rev, purpose);
                 log('miss:loaded id=%s cacheSize=%d', id, this.cache.size);
             }
             else {
+                // Absent block: record nothing (matches TransactorSource, which skips missing blocks).
                 log('miss:absent id=%s', id);
             }
         }
         return structuredClone(block);
     }
+    /** Upgrade an already-captured read of `id` to a `value` read in the shared collector,
+     *  retaining it in the conflict set. The B-tree point-lookup descent calls this (through the
+     *  Tracker, which forwards) to pin the terminal leaf after recording the interior nodes as
+     *  `navigation`. No-op when no collector is wired (log-walk caches) or the id was never
+     *  recorded. Duck-typed by the Tracker; keep the name in sync with Tracker.markReadValue. */
+    markReadValue(id) {
+        this.collector?.markValue(id);
+    }
     generateId() {
         return this.source.generateId();
     }
@@ -37,26 +99,40 @@ export class CacheSource {
         if (blockIds) {
             for (const id of blockIds) {
                 this.cache.delete(id);
+                this.revisions.delete(id);
+                this.bump(id);
             }
         }
         else {
+            for (const [id] of this.cache) {
+                this.bump(id);
+            }
             this.cache.clear();
+            this.revisions.clear();
         }
     }
-    /** Mutates the cache without affecting the source */
-    transformCache(transform) {
+    /** Mutates the cache without affecting the source. `revision` is the committed revision this
+     *  transform lands at; the stored per-id revision advances to it so a later read records a
+     *  dependency at the NEW revision (recording the old one would spuriously fail validation). */
+    transformCache(transform, revision) {
         for (const blockId of transform.deletes ?? []) {
             this.cache.delete(blockId);
+            this.revisions.delete(blockId);
+            this.bump(blockId);
         }
         for (const [, block] of Object.entries(transform.inserts ?? {})) {
             this.cache.set(block.header.id, structuredClone(block));
+            this.revisions.set(block.header.id, revision);
+            this.bump(block.header.id);
         }
         for (const [blockId, operations] of Object.entries(transform.updates ?? {})) {
-            for (const op of operations) {
-                const block = this.cache.get(blockId);
-                if (block) {
+            const block = this.cache.get(blockId);
+            if (block) {
+                for (const op of operations) {
                     applyOperation(block, op);
+                    this.bump(blockId);
                 }
+                this.revisions.set(blockId, revision);
             }
         }
     }

package/dist/src/transform/cache-source.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache-source.js","sourceRoot":"","sources":["../../../src/transform/cache-source.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cache-source.js","sourceRoot":"","sources":["../../../src/transform/cache-source.ts"],"names":[],"mappings":"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"}

package/dist/src/transform/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/transform/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEvH;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,cAAc,QAMnG;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,QAIzE;AAED,mEAAmE;AACnE,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,cAAc;;EAOlG;AAED,8DAA8D;AAC9D,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS,YAMvE;AAED,iCAAiC;AACjC,wBAAgB,eAAe,IAAI,UAAU,CAE5C;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,UAAU,GAAG,UAAU,CAQhE;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,GAAG,UAAU,CAMxE;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAIhE;AAED,wBAAgB,gBAAgB,CAAC,GAAG,UAAU,EAAE,UAAU,EAAE,GAAG,UAAU,CAExE;AAGD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,CAOtF;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,CAM1F;AAED,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,QAYlG;AAED,6CAA6C;AAC7C,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAWlG;AAED,uDAAuD;AACvD,wBAAgB,eAAe,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,UAAU,CAM1G"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/transform/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEvH;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,cAAc,QAMnG;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,QAIzE;AAED,mEAAmE;AACnE,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,cAAc;;EAOlG;AAED,8DAA8D;AAC9D,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS,YAMvE;AAED,iCAAiC;AACjC,wBAAgB,eAAe,IAAI,UAAU,CAE5C;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,UAAU,GAAG,UAAU,CAQhE;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,GAAG,UAAU,CAYxE;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAIhE;AAED,wBAAgB,gBAAgB,CAAC,GAAG,UAAU,EAAE,UAAU,EAAE,GAAG,UAAU,CAExE;AAGD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,CAOtF;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,CAM1F;AAED,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,QAYlG;AAED,6CAA6C;AAC7C,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAWlG;AAED,uDAAuD;AACvD,wBAAgB,eAAe,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,UAAU,CAM1G"}

package/dist/src/transform/helpers.js

@@ -67,10 +67,16 @@ export function copyTransforms(transform) {
     return { inserts, updates, deletes: transform.deletes ? [...transform.deletes] : undefined };
 }
 export function mergeTransforms(a, b) {
+    // updates: for a block id present in both sides, concatenate a's ops then b's ops
+    // (order-preserving) rather than letting b's array replace a's. inserts stay last-wins.
+    const updates = { ...a.updates };
+    for (const [id, ops] of Object.entries(b.updates ?? {})) {
+        updates[id] = updates[id] ? [...updates[id], ...ops] : ops;
+    }
     return {
         inserts: { ...a.inserts, ...b.inserts },
-        updates: { ...a.updates, ...b.updates },
-        deletes: [...(a.deletes ?? []), ...(b.deletes ?? [])]
+        updates,
+        deletes: [...new Set([...(a.deletes ?? []), ...(b.deletes ?? [])])]
     };
 }
 export function isTransformsEmpty(transform) {

package/dist/src/transform/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/transform/helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/transform/helpers.ts"],"names":[],"mappings":"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"}

package/dist/src/transform/tracker.d.ts

@@ -1,4 +1,4 @@
-import type { IBlock, BlockId, BlockStore as IBlockStore, BlockHeader, BlockOperation, BlockType, BlockSource as IBlockSource } from "../index.js";
+import type { IBlock, BlockId, BlockStore as IBlockStore, BlockHeader, BlockOperation, BlockType, BlockSource as IBlockSource, ReadPurpose } from "../index.js";
 /** A block store that collects transformations, without applying them to the underlying source.
  * Transformations are also applied to the retrieved blocks, making it seem like the source has been modified.
  */
@@ -6,10 +6,25 @@ export declare class Tracker<T extends IBlock> implements IBlockStore<T> {
     private readonly source;
     /** The collected set of transformations to be applied. Treat as immutable */
     transforms: import("./struct.js").Transforms;
+    /** Per-id memo of the materialized (source block + all `updates[id]` ops) result, so a
+     * repeated read of a hot op-carrying block is O(block size) instead of O(block size + ops).
+     * Kept fresh incrementally on {@link update}, dropped on {@link insert}/{@link delete}/{@link reset},
+     * and invalidated when the source's generation for the id advances (external cache mutation).
+     * Only populated for sources that expose `getGeneration` — without a drift signal we cannot
+     * detect source changes, so those fall back to always-replay. `gen` is the source generation of
+     * the base block content the memo was built from. */
+    private materialized;
     constructor(source: IBlockSource<T>, 
     /** The collected set of transformations to be applied. Treat as immutable */
     transforms?: import("./struct.js").Transforms);
-    tryGet(id: BlockId): Promise<T | undefined>;
+    /** The source's generation for an id, or undefined if the source cannot report drift. */
+    private sourceGeneration;
+    tryGet(id: BlockId, purpose?: ReadPurpose): Promise<T | undefined>;
+    /** Forward a leaf-value upgrade down to the source's read collector (duck-typed: only the
+     *  CacheSource layer implements it). Lets the B-tree point-lookup descent, which reads through
+     *  this tracker, pin its terminal leaf as a `value` read after tagging interior nodes
+     *  `navigation`. No-op for sources without a collector (test doubles, log-walk caches). */
+    markReadValue(id: BlockId): void;
     generateId(): BlockId;
     createBlockHeader(type: BlockType, newId?: BlockId): BlockHeader;
     insert(block: T): void;

package/dist/src/transform/tracker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tracker.d.ts","sourceRoot":"","sources":["../../../src/transform/tracker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,IAAI,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,SAAS,EAAE,WAAW,IAAI,YAAY,EAAE,MAAM,aAAa,CAAC;AAGnJ;;GAEG;AACH,qBAAa,OAAO,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;IAE9D,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,6EAA6E;IACtE,UAAU;gBAFA,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACxC,6EAA6E;IACtE,UAAU,mCAAoB;IAGhC,MAAM,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAejD,UAAU,IAAI,OAAO;IAIrB,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW;IAIhE,MAAM,CAAC,KAAK,EAAE,CAAC;IAUf,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,cAAc;IAU3C,MAAM,CAAC,OAAO,EAAE,OAAO;IAOvB,KAAK,CAAC,YAAY,mCAAoB;IAMtC,mBAAmB,IAAI,OAAO,EAAE;IAIhC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;CAGhC"}
+{"version":3,"file":"tracker.d.ts","sourceRoot":"","sources":["../../../src/transform/tracker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,IAAI,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,SAAS,EAAE,WAAW,IAAI,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAGhK;;GAEG;AACH,qBAAa,OAAO,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,WAAW,CAAC,CAAC,CAAC;IAW9D,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,6EAA6E;IACtE,UAAU;IAZlB;;;;;;yDAMqD;IACrD,OAAO,CAAC,YAAY,CAAiD;gBAGnD,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACxC,6EAA6E;IACtE,UAAU,mCAAoB;IAGtC,yFAAyF;IACzF,OAAO,CAAC,gBAAgB;IAKlB,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,GAAE,WAAqB,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAsCjF;;;+FAG2F;IAC3F,aAAa,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI;IAIhC,UAAU,IAAI,OAAO;IAIrB,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW;IAIhE,MAAM,CAAC,KAAK,EAAE,CAAC;IAYf,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,cAAc;IAkB3C,MAAM,CAAC,OAAO,EAAE,OAAO;IAQvB,KAAK,CAAC,YAAY,mCAAoB;IAOtC,mBAAmB,IAAI,OAAO,EAAE;IAIhC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;CAGhC"}

package/dist/src/transform/tracker.js

@@ -1,29 +1,72 @@
-import { applyOperation, emptyTransforms, blockIdsForTransforms, ensured } from "../index.js";
+import { applyOperation, applyOperations, emptyTransforms, blockIdsForTransforms, ensured } from "../index.js";
 /** A block store that collects transformations, without applying them to the underlying source.
  * Transformations are also applied to the retrieved blocks, making it seem like the source has been modified.
  */
 export class Tracker {
     source;
     transforms;
+    /** Per-id memo of the materialized (source block + all `updates[id]` ops) result, so a
+     * repeated read of a hot op-carrying block is O(block size) instead of O(block size + ops).
+     * Kept fresh incrementally on {@link update}, dropped on {@link insert}/{@link delete}/{@link reset},
+     * and invalidated when the source's generation for the id advances (external cache mutation).
+     * Only populated for sources that expose `getGeneration` — without a drift signal we cannot
+     * detect source changes, so those fall back to always-replay. `gen` is the source generation of
+     * the base block content the memo was built from. */
+    materialized = new Map();
     constructor(source, 
     /** The collected set of transformations to be applied. Treat as immutable */
     transforms = emptyTransforms()) {
         this.source = source;
         this.transforms = transforms;
     }
-    async tryGet(id) {
-        const block = await this.source.tryGet(id);
+    /** The source's generation for an id, or undefined if the source cannot report drift. */
+    sourceGeneration(id) {
+        const src = this.source;
+        return typeof src.getGeneration === 'function' ? src.getGeneration(id) : undefined;
+    }
+    async tryGet(id, purpose = 'value') {
+        // NOTE: precedence here is insert > delete > source+updates. In a well-formed transform an id is
+        // never in both `inserts` and `deletes` (insert/delete each clear the other), so order is moot. It
+        // only diverges from the canonical `applyTransform` (delete-last-wins, see struct.ts / helpers.ts:132)
+        // in the malformed insert+delete state reachable via the phantom-delete bug (double-delete then
+        // reinsert). Likewise the insert path intentionally skips `updates[id]` — inserted blocks bake ops
+        // in-place via update(); a stale pre-insert `updates[id]` is discarded here but would be re-applied
+        // on commit. Both are read-vs-commit inconsistencies confined to malformed states; fix the source
+        // bug (phantom delete / stale updates) rather than papering over it here.
+        if (this.transforms.inserts && Object.hasOwn(this.transforms.inserts, id)) {
+            return structuredClone(this.transforms.inserts[id]);
+        }
+        if (this.transforms.deletes?.includes(id)) {
+            return undefined;
+        }
+        const gen = this.sourceGeneration(id);
+        const memo = this.materialized.get(id);
+        if (memo && (gen === undefined || memo.gen === gen)) {
+            return structuredClone(memo.block); // O(block size), no replay
+        }
+        const block = await this.source.tryGet(id, purpose);
         if (block) {
             const ops = this.transforms.updates?.[id] ?? [];
-            ops.forEach(op => applyOperation(block, op));
-            if (this.transforms.deletes?.includes(id)) {
-                return undefined;
+            if (ops.length > 0) {
+                applyOperations(block, ops);
+                // Memoize only when the source can report drift, and stamp with the generation read
+                // AFTER the load — the source may bump during tryGet (a cache miss-load), and stamping
+                // with the pre-load generation would force a needless reload on the very next read.
+                const freshGen = this.sourceGeneration(id);
+                if (freshGen !== undefined) {
+                    this.materialized.set(id, { block, gen: freshGen });
+                }
+                return structuredClone(block); // clone so callers can't mutate the memo
             }
         }
-        else if (this.transforms.inserts && Object.hasOwn(this.transforms.inserts, id)) {
-            return structuredClone(this.transforms.inserts[id]);
-        }
-        return block;
+        return block; // no-ops path unchanged (source already cloned)
+    }
+    /** Forward a leaf-value upgrade down to the source's read collector (duck-typed: only the
+     *  CacheSource layer implements it). Lets the B-tree point-lookup descent, which reads through
+     *  this tracker, pin its terminal leaf as a `value` read after tagging interior nodes
+     *  `navigation`. No-op for sources without a collector (test doubles, log-walk caches). */
+    markReadValue(id) {
+        this.source.markReadValue?.(id);
     }
     generateId() {
         return this.source.generateId();
@@ -34,6 +77,8 @@ export class Tracker {
     insert(block) {
         const inserts = this.transforms.inserts ??= {};
         inserts[block.header.id] = structuredClone(block);
+        // Served from `inserts` now, not source+updates — the materialized memo no longer applies.
+        this.materialized.delete(block.header.id);
         const deletes = this.transforms.deletes;
         const deleteIndex = deletes?.indexOf(block.header.id) ?? -1;
         if (deleteIndex >= 0) {
@@ -48,6 +93,14 @@ export class Tracker {
         else {
             const updates = this.transforms.updates ??= {};
             ensured(updates, blockId, () => []).push(structuredClone(op));
+            // The memo already equals (base source content + prior ops); applying just the new op
+            // keeps it equal to the full ops list — O(1), no full replay. Leave `gen` untouched: it
+            // still records the base-content generation, so a later external source change still
+            // forces a reload. (Refreshing gen here would mask stale base content.)
+            const memo = this.materialized.get(blockId);
+            if (memo) {
+                applyOperation(memo.block, op);
+            }
         }
     }
     delete(blockId) {
@@ -55,16 +108,18 @@ export class Tracker {
             delete this.transforms.inserts[blockId];
         if (this.transforms.updates)
             delete this.transforms.updates[blockId];
+        this.materialized.delete(blockId);
         const deletes = this.transforms.deletes ??= [];
         deletes.push(blockId);
     }
     reset(newTransform = emptyTransforms()) {
         const oldTransform = this.transforms;
         this.transforms = newTransform;
+        this.materialized.clear();
         return oldTransform;
     }
     transformedBlockIds() {
-        return Array.from(new Set(blockIdsForTransforms(this.transforms)));
+        return blockIdsForTransforms(this.transforms);
     }
     conflicts(blockIds) {
         return this.transformedBlockIds().filter(id => blockIds.has(id));