@dxos/echo-pipeline 0.8.2-main.f11618f → 0.8.2-main.fbd8ed0

package/dist/lib/browser/index.mjs

@@ -21,7 +21,7 @@ import {
   mapTimeframeToFeedIndexes,
   startAfter,
   valueEncoding
-} from "./chunk-32WDI3LB.mjs";
+} from "./chunk-TPEBUDNJ.mjs";
 
 // packages/core/echo/echo-pipeline/src/db-host/data-service.ts
 import { UpdateScheduler as UpdateScheduler2 } from "@dxos/async";
@@ -31,8 +31,8 @@ import { SpaceId as SpaceId2 } from "@dxos/keys";
 import { log as log7 } from "@dxos/log";
 
 // packages/core/echo/echo-pipeline/src/db-host/documents-synchronizer.ts
+import { next as A } from "@automerge/automerge";
 import { UpdateScheduler } from "@dxos/async";
-import { next as A } from "@dxos/automerge/automerge";
 import { Resource } from "@dxos/context";
 import { invariant } from "@dxos/invariant";
 import { log } from "@dxos/log";
@@ -52,15 +52,15 @@ var DocumentsSynchronizer = class extends Resource {
         documentIds
       }, {
         F: __dxlog_file,
-        L: 49,
+        L: 50,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
     for (const documentId of documentIds) {
-      const doc = this._params.repo.find(documentId);
-      doc.whenReady().then(() => {
+      this._params.repo.find(documentId).then(async (doc) => {
+        await doc.whenReady();
         this._startSync(doc);
         this._pendingUpdates.add(doc.documentId);
         this._sendUpdatesJob.trigger();
@@ -70,7 +70,7 @@ var DocumentsSynchronizer = class extends Resource {
           error
         }, {
           F: __dxlog_file,
-          L: 63,
+          L: 64,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -99,7 +99,7 @@ var DocumentsSynchronizer = class extends Resource {
   update(updates) {
     for (const { documentId, mutation, isNew } of updates) {
       if (isNew) {
-        const doc = this._params.repo.find(documentId);
+        const { handle: doc } = this._params.repo.findWithProgress(documentId);
         doc.update((doc2) => A.loadIncremental(doc2, mutation));
         this._startSync(doc);
       } else {
@@ -113,7 +113,7 @@ var DocumentsSynchronizer = class extends Resource {
         documentId: doc.documentId
       }, {
         F: __dxlog_file,
-        L: 102,
+        L: 103,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -156,17 +156,18 @@ var DocumentsSynchronizer = class extends Resource {
     const syncState = this._syncStates.get(documentId);
     invariant(syncState, "Sync state for document not found", {
       F: __dxlog_file,
-      L: 143,
+      L: 144,
       S: this,
       A: [
         "syncState",
         "'Sync state for document not found'"
       ]
     });
-    const doc = syncState.handle.docSync();
-    if (!doc) {
+    const handle = syncState.handle;
+    if (!handle || !handle.isReady() || !handle.doc()) {
       return;
     }
+    const doc = handle.doc();
     const mutation = syncState.lastSentHead ? A.saveSince(doc, syncState.lastSentHead) : A.save(doc);
     if (mutation.length === 0) {
       return;
@@ -178,7 +179,7 @@ var DocumentsSynchronizer = class extends Resource {
     const syncState = this._syncStates.get(documentId);
     invariant(syncState, "Sync state for document not found", {
       F: __dxlog_file,
-      L: 158,
+      L: 160,
       S: this,
       A: [
         "syncState",
@@ -197,9 +198,9 @@ var DocumentsSynchronizer = class extends Resource {
 };
 
 // packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts
+import { getBackend, getHeads, isAutomerge, equals as headsEquals, save } from "@automerge/automerge";
+import { Repo, interpretAsDocumentId } from "@automerge/automerge-repo";
 import { Event as Event2, asyncTimeout } from "@dxos/async";
-import { getBackend, getHeads, isAutomerge, equals as headsEquals, save } from "@dxos/automerge/automerge";
-import { Repo, interpretAsDocumentId } from "@dxos/automerge/automerge-repo";
 import { Context, Resource as Resource4, cancelWithContext } from "@dxos/context";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
@@ -209,8 +210,8 @@ import { trace as trace2 } from "@dxos/tracing";
 import { bufferToArray } from "@dxos/util";
 
 // packages/core/echo/echo-pipeline/src/automerge/collection-synchronizer.ts
+import { next as am } from "@automerge/automerge";
 import { asyncReturn, Event, scheduleTask, scheduleTaskInterval } from "@dxos/async";
-import { next as am } from "@dxos/automerge/automerge";
 import { Resource as Resource2 } from "@dxos/context";
 import { log as log2 } from "@dxos/log";
 import { trace } from "@dxos/tracing";
@@ -263,7 +264,7 @@ var CollectionSynchronizer = class extends Resource2 {
       state
     }, {
       F: __dxlog_file2,
-      L: 75,
+      L: 76,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -282,7 +283,7 @@ var CollectionSynchronizer = class extends Resource2 {
       collectionId
     }, {
       F: __dxlog_file2,
-      L: 89,
+      L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -365,7 +366,7 @@ var CollectionSynchronizer = class extends Resource2 {
       state
     }, {
       F: __dxlog_file2,
-      L: 170,
+      L: 171,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -461,8 +462,8 @@ var getSpanName = (peerId) => {
 };
 
 // packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts
+import { NetworkAdapter } from "@automerge/automerge-repo";
 import { synchronized, Trigger } from "@dxos/async";
-import { NetworkAdapter } from "@dxos/automerge/automerge-repo";
 import { LifecycleState } from "@dxos/context";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { log as log3 } from "@dxos/log";
@@ -489,6 +490,13 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     this._connections = /* @__PURE__ */ new Map();
     this._lifecycleState = LifecycleState.CLOSED;
     this._connected = new Trigger();
+    this._ready = new Trigger();
+  }
+  isReady() {
+    return this._lifecycleState === LifecycleState.OPEN;
+  }
+  whenReady() {
+    return this._ready.wait();
   }
   connect(peerId, peerMetadata) {
     this.peerId = peerId;
@@ -505,15 +513,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       return;
     }
     this._lifecycleState = LifecycleState.OPEN;
-    log3("emit ready", void 0, {
-      F: __dxlog_file3,
-      L: 82,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this.emit("ready", {
-      network: this
-    });
+    this._ready.wake();
   }
   async close() {
     if (this._lifecycleState === LifecycleState.CLOSED) {
@@ -523,6 +523,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       await replicator.disconnect();
     }
     this._replicators.clear();
+    this._ready.reset();
     this._lifecycleState = LifecycleState.CLOSED;
   }
   async whenConnected() {
@@ -533,7 +534,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   async addReplicator(replicator) {
     invariant2(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file3,
-      L: 108,
+      L: 115,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -542,7 +543,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant2(this.peerId, void 0, {
       F: __dxlog_file3,
-      L: 109,
+      L: 116,
       S: this,
       A: [
         "this.peerId",
@@ -551,7 +552,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant2(!this._replicators.has(replicator), void 0, {
       F: __dxlog_file3,
-      L: 110,
+      L: 117,
       S: this,
       A: [
         "!this._replicators.has(replicator)",
@@ -575,7 +576,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   async removeReplicator(replicator) {
     invariant2(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file3,
-      L: 129,
+      L: 136,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -584,7 +585,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant2(this._replicators.has(replicator), void 0, {
       F: __dxlog_file3,
-      L: 130,
+      L: 137,
       S: this,
       A: [
         "this._replicators.has(replicator)",
@@ -640,7 +641,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       if (connectionEntry.isOpen) {
         log3.catch(err, void 0, {
           F: __dxlog_file3,
-          L: 190,
+          L: 197,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -661,13 +662,13 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 208,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._connections.has(connection.peerId), void 0, {
       F: __dxlog_file3,
-      L: 209,
+      L: 216,
       S: this,
       A: [
         "!this._connections.has(connection.peerId as PeerId)",
@@ -696,7 +697,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
         if (connectionEntry.isOpen) {
           log3.catch(err, void 0, {
             F: __dxlog_file3,
-            L: 228,
+            L: 235,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -707,7 +708,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 233,
+      L: 240,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -739,14 +740,14 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 261,
+      L: 268,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     invariant2(entry, void 0, {
       F: __dxlog_file3,
-      L: 263,
+      L: 270,
       S: this,
       A: [
         "entry",
@@ -763,14 +764,14 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 269,
+      L: 276,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     invariant2(entry, void 0, {
       F: __dxlog_file3,
-      L: 271,
+      L: 278,
       S: this,
       A: [
         "entry",
@@ -784,13 +785,13 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     this._params.monitor?.recordPeerDisconnected(connection.peerId);
     void entry.reader.cancel().catch((err) => log3.catch(err, void 0, {
       F: __dxlog_file3,
-      L: 277,
+      L: 284,
       S: this,
       C: (f, a) => f(...a)
     }));
     void entry.writer.abort().catch((err) => log3.catch(err, void 0, {
       F: __dxlog_file3,
-      L: 278,
+      L: 285,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -957,6 +958,12 @@ function _ts_decorate3(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
+var FIND_PARAMS = {
+  allowableStates: [
+    "ready",
+    "requesting"
+  ]
+};
 var AutomergeHost = class extends Resource4 {
   constructor({ db, indexMetadataStore, dataMonitor, peerIdProvider, getSpaceKeyByRootDocumentId }) {
     super();
@@ -1056,7 +1063,7 @@ var AutomergeHost = class extends Resource4 {
       handle = this._repo.handles[documentId];
     }
     if (!handle) {
-      handle = this._repo.find(documentId);
+      handle = await this._repo.find(documentId, FIND_PARAMS);
     }
     if (!handle.isReady()) {
       if (!opts?.timeout) {
@@ -1112,12 +1119,12 @@ var AutomergeHost = class extends Resource4 {
       await Promise.all(headsToWait.map(async (entry, index) => {
         const handle = await this.loadDoc(Context.default(void 0, {
           F: __dxlog_file4,
-          L: 282
+          L: 288
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
       }));
     }
-    await this._repo.flush(documentIds.filter((documentId) => !!this._repo.handles[documentId]));
+    await this._repo.flush(documentIds.filter((documentId) => this._repo.handles[documentId] && this._repo.handles[documentId].isReady()));
   }
   async reIndexHeads(documentIds) {
     for (const documentId of documentIds) {
@@ -1125,46 +1132,30 @@ var AutomergeHost = class extends Resource4 {
         documentId
       }, {
         F: __dxlog_file4,
-        L: 294,
+        L: 302,
         S: this,
         C: (f, a) => f(...a)
       });
-      const handle = this._repo.find(documentId);
-      await handle.whenReady([
-        "ready",
-        "requesting"
-      ]);
-      if (handle.inState([
-        "requesting"
-      ])) {
+      const handle = await this._repo.find(documentId, FIND_PARAMS);
+      if (!handle.isReady()) {
         log4.warn("document is not available locally, skipping", {
           documentId
         }, {
           F: __dxlog_file4,
-          L: 298,
+          L: 305,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
-      const doc = handle.docSync();
-      invariant3(doc, void 0, {
-        F: __dxlog_file4,
-        L: 303,
-        S: this,
-        A: [
-          "doc",
-          ""
-        ]
-      });
-      const heads = getHeads(doc);
+      const heads = handle.heads();
       const batch = this._db.batch();
       this._headsStore.setHeads(documentId, heads, batch);
       await batch.write();
     }
     log4.info("done re-indexing heads", void 0, {
       F: __dxlog_file4,
-      L: 310,
+      L: 314,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1190,10 +1181,10 @@ var AutomergeHost = class extends Resource4 {
   }
   async _beforeSave({ path, batch }) {
     const handle = this._repo.handles[path[0]];
-    if (!handle) {
+    if (!handle || !handle.isReady()) {
       return;
     }
-    const doc = handle.docSync();
+    const doc = handle.doc();
     if (!doc) {
       return;
     }
@@ -1227,7 +1218,7 @@ var AutomergeHost = class extends Resource4 {
   async _afterSave(path) {
     this._indexMetadataStore.notifyMarkedDirty();
     const documentId = path[0];
-    const document = this._repo.handles[documentId]?.docSync();
+    const document = this._repo.handles[documentId]?.doc();
     if (document) {
       const heads = getHeads(document);
       this._onHeadsChanged(documentId, heads);
@@ -1247,9 +1238,12 @@ var AutomergeHost = class extends Resource4 {
     return false;
   }
   async _getContainingSpaceForDocument(documentId) {
-    const doc = this._repo.handles[documentId]?.docSync();
-    if (doc) {
-      const spaceKeyHex = getSpaceKeyFromDoc(doc);
+    const handle = this._repo.handles[documentId];
+    if (handle.state === "loading") {
+      await handle.whenReady();
+    }
+    if (handle && handle.isReady() && handle.doc()) {
+      const spaceKeyHex = getSpaceKeyFromDoc(handle.doc());
       if (spaceKeyHex) {
         return PublicKey.from(spaceKeyHex);
       }
@@ -1272,9 +1266,9 @@ var AutomergeHost = class extends Resource4 {
     const storeRequestIds = [];
     const storeResultIndices = [];
     for (const documentId of documentIds) {
-      const doc = this._repo.handles[documentId]?.docSync();
-      if (doc) {
-        result.push(getHeads(doc));
+      const handle = this._repo.handles[documentId];
+      if (handle && handle.isReady() && handle.doc()) {
+        result.push(getHeads(handle.doc()));
       } else {
         storeRequestIds.push(documentId);
         storeResultIndices.push(result.length);
@@ -1379,12 +1373,12 @@ var AutomergeHost = class extends Resource4 {
       count: toReplicate.length
     }, {
       F: __dxlog_file4,
-      L: 549,
+      L: 556,
       S: this,
       C: (f, a) => f(...a)
     });
     for (const documentId of toReplicate) {
-      this._repo.find(documentId);
+      this._repo.findWithProgress(documentId);
     }
   }
   _onHeadsChanged(documentId, heads) {
@@ -1433,7 +1427,7 @@ var waitForHeads = async (handle, heads) => {
   await handle.whenReady();
   await Event2.wrap(handle, "change").waitForCondition(() => {
     for (const changeHash of unavailableHeads.values()) {
-      if (changeIsPresentInDoc(handle.docSync(), changeHash)) {
+      if (changeIsPresentInDoc(handle.doc(), changeHash)) {
         unavailableHeads.delete(changeHash);
       }
     }
@@ -1446,7 +1440,7 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 var decodeCollectionState = (state) => {
   invariant3(typeof state === "object" && state !== null, "Invalid state", {
     F: __dxlog_file4,
-    L: 610,
+    L: 617,
     S: void 0,
     A: [
       "typeof state === 'object' && state !== null",
@@ -1466,8 +1460,8 @@ import { log as log6 } from "@dxos/log";
 import { ComplexSet, defaultMap as defaultMap2 } from "@dxos/util";
 
 // packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator-connection.ts
-import * as A2 from "@dxos/automerge/automerge";
-import { cbor } from "@dxos/automerge/automerge-repo";
+import * as A2 from "@automerge/automerge";
+import { cbor } from "@automerge/automerge-repo";
 import { Resource as Resource5 } from "@dxos/context";
 import { invariant as invariant4 } from "@dxos/invariant";
 import { log as log5 } from "@dxos/log";
@@ -1492,7 +1486,7 @@ var MeshReplicatorConnection = class extends Resource5 {
       write: async (message, controller) => {
         invariant4(this._isEnabled, "Writing to a disabled connection", {
           F: __dxlog_file5,
-          L: 50,
+          L: 51,
           S: this,
           A: [
             "this._isEnabled",
@@ -1525,7 +1519,7 @@ var MeshReplicatorConnection = class extends Resource5 {
             remotePeerId: remotePeerId.toHex()
           }, {
             F: __dxlog_file5,
-            L: 79,
+            L: 80,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1552,7 +1546,7 @@ var MeshReplicatorConnection = class extends Resource5 {
   get peerId() {
     invariant4(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
-      L: 105,
+      L: 106,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1577,7 +1571,7 @@ var MeshReplicatorConnection = class extends Resource5 {
   enable() {
     invariant4(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
-      L: 126,
+      L: 127,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1608,7 +1602,7 @@ var logSendSync = (message) => {
     };
   }, {
     F: __dxlog_file5,
-    L: 139,
+    L: 140,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -1623,7 +1617,7 @@ var getSpaceIdFromCollectionId = (collectionId) => {
   const spaceId = collectionId.split(":")[1];
   invariant5(SpaceId.isValid(spaceId), void 0, {
     F: __dxlog_file6,
-    L: 15,
+    L: 16,
     S: void 0,
     A: [
       "SpaceId.isValid(spaceId)",
@@ -1889,7 +1883,7 @@ var EchoDataMonitor = class {
     this._localTimeSeries = createLocalTimeSeries();
     this._storageAverages = createStorageAverages();
     this._replicationAverages = createNetworkAverages();
-    this._sizeByMessageType = {};
+    this._sizeByMessage = {};
     this._lastReceivedMessages = new CircularBuffer(100);
     this._lastSentMessages = new CircularBuffer(100);
     this._connectionsCount = 0;
@@ -1927,8 +1921,8 @@ var EchoDataMonitor = class {
           countPerSecond: this._replicationAverages.sentPerSecond.average(),
           failedPerSecond: this._replicationAverages.sendsFailedPerSecond.average()
         },
-        countByMessageType: this._computeMessageHistogram("type"),
-        avgSizeByMessageType: mapValues(this._sizeByMessageType, (summary) => summary.average())
+        countByMessage: this._computeMessageHistogram("type"),
+        avgSizeByMessage: mapValues(this._sizeByMessage, (summary) => summary.average())
       }
     };
   }
@@ -2133,7 +2127,7 @@ var EchoDataMonitor = class {
     messageCounts.failed++;
   }
   _getStatsForType(message) {
-    const messageSize = this._sizeByMessageType[message.type] ??= createSlidingWindow();
+    const messageSize = this._sizeByMessage[message.type] ??= createSlidingWindow();
     const messageCounts = this._activeCounters.byType[message.type] ??= createMessageCounter();
     return {
       messageCounts,
@@ -2253,7 +2247,7 @@ var DataServiceImpl = class {
         ready();
       }).catch((err) => log7.catch(err, void 0, {
         F: __dxlog_file8,
-        L: 70,
+        L: 71,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -2264,7 +2258,7 @@ var DataServiceImpl = class {
     const synchronizer = this._subscriptions.get(request.subscriptionId);
     invariant7(synchronizer, "Subscription not found", {
       F: __dxlog_file8,
-      L: 77,
+      L: 78,
       S: this,
       A: [
         "synchronizer",
@@ -2285,7 +2279,7 @@ var DataServiceImpl = class {
     const synchronizer = this._subscriptions.get(request.subscriptionId);
     invariant7(synchronizer, "Subscription not found", {
       F: __dxlog_file8,
-      L: 92,
+      L: 93,
       S: this,
       A: [
         "synchronizer",
@@ -2330,7 +2324,7 @@ var DataServiceImpl = class {
       const spaceId = request.spaceId;
       invariant7(SpaceId2.isValid(spaceId), void 0, {
         F: __dxlog_file8,
-        L: 132,
+        L: 133,
         S: this,
         A: [
           "SpaceId.isValid(spaceId)",
@@ -2381,7 +2375,7 @@ import { IndexKind } from "@dxos/protocols/proto/dxos/echo/indexing";
 import { trace as trace6 } from "@dxos/tracing";
 
 // packages/core/echo/echo-pipeline/src/db-host/documents-iterator.ts
-import * as A3 from "@dxos/automerge/automerge";
+import * as A3 from "@automerge/automerge";
 import { Context as Context2 } from "@dxos/context";
 import { SpaceDocVersion } from "@dxos/echo-protocol";
 import { invariant as invariant8 } from "@dxos/invariant";
@@ -2400,12 +2394,12 @@ var createSelectedDocumentsIterator = (automergeHost) => (
         const { documentId, objectId } = objectPointerCodec2.decode(id);
         const handle = await automergeHost.loadDoc(Context2.default(void 0, {
           F: __dxlog_file9,
-          L: 30
+          L: 31
         }), documentId);
-        let doc = handle.docSync();
+        let doc = handle.doc();
         invariant8(doc, void 0, {
           F: __dxlog_file9,
-          L: 33,
+          L: 34,
           S: this,
           A: [
             "doc",
@@ -2424,7 +2418,7 @@ var createSelectedDocumentsIterator = (automergeHost) => (
               originalHeads: currentHeads
             }, {
               F: __dxlog_file9,
-              L: 44,
+              L: 45,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2459,7 +2453,7 @@ var createSelectedDocumentsIterator = (automergeHost) => (
           error
         }, {
           F: __dxlog_file9,
-          L: 70,
+          L: 71,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2469,8 +2463,8 @@ var createSelectedDocumentsIterator = (automergeHost) => (
 );
 
 // packages/core/echo/echo-pipeline/src/db-host/query-service.ts
+import { getHeads as getHeads3 } from "@automerge/automerge";
 import { DeferredTask } from "@dxos/async";
-import { getHeads as getHeads3 } from "@dxos/automerge/automerge";
 import { Stream as Stream2 } from "@dxos/codec-protobuf/stream";
 import { Context as Context4, Resource as Resource7 } from "@dxos/context";
 import { log as log9 } from "@dxos/log";
@@ -2537,12 +2531,12 @@ var QueryState = class extends Resource6 {
         }
         const handle = await this._params.automergeHost.loadDoc(Context3.default(void 0, {
           F: __dxlog_file10,
-          L: 117
+          L: 118
         }), documentId);
         if (this._ctx.disposed) {
           return;
         }
-        spaceKey = getSpaceKeyFromDoc(handle.docSync());
+        spaceKey = getSpaceKeyFromDoc(handle.doc());
       }
       if (!spaceKey) {
         return;
@@ -2550,13 +2544,17 @@ var QueryState = class extends Resource6 {
       if (this._params.request.filter.options?.spaces?.length && !this._params.request.filter.options.spaces.some((key) => key.equals(spaceKey))) {
         return;
       }
+      const spaceId = await createIdFromSpaceKey2(PublicKey3.from(spaceKey));
+      if (this._params.request.filter.options?.spaceIds?.length && !this._params.request.filter.options.spaceIds.includes(spaceId)) {
+        return;
+      }
       if (this._firstRun) {
         this.metrics.objectsReturned++;
       }
       return {
         id: objectId,
         documentId,
-        spaceId: await createIdFromSpaceKey2(PublicKey3.from(spaceKey)),
+        spaceId,
         spaceKey: PublicKey3.from(spaceKey),
         rank: result.rank
       };
@@ -2612,7 +2610,7 @@ var filterToIndexQuery = (filter) => {
   const { type = [], or = [] } = filter;
   invariant9(!(type.length > 0 && or.length > 0), "Cannot mix type and or filters.", {
     F: __dxlog_file10,
-    L: 186,
+    L: 194,
     S: void 0,
     A: [
       "!(type.length > 0 && or.length > 0)",
@@ -2621,7 +2619,7 @@ var filterToIndexQuery = (filter) => {
   });
   invariant9(or.every((subFilter) => !((subFilter.type ?? []).length > 0 && (subFilter.or ?? []).length > 0)), "Cannot mix type and or filters.", {
     F: __dxlog_file10,
-    L: 187,
+    L: 195,
     S: void 0,
     A: [
       "or.every((subFilter) => !((subFilter.type ?? []).length > 0 && (subFilter.or ?? []).length > 0))",
@@ -2668,7 +2666,7 @@ var QueryServiceImpl = class extends Resource7 {
         } catch (err) {
           log9.catch(err, void 0, {
             F: __dxlog_file11,
-            L: 52,
+            L: 53,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2698,7 +2696,7 @@ var QueryServiceImpl = class extends Resource7 {
     if (this._params.indexer.initialized) {
       log9.warn("Indexer already initialized.", void 0, {
         F: __dxlog_file11,
-        L: 86,
+        L: 87,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2740,7 +2738,7 @@ var QueryServiceImpl = class extends Resource7 {
         } catch (error) {
           log9.catch(error, void 0, {
             F: __dxlog_file11,
-            L: 123,
+            L: 124,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2755,7 +2753,7 @@ var QueryServiceImpl = class extends Resource7 {
   async reindex() {
     log9.info("Reindexing all documents...", void 0, {
       F: __dxlog_file11,
-      L: 135,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2770,7 +2768,7 @@ var QueryServiceImpl = class extends Resource7 {
           count: ids.size
         }, {
           F: __dxlog_file11,
-          L: 143,
+          L: 144,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2780,7 +2778,7 @@ var QueryServiceImpl = class extends Resource7 {
       count: ids.size
     }, {
       F: __dxlog_file11,
-      L: 147,
+      L: 148,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2795,10 +2793,10 @@ var createDocumentsIterator = (automergeHost) => (
   async function* getAllDocuments() {
     const visited = /* @__PURE__ */ new Set();
     async function* getObjectsFromHandle(handle) {
-      if (visited.has(handle.documentId)) {
+      if (visited.has(handle.documentId) || !handle.isReady()) {
         return;
       }
-      const doc = handle.docSync();
+      const doc = handle.doc();
       const spaceKey = getSpaceKeyFromDoc(doc) ?? void 0;
       if (doc.objects) {
         yield Object.entries(doc.objects).map(([objectId, object]) => {
@@ -2821,7 +2819,7 @@ var createDocumentsIterator = (automergeHost) => (
           }
           const linkHandle = await automergeHost.loadDoc(Context4.default(void 0, {
             F: __dxlog_file11,
-            L: 189
+            L: 190
           }), urlString);
           for await (const result of getObjectsFromHandle(linkHandle)) {
             yield result;
@@ -2843,18 +2841,18 @@ var createDocumentsIterator = (automergeHost) => (
 );
 
 // packages/core/echo/echo-pipeline/src/db-host/space-state-manager.ts
+import { interpretAsDocumentId as interpretAsDocumentId3 } from "@automerge/automerge-repo";
 import isEqual from "lodash.isequal";
 import { Event as Event3, UpdateScheduler as UpdateScheduler3 } from "@dxos/async";
-import { interpretAsDocumentId as interpretAsDocumentId3 } from "@dxos/automerge/automerge-repo";
 import { Resource as Resource8, Context as Context5 } from "@dxos/context";
 
 // packages/core/echo/echo-pipeline/src/db-host/database-root.ts
-import { interpretAsDocumentId as interpretAsDocumentId2 } from "@dxos/automerge/automerge-repo";
+import { interpretAsDocumentId as interpretAsDocumentId2 } from "@automerge/automerge-repo";
 import { SpaceDocVersion as SpaceDocVersion2 } from "@dxos/echo-protocol";
 import { invariant as invariant10 } from "@dxos/invariant";
 
 // packages/core/echo/echo-pipeline/src/db-host/automerge-metrics.ts
-import * as A4 from "@dxos/automerge/automerge";
+import * as A4 from "@automerge/automerge";
 import { log as log10 } from "@dxos/log";
 var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/automerge-metrics.ts";
 var measureDocMetrics = (doc) => {
@@ -2871,7 +2869,7 @@ var measureDocMetrics = (doc) => {
       elapsed: getAllChangesEnd - getAllChangesStart
     }, {
       F: __dxlog_file12,
-      L: 30,
+      L: 31,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2909,47 +2907,47 @@ var DatabaseRoot = class {
     return this._rootHandle.url;
   }
   get isLoaded() {
-    return !!this._rootHandle.docSync();
+    return this._rootHandle.isReady();
   }
   get handle() {
     return this._rootHandle;
   }
-  docSync() {
-    return this._rootHandle.docSync() ?? null;
+  doc() {
+    return this._rootHandle.isReady() ? this._rootHandle.doc() : null;
   }
   getVersion() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
     return doc.version ?? SpaceDocVersion2.LEGACY;
   }
   getSpaceKey() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
     return getSpaceKeyFromDoc(doc);
   }
   getInlineObjectCount() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
     return Object.keys(doc.objects ?? {}).length;
   }
   getLinkedObjectCount() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
     return Object.keys(doc.links ?? {}).length;
   }
   getAllLinkedDocuments() {
-    const doc = this.docSync();
+    const doc = this.doc();
     invariant10(doc, void 0, {
       F: __dxlog_file13,
-      L: 93,
+      L: 89,
       S: this,
       A: [
         "doc",
@@ -2959,7 +2957,7 @@ var DatabaseRoot = class {
     return Object.values(doc.links ?? {}).map((s) => s.toString());
   }
   measureMetrics() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
@@ -3195,7 +3193,7 @@ var EchoHost = class extends Resource9 {
   async createSpaceRoot(spaceKey) {
     invariant11(this._lifecycleState === LifecycleState4.OPEN, void 0, {
       F: __dxlog_file15,
-      L: 224,
+      L: 226,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3223,14 +3221,15 @@ var EchoHost = class extends Resource9 {
   async openSpaceRoot(spaceId, automergeUrl) {
     invariant11(this._lifecycleState === LifecycleState4.OPEN, void 0, {
       F: __dxlog_file15,
-      L: 243,
+      L: 245,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
         ""
       ]
     });
-    const handle = this._automergeHost.repo.find(automergeUrl);
+    const handle = await this._automergeHost.repo.find(automergeUrl, FIND_PARAMS);
+    await handle.whenReady();
     return this._spaceStateManager.assignRootToSpace(spaceId, handle);
   }
   // TODO(dmaretskyi): Change to document id.
@@ -3252,8 +3251,8 @@ var EchoHost = class extends Resource9 {
 };
 
 // packages/core/echo/echo-pipeline/src/edge/echo-edge-replicator.ts
+import { cbor as cbor2 } from "@automerge/automerge-repo";
 import { Mutex, scheduleTask as scheduleTask2, scheduleMicroTask } from "@dxos/async";
-import { cbor as cbor2 } from "@dxos/automerge/automerge-repo";
 import { Context as Context6, Resource as Resource11 } from "@dxos/context";
 import { randomUUID } from "@dxos/crypto";
 import { invariant as invariant12 } from "@dxos/invariant";
@@ -3403,14 +3402,14 @@ var EchoEdgeReplicator = class {
       connectedSpaces: this._connectedSpaces.size
     }, {
       F: __dxlog_file17,
-      L: 60,
+      L: 61,
       S: this,
       C: (f, a) => f(...a)
     });
     this._context = context;
     this._ctx = Context6.default(void 0, {
       F: __dxlog_file17,
-      L: 63
+      L: 64
     });
     this._ctx.onDispose(this._edgeConnection.onReconnected(() => {
       this._ctx && scheduleMicroTask(this._ctx, () => this._handleReconnect());
@@ -3489,7 +3488,7 @@ var EchoEdgeReplicator = class {
   async _openConnection(spaceId, reconnects = 0) {
     invariant12(this._context, void 0, {
       F: __dxlog_file17,
-      L: 124,
+      L: 125,
       S: this,
       A: [
         "this._context",
@@ -3498,7 +3497,7 @@ var EchoEdgeReplicator = class {
     });
     invariant12(!this._connections.has(spaceId), void 0, {
       F: __dxlog_file17,
-      L: 125,
+      L: 126,
       S: this,
       A: [
         "!this._connections.has(spaceId)",
@@ -3528,7 +3527,7 @@ var EchoEdgeReplicator = class {
           restartDelay
         }, {
           F: __dxlog_file17,
-          L: 148,
+          L: 149,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3593,7 +3592,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
   async _open(ctx) {
     log12("opening...", void 0, {
       F: __dxlog_file17,
-      L: 251,
+      L: 252,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3606,7 +3605,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
   async _close() {
     log12("closing...", void 0, {
       F: __dxlog_file17,
-      L: 266,
+      L: 267,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3617,7 +3616,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
   get peerId() {
     invariant12(this._remotePeerId, "Not connected", {
       F: __dxlog_file17,
-      L: 275,
+      L: 276,
       S: this,
       A: [
         "this._remotePeerId",
@@ -3642,7 +3641,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
         remoteId: this._remotePeerId
       }, {
         F: __dxlog_file17,
-        L: 290,
+        L: 291,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3668,7 +3667,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
       remoteId: this._remotePeerId
     }, {
       F: __dxlog_file17,
-      L: 319,
+      L: 320,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3691,7 +3690,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
       remoteId: this._remotePeerId
     }, {
       F: __dxlog_file17,
-      L: 348,
+      L: 349,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3736,6 +3735,7 @@ export {
   EchoDataMonitor,
   EchoEdgeReplicator,
   EchoHost,
+  FIND_PARAMS,
   LevelDBStorageAdapter,
   MOCK_AUTH_PROVIDER,
   MOCK_AUTH_VERIFIER,