@git-stunts/git-warp 12.2.0 → 12.2.1

package/src/domain/services/SyncProtocol.js

@@ -39,7 +39,8 @@
 import defaultCodec from '../utils/defaultCodec.js';
 import nullLogger from '../utils/nullLogger.js';
 import { decodePatchMessage, assertOpsCompatible, SCHEMA_V3 } from './WarpMessageCodec.js';
-import { join, cloneStateV5 } from './JoinReducer.js';
+import { join, cloneStateV5, isKnownOp } from './JoinReducer.js';
+import SchemaUnsupportedError from '../errors/SchemaUnsupportedError.js';
 import { cloneFrontier, updateFrontier } from './Frontier.js';
 import { vvDeserialize } from '../crdt/VersionVector.js';
 
@@ -81,6 +82,33 @@ function normalizePatch(patch) {
   return patch;
 }
 
+/**
+ * Converts a frontier Map to a plain object for JSON serialization.
+ *
+ * @param {Map<string, string>} map - Frontier as Map<writerId, sha>
+ * @returns {{ [x: string]: string }} Plain object representation
+ * @private
+ */
+function frontierToObject(map) {
+  /** @type {{ [x: string]: string }} */
+  const obj = {};
+  for (const [writerId, sha] of map) {
+    obj[writerId] = sha;
+  }
+  return obj;
+}
+
+/**
+ * Converts a frontier plain object back to a Map.
+ *
+ * @param {{ [x: string]: string }} obj - Frontier as plain object
+ * @returns {Map<string, string>} Frontier as Map<writerId, sha>
+ * @private
+ */
+function objectToFrontier(obj) {
+  return new Map(Object.entries(obj));
+}
+
 /**
  * Loads a patch from a commit.
  *
@@ -252,7 +280,8 @@ export function computeSyncDelta(localFrontier, remoteFrontier) {
       newWritersForLocal.push(writerId);
     } else if (localSha !== remoteSha) {
       // Different heads - local needs patches from its head to remote head
-      // Note: We assume remote is ahead; the caller should verify ancestry
+      // Direction is intentionally deferred: ancestry is verified by
+      // isAncestor() pre-check or loadPatchRange() in processSyncRequest()
       needFromRemote.set(writerId, { from: localSha, to: remoteSha });
     }
     // If localSha === remoteSha, already in sync for this writer
@@ -339,16 +368,9 @@ export function computeSyncDelta(localFrontier, remoteFrontier) {
  * // Send over HTTP: await fetch(url, { body: JSON.stringify(request) })
  */
 export function createSyncRequest(frontier) {
-  // Convert Map to plain object for serialization
-  /** @type {{ [x: string]: string }} */
-  const frontierObj = {};
-  for (const [writerId, sha] of frontier) {
-    frontierObj[writerId] = sha;
-  }
-
   return {
     type: /** @type {'sync-request'} */ ('sync-request'),
-    frontier: frontierObj,
+    frontier: frontierToObject(frontier),
   };
 }
 
@@ -393,8 +415,7 @@ export function createSyncRequest(frontier) {
 export async function processSyncRequest(request, localFrontier, persistence, graphName, { codec, logger } = /** @type {{ codec?: import('../../ports/CodecPort.js').default, logger?: import('../../ports/LoggerPort.js').default }} */ ({})) {
   const log = logger || nullLogger;
 
-  // Convert incoming frontier from object to Map
-  const remoteFrontier = new Map(Object.entries(request.frontier));
+  const remoteFrontier = objectToFrontier(request.frontier);
 
   // Compute what the requester needs
   const delta = computeSyncDelta(remoteFrontier, localFrontier);
@@ -406,6 +427,29 @@ export async function processSyncRequest(request, localFrontier, persistence, gr
 
   for (const [writerId, range] of delta.needFromRemote) {
     try {
+      // Pre-check ancestry to avoid expensive chain walk (B107 / S3 fix).
+      // If the persistence layer provides isAncestor, use it to detect
+      // divergence early without walking the full commit chain.
+      const hasIsAncestor = typeof /** @type {{isAncestor?: (...args: unknown[]) => unknown}} */ (persistence).isAncestor === 'function';
+      if (range.from && hasIsAncestor) {
+        const isAnc = await /** @type {{isAncestor: (a: string, b: string) => Promise<boolean>}} */ (/** @type {unknown} */ (persistence)).isAncestor(range.from, range.to);
+        if (!isAnc) {
+          const entry = {
+            writerId,
+            reason: 'E_SYNC_DIVERGENCE',
+            localSha: range.to,
+            remoteSha: range.from,
+          };
+          skippedWriters.push(entry);
+          log.warn('Sync divergence detected — skipping writer', {
+            code: 'E_SYNC_DIVERGENCE',
+            graphName,
+            ...entry,
+          });
+          continue;
+        }
+      }
+
       const writerPatches = await loadPatchRange(
         persistence,
         graphName,
@@ -440,16 +484,9 @@ export async function processSyncRequest(request, localFrontier, persistence, gr
     }
   }
 
-  // Convert local frontier to plain object
-  /** @type {{ [x: string]: string }} */
-  const frontierObj = {};
-  for (const [writerId, sha] of localFrontier) {
-    frontierObj[writerId] = sha;
-  }
-
   return {
     type: /** @type {'sync-response'} */ ('sync-response'),
-    frontier: frontierObj,
+    frontier: frontierToObject(localFrontier),
     patches,
     skippedWriters,
   };
@@ -503,7 +540,10 @@ export function applySyncResponse(response, state, frontier) {
   const newFrontier = cloneFrontier(frontier);
   let applied = 0;
 
-  // Group patches by writer to ensure proper ordering
+  // Patches arrive pre-grouped by writer from the sync response. This
+  // re-grouping is defensive — it handles edge cases where patches from
+  // multiple writers arrive interleaved (e.g., from a relay that merges
+  // streams).
   const patchesByWriter = new Map();
   for (const { writerId, sha, patch } of response.patches) {
     if (!patchesByWriter.has(writerId)) {
@@ -518,10 +558,19 @@ export function applySyncResponse(response, state, frontier) {
     for (const { sha, patch } of writerPatches) {
       // Normalize patch context (in case it came from network serialization)
       const normalizedPatch = normalizePatch(patch);
-      // Guard: reject patches containing ops we don't understand.
-      // Currently SCHEMA_V3 is the max, so this is a no-op for this
-      // codebase. If a future schema adds new op types, this check
-      // will prevent silent data loss until the reader is upgraded.
+      // Guard: reject patches with genuinely unknown op types (B106 / C2 fix).
+      // This prevents silent data loss when a newer writer sends ops we
+      // don't recognise — fail closed rather than silently ignoring.
+      for (const op of normalizedPatch.ops) {
+        if (!isKnownOp(op)) {
+          throw new SchemaUnsupportedError(
+            `Patch ${sha} contains unknown op type: ${op.type}`
+          );
+        }
+      }
+      // Guard: reject patches exceeding our maximum supported schema version.
+      // isKnownOp() above checks op-type recognition; this checks the schema
+      // version ceiling. Currently SCHEMA_V3 is the max.
       assertOpsCompatible(normalizedPatch.ops, SCHEMA_V3);
       // Apply patch to state
       join(newState, /** @type {Parameters<typeof join>[1]} */ (normalizedPatch), sha);
@@ -609,15 +658,9 @@ export function syncNeeded(localFrontier, remoteFrontier) {
  * }
  */
 export function createEmptySyncResponse(frontier) {
-  /** @type {{ [x: string]: string }} */
-  const frontierObj = {};
-  for (const [writerId, sha] of frontier) {
-    frontierObj[writerId] = sha;
-  }
-
   return {
     type: /** @type {'sync-response'} */ ('sync-response'),
-    frontier: frontierObj,
+    frontier: frontierToObject(frontier),
     patches: [],
   };
 }

package/src/domain/trust/TrustRecordService.js

@@ -26,6 +26,10 @@ const MAX_CAS_ATTEMPTS = 3;
  * @property {boolean} [skipSignatureVerify=false] - Skip signature verification (for testing)
  */
 
+/**
+ * @typedef {{ok: true, records: Array<Record<string, unknown>>} | {ok: false, error: Error}} ReadRecordsResult
+ */
+
 export class TrustRecordService {
   /**
    * @param {Object} options
@@ -102,55 +106,65 @@ export class TrustRecordService {
    * @param {string} graphName
    * @param {Object} [options]
    * @param {string} [options.tip] - Override tip commit (for pinned reads)
-   * @returns {Promise<Array<Record<string, unknown>>>}
+   * @returns {Promise<ReadRecordsResult>}
    */
   async readRecords(graphName, options = {}) {
     const ref = buildTrustRecordRef(graphName);
     let tip = options.tip ?? null;
 
-    if (!tip) {
-      try {
-        tip = await this._persistence.readRef(ref);
-      } catch (err) {
-        // Distinguish "ref not found" from operational error (J15)
-        if (err instanceof Error && (err.message?.includes('not found') || err.message?.includes('does not exist'))) {
-          return [];
-        }
-        throw new TrustError(
-          `Failed to read trust chain ref: ${err instanceof Error ? err.message : String(err)}`,
-          { code: 'E_TRUST_READ_FAILED' },
-        );
-      }
+    try {
       if (!tip) {
-        return [];
+        try {
+          tip = await this._persistence.readRef(ref);
+        } catch (err) {
+          // Distinguish "ref not found" from operational error (J15)
+          if (err instanceof Error && (err.message?.includes('not found') || err.message?.includes('does not exist'))) {
+            return { ok: true, records: [] };
+          }
+          return {
+            ok: false,
+            error: new TrustError(
+              `Failed to read trust chain ref: ${err instanceof Error ? err.message : String(err)}`,
+              { code: 'E_TRUST_READ_FAILED' },
+            ),
+          };
+        }
+        if (!tip) {
+          return { ok: true, records: [] };
+        }
       }
-    }
 
-    const records = [];
-    let current = tip;
+      const records = [];
+      let current = tip;
 
-    while (current) {
-      const info = await this._persistence.getNodeInfo(current);
-      const entries = await this._persistence.readTreeOids(
-        await this._persistence.getCommitTree(current),
-      );
-      const blobOid = entries['record.cbor'];
-      if (!blobOid) {
-        break;
-      }
-      const record = /** @type {Record<string, unknown>} */ (this._codec.decode(
-        await this._persistence.readBlob(blobOid),
-      ));
+      while (current) {
+        const info = await this._persistence.getNodeInfo(current);
+        const entries = await this._persistence.readTreeOids(
+          await this._persistence.getCommitTree(current),
+        );
+        const blobOid = entries['record.cbor'];
+        if (!blobOid) {
+          break;
+        }
+        const record = /** @type {Record<string, unknown>} */ (this._codec.decode(
+          await this._persistence.readBlob(blobOid),
+        ));
 
-      records.unshift(record);
+        records.unshift(record);
 
-      if (info.parents.length === 0) {
-        break;
+        if (info.parents.length === 0) {
+          break;
+        }
+        current = info.parents[0];
       }
-      current = info.parents[0];
-    }
 
-    return records;
+      return { ok: true, records };
+    } catch (err) {
+      return {
+        ok: false,
+        error: err instanceof Error ? err : new Error(String(err)),
+      };
+    }
   }
 
   /**

package/src/domain/utils/CachedValue.js

@@ -54,6 +54,12 @@ class CachedValue {
     /** @type {T|null} */
     this._value = null;
 
+    /** @type {Promise<T>|null} */
+    this._inflight = null;
+
+    /** @type {number} */
+    this._generation = 0;
+
     /** @type {number} */
     this._cachedAt = 0;
 
@@ -71,12 +77,33 @@ class CachedValue {
       return /** @type {T} */ (this._value);
     }
 
-    const value = await this._compute();
-    this._value = value;
-    this._cachedAt = this._clock.now();
-    this._cachedAtIso = this._clock.timestamp();
+    if (this._inflight) {
+      return await this._inflight;
+    }
 
-    return value;
+    const generation = this._generation;
+
+    this._inflight = Promise.resolve(this._compute()).then(
+      (value) => {
+        // Ignore stale in-flight completion if cache was invalidated mid-flight.
+        if (generation !== this._generation) {
+          return value;
+        }
+        this._value = value;
+        this._cachedAt = this._clock.now();
+        this._cachedAtIso = this._clock.timestamp();
+        this._inflight = null;
+        return value;
+      },
+      (err) => {
+        if (generation === this._generation) {
+          this._inflight = null;
+        }
+        throw err;
+      },
+    );
+
+    return await this._inflight;
   }
 
   /**
@@ -99,7 +126,9 @@ class CachedValue {
    * Invalidates the cached value, forcing recomputation on next get().
    */
   invalidate() {
+    this._generation += 1;
     this._value = null;
+    this._inflight = null;
     this._cachedAt = 0;
     this._cachedAtIso = null;
   }

package/src/domain/utils/EventId.js

@@ -49,6 +49,9 @@ export function createEventId(lamport, writerId, patchSha, opIndex) {
  * Compares two EventIds lexicographically.
  * Order: lamport -> writerId -> patchSha -> opIndex
  *
+ * SHA tiebreaker uses lexicographic string comparison. This is arbitrary but
+ * deterministic — the specific order doesn't matter as long as all writers agree.
+ *
  * @param {EventId} a
  * @param {EventId} b
  * @returns {number} -1 if a < b, 0 if equal, 1 if a > b
@@ -64,7 +67,7 @@ export function compareEventIds(a, b) {
     return a.writerId < b.writerId ? -1 : 1;
   }
 
-  // 3. Compare patchSha as string
+  // 3. Compare patchSha as string (lexicographic — arbitrary but deterministic)
   if (a.patchSha !== b.patchSha) {
     return a.patchSha < b.patchSha ? -1 : 1;
   }

package/src/domain/utils/LRUCache.js

@@ -34,7 +34,9 @@ class LRUCache {
     if (!this._cache.has(key)) {
       return undefined;
     }
-    // Move to end (most recently used) by deleting and re-inserting
+    // Delete-reinsert maintains insertion order in the underlying Map, which
+    // serves as the LRU eviction order. This is O(1) amortized in V8's Map
+    // implementation despite appearing wasteful (2x Map ops per get).
     const value = /** @type {V} */ (this._cache.get(key));
     this._cache.delete(key);
     this._cache.set(key, value);

package/src/domain/utils/RefLayout.js

@@ -376,6 +376,10 @@ export function buildTrustRecordRef(graphName) {
 /**
  * Parses and extracts the writer ID from a writer ref path.
  *
+ * Returns null for any non-writer ref, including malformed refs. Callers that
+ * need to distinguish "not a writer ref" from "malformed ref" should validate
+ * the ref format separately before calling this method.
+ *
  * @param {string} refPath - The full ref path
  * @returns {string|null} The writer ID, or null if the path is not a valid writer ref
  *

package/src/domain/utils/canonicalStringify.js

@@ -7,10 +7,24 @@
  * - Array elements that are undefined/function/symbol become "null"
  * - Object properties with undefined/function/symbol values are omitted
  *
+ * Throws TypeError on circular references rather than stack-overflowing.
+ *
  * @param {unknown} value - Any JSON-serializable value
  * @returns {string} Canonical JSON string with sorted keys
  */
 export function canonicalStringify(value) {
+  return _canonicalStringify(value, new WeakSet());
+}
+
+/**
+ * Internal recursive helper with cycle detection.
+ *
+ * @param {unknown} value - Any JSON-serializable value
+ * @param {WeakSet<object>} seen - Set of already-visited objects for cycle detection
+ * @returns {string} Canonical JSON string with sorted keys
+ * @private
+ */
+function _canonicalStringify(value, seen) {
   if (value === undefined) {
     return 'null';
   }
@@ -18,26 +32,42 @@ export function canonicalStringify(value) {
     return 'null';
   }
   if (Array.isArray(value)) {
-    // Map elements: undefined/function/symbol -> "null", others recurse
-    const elements = value.map(el => {
-      if (el === undefined || typeof el === 'function' || typeof el === 'symbol') {
-        return 'null';
-      }
-      return canonicalStringify(el);
-    });
-    return `[${elements.join(',')}]`;
+    if (seen.has(value)) {
+      throw new TypeError('Circular reference detected in canonicalStringify');
+    }
+    seen.add(value);
+    try {
+      // Map elements: undefined/function/symbol -> "null", others recurse
+      const elements = value.map(el => {
+        if (el === undefined || typeof el === 'function' || typeof el === 'symbol') {
+          return 'null';
+        }
+        return _canonicalStringify(el, seen);
+      });
+      return `[${elements.join(',')}]`;
+    } finally {
+      seen.delete(value);
+    }
   }
   if (typeof value === 'object') {
-    const obj = /** @type {Record<string, unknown>} */ (value);
-    // Filter out keys with undefined/function/symbol values, then sort
-    const keys = Object.keys(obj)
-      .filter(k => {
-        const v = obj[k];
-        return v !== undefined && typeof v !== 'function' && typeof v !== 'symbol';
-      })
-      .sort();
-    const pairs = keys.map(k => `${JSON.stringify(k)}:${canonicalStringify(obj[k])}`);
-    return `{${pairs.join(',')}}`;
+    if (seen.has(value)) {
+      throw new TypeError('Circular reference detected in canonicalStringify');
+    }
+    seen.add(value);
+    try {
+      const obj = /** @type {Record<string, unknown>} */ (value);
+      // Filter out keys with undefined/function/symbol values, then sort
+      const keys = Object.keys(obj)
+        .filter(k => {
+          const v = obj[k];
+          return v !== undefined && typeof v !== 'function' && typeof v !== 'symbol';
+        })
+        .sort();
+      const pairs = keys.map(k => `${JSON.stringify(k)}:${_canonicalStringify(obj[k], seen)}`);
+      return `{${pairs.join(',')}}`;
+    } finally {
+      seen.delete(value);
+    }
   }
   return JSON.stringify(value);
 }

package/src/domain/utils/matchGlob.js

@@ -46,6 +46,13 @@ export function matchGlob(pattern, str) {
   if (!regex) {
     regex = new RegExp(`^${escapeRegex(pattern).replace(/\\\*/g, '.*')}$`);
     globRegexCache.set(pattern, regex);
+    // Prevent unbounded cache growth. 1000 entries is generous for typical
+    // usage; a full clear is simpler and cheaper than LRU for a regex cache.
+    // Evict after insert so the just-compiled regex survives the clear.
+    if (globRegexCache.size >= 1000) {
+      globRegexCache.clear();
+      globRegexCache.set(pattern, regex);
+    }
   }
   return regex.test(str);
 }

package/src/domain/warp/PatchSession.js

@@ -9,8 +9,8 @@
  * @see WARP Writer Spec v1
  */
 
-import { buildWriterRef } from '../utils/RefLayout.js';
 import WriterError from '../errors/WriterError.js';
+import { buildWriterRef } from '../utils/RefLayout.js';
 
 /**
  * Fluent patch session for building and committing graph mutations.
@@ -60,7 +60,7 @@ export class PatchSession {
    *
    * @param {string} nodeId - The node ID to add
    * @returns {this} This session for chaining
-   * @throws {Error} If this session has already been committed
+   * @throws {WriterError} SESSION_COMMITTED if already committed
    */
   addNode(nodeId) {
     this._ensureNotCommitted();
@@ -75,7 +75,7 @@ export class PatchSession {
    *
    * @param {string} nodeId - The node ID to remove
    * @returns {this} This session for chaining
-   * @throws {Error} If this session has already been committed
+   * @throws {WriterError} SESSION_COMMITTED if already committed
    */
   removeNode(nodeId) {
     this._ensureNotCommitted();
@@ -90,7 +90,7 @@ export class PatchSession {
    * @param {string} to - Target node ID
    * @param {string} label - Edge label/type
    * @returns {this} This session for chaining
-   * @throws {Error} If this session has already been committed
+   * @throws {WriterError} SESSION_COMMITTED if already committed
    */
   addEdge(from, to, label) {
     this._ensureNotCommitted();
@@ -107,7 +107,7 @@ export class PatchSession {
    * @param {string} to - Target node ID
    * @param {string} label - Edge label/type
    * @returns {this} This session for chaining
-   * @throws {Error} If this session has already been committed
+   * @throws {WriterError} SESSION_COMMITTED if already committed
    */
   removeEdge(from, to, label) {
     this._ensureNotCommitted();
@@ -122,7 +122,7 @@ export class PatchSession {
    * @param {string} key - Property key
    * @param {unknown} value - Property value (must be JSON-serializable)
    * @returns {this} This session for chaining
-   * @throws {Error} If this session has already been committed
+   * @throws {WriterError} SESSION_COMMITTED if already committed
    */
   setProperty(nodeId, key, value) {
     this._ensureNotCommitted();
@@ -139,7 +139,7 @@ export class PatchSession {
    * @param {string} key - Property key
    * @param {unknown} value - Property value (must be JSON-serializable)
    * @returns {this} This session for chaining
-   * @throws {Error} If this session has already been committed
+   * @throws {WriterError} SESSION_COMMITTED if already committed
    */
   // eslint-disable-next-line max-params -- direct delegate matching PatchBuilderV2 signature
   setEdgeProperty(from, to, label, key, value) {
@@ -154,7 +154,7 @@ export class PatchSession {
    * @param {string} nodeId - The node ID to attach content to
    * @param {Buffer|string} content - The content to attach
    * @returns {Promise<this>} This session for chaining
-   * @throws {Error} If this session has already been committed
+   * @throws {WriterError} SESSION_COMMITTED if already committed
    */
   async attachContent(nodeId, content) {
     this._ensureNotCommitted();
@@ -170,7 +170,7 @@ export class PatchSession {
    * @param {string} label - Edge label/type
    * @param {Buffer|string} content - The content to attach
    * @returns {Promise<this>} This session for chaining
-   * @throws {Error} If this session has already been committed
+   * @throws {WriterError} SESSION_COMMITTED if already committed
    */
   // eslint-disable-next-line max-params -- direct delegate matching PatchBuilderV2 signature
   async attachEdgeContent(from, to, label, content) {
@@ -199,6 +199,7 @@ export class PatchSession {
    * @example
    * const sha = await patch.commit();
    */
+  // eslint-disable-next-line complexity -- maps multiple commit-failure modes into stable WriterError codes
   async commit() {
     this._ensureNotCommitted();
 
@@ -207,19 +208,6 @@ export class PatchSession {
       throw new WriterError('EMPTY_PATCH', 'Cannot commit empty patch: no operations added');
     }
 
-    const writerRef = buildWriterRef(this._graphName, this._writerId);
-
-    // Pre-commit CAS check: verify ref hasn't moved
-    const currentHead = await this._persistence.readRef(writerRef);
-    if (currentHead !== this._expectedOldHead) {
-      throw new WriterError(
-        'WRITER_REF_ADVANCED',
-        `Writer ref ${writerRef} has advanced since beginPatch(). ` +
-        `Expected ${this._expectedOldHead || '(none)'}, found ${currentHead || '(none)'}. ` +
-        `Call beginPatch() again to retry.`
-      );
-    }
-
     try {
       // Delegate to PatchBuilderV2.commit() which handles the git operations
       const sha = await this._builder.commit();
@@ -228,6 +216,21 @@ export class PatchSession {
     } catch (err) {
       const errMsg = err instanceof Error ? err.message : String(err);
       const cause = err instanceof Error ? err : undefined;
+      const casError = /** @type {{code?: unknown, expectedSha?: unknown, actualSha?: unknown}|null} */ (
+        (err && typeof err === 'object') ? err : null
+      );
+      if (casError?.code === 'WRITER_CAS_CONFLICT') {
+        const writerRef = buildWriterRef(this._graphName, this._writerId);
+        const expectedSha = typeof casError.expectedSha === 'string' ? casError.expectedSha : this._expectedOldHead;
+        const actualSha = typeof casError.actualSha === 'string' ? casError.actualSha : null;
+        throw new WriterError(
+          'WRITER_REF_ADVANCED',
+          `Writer ref ${writerRef} has advanced since beginPatch(). ` +
+          `Expected ${expectedSha || '(none)'}, found ${actualSha || '(none)'}. ` +
+          'Call beginPatch() again to retry.',
+          cause
+        );
+      }
       if (errMsg.includes('Concurrent commit detected') ||
           errMsg.includes('has advanced')) {
         throw new WriterError('WRITER_REF_ADVANCED', errMsg, cause);
@@ -246,12 +249,15 @@ export class PatchSession {
 
   /**
    * Ensures the session hasn't been committed yet.
-   * @throws {Error} If already committed
+   * @throws {WriterError} SESSION_COMMITTED if already committed
    * @private
    */
   _ensureNotCommitted() {
     if (this._committed) {
-      throw new Error('PatchSession already committed. Call beginPatch() to create a new session.');
+      throw new WriterError(
+        'SESSION_COMMITTED',
+        'PatchSession already committed. Call beginPatch() to create a new session.',
+      );
     }
   }
 }

package/src/domain/warp/Writer.js

@@ -186,6 +186,11 @@ export class Writer {
         'commitPatch() is not reentrant. Use beginPatch() for nested or concurrent patches.',
       );
     }
+    // The `_commitInProgress` flag prevents concurrent commits from the same
+    // Writer instance. The finally block unconditionally resets it to ensure
+    // the writer remains usable after a failed commit. Error classification
+    // (CAS failure vs corruption vs I/O) is handled by the caller via the
+    // thrown error type.
     this._commitInProgress = true;
     try {
       const patch = await this.beginPatch();

package/src/domain/warp/_wiredMethods.d.ts

@@ -249,7 +249,7 @@ declare module '../WarpGraph.js' {
     _resolveCeiling(options?: { ceiling?: number | null }): number | null;
     _buildAdjacency(state: WarpStateV5): { outgoing: Map<string, Array<{ neighborId: string; label: string }>>; incoming: Map<string, Array<{ neighborId: string; label: string }>> };
     _buildView(state: WarpStateV5, stateHash: string, diff?: import('../types/PatchDiff.js').PatchDiff): void;
-    _setMaterializedState(state: WarpStateV5, diff?: import('../types/PatchDiff.js').PatchDiff): Promise<{ state: WarpStateV5; stateHash: string; adjacency: unknown }>;
+    _setMaterializedState(state: WarpStateV5, optionsOrDiff?: import('../types/PatchDiff.js').PatchDiff | { diff?: import('../types/PatchDiff.js').PatchDiff | null }): Promise<{ state: WarpStateV5; stateHash: string; adjacency: unknown }>;
     _materializeWithCeiling(ceiling: number, collectReceipts: boolean, t0: number): Promise<WarpStateV5 | { state: WarpStateV5; receipts: TickReceipt[] }>;
     _persistSeekCacheEntry(cacheKey: string, buf: Buffer, state: WarpStateV5): Promise<void>;
     _restoreIndexFromCache(indexTreeOid: string): Promise<void>;