@xnetjs/data 0.11.1 → 1.0.0

package/dist/{chunk-QN334DU7.js → chunk-CARPMPXV.js}

@@ -1,18 +1,18 @@
+import {
+  SYSTEM_SCHEMA_BASE_IRIS,
+  isSystemNamespaceResource,
+  isSystemSchemaIri
+} from "./chunk-XJBDESCX.js";
 import {
   applyNodeQueryDescriptor,
   getNodeQuerySearchTokens,
   withoutNodeQueryMaterializedView,
   withoutNodeQueryPagination
 } from "./chunk-S5RP5RKY.js";
-import {
-  SYSTEM_SCHEMA_BASE_IRIS,
-  isSystemNamespaceResource,
-  isSystemSchemaIri
-} from "./chunk-BY5O6LNC.js";
 import {
   createNodeId,
   getBaseSchemaIRI
-} from "./chunk-EBNMV2VO.js";
+} from "./chunk-RRXJNZX5.js";
 
 // src/store/query-ast.ts
 var QUERY_AST_VERSION = 1;
@@ -887,187 +887,23 @@ function evaluateQueryASTPlannerGate(value) {
 }
 
 // src/store/store.ts
-import { compareChangeApplicationOrder, lwwWins } from "@xnetjs/core";
-
-// src/store/transaction-executor.ts
-async function executeTransactionOperations(host, input) {
-  const results = [];
-  const changes = [];
-  const events = [];
-  for (let i = 0; i < input.operations.length; i++) {
-    const op = input.operations[i];
-    let change;
-    let result = null;
-    let previousNode = null;
-    switch (op.type) {
-      case "create": {
-        const id = op.options.id ?? createNodeId();
-        const payload = {
-          nodeId: id,
-          schemaId: op.options.schemaId,
-          properties: op.options.properties
-        };
-        change = await host.createBatchedChange(
-          "node-change",
-          payload,
-          input.lamport,
-          input.now,
-          input.batchId,
-          i,
-          input.batchSize,
-          input.storage
-        );
-        await host.applyChange(change, input.storage);
-        result = await input.storage.getNode(id);
-        await host.persistEncryptedNodeSnapshot(result, input.storage);
-        break;
-      }
-      case "update": {
-        const existing = host.cloneNodeState(await input.storage.getNode(op.nodeId));
-        if (!existing) {
-          throw new Error(`Node not found: ${op.nodeId}`);
-        }
-        previousNode = existing;
-        const payload = {
-          nodeId: op.nodeId,
-          properties: op.options.properties
-        };
-        change = await host.createBatchedChange(
-          "node-change",
-          payload,
-          input.lamport,
-          input.now,
-          input.batchId,
-          i,
-          input.batchSize,
-          input.storage
-        );
-        await host.applyChange(change, input.storage);
-        result = await input.storage.getNode(op.nodeId);
-        await host.persistEncryptedNodeSnapshot(result, input.storage);
-        break;
-      }
-      case "delete": {
-        const existing = host.cloneNodeState(await input.storage.getNode(op.nodeId));
-        if (!existing) {
-          throw new Error(`Node not found: ${op.nodeId}`);
-        }
-        previousNode = existing;
-        const payload = {
-          nodeId: op.nodeId,
-          properties: {},
-          deleted: true
-        };
-        change = await host.createBatchedChange(
-          "node-change",
-          payload,
-          input.lamport,
-          input.now,
-          input.batchId,
-          i,
-          input.batchSize,
-          input.storage
-        );
-        await host.applyChange(change, input.storage);
-        result = null;
-        break;
-      }
-      case "restore": {
-        const existing = host.cloneNodeState(await input.storage.getNode(op.nodeId));
-        if (!existing) {
-          throw new Error(`Node not found: ${op.nodeId}`);
-        }
-        previousNode = existing;
-        const payload = {
-          nodeId: op.nodeId,
-          properties: {},
-          deleted: false
-        };
-        change = await host.createBatchedChange(
-          "node-change",
-          payload,
-          input.lamport,
-          input.now,
-          input.batchId,
-          i,
-          input.batchSize,
-          input.storage
-        );
-        await host.applyChange(change, input.storage);
-        result = await input.storage.getNode(op.nodeId);
-        await host.persistEncryptedNodeSnapshot(result, input.storage);
-        break;
-      }
-    }
-    changes.push(change);
-    results.push(result);
-    events.push({ change, result, previousNode });
-  }
-  return { results, changes, events };
-}
-async function executeTransactionOperationsFast(host, input) {
-  const planned = input.operations.map((op) => ({
-    op,
-    id: op.type === "create" ? op.options.id ?? createNodeId() : op.nodeId
-  }));
-  const preflight = await host.getBatchPreflight(
-    planned.map((entry) => entry.id),
-    host.storage
-  );
-  const nodesById = host.cloneNodeMap(preflight.nodesById);
-  const lastChanges = new Map(preflight.lastChangesByNodeId);
-  const results = [];
-  const changes = [];
-  const events = [];
-  const affectedSchemaIds = /* @__PURE__ */ new Set();
-  for (let i = 0; i < planned.length; i++) {
-    const { op, id } = planned[i];
-    const existing = nodesById.get(id) ?? null;
-    if (op.type !== "create" && !existing) {
-      throw new Error(`Node not found: ${id}`);
-    }
-    const payload = op.type === "create" ? { nodeId: id, schemaId: op.options.schemaId, properties: op.options.properties } : op.type === "update" ? { nodeId: id, properties: op.options.properties } : { nodeId: id, properties: {}, deleted: op.type === "delete" };
-    const change = await host.createBatchedChangeWithParentHash(
-      "node-change",
-      payload,
-      lastChanges.get(id)?.hash ?? null,
-      input.lamport,
-      input.now,
-      input.batchId,
-      i,
-      input.batchSize
-    );
-    const schemaId = existing?.schemaId ?? (op.type === "create" ? op.options.schemaId : null);
-    if (!schemaId) {
-      throw new Error(`First change for node ${id} must include schemaId`);
-    }
-    const node = host.materializeNodeChange(
-      change,
-      existing ?? host.createInitialNodeFromChange(change, schemaId)
-    );
-    nodesById.set(id, node);
-    lastChanges.set(id, change);
-    affectedSchemaIds.add(schemaId);
-    changes.push(change);
-    const result = op.type === "delete" ? null : node;
-    results.push(result);
-    events.push({ change, result, previousNode: existing });
-  }
-  const touchedIds = Array.from(new Set(planned.map((entry) => entry.id)));
-  await host.storage.applyNodeBatch({
-    batchId: input.batchId,
-    nodes: touchedIds.flatMap((id) => {
-      const node = nodesById.get(id);
-      return node ? [node] : [];
-    }),
-    changes,
-    lastLamportTime: host.clockTime(),
-    affectedSchemaIds: Array.from(affectedSchemaIds),
-    indexMode: "touched",
-    indexProperties: true
-  });
-  return { results, changes, events };
-}
+import {
+  LWW_TIEBREAK_KEY_VERSION,
+  compareChangeApplicationOrder,
+  computeLwwTiebreakKey,
+  lwwWins
+} from "@xnetjs/core";
+import { base64ToBytes, bytesToBase64 } from "@xnetjs/crypto";
+import { parseDID } from "@xnetjs/identity";
+import {
+  createLamportClock,
+  tick,
+  receive,
+  signChange,
+  createUnsignedChange,
+  createBatchId
+} from "@xnetjs/sync";
+import { verifyChange, verifyChangeHash } from "@xnetjs/sync";
 
 // src/store/batch-write-orchestrator.ts
 var elapsedMs = (startedAt) => Math.max(0, Date.now() - startedAt);
@@ -1159,21 +995,10 @@ async function executeDeterministicNodeImport(host, input) {
   };
 }
 
-// src/store/store.ts
-import { base64ToBytes, bytesToBase64 } from "@xnetjs/crypto";
-import { parseDID } from "@xnetjs/identity";
-import {
-  createLamportClock,
-  tick,
-  receive,
-  signChange,
-  createUnsignedChange,
-  createBatchId
-} from "@xnetjs/sync";
-import { verifyChange, verifyChangeHash } from "@xnetjs/sync";
-
 // src/store/permission-error.ts
-var PermissionError = class extends Error {
+import { TaggedError } from "@xnetjs/core";
+var PermissionError = class extends TaggedError {
+  _tag = "PermissionError";
   code = "PERMISSION_DENIED";
   action;
   nodeId;
@@ -1186,7 +1011,6 @@ var PermissionError = class extends Error {
     super(
       `Permission denied: ${roleInfo} but action '${decision.action}' is not permitted. Reasons: ${decision.reasons.join(", ")}`
     );
-    this.name = "PermissionError";
     this.action = decision.action;
     this.nodeId = decision.resource;
     this.subject = decision.subject;
@@ -1363,6 +1187,186 @@ function findSchemaIdForNode(operations, nodeId, tempIds) {
   return void 0;
 }
 
+// src/store/transaction-executor.ts
+async function executeTransactionOperations(host, input) {
+  const results = [];
+  const changes = [];
+  const events = [];
+  for (let i = 0; i < input.operations.length; i++) {
+    const op = input.operations[i];
+    let change;
+    let result = null;
+    let previousNode = null;
+    switch (op.type) {
+      case "create": {
+        const id = op.options.id ?? createNodeId();
+        const payload = {
+          nodeId: id,
+          schemaId: op.options.schemaId,
+          properties: op.options.properties
+        };
+        change = await host.createBatchedChange(
+          "node-change",
+          payload,
+          input.lamport,
+          input.now,
+          input.batchId,
+          i,
+          input.batchSize,
+          input.storage
+        );
+        await host.applyChange(change, input.storage);
+        result = await input.storage.getNode(id);
+        await host.persistEncryptedNodeSnapshot(result, input.storage);
+        break;
+      }
+      case "update": {
+        const existing = host.cloneNodeState(await input.storage.getNode(op.nodeId));
+        if (!existing) {
+          throw new Error(`Node not found: ${op.nodeId}`);
+        }
+        previousNode = existing;
+        const payload = {
+          nodeId: op.nodeId,
+          properties: op.options.properties
+        };
+        change = await host.createBatchedChange(
+          "node-change",
+          payload,
+          input.lamport,
+          input.now,
+          input.batchId,
+          i,
+          input.batchSize,
+          input.storage
+        );
+        await host.applyChange(change, input.storage);
+        result = await input.storage.getNode(op.nodeId);
+        await host.persistEncryptedNodeSnapshot(result, input.storage);
+        break;
+      }
+      case "delete": {
+        const existing = host.cloneNodeState(await input.storage.getNode(op.nodeId));
+        if (!existing) {
+          throw new Error(`Node not found: ${op.nodeId}`);
+        }
+        previousNode = existing;
+        const payload = {
+          nodeId: op.nodeId,
+          properties: {},
+          deleted: true
+        };
+        change = await host.createBatchedChange(
+          "node-change",
+          payload,
+          input.lamport,
+          input.now,
+          input.batchId,
+          i,
+          input.batchSize,
+          input.storage
+        );
+        await host.applyChange(change, input.storage);
+        result = null;
+        break;
+      }
+      case "restore": {
+        const existing = host.cloneNodeState(await input.storage.getNode(op.nodeId));
+        if (!existing) {
+          throw new Error(`Node not found: ${op.nodeId}`);
+        }
+        previousNode = existing;
+        const payload = {
+          nodeId: op.nodeId,
+          properties: {},
+          deleted: false
+        };
+        change = await host.createBatchedChange(
+          "node-change",
+          payload,
+          input.lamport,
+          input.now,
+          input.batchId,
+          i,
+          input.batchSize,
+          input.storage
+        );
+        await host.applyChange(change, input.storage);
+        result = await input.storage.getNode(op.nodeId);
+        await host.persistEncryptedNodeSnapshot(result, input.storage);
+        break;
+      }
+    }
+    changes.push(change);
+    results.push(result);
+    events.push({ change, result, previousNode });
+  }
+  return { results, changes, events };
+}
+async function executeTransactionOperationsFast(host, input) {
+  const planned = input.operations.map((op) => ({
+    op,
+    id: op.type === "create" ? op.options.id ?? createNodeId() : op.nodeId
+  }));
+  const preflight = await host.getBatchPreflight(
+    planned.map((entry) => entry.id),
+    host.storage
+  );
+  const nodesById = host.cloneNodeMap(preflight.nodesById);
+  const lastChanges = new Map(preflight.lastChangesByNodeId);
+  const results = [];
+  const changes = [];
+  const events = [];
+  const affectedSchemaIds = /* @__PURE__ */ new Set();
+  for (let i = 0; i < planned.length; i++) {
+    const { op, id } = planned[i];
+    const existing = nodesById.get(id) ?? null;
+    if (op.type !== "create" && !existing) {
+      throw new Error(`Node not found: ${id}`);
+    }
+    const payload = op.type === "create" ? { nodeId: id, schemaId: op.options.schemaId, properties: op.options.properties } : op.type === "update" ? { nodeId: id, properties: op.options.properties } : { nodeId: id, properties: {}, deleted: op.type === "delete" };
+    const change = await host.createBatchedChangeWithParentHash(
+      "node-change",
+      payload,
+      lastChanges.get(id)?.hash ?? null,
+      input.lamport,
+      input.now,
+      input.batchId,
+      i,
+      input.batchSize
+    );
+    const schemaId = existing?.schemaId ?? (op.type === "create" ? op.options.schemaId : null);
+    if (!schemaId) {
+      throw new Error(`First change for node ${id} must include schemaId`);
+    }
+    const node = host.materializeNodeChange(
+      change,
+      existing ?? host.createInitialNodeFromChange(change, schemaId)
+    );
+    nodesById.set(id, node);
+    lastChanges.set(id, change);
+    affectedSchemaIds.add(schemaId);
+    changes.push(change);
+    const result = op.type === "delete" ? null : node;
+    results.push(result);
+    events.push({ change, result, previousNode: existing });
+  }
+  const touchedIds = Array.from(new Set(planned.map((entry) => entry.id)));
+  await host.storage.applyNodeBatch({
+    batchId: input.batchId,
+    nodes: touchedIds.flatMap((id) => {
+      const node = nodesById.get(id);
+      return node ? [node] : [];
+    }),
+    changes,
+    lastLamportTime: host.clockTime(),
+    affectedSchemaIds: Array.from(affectedSchemaIds),
+    indexMode: "touched",
+    indexProperties: true
+  });
+  return { results, changes, events };
+}
+
 // src/store/store.ts
 var MAX_CONFLICTS = 200;
 var ENCRYPTED_NODE_MARKER = "xnet:node-encrypted:v1";
@@ -1462,7 +1466,7 @@ var NodeStore = class {
             schemaId: options.schemaId,
             properties: options.properties
           },
-          authAction: "write",
+          authAction: "create",
           requireExisting: false,
           createSchemaId: options.schemaId
         });
@@ -1476,7 +1480,7 @@ var NodeStore = class {
       }
       await this.assertAuthorized({
         subject: this.authorDID,
-        action: "write",
+        action: "create",
         nodeId: id,
         patch: options.properties,
         node: {
@@ -1610,7 +1614,7 @@ var NodeStore = class {
             nodeId: id,
             properties: options.properties
           },
-          authAction: "write",
+          authAction: "update",
           requireExisting: true
         });
         this.emit(change2, node2, previousNode, false);
@@ -1634,7 +1638,7 @@ var NodeStore = class {
       }
       await this.assertAuthorized({
         subject: this.authorDID,
-        action: "write",
+        action: "update",
         nodeId: id,
         patch: options.properties,
         node: {
@@ -1757,7 +1761,7 @@ var NodeStore = class {
           properties: {},
           deleted: false
         },
-        authAction: "write",
+        authAction: "update",
         requireExisting: true
       });
       this.emit(change2, node2, previousNode, false);
@@ -1770,7 +1774,7 @@ var NodeStore = class {
     }
     await this.assertAuthorized({
       subject: this.authorDID,
-      action: "write",
+      action: "update",
       nodeId: id,
       node: {
         schemaId: existing.schemaId,
@@ -2471,12 +2475,21 @@ var NodeStore = class {
         );
       }
       if (this.authEvaluator) {
-        const action = this.inferActionFromChange(change);
+        const stored = await this.storage.getNode(change.payload.nodeId);
+        const action = this.inferActionFromChange(change, stored);
         const decision = await this.authEvaluator.can({
           subject: change.authorDID,
           action,
           nodeId: change.payload.nodeId,
-          patch: action === "write" ? change.payload.properties : void 0
+          patch: action === "create" || action === "update" ? change.payload.properties : void 0,
+          // A remote create has no stored node to evaluate against — build the
+          // draft from the payload so container-relation roles resolve
+          // (exploration 0304). Update/delete load the stored node as before.
+          node: action === "create" && change.payload.schemaId ? {
+            schemaId: change.payload.schemaId,
+            createdBy: change.authorDID,
+            properties: change.payload.properties
+          } : void 0
         });
         if (!decision.allowed) {
           this.telemetry?.reportSecurityEvent("data.unauthorized_remote_change", "medium");
@@ -2921,7 +2934,11 @@ var NodeStore = class {
     const newTs = {
       lamport: change.lamport,
       author: change.authorDID,
-      wallTime: change.wallTime
+      wallTime: change.wallTime,
+      // Grinding-resistant final tiebreak (exploration 0305): only v4+ changes
+      // carry a key, so a v4-vs-legacy comparison degrades to the author DID
+      // and mixed fleets still agree.
+      ...(change.protocolVersion ?? 0) >= LWW_TIEBREAK_KEY_VERSION ? { tiebreakKey: computeLwwTiebreakKey(change.authorDID, key, value) } : {}
     };
     const incomingWins = !existingTs || this.shouldReplace(existingTs, newTs);
     const target = isUnknownProperty ? node._unknown ??= {} : node.properties;
@@ -3056,7 +3073,7 @@ var NodeStore = class {
       if (operation.type === "create") {
         await this.assertAuthorized({
           subject: this.authorDID,
-          action: "write",
+          action: "create",
           nodeId: operation.options.id ?? "",
           node: {
             schemaId: operation.options.schemaId,
@@ -3076,17 +3093,20 @@ var NodeStore = class {
       }
       await this.assertAuthorized({
         subject: this.authorDID,
-        action: "write",
+        action: "update",
         nodeId: operation.nodeId,
         patch: operation.type === "update" ? operation.options.properties : void 0
       });
     }
   }
-  inferActionFromChange(change) {
+  inferActionFromChange(change, stored) {
     if (change.payload.deleted === true) {
       return "delete";
     }
-    return "write";
+    if (!stored && change.payload.schemaId) {
+      return "create";
+    }
+    return "update";
   }
   shouldRecomputeRecipients(schemaId, patch) {
     const authRelevant = this.authRelevantPropertyLookup?.(schemaId);
@@ -3459,7 +3479,7 @@ var MemoryNodeStorageAdapter = class {
 };
 
 // src/store/sqlite-adapter.ts
-import { lwwUpdateGuardSql } from "@xnetjs/core";
+import { lwwUpdateGuardSql, singleFlight } from "@xnetjs/core";
 import {
   extractSearchableContent as extractSearchableContent2,
   analyzeQuery,
@@ -3519,7 +3539,10 @@ function hydrateJoinedRows(rows) {
       node.timestamps[row.property_key] = {
         lamport: row.lamport_time ?? 0,
         author: row.updated_by ?? "",
-        wallTime: row.prop_updated_at ?? 0
+        wallTime: row.prop_updated_at ?? 0,
+        // Round-trip the stored key so the in-memory LWW comparison matches the
+        // SQL guard exactly (0305); NULL legacy rows keep the author tiebreak.
+        ...row.tiebreak_key != null ? { tiebreakKey: row.tiebreak_key } : {}
       };
       if ((row.prop_updated_at ?? 0) >= node.updatedAt) {
         node.updatedBy = row.updated_by ?? node.createdBy;
@@ -3539,7 +3562,10 @@ function hydrateAggregatedRows(rows) {
       timestamps[key] = {
         lamport: entry.l ?? 0,
         author: entry.b ?? "",
-        wallTime: entry.w ?? 0
+        wallTime: entry.w ?? 0,
+        // Round-trip the stored tiebreak key (0305) so aggregated hydrate
+        // matches the SQL guard; NULL/absent → author tiebreak.
+        ...entry.k != null ? { tiebreakKey: entry.k } : {}
       };
       if ((entry.w ?? 0) >= row.updated_at) {
         node.updatedBy = entry.b ?? row.created_by;
@@ -3570,6 +3596,7 @@ function buildHydrateChunkQuery(ids) {
         p.lamport_time,
         p.updated_by,
         p.updated_at AS prop_updated_at,
+        p.tiebreak_key,
         wanted.ordinal
       FROM wanted
       JOIN nodes n ON n.id = wanted.id
@@ -3598,7 +3625,7 @@ function buildAggregatedHydrateChunkQuery(ids) {
           FILTER (WHERE p.property_key IS NOT NULL) AS props_json,
         json_group_object(
           p.property_key,
-          json_object('l', p.lamport_time, 'b', p.updated_by, 'w', p.updated_at)
+          json_object('l', p.lamport_time, 'b', p.updated_by, 'w', p.updated_at, 'k', p.tiebreak_key)
         ) FILTER (WHERE p.property_key IS NOT NULL) AS meta_json
       FROM wanted
       JOIN nodes n ON n.id = wanted.id
@@ -4521,7 +4548,12 @@ var NODE_PROPERTIES_LWW_GUARD = lwwUpdateGuardSql({
   table: "node_properties",
   lamportColumn: "lamport_time",
   wallTimeColumn: "updated_at",
-  authorColumn: "updated_by"
+  authorColumn: "updated_by",
+  // Grinding-resistant final tiebreak (exploration 0305): larger key wins when
+  // both rows carry one (v4+), else the author DID. The key is precomputed in
+  // application code and stored, so SQL only compares the opaque hex — byte
+  // identical to `shouldReplace` in ./store.ts, no user-defined function.
+  tiebreakKeyColumn: "tiebreak_key"
 });
 var DEFAULT_ADAPTIVE_INDEXING = {
   enabled: false,
@@ -4621,6 +4653,7 @@ var SQLiteNodeStorageAdapter = class {
   nodeReadAuthorizer;
   /** One-time guard: ensure the `auth_fingerprint` column exists on upgraded DBs. */
   materializationColumnsReady = false;
+  nodePropertyColumnsReady = false;
   /**
    * Descriptor→SQL compilation lives in `query-compiler.ts` (exploration
    * 0276). Flags are read per-compile so the compiler never captures stale
@@ -4965,6 +4998,7 @@ var SQLiteNodeStorageAdapter = class {
    * Used by importNodes to avoid nested transactions.
    */
   async _setNodeInternal(node, options) {
+    await this.ensureNodePropertyColumns();
     await this.db.run(
       `INSERT INTO nodes (id, schema_id, created_at, updated_at, created_by, deleted_at)
        VALUES (?, ?, ?, ?, ?, ?)
@@ -4986,13 +5020,14 @@ var SQLiteNodeStorageAdapter = class {
       const timestamp = node.timestamps[key];
       if (!timestamp) continue;
       await this.db.run(
-        `INSERT INTO node_properties (node_id, property_key, value, lamport_time, updated_by, updated_at)
-         VALUES (?, ?, ?, ?, ?, ?)
+        `INSERT INTO node_properties (node_id, property_key, value, lamport_time, updated_by, updated_at, tiebreak_key)
+         VALUES (?, ?, ?, ?, ?, ?, ?)
          ON CONFLICT(node_id, property_key) DO UPDATE SET
            value = excluded.value,
            lamport_time = excluded.lamport_time,
            updated_by = excluded.updated_by,
-           updated_at = excluded.updated_at
+           updated_at = excluded.updated_at,
+           tiebreak_key = excluded.tiebreak_key
          WHERE ${NODE_PROPERTIES_LWW_GUARD}`,
         [
           node.id,
@@ -5000,7 +5035,8 @@ var SQLiteNodeStorageAdapter = class {
           this.serializeValue(value),
           timestamp.lamport,
           timestamp.author,
-          timestamp.wallTime
+          timestamp.wallTime,
+          timestamp.tiebreakKey ?? null
         ]
       );
     }
@@ -5062,7 +5098,7 @@ var SQLiteNodeStorageAdapter = class {
         )
         SELECT 
           ln.id, ln.schema_id, ln.created_at, ln.updated_at, ln.created_by, ln.deleted_at,
-          p.property_key, p.value, p.lamport_time, p.updated_by, p.updated_at as prop_updated_at,
+          p.property_key, p.value, p.lamport_time, p.updated_by, p.updated_at as prop_updated_at, p.tiebreak_key,
           NULL as ordinal
         FROM limited_nodes ln
         LEFT JOIN node_properties p ON ln.id = p.node_id
@@ -5074,7 +5110,7 @@ var SQLiteNodeStorageAdapter = class {
       sql = `
         SELECT 
           n.id, n.schema_id, n.created_at, n.updated_at, n.created_by, n.deleted_at,
-          p.property_key, p.value, p.lamport_time, p.updated_by, p.updated_at as prop_updated_at,
+          p.property_key, p.value, p.lamport_time, p.updated_by, p.updated_at as prop_updated_at, p.tiebreak_key,
           NULL as ordinal
         FROM nodes n
         LEFT JOIN node_properties p ON n.id = p.node_id
@@ -5587,6 +5623,7 @@ var SQLiteNodeStorageAdapter = class {
     if (!this.db.transactionBatch) {
       throw new Error("SQLite transactionBatch is not available.");
     }
+    await this.ensureNodePropertyColumns();
     const operations = [];
     const indexProperties = options?.indexProperties ?? true;
     const hasFullTextSearch = await this.fullTextIndexing.hasTable();
@@ -5637,16 +5674,17 @@ var SQLiteNodeStorageAdapter = class {
       const timestamp = node.timestamps[key];
       if (!timestamp) continue;
       operations.push({
-        // Full LWW ordering triple — keep in lockstep with the setNode
-        // upsert above and `shouldReplace` in ./store.ts (0272).
+        // Full LWW ordering chain — keep in lockstep with the setNode
+        // upsert above and `shouldReplace` in ./store.ts (0272/0305).
         sql: `INSERT INTO node_properties
-                (node_id, property_key, value, lamport_time, updated_by, updated_at)
-              VALUES (?, ?, ?, ?, ?, ?)
+                (node_id, property_key, value, lamport_time, updated_by, updated_at, tiebreak_key)
+              VALUES (?, ?, ?, ?, ?, ?, ?)
               ON CONFLICT(node_id, property_key) DO UPDATE SET
                 value = excluded.value,
                 lamport_time = excluded.lamport_time,
                 updated_by = excluded.updated_by,
-                updated_at = excluded.updated_at
+                updated_at = excluded.updated_at,
+                tiebreak_key = excluded.tiebreak_key
               WHERE ${NODE_PROPERTIES_LWW_GUARD}`,
         params: [
           node.id,
@@ -5654,7 +5692,8 @@ var SQLiteNodeStorageAdapter = class {
           this.serializeValue(value),
           timestamp.lamport,
           timestamp.author,
-          timestamp.wallTime
+          timestamp.wallTime,
+          timestamp.tiebreakKey ?? null
         ]
       });
     }
@@ -5906,6 +5945,24 @@ var SQLiteNodeStorageAdapter = class {
     }
     this.materializationColumnsReady = true;
   }
+  /**
+   * Ensure the `node_properties.tiebreak_key` column exists (exploration 0305).
+   * Fresh databases get it from the DDL; databases created before schema v8 need
+   * this in-place add so the grinding-resistant LWW guard has a column to
+   * compare. Idempotent, memoized, and non-fatal on races — a legacy NULL key
+   * just falls back to the author-DID tiebreak.
+   */
+  async ensureNodePropertyColumns() {
+    if (this.nodePropertyColumnsReady) return;
+    try {
+      const columns = await this.db.query(`PRAGMA table_info(node_properties)`);
+      if (!columns.some((column) => column.name === "tiebreak_key")) {
+        await this.db.run("ALTER TABLE node_properties ADD COLUMN tiebreak_key TEXT");
+      }
+    } catch {
+    }
+    this.nodePropertyColumnsReady = true;
+  }
   setNodeReadAuthorizer(authorizer) {
     this.nodeReadAuthorizer = authorizer;
   }
@@ -6185,24 +6242,23 @@ var SQLiteNodeStorageAdapter = class {
    */
   collectCompiledQueryDiagnostics(compiled) {
     const memoKey = compiled.sql;
-    const memoized = this.compiledQueryDiagnosticsMemo.get(memoKey);
-    if (memoized) {
-      return memoized;
-    }
-    const pending = this.computeCompiledQueryDiagnostics(compiled).then((diagnostics) => {
-      if (diagnostics.diagnosticsError) {
-        this.compiledQueryDiagnosticsMemo.delete(memoKey);
-      }
-      return diagnostics;
-    });
-    if (this.compiledQueryDiagnosticsMemo.size >= COMPILED_QUERY_DIAGNOSTICS_MEMO_LIMIT) {
+    if (!this.compiledQueryDiagnosticsMemo.has(memoKey) && this.compiledQueryDiagnosticsMemo.size >= COMPILED_QUERY_DIAGNOSTICS_MEMO_LIMIT) {
       const oldest = this.compiledQueryDiagnosticsMemo.keys().next().value;
       if (oldest !== void 0) {
         this.compiledQueryDiagnosticsMemo.delete(oldest);
       }
     }
-    this.compiledQueryDiagnosticsMemo.set(memoKey, pending);
-    return pending;
+    return singleFlight(
+      this.compiledQueryDiagnosticsMemo,
+      memoKey,
+      () => this.computeCompiledQueryDiagnostics(compiled).then((diagnostics) => {
+        if (diagnostics.diagnosticsError) {
+          this.compiledQueryDiagnosticsMemo.delete(memoKey);
+        }
+        return diagnostics;
+      }),
+      { retain: "keep" }
+    );
   }
   async computeCompiledQueryDiagnostics(compiled) {
     try {