@powerhousedao/reactor 6.0.0-dev.6 → 6.0.0-dev.61

package/dist/src/sync/utils.js

@@ -1,3 +1,55 @@
+import { driveCollectionId, } from "../cache/operation-index-types.js";
+import { SyncOperation } from "./sync-operation.js";
+import { SyncOperationStatus, } from "./types.js";
+/**
+ * Trims a mailbox using the jobIds from a batch.
+ */
+export function trimMailboxFromBatch(mailbox, batch) {
+    const toRemove = [];
+    // we want to guarantee:
+    //
+    // 1. sync ops are still in the inbox when marked as executed
+    // 2. we remove syncops as a batch after they have been executed
+    for (const syncOp of batch.entries) {
+        for (const item of mailbox.items) {
+            if (syncOp.event.jobId === item.jobId) {
+                toRemove.push(item);
+                break;
+            }
+        }
+    }
+    if (toRemove.length > 0) {
+        for (const syncOp of toRemove) {
+            syncOp.executed();
+        }
+        mailbox.remove(...toRemove);
+    }
+}
+/**
+ * Trims a mailbox using the ack ordinal.
+ */
+export function trimMailboxFromAckOrdinal(mailbox, ackOrdinal) {
+    const toRemove = [];
+    // we want to guarantee:
+    //
+    // 1. sync ops are still in the mailbox when marked as applied
+    // 2. we remove syncops as a single batch
+    for (const syncOp of mailbox.items) {
+        let maxOrdinal = 0;
+        for (const op of syncOp.operations) {
+            maxOrdinal = Math.max(maxOrdinal, op.context.ordinal);
+        }
+        if (maxOrdinal <= ackOrdinal) {
+            toRemove.push(syncOp);
+        }
+    }
+    if (toRemove.length > 0) {
+        for (const syncOp of toRemove) {
+            syncOp.executed();
+        }
+        mailbox.remove(...toRemove);
+    }
+}
 /**
  * Filters operations based on a remote's filter criteria.
  *
@@ -43,6 +95,23 @@ export function createIdleHealth() {
  * This ensures operations are grouped for efficient processing while maintaining
  * causality across documents and scopes.
  */
+/**
+ * Sorts envelopes by the timestamp of their first operation.
+ * Envelopes without operations are placed at the end.
+ */
+export function sortEnvelopesByFirstOperationTimestamp(envelopes) {
+    return envelopes.slice().sort((a, b) => {
+        const aTimestamp = a.operations?.[0]?.operation.timestampUtcMs;
+        const bTimestamp = b.operations?.[0]?.operation.timestampUtcMs;
+        if (!aTimestamp && !bTimestamp)
+            return 0;
+        if (!aTimestamp)
+            return 1;
+        if (!bTimestamp)
+            return -1;
+        return new Date(aTimestamp).getTime() - new Date(bTimestamp).getTime();
+    });
+}
 export function batchOperationsByDocument(operations) {
     const batches = [];
     let currentDocId = null;
@@ -75,4 +144,140 @@ export function batchOperationsByDocument(operations) {
     flushBatch();
     return batches;
 }
+export function getMaxOrdinal(operations) {
+    return operations.reduce((maxOrdinal, operation) => Math.max(maxOrdinal, operation.context.ordinal), 0);
+}
+export function filterByCollectionMembership(operations, collectionId, collectionMemberships) {
+    if (!collectionMemberships) {
+        return [];
+    }
+    return operations.filter((op) => {
+        const documentId = op.context.documentId;
+        if (!(documentId in collectionMemberships)) {
+            return false;
+        }
+        return collectionMemberships[documentId].includes(collectionId);
+    });
+}
+export function toOperationWithContext(entry) {
+    return {
+        operation: {
+            id: entry.id,
+            index: entry.index,
+            skip: entry.skip,
+            hash: entry.hash,
+            timestampUtcMs: entry.timestampUtcMs,
+            action: entry.action,
+        },
+        context: {
+            documentId: entry.documentId,
+            documentType: entry.documentType,
+            scope: entry.scope,
+            branch: entry.branch,
+            ordinal: entry.ordinal ?? 0,
+        },
+    };
+}
+/**
+ * Merges SyncOperations that share the same (documentId, scope, branch) into
+ * a single SyncOperation per group. Within each group, operations are sorted
+ * by context.ordinal. The merged SyncOperation keeps the first group member's
+ * jobId; all other jobIds are remapped so external dependencies still resolve.
+ */
+export function consolidateSyncOperations(syncOps) {
+    if (syncOps.length <= 1) {
+        return syncOps;
+    }
+    const groups = new Map();
+    const jobIdRemap = new Map();
+    const insertionOrder = [];
+    for (const syncOp of syncOps) {
+        const key = `${syncOp.documentId}|${syncOp.scopes.slice().sort().join(",")}|${syncOp.branch}`;
+        const existing = groups.get(key);
+        if (existing) {
+            existing.ops.push(syncOp);
+            if (syncOp.jobId && syncOp.jobId !== existing.canonicalJobId) {
+                jobIdRemap.set(syncOp.jobId, existing.canonicalJobId);
+            }
+        }
+        else {
+            groups.set(key, { ops: [syncOp], canonicalJobId: syncOp.jobId });
+            insertionOrder.push(key);
+        }
+    }
+    const result = [];
+    for (const key of insertionOrder) {
+        const group = groups.get(key);
+        const allOperations = group.ops
+            .flatMap((op) => op.operations)
+            .sort((a, b) => a.context.ordinal - b.context.ordinal);
+        const allDeps = new Set();
+        for (const op of group.ops) {
+            for (const dep of op.jobDependencies) {
+                allDeps.add(dep);
+            }
+        }
+        allDeps.delete(group.canonicalJobId);
+        for (const op of group.ops) {
+            allDeps.delete(op.jobId);
+        }
+        const remappedDeps = [];
+        for (const dep of allDeps) {
+            const mapped = jobIdRemap.get(dep) ?? dep;
+            if (!remappedDeps.includes(mapped) && mapped !== group.canonicalJobId) {
+                remappedDeps.push(mapped);
+            }
+        }
+        const first = group.ops[0];
+        const merged = new SyncOperation(first.id, first.jobId, remappedDeps, first.remoteName, first.documentId, first.scopes, first.branch, allOperations);
+        if (first.status > SyncOperationStatus.TransportPending) {
+            if (first.status >= SyncOperationStatus.Error) {
+                merged.executed();
+            }
+            else if (first.status >= SyncOperationStatus.Applied) {
+                merged.transported();
+            }
+            else {
+                merged.started();
+            }
+        }
+        result.push(merged);
+    }
+    return result;
+}
+export function mergeCollectionMemberships(events) {
+    const mergedMemberships = {};
+    for (const event of events) {
+        if (event.collectionMemberships) {
+            for (const [docId, collections] of Object.entries(event.collectionMemberships)) {
+                if (!(docId in mergedMemberships)) {
+                    mergedMemberships[docId] = [];
+                }
+                for (const c of collections) {
+                    if (!mergedMemberships[docId].includes(c)) {
+                        mergedMemberships[docId].push(c);
+                    }
+                }
+            }
+        }
+        for (const op of event.operations) {
+            const action = op.operation.action;
+            if (action.type !== "ADD_RELATIONSHIP") {
+                continue;
+            }
+            const input = action.input;
+            if (!input?.sourceId || !input.targetId) {
+                continue;
+            }
+            const collectionId = driveCollectionId(op.context.branch, input.sourceId);
+            if (!(input.targetId in mergedMemberships)) {
+                mergedMemberships[input.targetId] = [];
+            }
+            if (!mergedMemberships[input.targetId].includes(collectionId)) {
+                mergedMemberships[input.targetId].push(collectionId);
+            }
+        }
+    }
+    return mergedMemberships;
+}
 //# sourceMappingURL=utils.js.map

package/dist/src/sync/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/sync/utils.ts"],"names":[],"mappings":"AAUA;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC9B,UAAkC,EAClC,MAAoB;IAEpB,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;QAC9B,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;YACzD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IACE,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;YAC5B,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,EAClD,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACxE,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO;QACL,KAAK,EAAE,MAAM;QACb,YAAY,EAAE,CAAC;KAChB,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,yBAAyB,CACvC,UAAkC;IAElC,MAAM,OAAO,GAAqB,EAAE,CAAC;IAErC,IAAI,YAAY,GAAkB,IAAI,CAAC;IACvC,IAAI,YAAY,GAAkB,IAAI,CAAC;IACvC,IAAI,YAAY,GAA2B,EAAE,CAAC;IAE9C,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IACE,YAAY,CAAC,MAAM,KAAK,CAAC;YACzB,YAAY,KAAK,IAAI;YACrB,YAAY,KAAK,IAAI,EACrB,CAAC;YACD,OAAO;QACT,CAAC;QAED,OAAO,CAAC,IAAI,CAAC;YACX,UAAU,EAAE,YAAY;YACxB,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM;YACtC,KAAK,EAAE,YAAY;YACnB,UAAU,EAAE,YAAY;SACzB,CAAC,CAAC;QACH,YAAY,GAAG,EAAE,CAAC;IACpB,CAAC,CAAC;IAEF,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;QACpC,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;QAC/B,IAAI,KAAK,KAAK,YAAY,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;YACrD,UAAU,EAAE,CAAC;YACb,YAAY,GAAG,KAAK,CAAC;YACrB,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC;QACD,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAED,UAAU,EAAE,CAAC;IACb,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/sync/utils.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/reshuffle.d.ts

@@ -1,8 +1,12 @@
 type OperationIndex = {
     index: number;
     skip: number;
-    id?: string;
-    timestampUtcMs?: string;
+    id: string;
+    timestampUtcMs: string;
+    action?: {
+        id?: string;
+        type?: string;
+    };
 };
 /**
  * Sorts operations by index and skip number.
@@ -10,9 +14,16 @@ type OperationIndex = {
  */
 export declare function sortOperations<TOpIndex extends OperationIndex>(operations: TOpIndex[]): TOpIndex[];
 /**
- * Reshuffles operations by timestamp only, ignoring their original index values.
+ * Reshuffles operations by timestamp, then applies deterministic tie-breaking.
  * Used for merging concurrent operations from different branches.
  *
+ * For strict document-structure actions (e.g., CREATE_DOCUMENT/UPGRADE_DOCUMENT),
+ * logical index (index - skip) is prioritized to preserve causal replay order.
+ *
+ * For other actions, action ID is prioritized to ensure a canonical cross-reactor order
+ * for concurrent operations that may have diverged local indices due to prior reshuffles.
+ * Logical index and operation ID are then used as deterministic tie-breakers.
+ *
  * Example:
  * [0:0, 1:0, 2:0, A3:0, A4:0, A5:0] + [0:0, 1:0, 2:0, B3:0, B4:2, B5:0]
  * GC               => [0:0, 1:0, 2:0, A3:0, A4:0, A5:0] + [0:0, 1:0, B4:2, B5:0]
@@ -20,11 +31,17 @@ export declare function sortOperations<TOpIndex extends OperationIndex>(operatio
  * Reshuffle(6:4)   => [6:4, 7:0, 8:0, 9:0, 10:0, 11:0]
  * merge            => [0:0, 1:0, 6:4, 7:0, 8:0, 9:0, 10:0, 11:0]
  */
-export declare function reshuffleByTimestamp<TOp extends OperationIndex>(startIndex: OperationIndex, opsA: TOp[], opsB: TOp[]): TOp[];
+export declare function reshuffleByTimestamp<TOp extends OperationIndex>(startIndex: {
+    index: number;
+    skip: number;
+}, opsA: TOp[], opsB: TOp[]): TOp[];
 /**
  * Reshuffles operations by timestamp first, then by original index value.
  * Used for merging concurrent operations while preserving index ordering for operations with same timestamp.
  */
-export declare function reshuffleByTimestampAndIndex<TOp extends OperationIndex>(startIndex: OperationIndex, opsA: TOp[], opsB: TOp[]): TOp[];
+export declare function reshuffleByTimestampAndIndex<TOp extends OperationIndex>(startIndex: {
+    index: number;
+    skip: number;
+}, opsA: TOp[], opsB: TOp[]): TOp[];
 export {};
 //# sourceMappingURL=reshuffle.d.ts.map

package/dist/src/utils/reshuffle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reshuffle.d.ts","sourceRoot":"","sources":["../../../src/utils/reshuffle.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,SAAS,cAAc,EAC5D,UAAU,EAAE,QAAQ,EAAE,GACrB,QAAQ,EAAE,CAKZ;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,SAAS,cAAc,EAC7D,UAAU,EAAE,cAAc,EAC1B,IAAI,EAAE,GAAG,EAAE,EACX,IAAI,EAAE,GAAG,EAAE,GACV,GAAG,EAAE,CAYP;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,SAAS,cAAc,EACrE,UAAU,EAAE,cAAc,EAC1B,IAAI,EAAE,GAAG,EAAE,EACX,IAAI,EAAE,GAAG,EAAE,GACV,GAAG,EAAE,CAaP"}
+{"version":3,"file":"reshuffle.d.ts","sourceRoot":"","sources":["../../../src/utils/reshuffle.ts"],"names":[],"mappings":"AAAA,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE;QACP,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;CACH,CAAC;AAUF;;;GAGG;AACH,wBAAgB,cAAc,CAAC,QAAQ,SAAS,cAAc,EAC5D,UAAU,EAAE,QAAQ,EAAE,GACrB,QAAQ,EAAE,CAKZ;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,SAAS,cAAc,EAC7D,UAAU,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC3C,IAAI,EAAE,GAAG,EAAE,EACX,IAAI,EAAE,GAAG,EAAE,GACV,GAAG,EAAE,CAuCP;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,SAAS,cAAc,EACrE,UAAU,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC3C,IAAI,EAAE,GAAG,EAAE,EACX,IAAI,EAAE,GAAG,EAAE,GACV,GAAG,EAAE,CAoBP"}

package/dist/src/utils/reshuffle.js

@@ -1,3 +1,10 @@
+const STRICT_ORDER_ACTION_TYPES = new Set([
+    "CREATE_DOCUMENT",
+    "DELETE_DOCUMENT",
+    "UPGRADE_DOCUMENT",
+    "ADD_RELATIONSHIP",
+    "REMOVE_RELATIONSHIP",
+]);
 /**
  * Sorts operations by index and skip number.
  * [0:0 2:0 1:0 3:3 3:1] => [0:0 1:0 2:0 3:1 3:3]
@@ -9,9 +16,16 @@ export function sortOperations(operations) {
         .sort((a, b) => a.index - b.index);
 }
 /**
- * Reshuffles operations by timestamp only, ignoring their original index values.
+ * Reshuffles operations by timestamp, then applies deterministic tie-breaking.
  * Used for merging concurrent operations from different branches.
  *
+ * For strict document-structure actions (e.g., CREATE_DOCUMENT/UPGRADE_DOCUMENT),
+ * logical index (index - skip) is prioritized to preserve causal replay order.
+ *
+ * For other actions, action ID is prioritized to ensure a canonical cross-reactor order
+ * for concurrent operations that may have diverged local indices due to prior reshuffles.
+ * Logical index and operation ID are then used as deterministic tie-breakers.
+ *
  * Example:
  * [0:0, 1:0, 2:0, A3:0, A4:0, A5:0] + [0:0, 1:0, 2:0, B3:0, B4:2, B5:0]
  * GC               => [0:0, 1:0, 2:0, A3:0, A4:0, A5:0] + [0:0, 1:0, B4:2, B5:0]
@@ -21,8 +35,29 @@ export function sortOperations(operations) {
  */
 export function reshuffleByTimestamp(startIndex, opsA, opsB) {
     return [...opsA, ...opsB]
-        .sort((a, b) => new Date(a.timestampUtcMs || "").getTime() -
-        new Date(b.timestampUtcMs || "").getTime())
+        .sort((a, b) => {
+        const timestampDiff = new Date(a.timestampUtcMs).getTime() -
+            new Date(b.timestampUtcMs).getTime();
+        if (timestampDiff !== 0) {
+            return timestampDiff;
+        }
+        const shouldPrioritizeLogicalIndex = STRICT_ORDER_ACTION_TYPES.has(a.action?.type ?? "") ||
+            STRICT_ORDER_ACTION_TYPES.has(b.action?.type ?? "");
+        const logicalIndexDiff = a.index - a.skip - (b.index - b.skip);
+        if (shouldPrioritizeLogicalIndex) {
+            if (logicalIndexDiff !== 0) {
+                return logicalIndexDiff;
+            }
+        }
+        const actionIdDiff = (a.action?.id ?? "").localeCompare(b.action?.id ?? "");
+        if (actionIdDiff !== 0) {
+            return actionIdDiff;
+        }
+        if (!shouldPrioritizeLogicalIndex && logicalIndexDiff !== 0) {
+            return logicalIndexDiff;
+        }
+        return a.id.localeCompare(b.id);
+    })
         .map((op, i) => ({
         ...op,
         index: startIndex.index + i,
@@ -35,9 +70,18 @@ export function reshuffleByTimestamp(startIndex, opsA, opsB) {
  */
 export function reshuffleByTimestampAndIndex(startIndex, opsA, opsB) {
     return [...opsA, ...opsB]
-        .sort((a, b) => new Date(a.timestampUtcMs || "").getTime() -
-        new Date(b.timestampUtcMs || "").getTime())
-        .sort((a, b) => a.index - b.index)
+        .sort((a, b) => {
+        const indexDiff = a.index - b.index;
+        if (indexDiff !== 0) {
+            return indexDiff;
+        }
+        const timestampDiff = new Date(a.timestampUtcMs).getTime() -
+            new Date(b.timestampUtcMs).getTime();
+        if (timestampDiff !== 0) {
+            return timestampDiff;
+        }
+        return a.id.localeCompare(b.id);
+    })
         .map((op, i) => ({
         ...op,
         index: startIndex.index + i,

package/dist/src/utils/reshuffle.js.map

@@ -1 +1 @@
-{"version":3,"file":"reshuffle.js","sourceRoot":"","sources":["../../../src/utils/reshuffle.ts"],"names":[],"mappings":"AAOA;;;GAGG;AACH,MAAM,UAAU,cAAc,CAC5B,UAAsB;IAEtB,OAAO,UAAU;SACd,KAAK,EAAE;SACP,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;SAC/B,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;AACvC,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,oBAAoB,CAClC,UAA0B,EAC1B,IAAW,EACX,IAAW;IAEX,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;SACtB,IAAI,CACH,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACP,IAAI,IAAI,CAAC,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;QAC1C,IAAI,IAAI,CAAC,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAC7C;SACA,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,EAAE;QACL,KAAK,EAAE,UAAU,CAAC,KAAK,GAAG,CAAC;QAC3B,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACpC,CAAC,CAAC,CAAC;AACR,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,4BAA4B,CAC1C,UAA0B,EAC1B,IAAW,EACX,IAAW;IAEX,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC;SACtB,IAAI,CACH,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACP,IAAI,IAAI,CAAC,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;QAC1C,IAAI,IAAI,CAAC,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAC7C;SACA,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;SACjC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,EAAE;QACL,KAAK,EAAE,UAAU,CAAC,KAAK,GAAG,CAAC;QAC3B,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACpC,CAAC,CAAC,CAAC;AACR,CAAC"}
+{"version":3,"file":"reshuffle.js","sourceRoot":"","sources":["../../../src/utils/reshuffle.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powerhousedao/reactor",
-  "version": "6.0.0-dev.6",
+  "version": "6.0.0-dev.61",
   "description": "",
   "repository": {
     "url": "https://github.com/powerhouse-inc/powerhouse",
@@ -11,9 +11,6 @@
   "exports": {
     ".": "./dist/src/index.js"
   },
-  "imports": {
-    "#*": "./dist/src/*"
-  },
   "files": [
     "./dist/src"
   ],
@@ -24,24 +21,24 @@
   "author": "",
   "license": "AGPL-3.0-only",
   "dependencies": {
-    "@electric-sql/pglite": "0.2.17",
-    "kysely": "^0.28.2",
-    "kysely-pglite-dialect": "^1.1.1",
+    "@electric-sql/pglite": "0.3.15",
+    "kysely": "0.28.11",
+    "kysely-pglite-dialect": "1.2.0",
     "uuid": "^11.0.5",
-    "document-model": "6.0.0-dev.6",
-    "document-drive": "6.0.0-dev.6"
+    "@powerhousedao/shared": "6.0.0-dev.61",
+    "document-model": "6.0.0-dev.61",
+    "document-drive": "6.0.0-dev.61"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^3.2.4",
+    "prettier": "3.8.1",
     "tinybench": "^2.9.0",
-    "tsx": "^4.19.2",
-    "typescript": "^5.7.3",
-    "vitest": "^3.2.4"
+    "tsx": "4.21.0",
+    "vitest": "3.2.4"
   },
   "scripts": {
-    "build": "pnpm run build:tsc",
-    "build:tsc": "tsc --build",
     "prebuild": "pnpm run clean",
+    "build": "tsc",
     "test": "vitest run --coverage --printConsoleTrace=true --silent=false",
     "test:watch": "vitest --coverage",
     "lint": "eslint",
@@ -49,7 +46,7 @@
     "bench:sync": "node --import tsx bench/two-reactor-sync.bench.ts",
     "clean": "rimraf dist",
     "clean:node_modules": "rimraf node_modules",
-    "claude": "pnpm build && pnpm test && npx prettier --write \"**/*.ts\" && pnpm lint",
+    "claude": "pnpm build && pnpm test && pnpm exec prettier --write \"**/*.ts\" && pnpm lint",
     "migrate": "tsx src/storage/migrations/run-migrations.ts",
     "migrate:status": "tsx src/storage/migrations/run-migrations.ts status"
   }

package/dist/src/processors/types.d.ts

@@ -1,63 +0,0 @@
-import type { PHDocumentHeader } from "document-model";
-import type { OperationWithContext } from "../storage/interfaces.js";
-/**
- * Filter for matching operations to processors.
- * All fields are optional arrays - when provided, operations must match at least one value in each specified field.
- * When a field is undefined or empty, it matches all values for that field.
- */
-export type ProcessorFilter = {
-    documentType?: string[];
-    scope?: string[];
-    branch?: string[];
-    documentId?: string[];
-};
-/**
- * Describes an object that can process operations.
- */
-export interface IProcessor {
-    /**
-     * Processes a list of operations with context.
-     * Called when operations match this processor's filter.
-     */
-    onOperations(operations: OperationWithContext[]): Promise<void>;
-    /**
-     * Called when the processor is disconnected.
-     * Used to clean up any resources allocated during processor creation.
-     */
-    onDisconnect(): Promise<void>;
-}
-/**
- * Relates a processor to its filter configuration.
- */
-export type ProcessorRecord = {
-    processor: IProcessor;
-    filter: ProcessorFilter;
-};
-/**
- * A factory function that creates processor records for a given drive.
- * Called once per drive when the drive is first detected or when the factory is registered.
- */
-export type ProcessorFactory = (driveHeader: PHDocumentHeader) => ProcessorRecord[] | Promise<ProcessorRecord[]>;
-/**
- * Manages processor creation and destruction based on drive operations.
- */
-export interface IProcessorManager {
-    /**
-     * Registers a processor factory.
-     * Immediately creates processors for all existing drives.
-     */
-    registerFactory(identifier: string, factory: ProcessorFactory): Promise<void>;
-    /**
-     * Unregisters a processor factory and disconnects all processors it created.
-     */
-    unregisterFactory(identifier: string): Promise<void>;
-    /**
-     * Gets all registered factory identifiers.
-     */
-    getFactoryIdentifiers(): string[];
-    /**
-     * Gets all processor records for a specific drive.
-     */
-    getProcessorsForDrive(driveId: string): ProcessorRecord[];
-}
-//# sourceMappingURL=types.d.ts.map

package/dist/src/processors/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/processors/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAErE;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,YAAY,CAAC,UAAU,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhE;;;OAGG;IACH,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,UAAU,CAAC;IACtB,MAAM,EAAE,eAAe,CAAC;CACzB,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAC7B,WAAW,EAAE,gBAAgB,KAC1B,eAAe,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9E;;OAEG;IACH,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErD;;OAEG;IACH,qBAAqB,IAAI,MAAM,EAAE,CAAC;IAElC;;OAEG;IACH,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,EAAE,CAAC;CAC3D"}

package/dist/src/processors/types.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=types.js.map

package/dist/src/processors/types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/processors/types.ts"],"names":[],"mappings":""}

package/dist/src/storage/consistency-aware-legacy-storage.d.ts

@@ -1,33 +0,0 @@
-import type { IDocumentStorage } from "document-drive";
-import type { PHDocument } from "document-model";
-import type { IEventBus } from "../events/interfaces.js";
-import type { IConsistencyTracker } from "../shared/consistency-tracker.js";
-import type { ConsistencyToken } from "../shared/types.js";
-import type { IConsistencyAwareStorage } from "./interfaces.js";
-/**
- * A wrapper around IDocumentStorage that provides read-after-write consistency
- * by waiting for the consistency tracker to be updated before delegating reads
- * to the inner storage.
- *
- * This is used when legacy storage mode is enabled with async persistence
- * (e.g., BrowserStorage with IndexedDB) to ensure documents are available
- * for reading after being written.
- */
-export declare class ConsistencyAwareLegacyStorage implements IConsistencyAwareStorage {
-    private inner;
-    private consistencyTracker;
-    constructor(inner: IDocumentStorage, consistencyTracker: IConsistencyTracker, eventBus: IEventBus);
-    private waitForConsistency;
-    get<TDocument extends PHDocument>(id: string, consistencyToken?: ConsistencyToken, signal?: AbortSignal): Promise<TDocument>;
-    getBySlug<TDocument extends PHDocument>(slug: string, consistencyToken?: ConsistencyToken, signal?: AbortSignal): Promise<TDocument>;
-    exists(id: string, consistencyToken?: ConsistencyToken, signal?: AbortSignal): Promise<boolean>;
-    findByType(type: string, limit?: number, cursor?: string, consistencyToken?: ConsistencyToken, signal?: AbortSignal): Promise<{
-        documents: string[];
-        nextCursor: string | undefined;
-    }>;
-    getChildren(id: string, consistencyToken?: ConsistencyToken, signal?: AbortSignal): Promise<string[]>;
-    resolveIds(slugs: string[], consistencyToken?: ConsistencyToken, signal?: AbortSignal): Promise<string[]>;
-    resolveSlugs(ids: string[], consistencyToken?: ConsistencyToken, signal?: AbortSignal): Promise<string[]>;
-    getParents(childId: string, consistencyToken?: ConsistencyToken, signal?: AbortSignal): Promise<string[]>;
-}
-//# sourceMappingURL=consistency-aware-legacy-storage.d.ts.map

package/dist/src/storage/consistency-aware-legacy-storage.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"consistency-aware-legacy-storage.d.ts","sourceRoot":"","sources":["../../../src/storage/consistency-aware-legacy-storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAEhE;;;;;;;;GAQG;AACH,qBAAa,6BAA8B,YAAW,wBAAwB;IAE1E,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,kBAAkB;gBADlB,KAAK,EAAE,gBAAgB,EACvB,kBAAkB,EAAE,mBAAmB,EAC/C,QAAQ,EAAE,SAAS;YAgBP,kBAAkB;IAa1B,GAAG,CAAC,SAAS,SAAS,UAAU,EACpC,EAAE,EAAE,MAAM,EACV,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,SAAS,CAAC;IAKf,SAAS,CAAC,SAAS,SAAS,UAAU,EAC1C,IAAI,EAAE,MAAM,EACZ,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,SAAS,CAAC;IAKf,MAAM,CACV,EAAE,EAAE,MAAM,EACV,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,OAAO,CAAC;IAKb,UAAU,CACd,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,EACf,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,EAAE,CAAC;QAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;IAK7D,WAAW,CACf,EAAE,EAAE,MAAM,EACV,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;IAKd,UAAU,CACd,KAAK,EAAE,MAAM,EAAE,EACf,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;IAKd,YAAY,CAChB,GAAG,EAAE,MAAM,EAAE,EACb,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;IAKd,UAAU,CACd,OAAO,EAAE,MAAM,EACf,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;CAIrB"}

package/dist/src/storage/consistency-aware-legacy-storage.js

@@ -1,65 +0,0 @@
-import { OperationEventTypes } from "../events/types.js";
-/**
- * A wrapper around IDocumentStorage that provides read-after-write consistency
- * by waiting for the consistency tracker to be updated before delegating reads
- * to the inner storage.
- *
- * This is used when legacy storage mode is enabled with async persistence
- * (e.g., BrowserStorage with IndexedDB) to ensure documents are available
- * for reading after being written.
- */
-export class ConsistencyAwareLegacyStorage {
-    inner;
-    consistencyTracker;
-    constructor(inner, consistencyTracker, eventBus) {
-        this.inner = inner;
-        this.consistencyTracker = consistencyTracker;
-        eventBus.subscribe(OperationEventTypes.OPERATION_WRITTEN, (_type, event) => {
-            const coordinates = event.operations.map((op) => ({
-                documentId: op.context.documentId,
-                scope: op.context.scope,
-                branch: op.context.branch,
-                operationIndex: op.operation.index,
-            }));
-            this.consistencyTracker.update(coordinates);
-        });
-    }
-    async waitForConsistency(consistencyToken, signal) {
-        if (consistencyToken && consistencyToken.coordinates.length > 0) {
-            await this.consistencyTracker.waitFor(consistencyToken.coordinates, undefined, signal);
-        }
-    }
-    async get(id, consistencyToken, signal) {
-        await this.waitForConsistency(consistencyToken, signal);
-        return this.inner.get(id);
-    }
-    async getBySlug(slug, consistencyToken, signal) {
-        await this.waitForConsistency(consistencyToken, signal);
-        return this.inner.getBySlug(slug);
-    }
-    async exists(id, consistencyToken, signal) {
-        await this.waitForConsistency(consistencyToken, signal);
-        return this.inner.exists(id);
-    }
-    async findByType(type, limit, cursor, consistencyToken, signal) {
-        await this.waitForConsistency(consistencyToken, signal);
-        return this.inner.findByType(type, limit, cursor);
-    }
-    async getChildren(id, consistencyToken, signal) {
-        await this.waitForConsistency(consistencyToken, signal);
-        return this.inner.getChildren(id);
-    }
-    async resolveIds(slugs, consistencyToken, signal) {
-        await this.waitForConsistency(consistencyToken, signal);
-        return this.inner.resolveIds(slugs, signal);
-    }
-    async resolveSlugs(ids, consistencyToken, signal) {
-        await this.waitForConsistency(consistencyToken, signal);
-        return this.inner.resolveSlugs(ids, signal);
-    }
-    async getParents(childId, consistencyToken, signal) {
-        await this.waitForConsistency(consistencyToken, signal);
-        return this.inner.getParents(childId);
-    }
-}
-//# sourceMappingURL=consistency-aware-legacy-storage.js.map

package/dist/src/storage/consistency-aware-legacy-storage.js.map

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