@dxos/echo-pipeline 0.8.4-main.f9ba587 → 0.8.4-main.fffef41

package/dist/lib/browser/index.mjs

@@ -1,8 +1,9 @@
 import "@dxos/node-std/globals";
 import {
   filterMatchObject,
+  filterMatchObjectJSON,
   filterMatchValue
-} from "./chunk-ANZAS5CC.mjs";
+} from "./chunk-WJJXJTNS.mjs";
 import {
   AuthExtension,
   AuthStatus,
@@ -25,7 +26,7 @@ import {
   mapTimeframeToFeedIndexes,
   startAfter,
   valueEncoding
-} from "./chunk-GBFX5J5B.mjs";
+} from "./chunk-FR6GJ4S4.mjs";
 import "./chunk-CGS2ULMK.mjs";
 
 // src/db-host/data-service.ts
@@ -35,17 +36,10 @@ import { invariant as invariant7 } from "@dxos/invariant";
 import { SpaceId as SpaceId2 } from "@dxos/keys";
 import { log as log7 } from "@dxos/log";
 
-// src/db-host/documents-synchronizer.ts
-import { next as A2 } from "@automerge/automerge";
-import { UpdateScheduler } from "@dxos/async";
-import { Resource as Resource5 } from "@dxos/context";
-import { invariant as invariant6 } from "@dxos/invariant";
-import { log as log6 } from "@dxos/log";
-
 // src/automerge/automerge-host.ts
-import { getBackend, getHeads, isAutomerge, equals as headsEquals, save } from "@automerge/automerge";
+import { getBackend, getHeads, equals as headsEquals, isAutomerge, save } from "@automerge/automerge";
 import { Repo, interpretAsDocumentId } from "@automerge/automerge-repo";
-import { Event as Event2, asyncTimeout } from "@dxos/async";
+import { DeferredTask, Event as Event2, asyncTimeout } from "@dxos/async";
 import { Context, Resource as Resource3, cancelWithContext } from "@dxos/context";
 import { DatabaseDirectory } from "@dxos/echo-protocol";
 import { invariant as invariant2 } from "@dxos/invariant";
@@ -53,11 +47,13 @@ import { PublicKey } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 import { objectPointerCodec } from "@dxos/protocols";
 import { trace as trace2 } from "@dxos/tracing";
-import { bufferToArray } from "@dxos/util";
+import { ComplexSet, bufferToArray, isNonNullable as isNonNullable2, range } from "@dxos/util";
 
 // src/automerge/collection-synchronizer.ts
-import { next as am } from "@automerge/automerge";
-import { asyncReturn, Event, scheduleTask, scheduleTaskInterval } from "@dxos/async";
+import { next as A } from "@automerge/automerge";
+import * as Array2 from "effect/Array";
+import * as Record from "effect/Record";
+import { Event, asyncReturn, scheduleTask, scheduleTaskInterval } from "@dxos/async";
 import { Resource } from "@dxos/context";
 import { log } from "@dxos/log";
 import { trace } from "@dxos/tracing";
@@ -72,15 +68,18 @@ var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerg
 var MIN_QUERY_INTERVAL = 5e3;
 var POLL_INTERVAL = 3e4;
 var CollectionSynchronizer = class extends Resource {
+  _sendCollectionState;
+  _queryCollectionState;
+  _shouldSyncCollection;
+  /**
+  * CollectionId -> State.
+  */
+  _perCollectionStates = /* @__PURE__ */ new Map();
+  _activeCollections = /* @__PURE__ */ new Set();
+  _connectedPeers = /* @__PURE__ */ new Set();
+  remoteStateUpdated = new Event();
   constructor(params) {
     super();
-    /**
-    * CollectionId -> State.
-    */
-    this._perCollectionStates = /* @__PURE__ */ new Map();
-    this._activeCollections = /* @__PURE__ */ new Set();
-    this._connectedPeers = /* @__PURE__ */ new Set();
-    this.remoteStateUpdated = new Event();
     this._sendCollectionState = params.sendCollectionState;
     this._queryCollectionState = params.queryCollectionState;
     this._shouldSyncCollection = params.shouldSyncCollection;
@@ -110,7 +109,7 @@ var CollectionSynchronizer = class extends Resource {
       state
     }, {
       F: __dxlog_file,
-      L: 76,
+      L: 78,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -129,7 +128,7 @@ var CollectionSynchronizer = class extends Resource {
       collectionId
     }, {
       F: __dxlog_file,
-      L: 90,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -212,7 +211,7 @@ var CollectionSynchronizer = class extends Resource {
       state
     }, {
       F: __dxlog_file,
-      L: 171,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -268,19 +267,23 @@ CollectionSynchronizer = _ts_decorate([
   trace.resource()
 ], CollectionSynchronizer);
 var diffCollectionState = (local, remote) => {
-  const allDocuments = /* @__PURE__ */ new Set([
-    ...Object.keys(local.documents),
-    ...Object.keys(remote.documents)
-  ]);
+  const localDocuments = Record.filter(local.documents, (heads) => heads.length > 0);
+  const remoteDocuments = Record.filter(remote.documents, (heads) => heads.length > 0);
+  const allDocuments = [
+    .../* @__PURE__ */ new Set([
+      ...Record.keys(localDocuments),
+      ...Record.keys(remoteDocuments)
+    ])
+  ];
   const missingOnRemote = [];
   const missingOnLocal = [];
   const different = [];
   for (const documentId of allDocuments) {
-    if (!local.documents[documentId]) {
+    if (!localDocuments[documentId]) {
       missingOnLocal.push(documentId);
-    } else if (!remote.documents[documentId]) {
+    } else if (!remoteDocuments[documentId]) {
       missingOnRemote.push(documentId);
-    } else if (!am.equals(local.documents[documentId], remote.documents[documentId])) {
+    } else if (!A.equals(local.documents[documentId], remote.documents[documentId])) {
       different.push(documentId);
     }
   }
@@ -295,7 +298,7 @@ var validateCollectionState = (state) => {
     if (!isValidDocumentId(documentId)) {
       throw new Error(`Invalid documentId: ${documentId}`);
     }
-    if (Array.isArray(heads) && heads.some((head) => typeof head !== "string")) {
+    if (Array2.isArray(heads) && heads.some((head) => typeof head !== "string")) {
       throw new Error(`Invalid heads: ${heads}`);
     }
   });
@@ -309,7 +312,7 @@ var getSpanName = (peerId) => {
 
 // src/automerge/echo-network-adapter.ts
 import { NetworkAdapter } from "@automerge/automerge-repo";
-import { synchronized, Trigger } from "@dxos/async";
+import { Trigger, synchronized } from "@dxos/async";
 import { LifecycleState } from "@dxos/context";
 import { invariant } from "@dxos/invariant";
 import { log as log2 } from "@dxos/log";
@@ -329,8 +332,17 @@ function _ts_decorate2(decorators, target, key, desc) {
 }
 var __dxlog_file2 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts";
 var EchoNetworkAdapter = class extends NetworkAdapter {
+  _params;
+  _replicators = /* @__PURE__ */ new Set();
+  /**
+  * Remote peer id -> connection.
+  */
+  _connections = /* @__PURE__ */ new Map();
+  _lifecycleState = LifecycleState.CLOSED;
+  _connected = new Trigger();
+  _ready = new Trigger();
   constructor(_params) {
-    super(), this._params = _params, this._replicators = /* @__PURE__ */ new Set(), this._connections = /* @__PURE__ */ new Map(), this._lifecycleState = LifecycleState.CLOSED, this._connected = new Trigger(), this._ready = new Trigger();
+    super(), this._params = _params;
   }
   isReady() {
     return this._lifecycleState === LifecycleState.OPEN;
@@ -380,7 +392,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   async addReplicator(replicator) {
     invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file2,
-      L: 129,
+      L: 137,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -389,7 +401,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant(this.peerId, void 0, {
       F: __dxlog_file2,
-      L: 130,
+      L: 138,
       S: this,
       A: [
         "this.peerId",
@@ -398,7 +410,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant(!this._replicators.has(replicator), void 0, {
       F: __dxlog_file2,
-      L: 131,
+      L: 139,
       S: this,
       A: [
         "!this._replicators.has(replicator)",
@@ -422,7 +434,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   async removeReplicator(replicator) {
     invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file2,
-      L: 150,
+      L: 158,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -431,7 +443,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
     invariant(this._replicators.has(replicator), void 0, {
       F: __dxlog_file2,
-      L: 151,
+      L: 159,
       S: this,
       A: [
         "this._replicators.has(replicator)",
@@ -482,6 +494,27 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       }) ? connection.connection.peerId : null;
     }).filter(isNonNullable);
   }
+  bundleSyncEnabledForPeer(peerId) {
+    const connection = this._connections.get(peerId);
+    if (!connection) {
+      return false;
+    }
+    return connection.connection.bundleSyncEnabled;
+  }
+  async pushBundle(peerId, bundle) {
+    const connection = this._connections.get(peerId);
+    if (!connection) {
+      throw new Error("Connection not found.");
+    }
+    return connection.connection.pushBundle(bundle);
+  }
+  async pullBundle(peerId, docHeads) {
+    const connection = this._connections.get(peerId);
+    if (!connection) {
+      throw new Error("Connection not found.");
+    }
+    return connection.connection.pullBundle(docHeads);
+  }
   _send(message) {
     const connectionEntry = this._connections.get(message.targetId);
     if (!connectionEntry) {
@@ -494,7 +527,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       if (connectionEntry.isOpen) {
         log2.catch(err, void 0, {
           F: __dxlog_file2,
-          L: 221,
+          L: 253,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -507,13 +540,13 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file2,
-      L: 229,
+      L: 261,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant(!this._connections.has(connection.peerId), void 0, {
       F: __dxlog_file2,
-      L: 230,
+      L: 262,
       S: this,
       A: [
         "!this._connections.has(connection.peerId as PeerId)",
@@ -540,7 +573,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
         if (connectionEntry.isOpen) {
           log2.catch(err, void 0, {
             F: __dxlog_file2,
-            L: 254,
+            L: 286,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -551,7 +584,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file2,
-      L: 259,
+      L: 291,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -573,14 +606,14 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file2,
-      L: 276,
+      L: 308,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     invariant(entry, void 0, {
       F: __dxlog_file2,
-      L: 278,
+      L: 310,
       S: this,
       A: [
         "entry",
@@ -594,13 +627,13 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     this._params.monitor?.recordPeerDisconnected(connection.peerId);
     void entry.writer.abort().catch((err) => log2.catch(err, void 0, {
       F: __dxlog_file2,
-      L: 284,
+      L: 316,
       S: this,
       C: (f, a) => f(...a)
     }));
     void entry.reader.cancel().catch((err) => log2.catch(err, void 0, {
       F: __dxlog_file2,
-      L: 285,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -615,14 +648,14 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file2,
-      L: 295,
+      L: 327,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     invariant(entry, void 0, {
       F: __dxlog_file2,
-      L: 297,
+      L: 329,
       S: this,
       A: [
         "entry",
@@ -662,6 +695,7 @@ var isEchoPeerMetadata = (metadata) => metadata?.dxos_peerSource === "EchoNetwor
 // src/automerge/heads-store.ts
 import { headsEncoding } from "@dxos/indexing";
 var HeadsStore = class {
+  _db;
   constructor({ db }) {
     this._db = db;
   }
@@ -682,14 +716,15 @@ var HeadsStore = class {
 };
 
 // src/automerge/leveldb-storage-adapter.ts
-import { LifecycleState as LifecycleState2, Resource as Resource2 } from "@dxos/context";
+import { Resource as Resource2 } from "@dxos/context";
 var LevelDBStorageAdapter = class extends Resource2 {
+  _params;
   constructor(_params) {
     super(), this._params = _params;
   }
   async load(keyArray) {
     try {
-      if (this._lifecycleState !== LifecycleState2.OPEN) {
+      if (!this.isOpen) {
         return void 0;
       }
       const startMs = Date.now();
@@ -707,7 +742,7 @@ var LevelDBStorageAdapter = class extends Resource2 {
     }
   }
   async save(keyArray, binary) {
-    if (this._lifecycleState !== LifecycleState2.OPEN) {
+    if (!this.isOpen) {
       return void 0;
     }
     const startMs = Date.now();
@@ -725,7 +760,7 @@ var LevelDBStorageAdapter = class extends Resource2 {
     this._params.monitor?.recordStoreDuration(Date.now() - startMs);
   }
   async remove(keyArray) {
-    if (this._lifecycleState !== LifecycleState2.OPEN) {
+    if (!this.isOpen) {
       return void 0;
     }
     await this._params.db.del(keyArray, {
@@ -733,7 +768,7 @@ var LevelDBStorageAdapter = class extends Resource2 {
     });
   }
   async loadRange(keyPrefix) {
-    if (this._lifecycleState !== LifecycleState2.OPEN) {
+    if (!this.isOpen) {
       return [];
     }
     const startMs = Date.now();
@@ -756,7 +791,7 @@ var LevelDBStorageAdapter = class extends Resource2 {
     return result;
   }
   async removeRange(keyPrefix) {
-    if (this._lifecycleState !== LifecycleState2.OPEN) {
+    if (!this.isOpen) {
       return void 0;
     }
     const batch = this._params.db.batch();
@@ -800,19 +835,38 @@ var FIND_PARAMS = {
     "requesting"
   ]
 };
+var BUNDLE_SIZE = 100;
+var BUNDLE_SYNC_CONCURRENCY = 2;
+var BUNDLE_SYNC_THRESHOLD = 50;
 var AutomergeHost = class extends Resource3 {
+  _db;
+  _indexMetadataStore;
+  _echoNetworkAdapter;
+  _collectionSynchronizer = new CollectionSynchronizer({
+    queryCollectionState: this._queryCollectionState.bind(this),
+    sendCollectionState: this._sendCollectionState.bind(this),
+    shouldSyncCollection: this._shouldSyncCollection.bind(this)
+  });
+  _repo;
+  _storage;
+  _headsStore;
+  _syncTask = void 0;
+  /**
+  * Cache of collections that would be synced on next sync task run.
+  */
+  _collectionsToSync = new ComplexSet(({ collectionId, peerId }) => `${collectionId}|${peerId}`);
+  _peerId;
+  _peerIdProvider;
+  _getSpaceKeyByRootDocumentId;
+  collectionStateUpdated = new Event2();
+  /**
+  * Fired after a batch of documents was saved to disk.
+  */
+  documentsSaved = new Event2();
+  _headsUpdates = /* @__PURE__ */ new Map();
+  _onHeadsChangedTask;
   constructor({ db, indexMetadataStore, dataMonitor, peerIdProvider, getSpaceKeyByRootDocumentId }) {
     super();
-    this._collectionSynchronizer = new CollectionSynchronizer({
-      queryCollectionState: this._queryCollectionState.bind(this),
-      sendCollectionState: this._sendCollectionState.bind(this),
-      shouldSyncCollection: this._shouldSyncCollection.bind(this)
-    });
-    this.collectionStateUpdated = new Event2();
-    /**
-    * Fired after a batch of documents was saved to disk.
-    */
-    this.documentsSaved = new Event2();
     this._db = db;
     this._storage = new LevelDBStorageAdapter({
       db: db.sublevel("automerge"),
@@ -838,6 +892,11 @@ var AutomergeHost = class extends Resource3 {
   }
   async _open() {
     this._peerId = `host-${this._peerIdProvider?.() ?? PublicKey.random().toHex()}`;
+    this._onHeadsChangedTask = new DeferredTask(this._ctx, async () => {
+      const docHeads = Array.from(this._headsUpdates.entries());
+      this._headsUpdates.clear();
+      this._onHeadsChanged(docHeads);
+    });
     await this._storage.open?.();
     this._repo = new Repo({
       peerId: this._peerId,
@@ -865,6 +924,28 @@ var AutomergeHost = class extends Resource3 {
         }
       }
     });
+    this._syncTask = new DeferredTask(this._ctx, async () => {
+      const collectionToSync = Array.from(this._collectionsToSync.values());
+      if (collectionToSync.length === 0) {
+        return;
+      }
+      await Promise.all(collectionToSync.map(async ({ collectionId, peerId }) => {
+        try {
+          await this._handleCollectionSync(collectionId, peerId);
+        } catch (err) {
+          log3.error("failed to sync collection", {
+            collectionId,
+            peerId,
+            err
+          }, {
+            F: __dxlog_file3,
+            L: 223,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+        }
+      }));
+    });
     await this._echoNetworkAdapter.open();
     await this._collectionSynchronizer.open();
     await this._echoNetworkAdapter.open();
@@ -874,7 +955,8 @@ var AutomergeHost = class extends Resource3 {
     await this._collectionSynchronizer.close();
     await this._storage.close?.();
     await this._echoNetworkAdapter.close();
-    await this._ctx.dispose();
+    this._syncTask = void 0;
+    this._onHeadsChangedTask = void 0;
   }
   /**
   * @deprecated To be abstracted away.
@@ -889,15 +971,42 @@ var AutomergeHost = class extends Resource3 {
     return Object.keys(this._repo.handles).length;
   }
   async addReplicator(replicator) {
+    invariant2(this.isOpen, "AutomergeHost is not open", {
+      F: __dxlog_file3,
+      L: 259,
+      S: this,
+      A: [
+        "this.isOpen",
+        "'AutomergeHost is not open'"
+      ]
+    });
     await this._echoNetworkAdapter.addReplicator(replicator);
   }
   async removeReplicator(replicator) {
+    invariant2(this.isOpen, "AutomergeHost is not open", {
+      F: __dxlog_file3,
+      L: 264,
+      S: this,
+      A: [
+        "this.isOpen",
+        "'AutomergeHost is not open'"
+      ]
+    });
     await this._echoNetworkAdapter.removeReplicator(replicator);
   }
   /**
   * Loads the document handle from the repo and waits for it to be ready.
   */
   async loadDoc(ctx, documentId, opts) {
+    invariant2(this.isOpen, "AutomergeHost is not open", {
+      F: __dxlog_file3,
+      L: 272,
+      S: this,
+      A: [
+        "this.isOpen",
+        "'AutomergeHost is not open'"
+      ]
+    });
     let handle;
     if (typeof documentId === "string") {
       handle = this._repo.handles[documentId];
@@ -915,6 +1024,15 @@ var AutomergeHost = class extends Resource3 {
     return handle;
   }
   async exportDoc(ctx, id) {
+    invariant2(this.isOpen, "AutomergeHost is not open", {
+      F: __dxlog_file3,
+      L: 295,
+      S: this,
+      A: [
+        "this.isOpen",
+        "'AutomergeHost is not open'"
+      ]
+    });
     const documentId = interpretAsDocumentId(id);
     const chunks = await this._storage.loadRange([
       documentId
@@ -925,6 +1043,15 @@ var AutomergeHost = class extends Resource3 {
   * Create new persisted document.
   */
   createDoc(initialValue, opts) {
+    invariant2(this.isOpen, "AutomergeHost is not open", {
+      F: __dxlog_file3,
+      L: 306,
+      S: this,
+      A: [
+        "this.isOpen",
+        "'AutomergeHost is not open'"
+      ]
+    });
     if (opts?.preserveHistory) {
       if (initialValue instanceof Uint8Array) {
         return this._repo.import(initialValue);
@@ -941,6 +1068,15 @@ var AutomergeHost = class extends Resource3 {
     }
   }
   async waitUntilHeadsReplicated(heads) {
+    invariant2(this.isOpen, "AutomergeHost is not open", {
+      F: __dxlog_file3,
+      L: 328,
+      S: this,
+      A: [
+        "this.isOpen",
+        "'AutomergeHost is not open'"
+      ]
+    });
     const entries = heads.entries;
     if (!entries?.length) {
       return;
@@ -956,10 +1092,10 @@ var AutomergeHost = class extends Resource3 {
       return !(currentHeads !== null && headsEquals(currentHeads, targetHeads));
     });
     if (headsToWait.length > 0) {
-      await Promise.all(headsToWait.map(async (entry, index) => {
+      await Promise.all(headsToWait.map(async (entry) => {
         const handle = await this.loadDoc(Context.default(void 0, {
           F: __dxlog_file3,
-          L: 293
+          L: 346
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
       }));
@@ -967,12 +1103,21 @@ var AutomergeHost = class extends Resource3 {
     await this._repo.flush(documentIds.filter((documentId) => this._repo.handles[documentId] && this._repo.handles[documentId].isReady()));
   }
   async reIndexHeads(documentIds) {
+    invariant2(this.isOpen, "AutomergeHost is not open", {
+      F: __dxlog_file3,
+      L: 359,
+      S: this,
+      A: [
+        "this.isOpen",
+        "'AutomergeHost is not open'"
+      ]
+    });
     for (const documentId of documentIds) {
       log3("re-indexing heads for document", {
         documentId
       }, {
         F: __dxlog_file3,
-        L: 307,
+        L: 361,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -982,7 +1127,7 @@ var AutomergeHost = class extends Resource3 {
           documentId
         }, {
           F: __dxlog_file3,
-          L: 310,
+          L: 364,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -995,7 +1140,7 @@ var AutomergeHost = class extends Resource3 {
     }
     log3("done re-indexing heads", void 0, {
       F: __dxlog_file3,
-      L: 319,
+      L: 373,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1005,9 +1150,6 @@ var AutomergeHost = class extends Resource3 {
   // NOTE: If both peers return sharePolicy=false the replication will not happen
   // https://github.com/automerge/automerge-repo/pull/292
   async _sharePolicy(peerId, documentId) {
-    if (peerId.startsWith("client-")) {
-      return false;
-    }
     if (!documentId) {
       return false;
     }
@@ -1056,13 +1198,31 @@ var AutomergeHost = class extends Resource3 {
   * Called by AutomergeStorageAdapter after levelDB batch commit.
   */
   async _afterSave(path) {
+    if (!this.isOpen) {
+      return void 0;
+    }
     this._indexMetadataStore.notifyMarkedDirty();
     const documentId = path[0];
-    const document = this._repo.handles[documentId]?.doc();
-    if (document) {
-      const heads = getHeads(document);
-      this._onHeadsChanged(documentId, heads);
+    const handle = this._repo.handles[documentId];
+    if (!handle || !handle.isReady()) {
+      return;
+    }
+    const document = handle.doc();
+    if (!document) {
+      return;
     }
+    const heads = getHeads(document);
+    this._headsUpdates.set(documentId, heads);
+    invariant2(this._onHeadsChangedTask, "onHeadsChangedTask is not initialized", {
+      F: __dxlog_file3,
+      L: 445,
+      S: this,
+      A: [
+        "this._onHeadsChangedTask",
+        "'onHeadsChangedTask is not initialized'"
+      ]
+    });
+    this._onHeadsChangedTask.schedule();
     this.documentsSaved.emit();
   }
   _automergePeers() {
@@ -1099,11 +1259,12 @@ var AutomergeHost = class extends Resource3 {
   * Flush documents to disk.
   */
   async flush({ documentIds } = {}) {
-    const loadedDocuments = documentIds?.filter((documentId) => {
+    const loadedDocuments = (documentIds ?? Object.keys(this._repo.handles)).filter((documentId) => {
       const handle = this._repo.handles[documentId];
       return handle && handle.isReady();
     });
     await this._repo.flush(loadedDocuments);
+    await this._onHeadsChangedTask?.runBlocking();
   }
   async getHeads(documentIds) {
     const result = [];
@@ -1155,8 +1316,17 @@ var AutomergeHost = class extends Resource3 {
         missingOnRemote: diff.missingOnRemote.length,
         missingOnLocal: diff.missingOnLocal.length,
         differentDocuments: diff.different.length,
-        localDocumentCount: Object.keys(localState.documents).length,
-        remoteDocumentCount: Object.keys(state.documents).length
+        localDocumentCount: Object.entries(localState.documents).filter(([_, heads]) => heads.length > 0).length,
+        remoteDocumentCount: Object.entries(state.documents).filter(([_, heads]) => heads.length > 0).length,
+        totalDocumentCount: (/* @__PURE__ */ new Set([
+          ...Object.keys(localState.documents),
+          ...Object.keys(state.documents)
+        ])).size,
+        unsyncedDocumentCount: (/* @__PURE__ */ new Set([
+          ...diff.missingOnLocal,
+          ...diff.missingOnRemote,
+          ...diff.different
+        ])).size
       });
     }
     return result;
@@ -1173,6 +1343,14 @@ var AutomergeHost = class extends Resource3 {
     this._collectionSynchronizer.setLocalCollectionState(collectionId, {
       documents
     });
+    const interestedPeers = this._echoNetworkAdapter.getPeersInterestedInCollection(collectionId);
+    if (interestedPeers.length > 0) {
+      for (const peerId of interestedPeers) {
+        this._sendCollectionState(collectionId, peerId, {
+          documents
+        });
+      }
+    }
   }
   async clearLocalCollectionState(collectionId) {
     this._collectionSynchronizer.clearLocalCollectionState(collectionId);
@@ -1196,42 +1374,231 @@ var AutomergeHost = class extends Resource3 {
     this._collectionSynchronizer.onConnectionClosed(peerId);
   }
   _onRemoteCollectionStateUpdated(collectionId, peerId) {
+    this._collectionsToSync.add({
+      collectionId,
+      peerId
+    });
+    this._syncTask?.schedule();
+  }
+  async _handleCollectionSync(collectionId, peerId) {
     const localState = this._collectionSynchronizer.getLocalCollectionState(collectionId);
     const remoteState = this._collectionSynchronizer.getRemoteCollectionStates(collectionId).get(peerId);
     if (!localState || !remoteState) {
       return;
     }
     const { different, missingOnLocal, missingOnRemote } = diffCollectionState(localState, remoteState);
-    const toReplicate = [
-      ...missingOnLocal,
-      ...missingOnRemote,
+    if (different.length === 0 && missingOnLocal.length === 0 && missingOnRemote.length === 0) {
+      return;
+    }
+    const toReplicateWithoutBatching = [
       ...different
     ];
-    if (toReplicate.length === 0) {
+    const bundleSyncEnabled = this._echoNetworkAdapter.bundleSyncEnabledForPeer(peerId);
+    if (bundleSyncEnabled && missingOnRemote.length >= BUNDLE_SYNC_THRESHOLD) {
+      log3("pushing bundle", {
+        amount: missingOnRemote.length
+      }, {
+        F: __dxlog_file3,
+        L: 650,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      const { syncInteractively } = await this._pushInBundles(peerId, missingOnRemote);
+      toReplicateWithoutBatching.push(...syncInteractively);
+    } else {
+      log3.verbose("failed to push bundle, replicating interactively", {
+        collectionId,
+        peerId,
+        amount: missingOnRemote.length
+      }, {
+        F: __dxlog_file3,
+        L: 654,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      toReplicateWithoutBatching.push(...missingOnRemote);
+    }
+    if (bundleSyncEnabled && missingOnLocal.length >= BUNDLE_SYNC_THRESHOLD) {
+      log3("pulling bundle", {
+        amount: missingOnLocal.length
+      }, {
+        F: __dxlog_file3,
+        L: 662,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      const { syncInteractively } = await this._pullInBundles(peerId, missingOnLocal);
+      toReplicateWithoutBatching.push(...syncInteractively);
+    } else {
+      log3.verbose("failed to pull bundle, replicating interactively", {
+        collectionId,
+        peerId,
+        amount: missingOnLocal.length
+      }, {
+        F: __dxlog_file3,
+        L: 666,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      toReplicateWithoutBatching.push(...missingOnLocal);
+    }
+    if (toReplicateWithoutBatching.length === 0) {
       return;
     }
     log3("replicating documents after collection sync", {
       collectionId,
       peerId,
-      toReplicate,
-      count: toReplicate.length
+      toReplicateWithoutBatching,
+      count: toReplicateWithoutBatching.length
     }, {
       F: __dxlog_file3,
-      L: 563,
+      L: 678,
       S: this,
       C: (f, a) => f(...a)
     });
-    for (const documentId of toReplicate) {
+    for (const documentId of toReplicateWithoutBatching) {
       this._repo.findWithProgress(documentId);
     }
   }
-  _onHeadsChanged(documentId, heads) {
+  // TODO(mykola): Add retries of batches https://gist.github.com/mykola-vrmchk/fde270259e9209fcbf1331e5abbf12cf
+  // TODO(mykola): Use effect to retry batches.
+  async _pushInBundles(peerId, documentIds) {
+    const documentsToPush = [
+      ...documentIds
+    ];
+    const syncInteractively = [];
+    while (documentsToPush.length > 0) {
+      await Promise.all(range(BUNDLE_SYNC_CONCURRENCY).map(async () => {
+        const bundle = documentsToPush.splice(0, BUNDLE_SIZE);
+        if (bundle.length === 0) {
+          return;
+        }
+        await this._pushBundle(peerId, bundle).catch((err) => {
+          log3.warn("failed to push bundle, replicating interactively", {
+            peerId,
+            bundle,
+            err
+          }, {
+            F: __dxlog_file3,
+            L: 709,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          syncInteractively.push(...bundle);
+        });
+      }));
+    }
+    return {
+      syncInteractively
+    };
+  }
+  async _pushBundle(peerId, documentIds) {
+    if (this._ctx.disposed) {
+      return;
+    }
+    const docs = documentIds.map((documentId) => {
+      const handle = this._repo.handles[documentId];
+      if (!handle || !handle.isReady()) {
+        log3.warn("document not ready, skipping", {
+          documentId
+        }, {
+          F: __dxlog_file3,
+          L: 727,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        return;
+      }
+      const doc = handle.doc();
+      if (!doc) {
+        log3.warn("document not available, skipping", {
+          documentId
+        }, {
+          F: __dxlog_file3,
+          L: 732,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        return;
+      }
+      return {
+        documentId,
+        data: save(doc),
+        heads: getHeads(doc)
+      };
+    });
+    await this._echoNetworkAdapter.pushBundle(peerId, docs.filter(isNonNullable2));
+  }
+  async _pullInBundles(peerId, documentIds) {
+    const documentsToPull = [
+      ...documentIds
+    ];
+    const syncInteractively = [];
+    const docsToImport = {};
+    while (documentsToPull.length > 0) {
+      await Promise.all(range(BUNDLE_SYNC_CONCURRENCY).map(async () => {
+        const bundle = documentsToPull.splice(0, BUNDLE_SIZE);
+        if (bundle.length === 0) {
+          return;
+        }
+        const result = await this._pullBundle(peerId, bundle).catch((err) => {
+          log3.warn("failed to pull bundle, replicating interactively", {
+            peerId,
+            bundle,
+            err
+          }, {
+            F: __dxlog_file3,
+            L: 762,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          syncInteractively.push(...bundle);
+        });
+        if (result) {
+          Object.assign(docsToImport, result.docsToImport);
+        }
+      }));
+    }
+    for (const [documentId, data] of Object.entries(docsToImport)) {
+      this._repo.import(data, {
+        docId: documentId
+      });
+    }
+    await this._repo.flush(Object.keys(docsToImport));
+    return {
+      syncInteractively
+    };
+  }
+  async _pullBundle(peerId, documentIds) {
+    if (this._ctx.disposed) {
+      return;
+    }
+    const docHeads = Object.fromEntries(documentIds.map((documentId) => [
+      documentId,
+      []
+    ]));
+    const bundle = await this._echoNetworkAdapter.pullBundle(peerId, docHeads);
+    return {
+      docsToImport: bundle
+    };
+  }
+  _onHeadsChanged(docHeads) {
     const collectionsChanged = /* @__PURE__ */ new Set();
     for (const collectionId of this._collectionSynchronizer.getRegisteredCollectionIds()) {
       const state = this._collectionSynchronizer.getLocalCollectionState(collectionId);
-      if (state?.documents[documentId]) {
-        const newState = structuredClone(state);
-        newState.documents[documentId] = heads;
+      if (!state) {
+        continue;
+      }
+      let newState;
+      for (const [documentId, heads] of docHeads) {
+        if (documentId in state.documents) {
+          if (!newState) {
+            newState = structuredClone(state);
+          }
+          newState.documents[documentId] = heads;
+        }
+      }
+      if (newState) {
         this._collectionSynchronizer.setLocalCollectionState(collectionId, newState);
         collectionsChanged.add(collectionId);
       }
@@ -1277,7 +1644,7 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 var decodeCollectionState = (state) => {
   invariant2(typeof state === "object" && state !== null, "Invalid state", {
     F: __dxlog_file3,
-    L: 614,
+    L: 845,
     S: void 0,
     A: [
       "typeof state === 'object' && state !== null",
@@ -1294,10 +1661,10 @@ var encodeCollectionState = (state) => {
 import { invariant as invariant5 } from "@dxos/invariant";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { log as log5 } from "@dxos/log";
-import { ComplexSet, defaultMap as defaultMap2 } from "@dxos/util";
+import { ComplexSet as ComplexSet2, defaultMap as defaultMap2 } from "@dxos/util";
 
 // src/automerge/mesh-echo-replicator-connection.ts
-import * as A from "@automerge/automerge";
+import * as A2 from "@automerge/automerge";
 import { cbor } from "@automerge/automerge-repo";
 import { Resource as Resource4 } from "@dxos/context";
 import { invariant as invariant3 } from "@dxos/invariant";
@@ -1306,8 +1673,15 @@ import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicat
 var __dxlog_file4 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator-connection.ts";
 var DEFAULT_FACTORY = (params) => new AutomergeReplicator(...params);
 var MeshReplicatorConnection = class extends Resource4 {
+  _params;
+  readable;
+  writable;
+  remoteDeviceKey = null;
+  replicatorExtension;
+  _remotePeerId = null;
+  _isEnabled = false;
   constructor(_params) {
-    super(), this._params = _params, this.remoteDeviceKey = null, this._remotePeerId = null, this._isEnabled = false;
+    super(), this._params = _params;
     let readableStreamController;
     this.readable = new ReadableStream({
       start: (controller) => {
@@ -1391,6 +1765,9 @@ var MeshReplicatorConnection = class extends Resource4 {
   get isEnabled() {
     return this._isEnabled;
   }
+  get bundleSyncEnabled() {
+    return false;
+  }
   async shouldAdvertise(params) {
     return this._params.shouldAdvertise(params);
   }
@@ -1404,7 +1781,7 @@ var MeshReplicatorConnection = class extends Resource4 {
   enable() {
     invariant3(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file4,
-      L: 127,
+      L: 131,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1422,7 +1799,7 @@ var MeshReplicatorConnection = class extends Resource4 {
 };
 var logSendSync = (message) => {
   log4("sendSyncMessage", () => {
-    const decodedSyncMessage = message.type === "sync" && message.data ? A.decodeSyncMessage(message.data) : void 0;
+    const decodedSyncMessage = message.type === "sync" && message.data ? A2.decodeSyncMessage(message.data) : void 0;
     return {
       sync: decodedSyncMessage && {
         headsLength: decodedSyncMessage.heads.length,
@@ -1435,7 +1812,7 @@ var logSendSync = (message) => {
     };
   }, {
     F: __dxlog_file4,
-    L: 140,
+    L: 144,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -1463,24 +1840,22 @@ var getSpaceIdFromCollectionId = (collectionId) => {
 // src/automerge/mesh-echo-replicator.ts
 var __dxlog_file6 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
 var MeshEchoReplicator = class {
-  constructor() {
-    /**
-    * We might have multiple connections open with a peer (one per space), but there'll be only one enabled
-    * connection at any given moment, because there's a single repo for all the spaces.
-    * When a connection closes (space was closed) it gets removed from the list and the next connection
-    * in the line gets enabled.
-    */
-    this._connectionsPerPeer = /* @__PURE__ */ new Map();
-    /**
-    * A set of all connections (enabled and disabled).
-    */
-    this._connections = /* @__PURE__ */ new Set();
-    /**
-    * spaceId -> deviceKey[]
-    */
-    this._authorizedDevices = /* @__PURE__ */ new Map();
-    this._context = null;
-  }
+  /**
+  * We might have multiple connections open with a peer (one per space), but there'll be only one enabled
+  * connection at any given moment, because there's a single repo for all the spaces.
+  * When a connection closes (space was closed) it gets removed from the list and the next connection
+  * in the line gets enabled.
+  */
+  _connectionsPerPeer = /* @__PURE__ */ new Map();
+  /**
+  * A set of all connections (enabled and disabled).
+  */
+  _connections = /* @__PURE__ */ new Set();
+  /**
+  * spaceId -> deviceKey[]
+  */
+  _authorizedDevices = /* @__PURE__ */ new Map();
+  _context = null;
   async connect(context) {
     this._context = context;
   }
@@ -1500,7 +1875,7 @@ var MeshEchoReplicator = class {
   createExtension(extensionFactory) {
     invariant5(this._context, void 0, {
       F: __dxlog_file6,
-      L: 67,
+      L: 68,
       S: this,
       A: [
         "this._context",
@@ -1515,13 +1890,13 @@ var MeshEchoReplicator = class {
           peerId: connection.peerId
         }, {
           F: __dxlog_file6,
-          L: 73,
+          L: 74,
           S: this,
           C: (f, a) => f(...a)
         });
         invariant5(this._context, void 0, {
           F: __dxlog_file6,
-          L: 74,
+          L: 75,
           S: this,
           A: [
             "this._context",
@@ -1546,7 +1921,7 @@ var MeshEchoReplicator = class {
           peerId: connection.peerId
         }, {
           F: __dxlog_file6,
-          L: 88,
+          L: 89,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1558,7 +1933,7 @@ var MeshEchoReplicator = class {
             peerId: connection.peerId
           }, {
             F: __dxlog_file6,
-            L: 96,
+            L: 97,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1580,13 +1955,13 @@ var MeshEchoReplicator = class {
           documentId: params.documentId
         }, {
           F: __dxlog_file6,
-          L: 114,
+          L: 115,
           S: this,
           C: (f, a) => f(...a)
         });
         invariant5(this._context, void 0, {
           F: __dxlog_file6,
-          L: 115,
+          L: 116,
           S: this,
           A: [
             "this._context",
@@ -1606,7 +1981,7 @@ var MeshEchoReplicator = class {
               acceptDocument: remoteDocumentExists
             }, {
               F: __dxlog_file6,
-              L: 123,
+              L: 124,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1620,7 +1995,7 @@ var MeshEchoReplicator = class {
               documentId: params.documentId
             }, {
               F: __dxlog_file6,
-              L: 140,
+              L: 141,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1636,7 +2011,7 @@ var MeshEchoReplicator = class {
             isAuthorized
           }, {
             F: __dxlog_file6,
-            L: 148,
+            L: 149,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1644,7 +2019,7 @@ var MeshEchoReplicator = class {
         } catch (err) {
           log5.catch(err, void 0, {
             F: __dxlog_file6,
-            L: 158,
+            L: 159,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1660,7 +2035,7 @@ var MeshEchoReplicator = class {
             collectionId
           }, {
             F: __dxlog_file6,
-            L: 168,
+            L: 169,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1679,12 +2054,12 @@ var MeshEchoReplicator = class {
       deviceKey
     }, {
       F: __dxlog_file6,
-      L: 185,
+      L: 186,
       S: this,
       C: (f, a) => f(...a)
     });
     const spaceId = await createIdFromSpaceKey(spaceKey);
-    defaultMap2(this._authorizedDevices, spaceId, () => new ComplexSet(PublicKey2.hash)).add(deviceKey);
+    defaultMap2(this._authorizedDevices, spaceId, () => new ComplexSet2(PublicKey2.hash)).add(deviceKey);
     for (const connection of this._connections) {
       if (connection.isEnabled && connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
         if (this._connectionsPerPeer.has(connection.peerId)) {
@@ -1697,7 +2072,7 @@ var MeshEchoReplicator = class {
 
 // src/automerge/echo-data-monitor.ts
 import { trace as trace3 } from "@dxos/tracing";
-import { CircularBuffer, mapValues, SlidingWindowSummary } from "@dxos/util";
+import { CircularBuffer, SlidingWindowSummary, mapValues } from "@dxos/util";
 function _ts_decorate4(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -1707,19 +2082,21 @@ function _ts_decorate4(decorators, target, key, desc) {
 var PER_SECOND_RATE_AVG_WINDOW_SIZE = 5;
 var DEFAULT_AVG_WINDOW_SIZE = 25;
 var EchoDataMonitor = class {
+  _params;
+  _lastTick = 0;
+  _activeCounters = createLocalCounters();
+  _lastCompleteCounters;
+  _localTimeSeries = createLocalTimeSeries();
+  _storageAverages = createStorageAverages();
+  _replicationAverages = createNetworkAverages();
+  _sizeByMessage = {};
+  _lastReceivedMessages = new CircularBuffer(100);
+  _lastSentMessages = new CircularBuffer(100);
+  _connectionsCount = 0;
   constructor(_params = {
     timeSeriesLength: 30
   }) {
     this._params = _params;
-    this._lastTick = 0;
-    this._activeCounters = createLocalCounters();
-    this._localTimeSeries = createLocalTimeSeries();
-    this._storageAverages = createStorageAverages();
-    this._replicationAverages = createNetworkAverages();
-    this._sizeByMessage = {};
-    this._lastReceivedMessages = new CircularBuffer(100);
-    this._lastSentMessages = new CircularBuffer(100);
-    this._connectionsCount = 0;
   }
   tick(timeMs) {
     this._advanceTimeWindow(timeMs - this._lastTick);
@@ -2057,19 +2434,37 @@ var getByteCount = (message) => {
 };
 
 // src/db-host/documents-synchronizer.ts
+import { next as A3 } from "@automerge/automerge";
+import { UpdateScheduler, sleep } from "@dxos/async";
+import { LifecycleState as LifecycleState2, Resource as Resource5, cancelWithContext as cancelWithContext2 } from "@dxos/context";
+import { invariant as invariant6 } from "@dxos/invariant";
+import { log as log6 } from "@dxos/log";
 var __dxlog_file7 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/documents-synchronizer.ts";
 var MAX_UPDATE_FREQ = 10;
+var WRAP_AROUND_RETRY_LIMIT = 3;
+var WRAP_AROUND_RETRY_INITIAL_DELAY = 100;
 var DocumentsSynchronizer = class extends Resource5 {
+  _params;
+  _syncStates = /* @__PURE__ */ new Map();
+  /**
+  * Documents that have pending updates.
+  * Used to batch updates.
+  */
+  _pendingUpdates = /* @__PURE__ */ new Set();
+  /**
+  * Job that schedules if there are pending updates.
+  */
+  _sendUpdatesJob = void 0;
   constructor(_params) {
-    super(), this._params = _params, this._syncStates = /* @__PURE__ */ new Map(), this._pendingUpdates = /* @__PURE__ */ new Set(), this._sendUpdatesJob = void 0;
+    super(), this._params = _params;
   }
-  addDocuments(documentIds, retryCounter = 0) {
-    if (retryCounter > 3) {
+  addDocuments(documentIds, retryCounter = 0, wrapAroundRetryDelay = WRAP_AROUND_RETRY_INITIAL_DELAY) {
+    if (retryCounter > WRAP_AROUND_RETRY_LIMIT) {
       log6.warn("Failed to load document, retry limit reached", {
         documentIds
       }, {
         F: __dxlog_file7,
-        L: 52,
+        L: 57,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2087,13 +2482,13 @@ var DocumentsSynchronizer = class extends Resource5 {
           error
         }, {
           F: __dxlog_file7,
-          L: 66,
+          L: 71,
           S: this,
           C: (f, a) => f(...a)
         });
-        this.addDocuments([
+        void cancelWithContext2(this._ctx, sleep(wrapAroundRetryDelay)).then(() => this.addDocuments([
           documentId
-        ], retryCounter + 1);
+        ], retryCounter + 1, wrapAroundRetryDelay * 2));
       });
     }
   }
@@ -2115,14 +2510,9 @@ var DocumentsSynchronizer = class extends Resource5 {
   }
   async update(updates) {
     for (const { documentId, mutation, isNew } of updates) {
-      if (isNew) {
-        const doc = await this._params.repo.find(documentId, FIND_PARAMS);
-        doc.update((doc2) => A2.loadIncremental(doc2, mutation));
-        this._startSync(doc);
-      } else {
-        this._writeMutation(documentId, mutation);
-      }
+      this._writeMutation(documentId, mutation, isNew);
     }
+    await this._params.repo.flush(updates.map(({ documentId }) => documentId));
   }
   _startSync(doc) {
     if (this._syncStates.has(doc.documentId)) {
@@ -2130,7 +2520,7 @@ var DocumentsSynchronizer = class extends Resource5 {
         documentId: doc.documentId
       }, {
         F: __dxlog_file7,
-        L: 105,
+        L: 108,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2141,6 +2531,7 @@ var DocumentsSynchronizer = class extends Resource5 {
     };
     this._subscribeForChanges(syncState);
     this._syncStates.set(doc.documentId, syncState);
+    return syncState;
   }
   _subscribeForChanges(syncState) {
     const handler = () => {
@@ -2173,7 +2564,7 @@ var DocumentsSynchronizer = class extends Resource5 {
     const syncState = this._syncStates.get(documentId);
     invariant6(syncState, "Sync state for document not found", {
       F: __dxlog_file7,
-      L: 146,
+      L: 150,
       S: this,
       A: [
         "syncState",
@@ -2185,44 +2576,57 @@ var DocumentsSynchronizer = class extends Resource5 {
       return;
     }
     const doc = handle.doc();
-    const mutation = syncState.lastSentHead ? A2.saveSince(doc, syncState.lastSentHead) : A2.save(doc);
+    const mutation = syncState.lastSentHead ? A3.saveSince(doc, syncState.lastSentHead) : A3.save(doc);
     if (mutation.length === 0) {
       return;
     }
-    syncState.lastSentHead = A2.getHeads(doc);
+    syncState.lastSentHead = A3.getHeads(doc);
     return mutation;
   }
-  _writeMutation(documentId, mutation) {
-    const syncState = this._syncStates.get(documentId);
-    invariant6(syncState, "Sync state for document not found", {
-      F: __dxlog_file7,
-      L: 162,
-      S: this,
-      A: [
-        "syncState",
-        "'Sync state for document not found'"
-      ]
-    });
-    syncState.handle.update((doc) => {
-      const headsBefore = A2.getHeads(doc);
-      const newDoc = A2.loadIncremental(doc, mutation);
-      if (A2.equals(headsBefore, syncState.lastSentHead)) {
-        syncState.lastSentHead = A2.getHeads(newDoc);
+  _writeMutation(documentId, mutation, isNew) {
+    if (this._lifecycleState === LifecycleState2.CLOSED) {
+      return;
+    }
+    if (isNew) {
+      const newHandle = this._params.repo.import(mutation, {
+        docId: documentId
+      });
+      const syncState = this._startSync(newHandle);
+      syncState.lastSentHead = A3.getHeads(newHandle.doc());
+    } else {
+      const syncState = this._syncStates.get(documentId);
+      invariant6(syncState, "Sync state for document not found", {
+        F: __dxlog_file7,
+        L: 174,
+        S: this,
+        A: [
+          "syncState",
+          "'Sync state for document not found'"
+        ]
+      });
+      const headsBefore = A3.getHeads(syncState.handle.doc());
+      this._params.repo.import(mutation, {
+        docId: documentId
+      });
+      if (A3.equals(headsBefore, syncState.lastSentHead)) {
+        syncState.lastSentHead = A3.getHeads(syncState.handle.doc());
       }
-      return newDoc;
-    });
+    }
   }
 };
 
 // src/db-host/data-service.ts
 var __dxlog_file8 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/data-service.ts";
 var DataServiceImpl = class {
+  /**
+  * Map of subscriptions.
+  * subscriptionId -> DocumentsSynchronizer
+  */
+  _subscriptions = /* @__PURE__ */ new Map();
+  _automergeHost;
+  _spaceStateManager;
+  _updateIndexes;
   constructor(params) {
-    /**
-    * Map of subscriptions.
-    * subscriptionId -> DocumentsSynchronizer
-    */
-    this._subscriptions = /* @__PURE__ */ new Map();
     this._automergeHost = params.automergeHost;
     this._spaceStateManager = params.spaceStateManager;
     this._updateIndexes = params.updateIndexes;
@@ -2238,7 +2642,7 @@ var DataServiceImpl = class {
         ready();
       }).catch((err) => log7.catch(err, void 0, {
         F: __dxlog_file8,
-        L: 71,
+        L: 72,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -2249,7 +2653,7 @@ var DataServiceImpl = class {
     const synchronizer = this._subscriptions.get(request.subscriptionId);
     invariant7(synchronizer, "Subscription not found", {
       F: __dxlog_file8,
-      L: 78,
+      L: 79,
       S: this,
       A: [
         "synchronizer",
@@ -2270,7 +2674,7 @@ var DataServiceImpl = class {
     const synchronizer = this._subscriptions.get(request.subscriptionId);
     invariant7(synchronizer, "Subscription not found", {
       F: __dxlog_file8,
-      L: 93,
+      L: 94,
       S: this,
       A: [
         "synchronizer",
@@ -2315,7 +2719,7 @@ var DataServiceImpl = class {
       const spaceId = request.spaceId;
       invariant7(SpaceId2.isValid(spaceId), void 0, {
         F: __dxlog_file8,
-        L: 133,
+        L: 134,
         S: this,
         A: [
           "SpaceId.isValid(spaceId)",
@@ -2336,14 +2740,7 @@ var DataServiceImpl = class {
           peers: []
         };
         next({
-          peers: state.peers.map((peer) => ({
-            peerId: peer.peerId,
-            missingOnRemote: peer.missingOnRemote,
-            missingOnLocal: peer.missingOnLocal,
-            differentDocuments: peer.differentDocuments,
-            localDocumentCount: peer.localDocumentCount,
-            remoteDocumentCount: peer.remoteDocumentCount
-          }))
+          peers: state.peers
         });
       });
       this._automergeHost.collectionStateUpdated.on(ctx, (e) => {
@@ -2359,14 +2756,14 @@ var DataServiceImpl = class {
 // src/db-host/echo-host.ts
 import { LifecycleState as LifecycleState5, Resource as Resource9 } from "@dxos/context";
 import { todo } from "@dxos/debug";
-import { createIdFromSpaceKey as createIdFromSpaceKey2, SpaceDocVersion as SpaceDocVersion3 } from "@dxos/echo-protocol";
+import { SpaceDocVersion as SpaceDocVersion3, createIdFromSpaceKey as createIdFromSpaceKey2 } from "@dxos/echo-protocol";
 import { IndexMetadataStore, IndexStore, Indexer } from "@dxos/indexing";
 import { invariant as invariant13 } from "@dxos/invariant";
 import { IndexKind } from "@dxos/protocols/proto/dxos/echo/indexing";
 import { trace as trace5 } from "@dxos/tracing";
 
 // src/db-host/documents-iterator.ts
-import * as A3 from "@automerge/automerge";
+import * as A4 from "@automerge/automerge";
 import { Context as Context2 } from "@dxos/context";
 import { DatabaseDirectory as DatabaseDirectory2, SpaceDocVersion } from "@dxos/echo-protocol";
 import { invariant as invariant8 } from "@dxos/invariant";
@@ -2397,10 +2794,10 @@ var createSelectedDocumentsIterator = (automergeHost) => (
             ""
           ]
         });
-        const currentHeads = A3.getHeads(doc);
-        if (!A3.equals(currentHeads, heads)) {
+        const currentHeads = A4.getHeads(doc);
+        if (!A4.equals(currentHeads, heads)) {
           const begin = Date.now();
-          doc = A3.view(doc, heads);
+          doc = A4.view(doc, heads);
           const end = Date.now();
           if (end - begin > LOG_VIEW_OPERATION_THRESHOLD) {
             log8("Checking out document version is taking too long", {
@@ -2455,8 +2852,8 @@ var createSelectedDocumentsIterator = (automergeHost) => (
 
 // src/db-host/query-service.ts
 import { getHeads as getHeads3 } from "@automerge/automerge";
-import { Schema } from "effect";
-import { DeferredTask, scheduleMicroTask, synchronized as synchronized2 } from "@dxos/async";
+import * as Schema from "effect/Schema";
+import { DeferredTask as DeferredTask2, scheduleMicroTask, synchronized as synchronized2 } from "@dxos/async";
 import { Stream as Stream2 } from "@dxos/codec-protobuf/stream";
 import { Context as Context4, Resource as Resource7 } from "@dxos/context";
 import { raise } from "@dxos/debug";
@@ -2466,23 +2863,27 @@ import { objectPointerCodec as objectPointerCodec4 } from "@dxos/protocols";
 import { trace as trace4 } from "@dxos/tracing";
 
 // src/query/query-executor.ts
-import { Match } from "effect";
+import * as Match from "effect/Match";
+import * as Predicate from "effect/Predicate";
 import { Context as Context3, ContextDisposedError, LifecycleState as LifecycleState3, Resource as Resource6 } from "@dxos/context";
-import { DatabaseDirectory as DatabaseDirectory3, isEncodedReference, ObjectStructure } from "@dxos/echo-protocol";
+import { DatabaseDirectory as DatabaseDirectory3, ObjectStructure, isEncodedReference } from "@dxos/echo-protocol";
 import { EscapedPropPath } from "@dxos/indexing";
 import { invariant as invariant10 } from "@dxos/invariant";
 import { DXN, PublicKey as PublicKey3 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
 import { objectPointerCodec as objectPointerCodec3 } from "@dxos/protocols";
-import { getDeep, isNonNullable as isNonNullable2 } from "@dxos/util";
+import { getDeep, isNonNullable as isNonNullable3 } from "@dxos/util";
 
 // src/query/query-planner.ts
+import { Order } from "@dxos/echo";
 import { invariant as invariant9 } from "@dxos/invariant";
 
 // src/query/errors.ts
 import { BaseError } from "@dxos/errors";
 var QueryError = class extends BaseError.extend("QUERY_ERROR") {
 };
+var InvalidQueryError = class extends QueryError.extend("INVALID_QUERY") {
+};
 
 // src/query/plan.ts
 (function(QueryPlan2) {
@@ -2511,6 +2912,7 @@ var DEFAULT_OPTIONS = {
   defaultTextSearchKind: "full-text"
 };
 var QueryPlanner = class {
+  _options;
   constructor(options) {
     this._options = {
       ...DEFAULT_OPTIONS,
@@ -2524,6 +2926,7 @@ var QueryPlanner = class {
     });
     plan = this._optimizeEmptyFilters(plan);
     plan = this._optimizeSoloUnions(plan);
+    plan = this._ensureOrderStep(plan);
     return plan;
   }
   _generate(query, context) {
@@ -2546,8 +2949,11 @@ var QueryPlanner = class {
         return this._generateUnionClause(query, context);
       case "set-difference":
         return this._generateSetDifferenceClause(query, context);
+      case "order":
+        return this._generateOrderClause(query, context);
       default:
-        throw new QueryError(`Unsupported query type: ${query.type}`, {
+        throw new QueryError({
+          message: `Unsupported query type: ${query.type}`,
           context: {
             query: context.originalQuery
           }
@@ -2571,10 +2977,11 @@ var QueryPlanner = class {
   }
   // TODO(dmaretskyi): This can be rewritten as a function of (filter[]) -> (selection ? undefined, rest: filter[]) that recurses onto itself.
   // TODO(dmaretskyi): If the tip of the query ast is a [select, ...filter] shape we can reorder the filters so the query is most efficient.
-  _generateSelectionFromFilter(filter, context) {
-    switch (filter.type) {
+  _generateSelectionFromFilter(filter2, context) {
+    switch (filter2.type) {
+      // Props
       case "object": {
-        if (context.selectionInverted && filter.id === void 0 && filter.typename === null && Object.keys(filter.props).length === 0) {
+        if (context.selectionInverted && filter2.id === void 0 && filter2.typename === null && Object.keys(filter2.props).length === 0) {
           return QueryPlan.Plan.make([
             {
               _tag: "ClearWorkingSetStep"
@@ -2583,32 +2990,33 @@ var QueryPlanner = class {
           ]);
         }
         if (context.selectionInverted) {
-          throw new QueryError("Query too complex", {
+          throw new QueryError({
+            message: "Query too complex",
             context: {
               query: context.originalQuery
             }
           });
         }
-        if (filter.id && filter.id?.length > 0) {
+        if (filter2.id && filter2.id?.length > 0) {
           return QueryPlan.Plan.make([
             {
               _tag: "SelectStep",
               spaces: context.selectionSpaces,
               selector: {
                 _tag: "IdSelector",
-                objectIds: filter.id
+                objectIds: filter2.id
               }
             },
             ...this._generateDeletedHandlingSteps(context),
             {
               _tag: "FilterStep",
               filter: {
-                ...filter,
+                ...filter2,
                 id: void 0
               }
             }
           ]);
-        } else if (filter.typename) {
+        } else if (filter2.typename) {
           return QueryPlan.Plan.make([
             {
               _tag: "SelectStep",
@@ -2616,17 +3024,17 @@ var QueryPlanner = class {
               selector: {
                 _tag: "TypeSelector",
                 typename: [
-                  filter.typename
+                  filter2.typename
                 ],
                 inverted: false
               }
             },
             ...this._generateDeletedHandlingSteps(context),
+            // TODO(dmaretskyi): Normally we could skip filtering by typename here, but since the index does not separate schema versions, we need to do additional filter to only select the correct version.
             {
               _tag: "FilterStep",
               filter: {
-                ...filter,
-                typename: null
+                ...filter2
               }
             }
           ]);
@@ -2643,12 +3051,32 @@ var QueryPlanner = class {
             {
               _tag: "FilterStep",
               filter: {
-                ...filter
+                ...filter2
               }
             }
           ]);
         }
       }
+      // Tag
+      case "tag": {
+        return QueryPlan.Plan.make([
+          {
+            _tag: "SelectStep",
+            spaces: context.selectionSpaces,
+            selector: {
+              _tag: "WildcardSelector"
+            }
+          },
+          ...this._generateDeletedHandlingSteps(context),
+          {
+            _tag: "FilterStep",
+            filter: {
+              ...filter2
+            }
+          }
+        ]);
+      }
+      // Text
       case "text-search": {
         return QueryPlan.Plan.make([
           {
@@ -2656,55 +3084,61 @@ var QueryPlanner = class {
             spaces: context.selectionSpaces,
             selector: {
               _tag: "TextSelector",
-              text: filter.text,
-              searchKind: filter.searchKind ?? this._options.defaultTextSearchKind
+              text: filter2.text,
+              searchKind: filter2.searchKind ?? this._options.defaultTextSearchKind
             }
           },
           ...this._generateDeletedHandlingSteps(context)
         ]);
       }
+      // Compare
       case "compare":
-        throw new QueryError("Query too complex", {
+        throw new QueryError({
+          message: "Query too complex",
           context: {
             query: context.originalQuery
           }
         });
       case "in":
-        throw new QueryError("Query too complex", {
+        throw new QueryError({
+          message: "Query too complex",
           context: {
             query: context.originalQuery
           }
         });
       case "range":
-        throw new QueryError("Query too complex", {
+        throw new QueryError({
+          message: "Query too complex",
           context: {
             query: context.originalQuery
           }
         });
+      // Boolean
       case "not":
-        return this._generateSelectionFromFilter(filter.filter, {
+        return this._generateSelectionFromFilter(filter2.filter, {
           ...context,
           selectionInverted: !context.selectionInverted
         });
       case "and":
-        throw new QueryError("Query too complex", {
+        throw new QueryError({
+          message: "Query too complex",
           context: {
             query: context.originalQuery
           }
         });
       case "or":
-        if (filter.filters.every(isTrivialTypenameFilter)) {
-          const typenames = filter.filters.map((f) => {
-            invariant9(f.type === "object" && f.typename !== null, void 0, {
+        if (filter2.filters.every(isTrivialTypenameFilter)) {
+          const typenames = filter2.filters.map((filter3) => {
+            invariant9(filter3.type === "object" && filter3.typename !== null, void 0, {
               F: __dxlog_file10,
-              L: 191,
+              L: 225,
               S: this,
               A: [
-                "f.type === 'object' && f.typename !== null",
+                "filter.type === 'object' && filter.typename !== null",
                 ""
               ]
             });
-            return f.typename;
+            return filter3.typename;
           });
           return QueryPlan.Plan.make([
             {
@@ -2716,17 +3150,25 @@ var QueryPlanner = class {
                 inverted: context.selectionInverted
               }
             },
-            ...this._generateDeletedHandlingSteps(context)
+            ...this._generateDeletedHandlingSteps(context),
+            {
+              _tag: "FilterStep",
+              filter: {
+                ...filter2
+              }
+            }
           ]);
         } else {
-          throw new QueryError("Query too complex", {
+          throw new QueryError({
+            message: "Query too complex",
             context: {
               query: context.originalQuery
             }
           });
         }
       default:
-        throw new QueryError(`Unsupported filter type: ${filter.type}`, {
+        throw new QueryError({
+          message: `Unsupported filter type: ${filter2.type}`,
           context: {
             query: context.originalQuery
           }
@@ -2926,6 +3368,45 @@ var QueryPlanner = class {
   _optimizeSoloUnions(plan) {
     return plan;
   }
+  _generateOrderClause(query, context) {
+    return QueryPlan.Plan.make([
+      ...this._generate(query.query, context).steps,
+      {
+        _tag: "OrderStep",
+        order: query.order
+      }
+    ]);
+  }
+  // After complete plan is built, inspect it from the end:
+  //   - Walk backwards until hitting an object set changer.
+  //   - If an order step is found, skip.
+  //   - Otherwise append natural order to the end.
+  _ensureOrderStep(plan) {
+    const OBJECT_SET_CHANGERS = /* @__PURE__ */ new Set([
+      "SelectStep",
+      "TraverseStep",
+      "UnionStep",
+      "SetDifferenceStep"
+    ]);
+    for (let i = plan.steps.length - 1; i >= 0; i--) {
+      const step = plan.steps[i];
+      if (step._tag === "OrderStep") {
+        return plan;
+      }
+      if (OBJECT_SET_CHANGERS.has(step._tag)) {
+        break;
+      }
+    }
+    return QueryPlan.Plan.make([
+      ...plan.steps,
+      {
+        _tag: "OrderStep",
+        order: [
+          Order.natural.ast
+        ]
+      }
+    ]);
+  }
 };
 var DEFAULT_CONTEXT = {
   originalQuery: null,
@@ -2946,8 +3427,8 @@ var createRelationTraversalStep = (direction) => ({
     direction
   }
 });
-var isTrivialTypenameFilter = (filter) => {
-  return filter.type === "object" && filter.typename !== null && Object.keys(filter.props).length === 0 && (filter.id === void 0 || filter.id.length === 0) && (filter.foreignKeys === void 0 || filter.foreignKeys.length === 0);
+var isTrivialTypenameFilter = (filter2) => {
+  return filter2.type === "object" && filter2.typename !== null && Object.keys(filter2.props).length === 0 && (filter2.id === void 0 || filter2.id.length === 0) && (filter2.foreignKeys === void 0 || filter2.foreignKeys.length === 0);
 };
 
 // src/query/query-executor.ts
@@ -2959,11 +3440,57 @@ var ExecutionTrace = Object.freeze({
     objectCount: 0,
     documentsLoaded: 0,
     indexHits: 0,
+    beginTs: 0,
+    endTs: 0,
     indexQueryTime: 0,
     documentLoadTime: 0,
     executionTime: 0,
     children: []
   }),
+  markEnd: (trace6) => {
+    trace6.endTs = performance.now();
+    trace6.executionTime = trace6.endTs - trace6.beginTs;
+  },
+  putOnPerformanceTimeline: (trace6) => {
+    performance.measure(trace6.name, {
+      start: trace6.beginTs,
+      end: trace6.endTs,
+      detail: {
+        devtools: {
+          dataType: "track-entry",
+          track: "Query Execution",
+          trackGroup: "ECHO",
+          color: "tertiary-dark",
+          properties: [
+            [
+              "objectCount",
+              trace6.objectCount
+            ],
+            [
+              "documentsLoaded",
+              trace6.documentsLoaded
+            ],
+            [
+              "index hits",
+              trace6.indexHits
+            ],
+            [
+              "indexQueryTime",
+              trace6.indexQueryTime
+            ],
+            [
+              "documentLoadTime",
+              trace6.documentLoadTime
+            ]
+          ],
+          tooltipText: trace6.details
+        }
+      }
+    });
+    for (const child of trace6.children) {
+      ExecutionTrace.putOnPerformanceTimeline(child);
+    }
+  },
   format: (trace6) => {
     const go = (trace7, indent) => {
       return [
@@ -2978,10 +3505,21 @@ var ExecutionTrace = Object.freeze({
 });
 var TRACE_QUERY_EXECUTION = false;
 var QueryExecutor = class extends Resource6 {
+  _indexer;
+  _automergeHost;
+  _spaceStateManager;
+  /**
+  * Id of this query.
+  */
+  _id;
+  _query;
+  // TODO(dmaretskyi): Might be used in the future.
+  _reactivity;
+  _plan;
+  _trace = ExecutionTrace.makeEmpty();
+  _lastResultSet = [];
   constructor(options) {
     super();
-    this._trace = ExecutionTrace.makeEmpty();
-    this._lastResultSet = [];
     this._indexer = options.indexer;
     this._automergeHost = options.automergeHost;
     this._spaceStateManager = options.spaceStateManager;
@@ -3016,7 +3554,7 @@ var QueryExecutor = class extends Resource6 {
   async execQuery() {
     invariant10(this._lifecycleState === LifecycleState3.OPEN, void 0, {
       F: __dxlog_file11,
-      L: 173,
+      L: 211,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3051,7 +3589,7 @@ var QueryExecutor = class extends Resource6 {
       trace6.children.push(result.trace);
     }
     trace6.objectCount = workingSet.length;
-    trace6.executionTime = performance.now() - begin;
+    ExecutionTrace.markEnd(trace6);
     return {
       workingSet,
       trace: trace6
@@ -3089,10 +3627,14 @@ var QueryExecutor = class extends Resource6 {
       case "TraverseStep":
         ({ workingSet: newWorkingSet, trace: trace6 } = await this._execTraverseStep(step, workingSet));
         break;
+      case "OrderStep":
+        ({ workingSet: newWorkingSet, trace: trace6 } = await this._execOrderStep(step, workingSet));
+        break;
       default:
         throw new Error(`Unknown step type: ${step._tag}`);
     }
-    trace6.executionTime = performance.now() - begin;
+    trace6.beginTs = begin;
+    ExecutionTrace.markEnd(trace6);
     return {
       workingSet: newWorkingSet,
       trace: trace6
@@ -3105,7 +3647,8 @@ var QueryExecutor = class extends Resource6 {
     const trace6 = {
       ...ExecutionTrace.makeEmpty(),
       name: "Select",
-      details: JSON.stringify(step.selector)
+      details: JSON.stringify(step.selector),
+      beginTs: performance.now()
     };
     switch (step.selector._tag) {
       case "WildcardSelector": {
@@ -3126,7 +3669,7 @@ var QueryExecutor = class extends Resource6 {
         const results = await this._loadDocumentsAfterIndexQuery(indexHits);
         trace6.documentsLoaded += results.length;
         trace6.documentLoadTime += performance.now() - documentLoadStart;
-        workingSet.push(...results.filter(isNonNullable2).filter((item) => step.spaces.includes(item.spaceId)));
+        workingSet.push(...results.filter(isNonNullable3).filter((item) => step.spaces.includes(item.spaceId)));
         trace6.objectCount = workingSet.length;
         break;
       }
@@ -3136,7 +3679,7 @@ var QueryExecutor = class extends Resource6 {
           sourceSpaceId: step.spaces[0]
         })));
         trace6.documentLoadTime += performance.now() - beginLoad;
-        workingSet.push(...items.filter(isNonNullable2));
+        workingSet.push(...items.filter(isNonNullable3));
         trace6.objectCount = workingSet.length;
         break;
       }
@@ -3158,7 +3701,7 @@ var QueryExecutor = class extends Resource6 {
         const results = await this._loadDocumentsAfterIndexQuery(indexHits);
         trace6.documentsLoaded += results.length;
         trace6.documentLoadTime += performance.now() - documentLoadStart;
-        workingSet.push(...results.filter(isNonNullable2).filter((item) => step.spaces.includes(item.spaceId)));
+        workingSet.push(...results.filter(isNonNullable3).filter((item) => step.spaces.includes(item.spaceId)));
         trace6.objectCount = workingSet.length;
         break;
       }
@@ -3183,7 +3726,7 @@ var QueryExecutor = class extends Resource6 {
         const results = await this._loadDocumentsAfterIndexQuery(indexHits);
         trace6.documentsLoaded += results.length;
         trace6.documentLoadTime += performance.now() - documentLoadStart;
-        workingSet.push(...results.filter(isNonNullable2).filter((item) => step.spaces.includes(item.spaceId)));
+        workingSet.push(...results.filter(isNonNullable3).filter((item) => step.spaces.includes(item.spaceId)));
         trace6.objectCount = workingSet.length;
         break;
       }
@@ -3212,17 +3755,6 @@ var QueryExecutor = class extends Resource6 {
     };
   }
   async _execFilterDeletedStep(step, workingSet) {
-    if (workingSet.length === 6) {
-      log9.info("FilterDeletedStep", {
-        step,
-        workingSet
-      }, {
-        F: __dxlog_file11,
-        L: 386,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
     const expected = step.mode === "only-deleted";
     const result = workingSet.filter((item) => ObjectStructure.isDeleted(item.doc) === expected);
     return {
@@ -3260,24 +3792,24 @@ var QueryExecutor = class extends Resource6 {
                     spaceId: item.spaceId
                   } : null;
                 } catch {
-                  log9.warn("Invalid reference", {
+                  log9.warn("invalid reference", {
                     ref: ref2["/"]
                   }, {
                     F: __dxlog_file11,
-                    L: 431,
+                    L: 477,
                     S: this,
                     C: (f, a) => f(...a)
                   });
                   return null;
                 }
               });
-            }).filter(isNonNullable2);
+            }).filter(isNonNullable3);
             const beginLoad = performance.now();
             const items = await Promise.all(refs.map(({ ref, spaceId }) => this._loadFromDXN(ref, {
               sourceSpaceId: spaceId
             })));
             trace6.documentLoadTime += performance.now() - beginLoad;
-            newWorkingSet.push(...items.filter(isNonNullable2));
+            newWorkingSet.push(...items.filter(isNonNullable3));
             trace6.objectCount = newWorkingSet.length;
             break;
           }
@@ -3296,7 +3828,7 @@ var QueryExecutor = class extends Resource6 {
             const results = await this._loadDocumentsAfterIndexQuery(indexHits);
             trace6.documentsLoaded += results.length;
             trace6.documentLoadTime += performance.now() - documentLoadStart;
-            newWorkingSet.push(...results.filter(isNonNullable2));
+            newWorkingSet.push(...results.filter(isNonNullable3));
             trace6.objectCount = newWorkingSet.length;
             break;
           }
@@ -3318,23 +3850,23 @@ var QueryExecutor = class extends Resource6 {
                   spaceId: item.spaceId
                 };
               } catch {
-                log9.warn("Invalid reference", {
+                log9.warn("invalid reference", {
                   ref: ref["/"]
                 }, {
                   F: __dxlog_file11,
-                  L: 494,
+                  L: 540,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 return null;
               }
-            }).filter(isNonNullable2);
+            }).filter(isNonNullable3);
             const beginLoad = performance.now();
             const items = await Promise.all(refs.map(({ ref, spaceId }) => this._loadFromDXN(ref, {
               sourceSpaceId: spaceId
             })));
             trace6.documentLoadTime += performance.now() - beginLoad;
-            newWorkingSet.push(...items.filter(isNonNullable2));
+            newWorkingSet.push(...items.filter(isNonNullable3));
             trace6.objectCount = newWorkingSet.length;
             break;
           }
@@ -3354,7 +3886,7 @@ var QueryExecutor = class extends Resource6 {
             const results = await this._loadDocumentsAfterIndexQuery(indexHits);
             trace6.documentsLoaded += results.length;
             trace6.documentLoadTime += performance.now() - documentLoadStart;
-            newWorkingSet.push(...results.filter(isNonNullable2));
+            newWorkingSet.push(...results.filter(isNonNullable3));
             trace6.objectCount = newWorkingSet.length;
             break;
           }
@@ -3411,16 +3943,83 @@ var QueryExecutor = class extends Resource6 {
       trace: trace6
     };
   }
+  async _execOrderStep(step, workingSet) {
+    const sortedWorkingSet = [
+      ...workingSet
+    ].sort((a, b) => this._compareMultiOrder(a, b, step.order));
+    return {
+      workingSet: sortedWorkingSet,
+      trace: {
+        ...ExecutionTrace.makeEmpty(),
+        name: "Order",
+        details: JSON.stringify(step.order),
+        objectCount: sortedWorkingSet.length
+      }
+    };
+  }
+  _compareMultiOrder(a, b, orders) {
+    if (orders.length === 0) {
+      return 0;
+    } else if (orders.length === 1) {
+      return this._compareByOrder(a, b, orders[0]);
+    }
+    for (const order of orders) {
+      const comparison = this._compareByOrder(a, b, order);
+      if (comparison !== 0) {
+        return comparison;
+      }
+    }
+    return 0;
+  }
+  _compareByOrder(a, b, order) {
+    switch (order.kind) {
+      case "natural":
+        return a.objectId.localeCompare(b.objectId);
+      case "property": {
+        const comparison = this._compareByProperty(a, b, order.property);
+        return order.direction === "desc" ? -comparison : comparison;
+      }
+      default:
+        return 0;
+    }
+  }
+  _compareByProperty(a, b, property) {
+    const aValue = a.doc.data[property];
+    const bValue = b.doc.data[property];
+    if (aValue == null && bValue == null) {
+      return 0;
+    }
+    if (aValue == null) {
+      return 1;
+    }
+    if (bValue == null) {
+      return -1;
+    }
+    if (typeof aValue === "string" && typeof bValue === "string") {
+      return aValue.localeCompare(bValue);
+    }
+    if (typeof aValue === "number" && typeof bValue === "number") {
+      return aValue - bValue;
+    }
+    if (typeof aValue === "boolean" && typeof bValue === "boolean") {
+      return aValue === bValue ? 0 : aValue ? 1 : -1;
+    }
+    return String(aValue).localeCompare(String(bValue));
+  }
   async _loadDocumentsAfterIndexQuery(indexHits) {
     return Promise.all(indexHits.map(async (hit) => {
       return this._loadFromIndexHit(hit);
     }));
   }
+  /**
+  * Space key hex -> SpaceId.
+  */
+  _spaceIdCache = /* @__PURE__ */ new Map();
   async _loadFromIndexHit(hit) {
     const { objectId, documentId, spaceKey: spaceKeyInIndex } = objectPointerCodec3.decode(hit.id);
     const handle = await this._automergeHost.loadDoc(Context3.default(void 0, {
       F: __dxlog_file11,
-      L: 604
+      L: 738
     }), documentId);
     const doc = handle.doc();
     if (!doc) {
@@ -3430,6 +4029,11 @@ var QueryExecutor = class extends Resource6 {
     if (!spaceKey) {
       return null;
     }
+    let spaceId = this._spaceIdCache.get(spaceKey);
+    if (!spaceId) {
+      spaceId = await createIdFromSpaceKey(PublicKey3.from(spaceKey));
+      this._spaceIdCache.set(spaceKey, spaceId);
+    }
     const object = DatabaseDirectory3.getInlineObject(doc, objectId);
     if (!object) {
       return null;
@@ -3437,7 +4041,7 @@ var QueryExecutor = class extends Resource6 {
     return {
       objectId,
       documentId,
-      spaceId: await createIdFromSpaceKey(PublicKey3.from(spaceKey)),
+      spaceId,
       doc: object
     };
   }
@@ -3448,7 +4052,7 @@ var QueryExecutor = class extends Resource6 {
         dxn
       }, {
         F: __dxlog_file11,
-        L: 631,
+        L: 771,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3461,7 +4065,7 @@ var QueryExecutor = class extends Resource6 {
         spaceId
       }, {
         F: __dxlog_file11,
-        L: 639,
+        L: 779,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3473,7 +4077,7 @@ var QueryExecutor = class extends Resource6 {
         spaceId
       }, {
         F: __dxlog_file11,
-        L: 644,
+        L: 784,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3494,7 +4098,7 @@ var QueryExecutor = class extends Resource6 {
     }
     const handle = await this._automergeHost.loadDoc(Context3.default(void 0, {
       F: __dxlog_file11,
-      L: 663
+      L: 803
     }), link);
     const doc = handle.doc();
     if (!doc) {
@@ -3522,9 +4126,13 @@ function _ts_decorate5(decorators, target, key, desc) {
 }
 var __dxlog_file12 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/query-service.ts";
 var QueryServiceImpl = class extends Resource7 {
+  _params;
+  // TODO(dmaretskyi): We need to implement query deduping. Idle composer has 80 queries with only 10 being unique.
+  _queries = /* @__PURE__ */ new Set();
+  _updateQueries;
   // TODO(burdon): OK for options, but not params. Pass separately and type readonly here.
   constructor(_params) {
-    super(), this._params = _params, this._queries = /* @__PURE__ */ new Set();
+    super(), this._params = _params;
     trace4.diagnostic({
       id: "active-queries",
       name: "Active Queries",
@@ -3541,7 +4149,7 @@ var QueryServiceImpl = class extends Resource7 {
   }
   async _open() {
     this._params.indexer.updated.on(this._ctx, () => this.invalidateQueries());
-    this._updateQueries = new DeferredTask(this._ctx, this._executeQueries.bind(this));
+    this._updateQueries = new DeferredTask2(this._ctx, this._executeQueries.bind(this));
   }
   async _close() {
     await this._updateQueries.join();
@@ -3552,6 +4160,18 @@ var QueryServiceImpl = class extends Resource7 {
   }
   execQuery(request) {
     return new Stream2(({ next, close, ctx }) => {
+      if (this._params.indexer.config?.enabled !== true) {
+        log10.error("indexer is disabled", {
+          config: this._params.indexer.config
+        }, {
+          F: __dxlog_file12,
+          L: 102,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        close();
+        return;
+      }
       const queryEntry = this._createQuery(ctx, request, next, close, close);
       scheduleMicroTask(ctx, async () => {
         await queryEntry.executor.open();
@@ -3567,7 +4187,7 @@ var QueryServiceImpl = class extends Resource7 {
   async reindex() {
     log10("Reindexing all documents...", void 0, {
       F: __dxlog_file12,
-      L: 113,
+      L: 121,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3582,7 +4202,7 @@ var QueryServiceImpl = class extends Resource7 {
           count: ids.size
         }, {
           F: __dxlog_file12,
-          L: 121,
+          L: 129,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3592,7 +4212,7 @@ var QueryServiceImpl = class extends Resource7 {
       count: ids.size
     }, {
       F: __dxlog_file12,
-      L: 125,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3658,7 +4278,7 @@ var QueryServiceImpl = class extends Resource7 {
       } catch (err) {
         log10.catch(err, void 0, {
           F: __dxlog_file12,
-          L: 196,
+          L: 204,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3669,7 +4289,7 @@ var QueryServiceImpl = class extends Resource7 {
       duration: performance.now() - begin
     }, {
       F: __dxlog_file12,
-      L: 200,
+      L: 208,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3720,7 +4340,7 @@ var createDocumentsIterator = (automergeHost) => (
           }
           const linkHandle = await automergeHost.loadDoc(Context4.default(void 0, {
             F: __dxlog_file12,
-            L: 240
+            L: 248
           }), urlString);
           for await (const result of getObjectsFromHandle(linkHandle)) {
             yield result;
@@ -3745,7 +4365,7 @@ var createDocumentsIterator = (automergeHost) => (
 import { interpretAsDocumentId as interpretAsDocumentId3 } from "@automerge/automerge-repo";
 import isEqual from "lodash.isequal";
 import { Event as Event3, UpdateScheduler as UpdateScheduler3 } from "@dxos/async";
-import { Resource as Resource8, Context as Context5, LifecycleState as LifecycleState4 } from "@dxos/context";
+import { Context as Context5, LifecycleState as LifecycleState4, Resource as Resource8 } from "@dxos/context";
 import { invariant as invariant12 } from "@dxos/invariant";
 
 // src/db-host/database-root.ts
@@ -3754,17 +4374,17 @@ import { DatabaseDirectory as DatabaseDirectory5, SpaceDocVersion as SpaceDocVer
 import { invariant as invariant11 } from "@dxos/invariant";
 
 // src/db-host/automerge-metrics.ts
-import * as A4 from "@automerge/automerge";
+import * as A5 from "@automerge/automerge";
 import { log as log11 } from "@dxos/log";
 var __dxlog_file13 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/automerge-metrics.ts";
 var measureDocMetrics = (doc) => {
-  const snapshot = A4.save(doc);
+  const snapshot = A5.save(doc);
   const start = Date.now();
-  const temp = A4.load(snapshot);
+  const temp = A5.load(snapshot);
   const end = Date.now();
-  A4.free(temp);
+  A5.free(temp);
   const getAllChangesStart = Date.now();
-  const mutationCount = A4.getAllChanges(doc).length;
+  const mutationCount = A5.getAllChanges(doc).length;
   const getAllChangesEnd = Date.now();
   if (getAllChangesEnd - getAllChangesStart > 300) {
     log11.warn("getAllChanges took too long", {
@@ -3786,6 +4406,7 @@ var measureDocMetrics = (doc) => {
 // src/db-host/database-root.ts
 var __dxlog_file14 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/database-root.ts";
 var DatabaseRoot = class {
+  _rootHandle;
   static mapLinks(doc, mapping) {
     doc.change((d) => {
       if (!d.links) {
@@ -3870,14 +4491,11 @@ var DatabaseRoot = class {
 // src/db-host/space-state-manager.ts
 var __dxlog_file15 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/space-state-manager.ts";
 var SpaceStateManager = class extends Resource8 {
-  constructor() {
-    super(...arguments);
-    this._roots = /* @__PURE__ */ new Map();
-    this._rootBySpace = /* @__PURE__ */ new Map();
-    this._perRootContext = /* @__PURE__ */ new Map();
-    this._lastSpaceDocumentList = /* @__PURE__ */ new Map();
-    this.spaceDocumentListUpdated = new Event3();
-  }
+  _roots = /* @__PURE__ */ new Map();
+  _rootBySpace = /* @__PURE__ */ new Map();
+  _perRootContext = /* @__PURE__ */ new Map();
+  _lastSpaceDocumentList = /* @__PURE__ */ new Map();
+  spaceDocumentListUpdated = new Event3();
   async _close(ctx) {
     for (const [_, rootCtx] of this._perRootContext) {
       await rootCtx.dispose();
@@ -3952,6 +4570,10 @@ var SpaceStateManager = class extends Resource8 {
   }
 };
 var SpaceDocumentListUpdatedEvent = class {
+  spaceId;
+  spaceRootId;
+  previousRootId;
+  documentIds;
   constructor(spaceId, spaceRootId, previousRootId, documentIds) {
     this.spaceId = spaceId;
     this.spaceRootId = spaceRootId;
@@ -3968,9 +4590,15 @@ var DEFAULT_INDEXING_CONFIG = {
   vector: false
 };
 var EchoHost = class extends Resource9 {
+  _indexMetadataStore;
+  _indexer;
+  _automergeHost;
+  _queryService;
+  _dataService;
+  _spaceStateManager = new SpaceStateManager();
+  _echoDataMonitor;
   constructor({ kv, indexing = {}, peerIdProvider, getSpaceKeyByRootDocumentId }) {
     super();
-    this._spaceStateManager = new SpaceStateManager();
     const indexingConfig = {
       ...DEFAULT_INDEXING_CONFIG,
       ...indexing
@@ -4091,7 +4719,6 @@ var EchoHost = class extends Resource9 {
       if (e.previousRootId) {
         void this._automergeHost.clearLocalCollectionState(deriveCollectionIdFromSpaceId(e.spaceId, e.previousRootId));
       }
-      void this._automergeHost.updateLocalCollectionState(deriveCollectionIdFromSpaceId(e.spaceId), e.documentIds);
       void this._automergeHost.updateLocalCollectionState(deriveCollectionIdFromSpaceId(e.spaceId, e.spaceRootId), e.documentIds);
     });
     this._automergeHost.documentsSaved.on(this._ctx, () => {
@@ -4108,7 +4735,7 @@ var EchoHost = class extends Resource9 {
   * Flush all pending writes to the underlying storage.
   */
   async flush() {
-    await this._automergeHost.repo.flush();
+    await this._automergeHost.flush();
   }
   /**
   * Perform any pending index updates.
@@ -4137,7 +4764,7 @@ var EchoHost = class extends Resource9 {
   async createSpaceRoot(spaceKey) {
     invariant13(this._lifecycleState === LifecycleState5.OPEN, void 0, {
       F: __dxlog_file16,
-      L: 255,
+      L: 254,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -4165,7 +4792,7 @@ var EchoHost = class extends Resource9 {
   async openSpaceRoot(spaceId, automergeUrl) {
     invariant13(this._lifecycleState === LifecycleState5.OPEN, void 0, {
       F: __dxlog_file16,
-      L: 274,
+      L: 273,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -4195,16 +4822,17 @@ var EchoHost = class extends Resource9 {
 };
 
 // src/edge/echo-edge-replicator.ts
+import * as Automerge from "@automerge/automerge";
 import { cbor as cbor2 } from "@automerge/automerge-repo";
-import { Mutex, scheduleTask as scheduleTask2, scheduleMicroTask as scheduleMicroTask2 } from "@dxos/async";
+import { Mutex, scheduleMicroTask as scheduleMicroTask2, scheduleTask as scheduleTask2 } from "@dxos/async";
 import { Context as Context6, Resource as Resource11 } from "@dxos/context";
 import { randomUUID } from "@dxos/crypto";
 import { invariant as invariant14 } from "@dxos/invariant";
 import { log as log13 } from "@dxos/log";
-import { EdgeService } from "@dxos/protocols";
+import { DocumentCodec, EdgeService } from "@dxos/protocols";
 import { buf } from "@dxos/protocols/buf";
 import { MessageSchema as RouterMessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
-import { bufferToArray as bufferToArray2 } from "@dxos/util";
+import { bufferToArray as bufferToArray2, setDeep } from "@dxos/util";
 
 // src/edge/inflight-request-limiter.ts
 import { Trigger as Trigger2 } from "@dxos/async";
@@ -4212,8 +4840,17 @@ import { Resource as Resource10 } from "@dxos/context";
 import { log as log12 } from "@dxos/log";
 var __dxlog_file17 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/edge/inflight-request-limiter.ts";
 var InflightRequestLimiter = class extends Resource10 {
+  _config;
+  /**
+  * Decrement when we receive a sync message, increment when we send one.
+  * Can't exceed _config.maxInflightRequests.
+  * Resets after timeout to avoid replicator being stuck.
+  */
+  _inflightRequestBalance = 0;
+  _requestBarrier = new Trigger2();
+  _resetBalanceTimeout;
   constructor(_config) {
-    super(), this._config = _config, this._inflightRequestBalance = 0, this._requestBarrier = new Trigger2();
+    super(), this._config = _config;
   }
   async _open() {
     this._inflightRequestBalance = 0;
@@ -4330,14 +4967,17 @@ var INITIAL_RESTART_DELAY = 500;
 var RESTART_DELAY_JITTER = 250;
 var MAX_RESTART_DELAY = 5e3;
 var EchoEdgeReplicator = class {
-  constructor({ edgeConnection, disableSharePolicy }) {
-    this._mutex = new Mutex();
-    this._ctx = void 0;
-    this._context = null;
-    this._connectedSpaces = /* @__PURE__ */ new Set();
-    this._connections = /* @__PURE__ */ new Map();
-    this._sharePolicyEnabled = true;
+  _edgeConnection;
+  _edgeHttpClient;
+  _mutex = new Mutex();
+  _ctx = void 0;
+  _context = null;
+  _connectedSpaces = /* @__PURE__ */ new Set();
+  _connections = /* @__PURE__ */ new Map();
+  _sharePolicyEnabled = true;
+  constructor({ edgeConnection, edgeHttpClient, disableSharePolicy }) {
     this._edgeConnection = edgeConnection;
+    this._edgeHttpClient = edgeHttpClient;
     this._sharePolicyEnabled = !disableSharePolicy;
   }
   async connect(context) {
@@ -4346,14 +4986,14 @@ var EchoEdgeReplicator = class {
       connectedSpaces: this._connectedSpaces.size
     }, {
       F: __dxlog_file18,
-      L: 61,
+      L: 73,
       S: this,
       C: (f, a) => f(...a)
     });
     this._context = context;
     this._ctx = Context6.default(void 0, {
       F: __dxlog_file18,
-      L: 63
+      L: 75
     });
     this._ctx.onDispose(this._edgeConnection.onReconnected(() => {
       this._ctx && scheduleMicroTask2(this._ctx, () => this._handleReconnect());
@@ -4452,7 +5092,7 @@ var EchoEdgeReplicator = class {
   async _openConnection(spaceId, reconnects = 0) {
     invariant14(this._context, void 0, {
       F: __dxlog_file18,
-      L: 124,
+      L: 136,
       S: this,
       A: [
         "this._context",
@@ -4461,7 +5101,7 @@ var EchoEdgeReplicator = class {
     });
     invariant14(!this._connections.has(spaceId), void 0, {
       F: __dxlog_file18,
-      L: 125,
+      L: 137,
       S: this,
       A: [
         "!this._connections.has(spaceId)",
@@ -4470,14 +5110,31 @@ var EchoEdgeReplicator = class {
     });
     let restartScheduled = false;
     const connection = new EdgeReplicatorConnection({
+      edgeHttpClient: this._edgeHttpClient,
       edgeConnection: this._edgeConnection,
       spaceId,
       context: this._context,
       sharedPolicyEnabled: this._sharePolicyEnabled,
       onRemoteConnected: async () => {
+        log13.trace("dxos.echo.edge.replicator.onRemoteConnected", {
+          spaceId
+        }, {
+          F: __dxlog_file18,
+          L: 148,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         this._context?.onConnectionOpen(connection);
       },
       onRemoteDisconnected: async () => {
+        log13.trace("dxos.echo.edge.replicator.onRemoteDisconnected", {
+          spaceId
+        }, {
+          F: __dxlog_file18,
+          L: 152,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         this._context?.onConnectionClosed(connection);
       },
       onRestartRequested: async () => {
@@ -4491,7 +5148,7 @@ var EchoEdgeReplicator = class {
           restartDelay
         }, {
           F: __dxlog_file18,
-          L: 148,
+          L: 163,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4513,6 +5170,16 @@ var EchoEdgeReplicator = class {
             if (ctx?.disposed) {
               return;
             }
+            log13.trace("dxos.echo.edge.replicator.restart", {
+              spaceId,
+              reconnects,
+              restartDelay
+            }, {
+              F: __dxlog_file18,
+              L: 180,
+              S: this,
+              C: (f, a) => f(...a)
+            });
             await this._openConnection(spaceId, reconnects + 1);
           } catch (e) {
             env.error = e;
@@ -4530,17 +5197,32 @@ var EchoEdgeReplicator = class {
 var MAX_INFLIGHT_REQUESTS = 5;
 var MAX_RATE_LIMIT_WAIT_TIME_MS = 3e3;
 var EdgeReplicatorConnection = class extends Resource11 {
-  constructor({ edgeConnection, spaceId, context, sharedPolicyEnabled, onRemoteConnected, onRemoteDisconnected, onRestartRequested }) {
+  _connectionId = randomUUID();
+  _edgeConnection;
+  _edgeHttpClient;
+  _remotePeerId = null;
+  _targetServiceId;
+  _spaceId;
+  _context;
+  _sharedPolicyEnabled;
+  _onRemoteConnected;
+  _onRemoteDisconnected;
+  _onRestartRequested;
+  _sequence = 0;
+  _requestLimiter = new InflightRequestLimiter({
+    maxInflightRequests: MAX_INFLIGHT_REQUESTS,
+    resetBalanceTimeoutMs: MAX_RATE_LIMIT_WAIT_TIME_MS
+  });
+  _readableStreamController;
+  readable;
+  writable;
+  constructor({ edgeConnection, edgeHttpClient, spaceId, context, sharedPolicyEnabled, onRemoteConnected, onRemoteDisconnected, onRestartRequested }) {
     super();
-    this._remotePeerId = null;
-    this._requestLimiter = new InflightRequestLimiter({
-      maxInflightRequests: MAX_INFLIGHT_REQUESTS,
-      resetBalanceTimeoutMs: MAX_RATE_LIMIT_WAIT_TIME_MS
-    });
     this._edgeConnection = edgeConnection;
+    this._edgeHttpClient = edgeHttpClient;
     this._spaceId = spaceId;
     this._context = context;
-    this._remotePeerId = `${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}-${randomUUID()}`;
+    this._remotePeerId = `${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}-${this._connectionId}`;
     this._targetServiceId = `${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}`;
     this._sharedPolicyEnabled = sharedPolicyEnabled;
     this._onRemoteConnected = onRemoteConnected;
@@ -4561,7 +5243,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
   async _open(ctx) {
     log13("opening...", void 0, {
       F: __dxlog_file18,
-      L: 251,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4569,12 +5251,29 @@ var EdgeReplicatorConnection = class extends Resource11 {
     this._ctx.onDispose(this._edgeConnection.onMessage((msg) => {
       this._onMessage(msg);
     }));
+    let firstReconnect = true;
+    this._ctx.onDispose(
+      // NOTE: This will fire immediately if the connection is already open.
+      this._edgeConnection.onReconnected(async () => {
+        if (firstReconnect) {
+          log13.verbose("first reconnect skipped", void 0, {
+            F: __dxlog_file18,
+            L: 288,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          firstReconnect = false;
+          return;
+        }
+        this._onRestartRequested();
+      })
+    );
     await this._onRemoteConnected();
   }
   async _close() {
     log13("closing...", void 0, {
       F: __dxlog_file18,
-      L: 266,
+      L: 301,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4585,7 +5284,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
   get peerId() {
     invariant14(this._remotePeerId, "Not connected", {
       F: __dxlog_file18,
-      L: 275,
+      L: 310,
       S: this,
       A: [
         "this._remotePeerId",
@@ -4610,7 +5309,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
         remoteId: this._remotePeerId
       }, {
         F: __dxlog_file18,
-        L: 290,
+        L: 325,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4631,20 +5330,42 @@ var EdgeReplicatorConnection = class extends Resource11 {
     }
     const payload = cbor2.decode(message.payload.value);
     log13.verbose("received", {
-      type: payload.type,
-      documentId: payload.type === "sync" && payload.documentId,
+      ...getMessageInfo(payload),
       remoteId: this._remotePeerId
     }, {
       F: __dxlog_file18,
-      L: 319,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
     payload.senderId = this._remotePeerId;
     this._processMessage(payload);
   }
+  get bundleSyncEnabled() {
+    return true;
+  }
+  async pushBundle(bundle) {
+    const request = {
+      bundle: bundle.map(({ documentId, data, heads }) => ({
+        documentId,
+        mutation: DocumentCodec.encode(data),
+        heads
+      }))
+    };
+    await this._edgeHttpClient.importBundle(this._spaceId, request);
+  }
+  async pullBundle(docHeads) {
+    const request = {
+      docHeads
+    };
+    const response = await this._edgeHttpClient.exportBundle(this._spaceId, request);
+    return Object.fromEntries(response.bundle.map((doc) => [
+      doc.documentId,
+      DocumentCodec.decode(doc.mutation)
+    ]));
+  }
   _processMessage(message) {
-    if (isForbiddenErrorMessage(message)) {
+    if (isErrorMessage(message)) {
       this._onRestartRequested();
       return;
     }
@@ -4653,33 +5374,66 @@ var EdgeReplicatorConnection = class extends Resource11 {
   }
   async _sendMessage(message) {
     message.targetId = this._targetServiceId;
+    setDeep(message, [
+      "metadata",
+      "dxos_sequence"
+    ], this._getSequence());
+    setDeep(message, [
+      "metadata",
+      "dxos_connectionId"
+    ], this._connectionId);
     log13.verbose("sending...", {
-      type: message.type,
-      documentId: message.type === "sync" && message.documentId,
+      ...getMessageInfo(message),
       remoteId: this._remotePeerId
     }, {
       F: __dxlog_file18,
-      L: 348,
+      L: 407,
       S: this,
       C: (f, a) => f(...a)
     });
     const encoded = cbor2.encode(message);
-    await this._edgeConnection.send(buf.create(RouterMessageSchema, {
-      serviceId: this._targetServiceId,
-      source: {
-        identityKey: this._edgeConnection.identityKey,
-        peerKey: this._edgeConnection.peerKey
-      },
-      payload: {
-        value: bufferToArray2(encoded)
-      }
-    }));
+    try {
+      await this._edgeConnection.send(buf.create(RouterMessageSchema, {
+        serviceId: this._targetServiceId,
+        source: {
+          identityKey: this._edgeConnection.identityKey,
+          peerKey: this._edgeConnection.peerKey
+        },
+        payload: {
+          value: bufferToArray2(encoded)
+        }
+      }));
+    } catch (err) {
+      log13.error("failed to send message", {
+        err
+      }, {
+        F: __dxlog_file18,
+        L: 426,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  _getSequence() {
+    return this._sequence++;
   }
 };
-var isForbiddenErrorMessage = (message) => message.type === "error" && message.message === "Forbidden";
+var isErrorMessage = (message) => message.type === "error";
+var getMessageInfo = (msg) => {
+  const { have, heads, need, changes } = msg.type === "sync" ? Automerge.decodeSyncMessage(msg.data) : {};
+  return {
+    type: msg.type,
+    documentId: "documentId" in msg ? msg.documentId : void 0,
+    have,
+    heads,
+    need,
+    changes: changes?.length,
+    sequence: msg.metadata?.dxos_sequence
+  };
+};
 
 // src/util.ts
-import { decodeReference, ObjectStructure as ObjectStructure2 } from "@dxos/echo-protocol";
+import { ObjectStructure as ObjectStructure2, decodeReference } from "@dxos/echo-protocol";
 var findInlineObjectOfType = (spaceDoc, typename) => {
   for (const id in spaceDoc.objects ?? {}) {
     const obj = spaceDoc.objects[id];
@@ -4731,6 +5485,7 @@ export {
   diffCollectionState,
   encodingOptions,
   filterMatchObject,
+  filterMatchObjectJSON,
   filterMatchValue,
   findInlineObjectOfType,
   getSpaceIdFromCollectionId,