@nicia-ai/typegraph 0.33.0 → 0.35.0

package/dist/graph-merge/index.cjs

@@ -1,37 +1,59 @@
 'use strict';
 
-var chunkD3EWZ67S_cjs = require('../chunk-D3EWZ67S.cjs');
-require('../chunk-HTGDWIDE.cjs');
-var chunkSST7XDY6_cjs = require('../chunk-SST7XDY6.cjs');
-var chunkNG5N7R45_cjs = require('../chunk-NG5N7R45.cjs');
-var chunkMBLXCV2Y_cjs = require('../chunk-MBLXCV2Y.cjs');
-require('../chunk-3QRBXYT5.cjs');
-require('../chunk-3IR2GEMJ.cjs');
-require('../chunk-EF3Z645U.cjs');
-require('../chunk-ZFWNO3GE.cjs');
-var chunkKTIEB7VH_cjs = require('../chunk-KTIEB7VH.cjs');
-require('../chunk-I4W7MKVG.cjs');
-var chunkOIE2UPVG_cjs = require('../chunk-OIE2UPVG.cjs');
-require('../chunk-CFNT3ITG.cjs');
-var chunk73KASJGO_cjs = require('../chunk-73KASJGO.cjs');
-require('../chunk-3E7SNSIA.cjs');
-var chunkJIEJCTDS_cjs = require('../chunk-JIEJCTDS.cjs');
-require('../chunk-FLRCVI2G.cjs');
+var chunkJ7WFGBJR_cjs = require('../chunk-J7WFGBJR.cjs');
+require('../chunk-CTTSDJLY.cjs');
+var chunk4JEZZJ6S_cjs = require('../chunk-4JEZZJ6S.cjs');
+require('../chunk-WJT7OU7E.cjs');
+var chunkCK5BVQOW_cjs = require('../chunk-CK5BVQOW.cjs');
+var chunkACSVZPK7_cjs = require('../chunk-ACSVZPK7.cjs');
+var chunkVPYHY3LJ_cjs = require('../chunk-VPYHY3LJ.cjs');
+require('../chunk-FACJJWGF.cjs');
+require('../chunk-UUT7UN2N.cjs');
+var chunkTEDRJXOG_cjs = require('../chunk-TEDRJXOG.cjs');
+require('../chunk-D7ZEOS56.cjs');
+require('../chunk-UMDVATGY.cjs');
+var chunkFL472AMI_cjs = require('../chunk-FL472AMI.cjs');
+require('../chunk-GSQ6NPH6.cjs');
+var chunkA42GCBGX_cjs = require('../chunk-A42GCBGX.cjs');
+var chunkXOX22WHL_cjs = require('../chunk-XOX22WHL.cjs');
+require('../chunk-EOLERH7Y.cjs');
+require('../chunk-4TOD4LBZ.cjs');
+require('../chunk-BLZDPRXT.cjs');
+require('../chunk-7YSP4V4R.cjs');
+require('../chunk-H7YNSMA7.cjs');
+require('../chunk-SJDMVITW.cjs');
+require('../chunk-DI74SMXS.cjs');
+var chunkLGEALRC6_cjs = require('../chunk-LGEALRC6.cjs');
+require('../chunk-TDXIBCGY.cjs');
 var zod = require('zod');
 
 // src/graph-merge/canonical-props.ts
 function canonicalizeProps(props) {
-  return JSON.stringify(props, chunkOIE2UPVG_cjs.sortedReplacer);
+  return JSON.stringify(props, chunkACSVZPK7_cjs.sortedReplacer);
 }
 function canonicalValueKey(value) {
-  return JSON.stringify(value, chunkOIE2UPVG_cjs.sortedReplacer);
+  return JSON.stringify(value, chunkACSVZPK7_cjs.sortedReplacer);
+}
+function edgeStateSignature(edge) {
+  return JSON.stringify([
+    edge.fromKind,
+    edge.fromId,
+    edge.toKind,
+    edge.toId,
+    edge.live,
+    canonicalizeProps(edge.props)
+  ]);
 }
 function parseRowProps(props) {
   let parsed;
-  try {
-    parsed = JSON.parse(props);
-  } catch {
-    return {};
+  if (typeof props === "string") {
+    try {
+      parsed = JSON.parse(props);
+    } catch {
+      return {};
+    }
+  } else {
+    parsed = props;
   }
   if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
     return {};
@@ -49,9 +71,6 @@ function mergeKey(kind, id) {
   }
   return `${kind}${SEPARATOR}${id}`;
 }
-function compareStrings(left, right) {
-  return left < right ? -1 : left > right ? 1 : 0;
-}
 function mergeKeyOf(node) {
   return mergeKey(node.kind, node.id);
 }
@@ -78,7 +97,7 @@ function compareMergeKeys(left, right) {
 var ENUMERATION_PAGE_SIZE = 1e3;
 async function enumerateAllNodes(backend, graphId, kind) {
   const collected = [];
-  let after = void 0;
+  let after;
   for (; ; ) {
     const page = await backend.findNodesByKind({
       graphId,
@@ -100,7 +119,7 @@ async function enumerateAllNodes(backend, graphId, kind) {
 }
 async function enumerateAllEdges(backend, graphId, kind) {
   const collected = [];
-  let after = void 0;
+  let after;
   for (; ; ) {
     const page = await backend.findEdgesByKind({
       graphId,
@@ -225,15 +244,16 @@ function diffEdgeKind(kind, baseRows, forkRows) {
   return { new: created, modified, deleted };
 }
 function byId(left, right) {
-  return compareStrings(left.id, right.id);
+  return chunkA42GCBGX_cjs.compareStrings(left.id, right.id);
 }
-async function diffAgainstBase(baseStore, forkStore) {
+async function diffAgainstBase(baseStore, forkStore, captureForkState = true) {
   const graph = baseStore.graph;
-  const nodeKinds = chunkMBLXCV2Y_cjs.getNodeKinds(graph);
-  const edgeKinds = chunkMBLXCV2Y_cjs.getEdgeKinds(graph);
+  const nodeKinds = chunkVPYHY3LJ_cjs.getNodeKinds(graph);
+  const edgeKinds = chunkVPYHY3LJ_cjs.getEdgeKinds(graph);
   const newNodes = [];
   const modifiedNodes = [];
   const deletedNodes = [];
+  const forkNodeVersions = /* @__PURE__ */ new Map();
   for (const kind of nodeKinds) {
     const baseRows = await enumerateAllNodes(
       baseStore.backend,
@@ -245,6 +265,11 @@ async function diffAgainstBase(baseStore, forkStore) {
       forkStore.graphId,
       kind
     );
+    if (captureForkState) {
+      for (const row of forkRows) {
+        forkNodeVersions.set(mergeKey(kind, row.id), row.version);
+      }
+    }
     const delta = diffNodeKind(kind, baseRows, forkRows);
     for (const entry of delta.new) {
       newNodes.push(entry);
@@ -259,6 +284,7 @@ async function diffAgainstBase(baseStore, forkStore) {
   const newEdges = [];
   const modifiedEdges = [];
   const deletedEdges = [];
+  const forkEdgeSignatures = /* @__PURE__ */ new Map();
   for (const kind of edgeKinds) {
     const baseRows = await enumerateAllEdges(
       baseStore.backend,
@@ -270,6 +296,21 @@ async function diffAgainstBase(baseStore, forkStore) {
       forkStore.graphId,
       kind
     );
+    if (captureForkState) {
+      for (const row of forkRows) {
+        forkEdgeSignatures.set(
+          mergeKey(kind, row.id),
+          edgeStateSignature({
+            fromKind: row.from_kind,
+            fromId: row.from_id,
+            toKind: row.to_kind,
+            toId: row.to_id,
+            live: isLive(row),
+            props: parseRowProps(row.props)
+          })
+        );
+      }
+    }
     const delta = diffEdgeKind(kind, baseRows, forkRows);
     for (const entry of delta.new) {
       newEdges.push(entry);
@@ -291,7 +332,9 @@ async function diffAgainstBase(baseStore, forkStore) {
       new: newEdges.sort((left, right) => byId(left, right)),
       modified: modifiedEdges.sort((left, right) => byId(left, right)),
       deleted: deletedEdges.sort((left, right) => byId(left, right))
-    }
+    },
+    forkNodeVersions,
+    forkEdgeSignatures
   };
 }
 
@@ -305,6 +348,9 @@ function asBaseVersion(value) {
 
 // src/graph-merge/base-version.ts
 var TOKEN_SEPARATOR = "\0";
+var REVISION_COMPONENT_PREFIX = "revision:";
+var REVISION_COMPONENT_SEPARATOR = ":";
+var INITIAL_REVISION = "initial";
 var FALLBACK_SCHEMA_VERSION = 1;
 async function readActiveSchemaVersion(backend, graphId) {
   const active = await backend.getActiveSchema(graphId);
@@ -312,16 +358,16 @@ async function readActiveSchemaVersion(backend, graphId) {
 }
 async function computeSchemaComponent(store) {
   const version = await readActiveSchemaVersion(store.backend, store.graphId);
-  return chunkNG5N7R45_cjs.computeSchemaHash(chunkNG5N7R45_cjs.serializeSchema(store.graph, version));
+  return chunkCK5BVQOW_cjs.computeSchemaHash(chunkCK5BVQOW_cjs.serializeSchema(store.graph, version));
 }
 function byDigestEntry(left, right) {
-  const byKind = compareStrings(left.kind, right.kind);
-  return byKind === 0 ? compareStrings(left.id, right.id) : byKind;
+  const byKind = chunkA42GCBGX_cjs.compareStrings(left.kind, right.kind);
+  return byKind === 0 ? chunkA42GCBGX_cjs.compareStrings(left.id, right.id) : byKind;
 }
 var CONTENT_FINGERPRINT_BYTES = 16;
 async function computeContentComponent(backend, graphId, graph) {
-  const nodeKinds = chunkMBLXCV2Y_cjs.getNodeKinds(graph);
-  const edgeKinds = chunkMBLXCV2Y_cjs.getEdgeKinds(graph);
+  const nodeKinds = chunkVPYHY3LJ_cjs.getNodeKinds(graph);
+  const edgeKinds = chunkVPYHY3LJ_cjs.getEdgeKinds(graph);
   const nodeDigest = [];
   for (const kind of nodeKinds) {
     const rows = await enumerateAllNodes(backend, graphId, kind);
@@ -356,7 +402,7 @@ async function computeContentComponent(backend, graphId, graph) {
       }
     }
   }
-  return chunk73KASJGO_cjs.sha256Hex(
+  return chunkTEDRJXOG_cjs.sha256Hex(
     canonicalizeProps({
       nodes: nodeDigest.sort((left, right) => byDigestEntry(left, right)),
       edges: edgeDigest.sort((left, right) => byDigestEntry(left, right))
@@ -365,6 +411,16 @@ async function computeContentComponent(backend, graphId, graph) {
   );
 }
 async function computeBaseVersion(store) {
+  if (store.revisionTrackingEnabled) {
+    const [schemaComponent2, origin, revision] = await Promise.all([
+      computeSchemaComponent(store),
+      store.revisionOriginNow(),
+      store.revisionNow()
+    ]);
+    return asBaseVersion(
+      `${schemaComponent2}${TOKEN_SEPARATOR}${revisionComponent(origin, revision)}`
+    );
+  }
   const [schemaComponent, contentComponent] = await Promise.all([
     computeSchemaComponent(store),
     computeContentComponent(store.backend, store.graphId, store.graph)
@@ -373,6 +429,30 @@ async function computeBaseVersion(store) {
     `${schemaComponent}${TOKEN_SEPARATOR}${contentComponent}`
   );
 }
+function revisionComponent(origin, revision) {
+  return `${REVISION_COMPONENT_PREFIX}${origin}${REVISION_COMPONENT_SEPARATOR}${revision ?? INITIAL_REVISION}`;
+}
+function hasRevisionAnchor(version) {
+  return contentComponentOf(version).startsWith(REVISION_COMPONENT_PREFIX);
+}
+function revisionAnchorOf(version) {
+  const revision = revisionPartsOf(version)?.revision;
+  return revision === void 0 || revision === INITIAL_REVISION ? void 0 : revision;
+}
+function revisionOriginOf(version) {
+  return revisionPartsOf(version)?.origin;
+}
+function revisionPartsOf(version) {
+  const component = contentComponentOf(version);
+  if (!component.startsWith(REVISION_COMPONENT_PREFIX)) return void 0;
+  const encoded = component.slice(REVISION_COMPONENT_PREFIX.length);
+  const separator = encoded.indexOf(REVISION_COMPONENT_SEPARATOR);
+  if (separator <= 0 || separator === encoded.length - 1) return void 0;
+  return {
+    origin: encoded.slice(0, separator),
+    revision: encoded.slice(separator + 1)
+  };
+}
 function contentComponentOf(version) {
   const separatorIndex = version.indexOf(TOKEN_SEPARATOR);
   return separatorIndex === -1 ? version : version.slice(separatorIndex + 1);
@@ -394,7 +474,7 @@ function toTypeGraphErrorOptions(category, options) {
     ...options.cause === void 0 ? {} : { cause: options.cause }
   };
 }
-var MergeError = class extends chunkJIEJCTDS_cjs.TypeGraphError {
+var MergeError = class extends chunkLGEALRC6_cjs.TypeGraphError {
   constructor(message, options = {}) {
     super(
       message,
@@ -404,7 +484,7 @@ var MergeError = class extends chunkJIEJCTDS_cjs.TypeGraphError {
     this.name = "MergeError";
   }
 };
-var BranchError = class extends chunkJIEJCTDS_cjs.TypeGraphError {
+var BranchError = class extends chunkLGEALRC6_cjs.TypeGraphError {
   constructor(message, options = {}) {
     super(
       message,
@@ -447,22 +527,32 @@ var CLONE_IMPORT_BATCH_SIZE = 1e3;
 function cloneWorkingCopyStrategy(makeBackend) {
   return {
     create: async (baseStore) => {
-      const data = await chunkSST7XDY6_cjs.exportGraph(baseStore, {
-        includeMeta: true,
-        includeDeleted: false
-      });
       const backend = await makeBackend();
       try {
-        const [freshStore] = await chunkD3EWZ67S_cjs.createStoreWithSchema(
+        const [freshStore] = await chunkJ7WFGBJR_cjs.createStoreWithSchema(
           baseStore.graph,
-          backend
+          backend,
+          {
+            // Keep descendants branchable with the same O(1) anchor contract,
+            // but do not copy recorded-time history into the disposable fork.
+            revisionTracking: baseStore.revisionTrackingEnabled
+          }
+        );
+        const result = await chunk4JEZZJ6S_cjs.importGraphStream(
+          freshStore,
+          chunk4JEZZJ6S_cjs.exportGraphStream(baseStore, {
+            includeMeta: true,
+            includeTemporal: true,
+            includeDeleted: false,
+            batchSize: CLONE_IMPORT_BATCH_SIZE
+          }),
+          {
+            onConflict: "error",
+            onUnknownProperty: "error",
+            validateReferences: true,
+            batchSize: CLONE_IMPORT_BATCH_SIZE
+          }
         );
-        const result = await chunkSST7XDY6_cjs.importGraph(freshStore, data, {
-          onConflict: "error",
-          onUnknownProperty: "error",
-          validateReferences: true,
-          batchSize: CLONE_IMPORT_BATCH_SIZE
-        });
         if (!result.success) {
           throw new BranchError(
             "Clone import failed: the working copy could not be seeded from the base store. The backend returned by makeBackend() must be empty.",
@@ -485,12 +575,12 @@ function cloneWorkingCopyStrategy(makeBackend) {
 async function branch(baseStore, makeBackend, options, strategy) {
   try {
     const base = await computeBaseVersion(baseStore);
-    const id = options?.id ?? asBranchId(chunkD3EWZ67S_cjs.generateId());
+    const id = options?.id ?? asBranchId(chunkXOX22WHL_cjs.generateId());
     const workingCopyStrategy = strategy ?? cloneWorkingCopyStrategy(makeBackend);
     const store = await workingCopyStrategy.create(baseStore);
-    return chunkKTIEB7VH_cjs.ok({ id, base, store });
+    return chunkFL472AMI_cjs.ok({ id, base, store });
   } catch (error) {
-    return chunkKTIEB7VH_cjs.err(
+    return chunkFL472AMI_cjs.err(
       new BranchError("Failed to create working-copy branch of base store", {
         cause: error
       })
@@ -514,7 +604,7 @@ function constraintSignature(node, constraint) {
       return void 0;
     }
   }
-  return `${constraint.name}${KEY_PART_SEPARATOR}${chunkD3EWZ67S_cjs.computeUniqueKey(
+  return `${constraint.name}${KEY_PART_SEPARATOR}${chunkXOX22WHL_cjs.computeUniqueKey(
     props,
     constraint.fields,
     constraint.collation
@@ -551,12 +641,12 @@ function blockNodes(newNodes, resolveConfig, uniqueConstraints = []) {
     }
   }
   const sortedKeys = [...buckets.keys()].sort(
-    (left, right) => compareStrings(left, right)
+    (left, right) => chunkA42GCBGX_cjs.compareStrings(left, right)
   );
   const ordered = /* @__PURE__ */ new Map();
   for (const key of sortedKeys) {
     const members = [...buckets.get(key)].sort(
-      (left, right) => compareStrings(left.id, right.id)
+      (left, right) => chunkA42GCBGX_cjs.compareStrings(left.id, right.id)
     );
     ordered.set(key, members);
   }
@@ -573,7 +663,7 @@ function buildBranchRank(branchOrder, allBranchIds) {
       next += 1;
     }
   }
-  const remaining = allBranchIds.filter((branchId) => !rank.has(branchId)).sort((left, right) => compareStrings(left, right));
+  const remaining = allBranchIds.filter((branchId) => !rank.has(branchId)).sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left, right));
   for (const branchId of remaining) {
     if (!rank.has(branchId)) {
       rank.set(branchId, next);
@@ -645,8 +735,8 @@ function collectConflictingValues(property, contributions) {
     values.push({ branchId, value });
   }
   return [...values].sort((left, right) => {
-    const byBranch = compareStrings(left.branchId, right.branchId);
-    return byBranch === 0 ? compareStrings(
+    const byBranch = chunkA42GCBGX_cjs.compareStrings(left.branchId, right.branchId);
+    return byBranch === 0 ? chunkA42GCBGX_cjs.compareStrings(
       canonicalValueKey(left.value),
       canonicalValueKey(right.value)
     ) : byBranch;
@@ -773,7 +863,7 @@ function unionProperties(canonicalMember, members, context, baseContext, branchR
   const props = {};
   const conflicts = [];
   for (const property of [...propertyNames].sort(
-    (left, right) => compareStrings(left, right)
+    (left, right) => chunkA42GCBGX_cjs.compareStrings(left, right)
   )) {
     const values = collectConflictingValues(property, members);
     if (values.length === 0) {
@@ -838,14 +928,14 @@ function canonicalizeCluster(cluster, members, policy, branchRank, weights, cano
   );
   const memberIds = [
     ...new Set(cluster.members.map((member) => idOf(member)))
-  ].sort((left, right) => compareStrings(left, right));
+  ].sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left, right));
   const branchOrigins = [
     ...new Set(
       members.map((member) => member.branchId).filter(
         (branchId) => branchId !== BASE_PROVENANCE_BRANCH && branchId !== preferredBranchId
       )
     )
-  ].sort((left, right) => compareStrings(left, right));
+  ].sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left, right));
   const resolution = {
     canonicalId,
     memberIds,
@@ -860,6 +950,7 @@ var UnionFind = class {
   constructor(compare) {
     this.compare = compare;
   }
+  compare;
   parent = /* @__PURE__ */ new Map();
   /** Adds `value` as its own singleton set if it is not already present. */
   add(value) {
@@ -905,7 +996,7 @@ var UnionFind = class {
 var SUB_CLASS_OF_META_EDGE = "subClassOf";
 var EQUIVALENT_TO_META_EDGE = "equivalentTo";
 function buildSubClassClosure(ontology) {
-  const unionFind = new UnionFind(compareStrings);
+  const unionFind = new UnionFind(chunkA42GCBGX_cjs.compareStrings);
   for (const relation of ontology) {
     unionFind.add(relation.from);
     unionFind.add(relation.to);
@@ -936,7 +1027,7 @@ function buildSubClassClosure(ontology) {
     relations.push([child, parent]);
   }
   return {
-    closure: chunkKTIEB7VH_cjs.computeTransitiveClosure(relations),
+    closure: chunkFL472AMI_cjs.computeTransitiveClosure(relations),
     canonicalOf
   };
 }
@@ -949,7 +1040,7 @@ function isReachable2(closure, from, to) {
   if (fromRep === toRep) {
     return from !== to;
   }
-  return chunkKTIEB7VH_cjs.isReachable(closure.closure, fromRep, toRep);
+  return chunkFL472AMI_cjs.isReachable(closure.closure, fromRep, toRep);
 }
 
 // src/graph-merge/similarity.ts
@@ -1132,37 +1223,37 @@ function scorePrepared(left, right, strategy, ctx) {
   switch (strategy.kind) {
     case "custom": {
       const raw = strategy.score(left.node, right.node);
-      return chunkKTIEB7VH_cjs.ok(clampScore(raw));
+      return chunkFL472AMI_cjs.ok(clampScore(raw));
     }
     case "fulltext": {
       if (left.text.length === 0 || right.text.length === 0) {
-        return chunkKTIEB7VH_cjs.ok(NO_EVIDENCE_SCORE);
+        return chunkFL472AMI_cjs.ok(NO_EVIDENCE_SCORE);
       }
-      return chunkKTIEB7VH_cjs.ok(clampScore(diceFromMultisets(left.grams, right.grams)));
+      return chunkFL472AMI_cjs.ok(clampScore(diceFromMultisets(left.grams, right.grams)));
     }
     case "vector": {
       if (ctx.embeddings === void 0) {
-        return chunkKTIEB7VH_cjs.err(embedderUnavailable("vector", ctx));
+        return chunkFL472AMI_cjs.err(embedderUnavailable("vector", ctx));
       }
       if (left.text.length === 0 || right.text.length === 0) {
-        return chunkKTIEB7VH_cjs.ok(NO_EVIDENCE_SCORE);
+        return chunkFL472AMI_cjs.ok(NO_EVIDENCE_SCORE);
       }
       const cosine = cosineFromLookup(ctx.embeddings, left.text, right.text);
-      return chunkKTIEB7VH_cjs.ok(clampScore(cosine));
+      return chunkFL472AMI_cjs.ok(clampScore(cosine));
     }
     case "hybrid": {
       if (ctx.embeddings === void 0) {
-        return chunkKTIEB7VH_cjs.err(embedderUnavailable("hybrid", ctx));
+        return chunkFL472AMI_cjs.err(embedderUnavailable("hybrid", ctx));
       }
       if (left.text.length === 0 || right.text.length === 0) {
-        return chunkKTIEB7VH_cjs.ok(NO_EVIDENCE_SCORE);
+        return chunkFL472AMI_cjs.ok(NO_EVIDENCE_SCORE);
       }
       const vectorScore = clampScore(
         cosineFromLookup(ctx.embeddings, left.text, right.text)
       );
       const fulltextScore = diceFromMultisets(left.grams, right.grams);
       const weights = normalizeHybridWeights(strategy.weights);
-      return chunkKTIEB7VH_cjs.ok(
+      return chunkFL472AMI_cjs.ok(
         clampScore(
           weights.vector * vectorScore + weights.fulltext * fulltextScore
         )
@@ -1220,7 +1311,7 @@ function scoreCandidates(input, resolveConfig, ctx, ceilingPolicy, maxComparison
   }
   if (maxComparisonsPerKind !== void 0 && fuzzy.length > maxComparisonsPerKind) {
     if (ceilingPolicy === "error") {
-      return chunkKTIEB7VH_cjs.err(
+      return chunkFL472AMI_cjs.err(
         new MergeError(
           `Comparison ceiling exceeded: ${fuzzy.length} candidate pairs > maxComparisonsPerKind ${maxComparisonsPerKind}.`,
           {
@@ -1233,7 +1324,7 @@ function scoreCandidates(input, resolveConfig, ctx, ceilingPolicy, maxComparison
         )
       );
     }
-    return chunkKTIEB7VH_cjs.ok({
+    return chunkFL472AMI_cjs.ok({
       edges: [...forced].sort(
         (left, right) => compareCandidateEdges(left, right)
       ),
@@ -1251,14 +1342,14 @@ function scoreCandidates(input, resolveConfig, ctx, ceilingPolicy, maxComparison
   const edges = [...forced];
   for (const { left, right, a, b } of fuzzy) {
     const scored = scorer(a, left, b, right);
-    if (chunkKTIEB7VH_cjs.isErr(scored)) {
-      return chunkKTIEB7VH_cjs.err(scored.error);
+    if (chunkFL472AMI_cjs.isErr(scored)) {
+      return chunkFL472AMI_cjs.err(scored.error);
     }
     if (scored.data >= threshold) {
       edges.push({ a, b, score: scored.data });
     }
   }
-  return chunkKTIEB7VH_cjs.ok({
+  return chunkFL472AMI_cjs.ok({
     edges: edges.sort((left, right) => compareCandidateEdges(left, right)),
     warnings: []
   });
@@ -1468,7 +1559,7 @@ function pickHighestPriorityBranch(branchIds, branchRank) {
   let chosenRank = branchRank.get(chosen) ?? Number.MAX_SAFE_INTEGER;
   for (const candidate of branchIds.slice(1)) {
     const candidateRank = branchRank.get(candidate) ?? Number.MAX_SAFE_INTEGER;
-    if (candidateRank < chosenRank || candidateRank === chosenRank && compareStrings(candidate, chosen) < 0) {
+    if (candidateRank < chosenRank || candidateRank === chosenRank && chunkA42GCBGX_cjs.compareStrings(candidate, chosen) < 0) {
       chosen = candidate;
       chosenRank = candidateRank;
     }
@@ -1561,20 +1652,20 @@ function resolveDeleteModifyOver(modified, deleted, modifiedEntity, deletedEntit
   }
   return {
     survivingModifications: [...survivingModifications].sort((left, right) => {
-      const byId2 = compareStrings(
+      const byId2 = chunkA42GCBGX_cjs.compareStrings(
         modifiedEntity(left).id,
         modifiedEntity(right).id
       );
-      return byId2 === 0 ? compareStrings(left.branchId, right.branchId) : byId2;
+      return byId2 === 0 ? chunkA42GCBGX_cjs.compareStrings(left.branchId, right.branchId) : byId2;
     }),
     deletions: [...deletions].sort(
-      (left, right) => compareStrings(left.id, right.id)
+      (left, right) => chunkA42GCBGX_cjs.compareStrings(left.id, right.id)
     ),
     conflicts: [...conflicts].sort(
-      (left, right) => compareStrings(left.entityId, right.entityId)
+      (left, right) => chunkA42GCBGX_cjs.compareStrings(left.entityId, right.entityId)
     ),
     dropped: [...dropped].sort(
-      (left, right) => compareStrings(left.id, right.id)
+      (left, right) => chunkA42GCBGX_cjs.compareStrings(left.id, right.id)
     )
   };
 }
@@ -1618,11 +1709,11 @@ function reconcileOver(survivingModifications, entityOf, rebuild, policy, branch
   }
   return {
     survivingModifications: [...out].sort((left, right) => {
-      const byId2 = compareStrings(entityOf(left).id, entityOf(right).id);
-      return byId2 === 0 ? compareStrings(left.branchId, right.branchId) : byId2;
+      const byId2 = chunkA42GCBGX_cjs.compareStrings(entityOf(left).id, entityOf(right).id);
+      return byId2 === 0 ? chunkA42GCBGX_cjs.compareStrings(left.branchId, right.branchId) : byId2;
     }),
     conflicts: conflicts.sort(
-      (left, right) => compareStrings(
+      (left, right) => chunkA42GCBGX_cjs.compareStrings(
         `${left.entityId}|${left.property}`,
         `${right.entityId}|${right.property}`
       )
@@ -1656,7 +1747,7 @@ function threeWayMergeProps(entityId, kind, baseProps, contributions, context, b
       propertyNames.add(name);
     }
   }
-  for (const property of [...propertyNames].sort(compareStrings)) {
+  for (const property of [...propertyNames].sort(chunkA42GCBGX_cjs.compareStrings)) {
     const baseHas = property in baseProps;
     const baseKey = baseHas ? canonicalValueKey(baseProps[property]) : void 0;
     const changed = contributions.filter((contribution) => {
@@ -1793,7 +1884,7 @@ function unionEdgeProps(survivorId, kind, survivor, edges, context, branchRank,
   const conflicts = [];
   const contributions = edges.map((edge) => edge.staged);
   for (const property of [...propertyNames].sort(
-    (left, right) => compareStrings(left, right)
+    (left, right) => chunkA42GCBGX_cjs.compareStrings(left, right)
   )) {
     const values = collectConflictingValues(property, contributions);
     if (values.length === 0) {
@@ -1862,7 +1953,7 @@ function repointEdges(stagedEdges, canonicalOf, deletedNodeIds, policy, branchRa
   const merged = [];
   const conflicts = [];
   const sortedGroups = [...dedupeKeyByGroup.keys()].sort(
-    (left, right) => compareStrings(left, right)
+    (left, right) => chunkA42GCBGX_cjs.compareStrings(left, right)
   );
   for (const group of sortedGroups) {
     const dedupeKeys = [...dedupeKeyByGroup.get(group)];
@@ -1874,7 +1965,7 @@ function repointEdges(stagedEdges, canonicalOf, deletedNodeIds, policy, branchRa
     }
     const survivor = pickSurvivor(groupEdges, preferredBranchId);
     const survivorId = survivor.staged.id;
-    const mergedIds = [...groupEdges].map((edge) => edge.staged.id).sort((left, right) => compareStrings(left, right));
+    const mergedIds = [...groupEdges].map((edge) => edge.staged.id).sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left, right));
     const fromId = idOf(survivor.fromKey);
     const fromKind = kindOf(survivor.fromKey);
     const toId = idOf(survivor.toKey);
@@ -1923,12 +2014,12 @@ function repointEdges(stagedEdges, canonicalOf, deletedNodeIds, policy, branchRa
       mergeKey(edge.toKind, edge.toId),
       edge.props
     )
-  })).sort((left, right) => compareStrings(left.sortKey, right.sortKey)).map(({ edge }) => edge);
+  })).sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left.sortKey, right.sortKey)).map(({ edge }) => edge);
   return {
     edges: sortedEdges,
-    dropped: dropped.sort((left, right) => compareStrings(left.id, right.id)),
+    dropped: dropped.sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left.id, right.id)),
     conflicts: conflicts.sort(
-      (left, right) => compareStrings(
+      (left, right) => chunkA42GCBGX_cjs.compareStrings(
         `${left.entityId}|${left.property}`,
         `${right.entityId}|${right.property}`
       )
@@ -2057,7 +2148,7 @@ function normalizeMergeOptions(options = {}) {
     ...provenanceWeights === void 0 ? {} : { provenanceWeights }
   };
 }
-var Provenance = chunkNG5N7R45_cjs.defineNode("Provenance", {
+var Provenance = chunkCK5BVQOW_cjs.defineNode("Provenance", {
   schema: zod.z.object({
     targetGraphId: zod.z.string(),
     role: zod.z.enum(["node", "edge"]),
@@ -2071,14 +2162,14 @@ function provenanceGraphId(targetGraphId) {
   return `${targetGraphId}::merge-provenance`;
 }
 function buildProvenanceGraph(targetGraphId) {
-  return chunkMBLXCV2Y_cjs.defineGraph({
+  return chunkVPYHY3LJ_cjs.defineGraph({
     id: provenanceGraphId(targetGraphId),
     nodes: { Provenance: { type: Provenance } },
     edges: {}
   });
 }
 async function openProvenanceStore(backend, targetGraphId) {
-  const [store] = await chunkD3EWZ67S_cjs.createStoreWithSchema(
+  const [store] = await chunkJ7WFGBJR_cjs.createStoreWithSchema(
     buildProvenanceGraph(targetGraphId),
     backend
   );
@@ -2098,7 +2189,7 @@ async function provenanceNodeId(targetGraphId, record) {
     record.branchId,
     record.sourceId
   ].join(ID_SEPARATOR);
-  const digest = await chunk73KASJGO_cjs.sha256Hex(tuple, ID_DIGEST_BYTES);
+  const digest = await chunkTEDRJXOG_cjs.sha256Hex(tuple, ID_DIGEST_BYTES);
   return `prov_${digest}`;
 }
 async function persistProvenanceRecords(store, targetGraphId, records) {
@@ -2125,7 +2216,7 @@ async function readProvenance(store, query = {}) {
   const all = await store.nodes.Provenance.find();
   return all.filter(
     (node) => (query.branchId === void 0 || node.branchId === query.branchId) && (query.canonicalId === void 0 || node.canonicalId === query.canonicalId) && (query.role === void 0 || node.role === query.role)
-  ).sort((left, right) => compareStrings(left.id, right.id));
+  ).sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left.id, right.id));
 }
 
 // src/graph-merge/sources.ts
@@ -2135,10 +2226,10 @@ function orderEndpoints(left, right) {
   return compareMergeKeys(leftKey, rightKey) <= 0 ? { a: leftKey, b: rightKey, left, right } : { a: rightKey, b: leftKey, left: right, right: left };
 }
 function sortMembersById(members) {
-  return [...members].sort((left, right) => compareStrings(left.id, right.id));
+  return [...members].sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left.id, right.id));
 }
 function sortedBucketKeys(blocks) {
-  return [...blocks.keys()].sort((left, right) => compareStrings(left, right));
+  return [...blocks.keys()].sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left, right));
 }
 var NODE_SYSTEM_FIELDS = /* @__PURE__ */ new Set(["id", "kind", "meta"]);
 function nodeProps(node) {
@@ -2166,7 +2257,7 @@ function windowedPairs(members, config) {
     key: fieldText(node, config.sortFields)
   }));
   keyed.sort(
-    (left, right) => left.key === right.key ? compareStrings(left.node.id, right.node.id) : compareStrings(left.key, right.key)
+    (left, right) => left.key === right.key ? chunkA42GCBGX_cjs.compareStrings(left.node.id, right.node.id) : chunkA42GCBGX_cjs.compareStrings(left.key, right.key)
   );
   const pairs = [];
   for (let index = 0; index < keyed.length; index += 1) {
@@ -2224,7 +2315,7 @@ function ontologyRetypeEdges(stagedIdentities, isRetypeCompatible) {
     }
   }
   const edges = [];
-  for (const id of [...identitiesById.keys()].sort(compareStrings)) {
+  for (const id of [...identitiesById.keys()].sort(chunkA42GCBGX_cjs.compareStrings)) {
     const identities = [...new Set(identitiesById.get(id))].sort(
       compareMergeKeys
     );
@@ -2316,7 +2407,7 @@ var baseUniqueSource = {
     const forcedEdges = [];
     const baseMembers = /* @__PURE__ */ new Map();
     const constraints = [...uniqueConstraints].sort(
-      (left, right) => compareStrings(left.name, right.name)
+      (left, right) => chunkA42GCBGX_cjs.compareStrings(left.name, right.name)
     );
     const items = nodes.map((node) => ({ props: nodeProps(node) }));
     const matchesByConstraint = await Promise.all(
@@ -2359,7 +2450,7 @@ var baseUniqueSource = {
       pairs: [],
       forcedEdges,
       baseMembers: [...baseMembers.values()].sort(
-        (left, right) => compareStrings(left.id, right.id)
+        (left, right) => chunkA42GCBGX_cjs.compareStrings(left.id, right.id)
       )
     };
   }
@@ -2416,7 +2507,7 @@ var baseKeySource = {
       pairs,
       forcedEdges: [],
       baseMembers: [...baseMembers.values()].sort(
-        (left, right) => compareStrings(left.id, right.id)
+        (left, right) => chunkA42GCBGX_cjs.compareStrings(left.id, right.id)
       )
     };
   }
@@ -2428,16 +2519,16 @@ var CANDIDATE_SOURCES = [
 
 // src/graph-merge/staging.ts
 function compareByIdThenBranch(left, right) {
-  const byId2 = compareStrings(left.id, right.id);
-  return byId2 === 0 ? compareStrings(left.branchId, right.branchId) : byId2;
+  const byId2 = chunkA42GCBGX_cjs.compareStrings(left.id, right.id);
+  return byId2 === 0 ? chunkA42GCBGX_cjs.compareStrings(left.branchId, right.branchId) : byId2;
 }
 function compareByKindIdBranch(left, right) {
-  const byKind = compareStrings(left.kind, right.kind);
+  const byKind = chunkA42GCBGX_cjs.compareStrings(left.kind, right.kind);
   if (byKind !== 0) {
     return byKind;
   }
-  const byId2 = compareStrings(left.id, right.id);
-  return byId2 === 0 ? compareStrings(left.branchId, right.branchId) : byId2;
+  const byId2 = chunkA42GCBGX_cjs.compareStrings(left.id, right.id);
+  return byId2 === 0 ? chunkA42GCBGX_cjs.compareStrings(left.branchId, right.branchId) : byId2;
 }
 function groupByKind(items) {
   const buckets = /* @__PURE__ */ new Map();
@@ -2451,7 +2542,7 @@ function groupByKind(items) {
   }
   const ordered = /* @__PURE__ */ new Map();
   for (const kind of [...buckets.keys()].sort(
-    (left, right) => compareStrings(left, right)
+    (left, right) => chunkA42GCBGX_cjs.compareStrings(left, right)
   )) {
     ordered.set(
       kind,
@@ -2462,16 +2553,26 @@ function groupByKind(items) {
   }
   return ordered;
 }
-async function stageBranches(baseStore, branches) {
+async function stageBranches(baseStore, branches, captureTargetStateFor) {
   const newNodes = [];
   const modifiedNodes = [];
   const deletedNodes = [];
   const newEdges = [];
   const modifiedEdges = [];
   const deletedEdges = [];
+  let targetNodeVersions = /* @__PURE__ */ new Map();
+  let targetEdgeSignatures = /* @__PURE__ */ new Map();
   for (const branch2 of branches) {
-    const diff = await diffAgainstBase(baseStore, branch2.store);
     const branchId = branch2.id;
+    const diff = await diffAgainstBase(
+      baseStore,
+      branch2.store,
+      branchId === captureTargetStateFor
+    );
+    if (branchId === captureTargetStateFor) {
+      targetNodeVersions = diff.forkNodeVersions;
+      targetEdgeSignatures = diff.forkEdgeSignatures;
+    }
     for (const node of diff.nodes.new) {
       newNodes.push({ branchId, node, kind: node.kind, id: node.id });
     }
@@ -2505,7 +2606,9 @@ async function stageBranches(baseStore, branches) {
     ),
     deletedEdges: [...deletedEdges].sort(
       (left, right) => compareByKindIdBranch(left, right)
-    )
+    ),
+    targetNodeVersions,
+    targetEdgeSignatures
   };
 }
 
@@ -2554,7 +2657,7 @@ async function withTxConflictRetry(commit) {
 // src/graph-merge/type-reconcile.ts
 var INCOMPATIBLE_TYPES_FLAG_REASON = "type-reconcile:incompatible-kinds";
 function distinctKinds(kinds) {
-  return [...new Set(kinds)].sort((left, right) => compareStrings(left, right));
+  return [...new Set(kinds)].sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left, right));
 }
 function areEquivalent(closure, left, right) {
   return left !== right && isReachable2(closure, left, right) && isReachable2(closure, right, left);
@@ -2572,7 +2675,7 @@ function mostSpecificCommonKind(closure, kinds) {
   if (qualifiers.length === 0) {
     return void 0;
   }
-  return [...qualifiers].sort((left, right) => compareStrings(left, right))[0];
+  return [...qualifiers].sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left, right))[0];
 }
 function reconcileTypes(clusters, closure, mode) {
   if (mode === "off") {
@@ -2609,10 +2712,10 @@ function reconcileTypes(clusters, closure, mode) {
   }
   return {
     reconciliations: reconciliations.sort(
-      (left, right) => compareStrings(left.entityId, right.entityId)
+      (left, right) => chunkA42GCBGX_cjs.compareStrings(left.entityId, right.entityId)
     ),
     retypeMap,
-    dropped: dropped.sort((left, right) => compareStrings(left.id, right.id))
+    dropped: dropped.sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left.id, right.id))
   };
 }
 
@@ -2631,8 +2734,8 @@ function newNodesByKind(staging) {
     ordered.set(
       kind,
       [...items].sort((left, right) => {
-        const byId2 = compareStrings(left.node.id, right.node.id);
-        return byId2 === 0 ? compareStrings(left.branchId, right.branchId) : byId2;
+        const byId2 = chunkA42GCBGX_cjs.compareStrings(left.node.id, right.node.id);
+        return byId2 === 0 ? chunkA42GCBGX_cjs.compareStrings(left.branchId, right.branchId) : byId2;
       })
     );
   }
@@ -2664,7 +2767,7 @@ async function precomputeEmbeddings(byKind, resolve, embedder) {
     return lookup;
   }
   const orderedTexts = [...texts].sort(
-    (left, right) => compareStrings(left, right)
+    (left, right) => chunkA42GCBGX_cjs.compareStrings(left, right)
   );
   const vectors = await embedder(orderedTexts);
   if (vectors.length !== orderedTexts.length) {
@@ -2700,7 +2803,7 @@ async function embedMissingPairTexts(base, pairs, strategy, embedder) {
     return existing;
   }
   const orderedTexts = [...missing].sort(
-    (left, right) => compareStrings(left, right)
+    (left, right) => chunkA42GCBGX_cjs.compareStrings(left, right)
   );
   const vectors = await embedder(orderedTexts);
   if (vectors.length !== orderedTexts.length) {
@@ -2730,7 +2833,7 @@ async function generateAllCandidates(target, staging, options, introspectionKind
       async ([kind, items]) => {
         const resolveConfig = options.resolve[kind];
         if (resolveConfig === void 0) {
-          return chunkKTIEB7VH_cjs.ok({ edges: [], warnings: [], baseMembers: [] });
+          return chunkFL472AMI_cjs.ok({ edges: [], warnings: [], baseMembers: [] });
         }
         const nodes = items.map((staged) => asNode(staged));
         const uniqueConstraints = uniqueConstraintsFor(
@@ -2773,10 +2876,10 @@ async function generateAllCandidates(target, staging, options, introspectionKind
           options.onComparisonCeiling,
           options.maxComparisonsPerKind
         );
-        if (chunkKTIEB7VH_cjs.isErr(scored)) {
-          return chunkKTIEB7VH_cjs.err(scored.error);
+        if (chunkFL472AMI_cjs.isErr(scored)) {
+          return chunkFL472AMI_cjs.err(scored.error);
         }
-        return chunkKTIEB7VH_cjs.ok({
+        return chunkFL472AMI_cjs.ok({
           edges: scored.data.edges,
           warnings: scored.data.warnings.map(
             (warning) => `[${kind}] ${warning.message}`
@@ -2787,14 +2890,14 @@ async function generateAllCandidates(target, staging, options, introspectionKind
     )
   );
   for (const result of perKind) {
-    if (chunkKTIEB7VH_cjs.isErr(result)) {
-      return chunkKTIEB7VH_cjs.err(result.error);
+    if (chunkFL472AMI_cjs.isErr(result)) {
+      return chunkFL472AMI_cjs.err(result.error);
     }
     allEdges.push(...result.data.edges);
     warnings.push(...result.data.warnings);
     baseMembers.push(...result.data.baseMembers);
   }
-  return chunkKTIEB7VH_cjs.ok({
+  return chunkFL472AMI_cjs.ok({
     // The ONE shared `(a, b)` edge comparator (id-first `(kind, id)` order), so this
     // stage emits edges in exactly the order clustering consumes them.
     edges: allEdges.sort((left, right) => compareCandidateEdges(left, right)),
@@ -2897,9 +3000,9 @@ function buildProvenanceIndex(records) {
   for (const [branchId, sets] of byBranch) {
     frozen.set(branchId, {
       nodeIds: [...sets.nodeIds].sort(
-        (left, right) => compareStrings(left, right)
+        (left, right) => chunkA42GCBGX_cjs.compareStrings(left, right)
       ),
-      edgeIds: [...sets.edgeIds].sort((left, right) => compareStrings(left, right)).map((id) => id)
+      edgeIds: [...sets.edgeIds].sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left, right)).map((id) => id)
     });
   }
   return {
@@ -3114,7 +3217,7 @@ function planMerge(staging, candidateEdges, candidateWarnings, baseMembers, opti
     ...repoint2.dropped,
     ...reconciliation.dropped
   ].sort(
-    (left, right) => compareStrings(`${left.kind}|${left.id}`, `${right.kind}|${right.id}`)
+    (left, right) => chunkA42GCBGX_cjs.compareStrings(`${left.kind}|${left.id}`, `${right.kind}|${right.id}`)
   );
   return {
     canonicalEntities,
@@ -3147,7 +3250,7 @@ function planMerge(staging, candidateEdges, candidateWarnings, baseMembers, opti
           mergeKey(left.kind, left.entityId),
           mergeKey(right.kind, right.entityId)
         );
-        return byEntity === 0 ? compareStrings(left.property, right.property) : byEntity;
+        return byEntity === 0 ? chunkA42GCBGX_cjs.compareStrings(left.property, right.property) : byEntity;
       }
     ),
     deleteModifyConflicts: [
@@ -3287,13 +3390,50 @@ async function commitPlan(target, plan, expectedBaseVersion) {
         tx.nodes,
         tx.edges
       );
-    }, MERGE_COMMIT_TX_OPTIONS)
+    }, mergeCommitTransactionOptions(target))
   );
 }
 var MERGE_COMMIT_TX_OPTIONS = {
   isolationLevel: "serializable"
 };
+function mergeCommitTransactionOptions(target) {
+  return target.historyEnabled ? void 0 : MERGE_COMMIT_TX_OPTIONS;
+}
 async function assertTargetUnchanged(txBackend, target, expectedBaseVersion) {
+  if (hasRevisionAnchor(expectedBaseVersion)) {
+    await chunkXOX22WHL_cjs.lockRecordedGraphWrite(txBackend, target.graphId);
+    const expectedOrigin = revisionOriginOf(expectedBaseVersion);
+    const liveOrigin = await chunkXOX22WHL_cjs.readRevisionOrigin(
+      txBackend,
+      target.revisionSchema,
+      target.graphId
+    );
+    if (liveOrigin !== expectedOrigin) {
+      throw new BaseVersionMismatchError(
+        "The merge branch was forked from a different revision-tracked store; the resolved plan was not applied.",
+        {
+          details: { expectedOrigin, liveOrigin },
+          suggestion: "Merge the branch back into its original base store, or fork a new branch from this target."
+        }
+      );
+    }
+    const liveRevision = await chunkXOX22WHL_cjs.readRecordedClock(
+      txBackend,
+      target.revisionSchema,
+      target.graphId
+    );
+    const expectedRevision = revisionAnchorOf(expectedBaseVersion);
+    if (liveRevision !== expectedRevision) {
+      throw new BaseVersionMismatchError(
+        "The merge target was modified between the revision-anchor check and the commit transaction; the resolved plan was not applied.",
+        {
+          details: { expectedRevision, liveRevision },
+          suggestion: "Re-run the merge (and re-branch if the divergence is real), or route all graph writes through the revision-tracked Store."
+        }
+      );
+    }
+    return;
+  }
   const liveContent = await computeContentComponent(
     txBackend,
     target.graphId,
@@ -3335,7 +3475,7 @@ async function validateBaseVersions(target, branches) {
   const targetVersion = await computeBaseVersion(target);
   for (const branch2 of branches) {
     if (branch2.base !== targetVersion) {
-      return chunkKTIEB7VH_cjs.err(
+      return chunkFL472AMI_cjs.err(
         new BaseVersionMismatchError(
           `Branch "${branch2.id}" forked from base@V "${branch2.base}", which does not match the merge target's current base@V "${targetVersion}".`,
           {
@@ -3349,20 +3489,20 @@ async function validateBaseVersions(target, branches) {
       );
     }
   }
-  return chunkKTIEB7VH_cjs.ok(targetVersion);
+  return chunkFL472AMI_cjs.ok(targetVersion);
 }
 function tryNormalize(optionsInput) {
   try {
-    return chunkKTIEB7VH_cjs.ok(normalizeMergeOptions(optionsInput));
+    return chunkFL472AMI_cjs.ok(normalizeMergeOptions(optionsInput));
   } catch (error) {
-    return chunkKTIEB7VH_cjs.err(new MergeError("Invalid merge options.", { cause: error }));
+    return chunkFL472AMI_cjs.err(new MergeError("Invalid merge options.", { cause: error }));
   }
 }
 async function resolveMerge(store, target, branches, options, useBaseSources, incremental, expectedBaseVersion) {
   let targetBranchSeen = false;
   for (const branch2 of branches) {
     if (branch2.id === BASE_PROVENANCE_BRANCH) {
-      return chunkKTIEB7VH_cjs.err(
+      return chunkFL472AMI_cjs.err(
         new MergeError(
           `Branch id "${BASE_PROVENANCE_BRANCH}" is reserved for committed-base provenance and cannot be used as a branch id.`,
           { details: { branchId: branch2.id } }
@@ -3371,7 +3511,7 @@ async function resolveMerge(store, target, branches, options, useBaseSources, in
     }
     if (branch2.id === COMMITTED_TARGET_BRANCH) {
       if (incremental?.targetBranchId !== COMMITTED_TARGET_BRANCH || targetBranchSeen) {
-        return chunkKTIEB7VH_cjs.err(
+        return chunkFL472AMI_cjs.err(
           new MergeError(
             `Branch id "${COMMITTED_TARGET_BRANCH}" is reserved for the committed incremental target and cannot be used as a branch id.`,
             { details: { branchId: branch2.id } }
@@ -3382,8 +3522,8 @@ async function resolveMerge(store, target, branches, options, useBaseSources, in
     }
   }
   try {
-    const staging = await stageBranches(store, branches);
     const preferredBranchId = incremental?.targetBranchId;
+    const staging = await stageBranches(store, branches, preferredBranchId);
     const branchIds = branches.map((branch2) => branch2.id);
     const branchOrder = preferredBranchId === void 0 ? options.branchOrder ?? [] : [
       preferredBranchId,
@@ -3416,8 +3556,8 @@ async function resolveMerge(store, target, branches, options, useBaseSources, in
       useBaseSources,
       options.embedder
     );
-    if (chunkKTIEB7VH_cjs.isErr(candidates)) {
-      return chunkKTIEB7VH_cjs.err(candidates.error);
+    if (chunkFL472AMI_cjs.isErr(candidates)) {
+      return chunkFL472AMI_cjs.err(candidates.error);
     }
     const plan = planMerge(
       staging,
@@ -3437,7 +3577,9 @@ async function resolveMerge(store, target, branches, options, useBaseSources, in
       // anything NEW the in-tx re-probe surfaces is a window write.
       plannedBaseMatchKeys: new Set(
         candidates.data.baseMembers.map((member) => mergeKeyOf(member))
-      )
+      ),
+      targetNodeVersions: staging.targetNodeVersions,
+      targetEdgeSignatures: staging.targetEdgeSignatures
     });
     const provenance = options.provenance ? buildProvenanceIndex(plan.provenanceRecords) : { byBranch: () => ({ nodeIds: [], edgeIds: [] }) };
     const warnings = [...plan.warnings];
@@ -3475,12 +3617,12 @@ async function resolveMerge(store, target, branches, options, useBaseSources, in
       warnings,
       ...provenancePersisted === void 0 ? {} : { provenancePersisted }
     };
-    return chunkKTIEB7VH_cjs.ok(report);
+    return chunkFL472AMI_cjs.ok(report);
   } catch (error) {
     if (error instanceof MergeError) {
-      return chunkKTIEB7VH_cjs.err(error);
+      return chunkFL472AMI_cjs.err(error);
     }
-    return chunkKTIEB7VH_cjs.err(
+    return chunkFL472AMI_cjs.err(
       new MergeError(
         `Merge failed while staging or committing: ${describeCause(error)}`,
         { cause: error }
@@ -3490,14 +3632,14 @@ async function resolveMerge(store, target, branches, options, useBaseSources, in
 }
 async function merge(store, branches, optionsInput = {}) {
   const normalized = tryNormalize(optionsInput);
-  if (chunkKTIEB7VH_cjs.isErr(normalized)) {
-    return chunkKTIEB7VH_cjs.err(normalized.error);
+  if (chunkFL472AMI_cjs.isErr(normalized)) {
+    return chunkFL472AMI_cjs.err(normalized.error);
   }
   const options = normalized.data;
   const target = options.target ?? store;
   const precondition = await validateBaseVersions(target, branches);
-  if (chunkKTIEB7VH_cjs.isErr(precondition)) {
-    return chunkKTIEB7VH_cjs.err(precondition.error);
+  if (chunkFL472AMI_cjs.isErr(precondition)) {
+    return chunkFL472AMI_cjs.err(precondition.error);
   }
   return resolveMerge(
     store,
@@ -3513,7 +3655,7 @@ async function validateForkPointVersions(forkPoint, branches) {
   const forkVersion = await computeBaseVersion(forkPoint);
   for (const branch2 of branches) {
     if (branch2.base !== forkVersion) {
-      return chunkKTIEB7VH_cjs.err(
+      return chunkFL472AMI_cjs.err(
         new BaseVersionMismatchError(
           `Branch "${branch2.id}" forked from base@V "${branch2.base}", which does not match the fork-point's base@V "${forkVersion}". mergeIncremental() requires every branch to have forked from the supplied forkPoint.`,
           {
@@ -3527,7 +3669,7 @@ async function validateForkPointVersions(forkPoint, branches) {
       );
     }
   }
-  return chunkKTIEB7VH_cjs.ok(forkVersion);
+  return chunkFL472AMI_cjs.ok(forkVersion);
 }
 function nodeSchemaFor(target, kind) {
   const registry = target.graph.nodes;
@@ -3738,7 +3880,7 @@ async function validateIncrementalEdgeWrites(target, edgesApi, plan) {
       }
     }
   }
-  const notFound = [...plannedKindById.keys()].filter((id) => !existingById.has(id)).sort((left, right) => compareStrings(left, right));
+  const notFound = [...plannedKindById.keys()].filter((id) => !existingById.has(id)).sort((left, right) => chunkA42GCBGX_cjs.compareStrings(left, right));
   if (notFound.length > 0) {
     const crossKindById = /* @__PURE__ */ new Map();
     for (const kind of Object.keys(target.graph.edges)) {
@@ -3867,6 +4009,99 @@ async function assertBaseResolutionStable(lookupStore, guard) {
     }
   );
 }
+function bucketInheritedRefsByKind(refs, identities) {
+  const seen = /* @__PURE__ */ new Set();
+  const idsByKind = /* @__PURE__ */ new Map();
+  for (const ref of refs) {
+    const identity = mergeKey(ref.kind, ref.id);
+    if (!identities.has(identity) || seen.has(identity)) {
+      continue;
+    }
+    seen.add(identity);
+    const bucket = idsByKind.get(ref.kind) ?? [];
+    bucket.push(ref.id);
+    idsByKind.set(ref.kind, bucket);
+  }
+  return idsByKind;
+}
+async function assertInheritedUnchanged(args) {
+  if (args.expected.size === 0) {
+    return;
+  }
+  const idsByKind = bucketInheritedRefsByKind(args.refs, args.expected);
+  for (const [kind, ids] of idsByKind) {
+    const rows = await args.fetchRows(kind, ids);
+    for (const [index, id] of ids.entries()) {
+      const expected = args.expected.get(mergeKey(kind, id));
+      const current = args.deriveValue(rows[index]);
+      if (current === expected) {
+        continue;
+      }
+      throw args.buildError(id, kind, expected, current);
+    }
+  }
+}
+async function assertInheritedTargetUnchanged(nodesApi, edgesApi, guard, plan) {
+  await Promise.all([
+    assertInheritedNodesUnchanged(nodesApi, guard, plan),
+    assertInheritedEdgesUnchanged(edgesApi, guard, plan)
+  ]);
+}
+async function assertInheritedNodesUnchanged(nodesApi, guard, plan) {
+  const nodeRefs = plannedNodeWrites(plan).map(
+    (write) => ({ kind: write.kind, id: write.id })
+  );
+  for (const [identity, kind] of plan.nodeDeletions) {
+    nodeRefs.push({ kind, id: idOf(identity) });
+  }
+  await assertInheritedUnchanged({
+    refs: nodeRefs,
+    expected: guard.targetNodeVersions,
+    fetchRows: (kind, ids) => nodeCollection(nodesApi, kind).getByIds(ids, INCLUDE_TOMBSTONES),
+    deriveValue: (row) => row?.meta.version,
+    buildError: (id, kind, expected, current) => new BaseVersionMismatchError(
+      `mergeIncremental() observed committed node "${id}" (kind "${kind}") at version ${expected} while planning, but it changed before the commit transaction; the resolved plan no longer describes the live target and was not applied.`,
+      {
+        details: {
+          id,
+          kind,
+          expectedVersion: expected,
+          currentVersion: current
+        },
+        suggestion: "Re-run mergeIncremental(); the re-planned merge resolves the inherited modifications against the now-committed rows."
+      }
+    )
+  });
+}
+async function assertInheritedEdgesUnchanged(edgesApi, guard, plan) {
+  const edgeRefs = plan.mergedEdges.map((edge) => ({
+    kind: edge.kind,
+    id: edge.id
+  }));
+  for (const [identity, kind] of plan.edgeDeletions) {
+    edgeRefs.push({ kind, id: idOf(identity) });
+  }
+  await assertInheritedUnchanged({
+    refs: edgeRefs,
+    expected: guard.targetEdgeSignatures,
+    fetchRows: (kind, ids) => edgeCollection(edgesApi, kind).getByIds(ids, INCLUDE_TOMBSTONES),
+    deriveValue: (row) => row === void 0 ? void 0 : edgeStateSignature({
+      fromKind: row.fromKind,
+      fromId: row.fromId,
+      toKind: row.toKind,
+      toId: row.toId,
+      live: row.meta.deletedAt === void 0,
+      props: edgeProps(row)
+    }),
+    buildError: (id, kind) => new BaseVersionMismatchError(
+      `mergeIncremental() observed committed edge "${id}" (kind "${kind}") while planning, but its endpoints, liveness, or props changed before the commit transaction; the resolved plan no longer describes the live target and was not applied.`,
+      {
+        details: { id, kind },
+        suggestion: "Re-run mergeIncremental(); the re-planned merge resolves the inherited modifications against the now-committed rows."
+      }
+    )
+  });
+}
 async function commitIncrementalPlan(target, plan, guard) {
   if (!target.backend.capabilities.transactions) {
     throw new MergeError(
@@ -3876,24 +4111,28 @@ async function commitIncrementalPlan(target, plan, guard) {
   }
   return withTxConflictRetry(
     () => target.transaction(async (tx) => {
+      if (target.revisionTrackingEnabled) {
+        await chunkXOX22WHL_cjs.lockRecordedGraphWrite(tx.backend, target.graphId);
+      }
       const nodesApi = tx.nodes;
       const edgesApi = tx.edges;
       await assertBaseResolutionStable(tx, guard);
+      await assertInheritedTargetUnchanged(nodesApi, edgesApi, guard, plan);
       await validateIncrementalNodeWrites(target, nodesApi, plan);
       await validateIncrementalEdgeWrites(target, edgesApi, plan);
       return applyMergePlan(plan, nodesApi, edgesApi);
-    }, MERGE_COMMIT_TX_OPTIONS)
+    }, mergeCommitTransactionOptions(target))
   );
 }
 async function mergeIncremental(args) {
   const { forkPoint, target, branches } = args;
   const normalized = tryNormalize(args.options ?? {});
-  if (chunkKTIEB7VH_cjs.isErr(normalized)) {
-    return chunkKTIEB7VH_cjs.err(normalized.error);
+  if (chunkFL472AMI_cjs.isErr(normalized)) {
+    return chunkFL472AMI_cjs.err(normalized.error);
   }
   const options = normalized.data;
   if (options.onBasePropertyConflict !== "flag") {
-    return chunkKTIEB7VH_cjs.err(
+    return chunkFL472AMI_cjs.err(
       new MergeError(
         'mergeIncremental() requires onBasePropertyConflict: "flag" (keep-base); a non-keep-base policy could overwrite a newer committed base value with a stale branch value.',
         { details: {} }
@@ -3901,8 +4140,8 @@ async function mergeIncremental(args) {
     );
   }
   const forkPrecondition = await validateForkPointVersions(forkPoint, branches);
-  if (chunkKTIEB7VH_cjs.isErr(forkPrecondition)) {
-    return chunkKTIEB7VH_cjs.err(forkPrecondition.error);
+  if (chunkFL472AMI_cjs.isErr(forkPrecondition)) {
+    return chunkFL472AMI_cjs.err(forkPrecondition.error);
   }
   const forkVersion = forkPrecondition.data;
   const [forkSchema, targetSchema] = await Promise.all([
@@ -3910,7 +4149,7 @@ async function mergeIncremental(args) {
     computeSchemaComponent(target)
   ]);
   if (forkSchema !== targetSchema) {
-    return chunkKTIEB7VH_cjs.err(
+    return chunkFL472AMI_cjs.err(
       new MergeError(
         "mergeIncremental() requires target and forkPoint to share a schema; schema drift is not supported (the target content may differ \u2014 only the schema must match).",
         { details: {} }
@@ -3934,15 +4173,15 @@ async function mergeIncremental(args) {
 
 Object.defineProperty(exports, "isErr", {
   enumerable: true,
-  get: function () { return chunkKTIEB7VH_cjs.isErr; }
+  get: function () { return chunkFL472AMI_cjs.isErr; }
 });
 Object.defineProperty(exports, "isOk", {
   enumerable: true,
-  get: function () { return chunkKTIEB7VH_cjs.isOk; }
+  get: function () { return chunkFL472AMI_cjs.isOk; }
 });
 Object.defineProperty(exports, "unwrap", {
   enumerable: true,
-  get: function () { return chunkKTIEB7VH_cjs.unwrap; }
+  get: function () { return chunkFL472AMI_cjs.unwrap; }
 });
 exports.BaseVersionMismatchError = BaseVersionMismatchError;
 exports.BranchError = BranchError;