@dxos/echo-pipeline 0.8.4-main.dedc0f3 → 0.8.4-main.e8ec1fe

package/dist/lib/browser/index.mjs

@@ -3,7 +3,7 @@ import {
   filterMatchObject,
   filterMatchObjectJSON,
   filterMatchValue
-} from "./chunk-MBMJB3V7.mjs";
+} from "./chunk-WJJXJTNS.mjs";
 import {
   AuthExtension,
   AuthStatus,
@@ -26,7 +26,7 @@ import {
   mapTimeframeToFeedIndexes,
   startAfter,
   valueEncoding
-} from "./chunk-I4JBIZSN.mjs";
+} from "./chunk-FR6GJ4S4.mjs";
 import "./chunk-CGS2ULMK.mjs";
 
 // src/db-host/data-service.ts
@@ -39,7 +39,6 @@ import { log as log7 } from "@dxos/log";
 // src/automerge/automerge-host.ts
 import { getBackend, getHeads, equals as headsEquals, isAutomerge, save } from "@automerge/automerge";
 import { Repo, interpretAsDocumentId } from "@automerge/automerge-repo";
-import { exportBundle } from "@automerge/automerge-repo-bundles";
 import { DeferredTask, Event as Event2, asyncTimeout } from "@dxos/async";
 import { Context, Resource as Resource3, cancelWithContext } from "@dxos/context";
 import { DatabaseDirectory } from "@dxos/echo-protocol";
@@ -48,28 +47,17 @@ 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 { ComplexSet, bufferToArray, range } 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 { 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";
 import { defaultMap } from "@dxos/util";
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate(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);
@@ -80,6 +68,22 @@ 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();
+    this._sendCollectionState = params.sendCollectionState;
+    this._queryCollectionState = params.queryCollectionState;
+    this._shouldSyncCollection = params.shouldSyncCollection;
+  }
   async _open(ctx) {
     scheduleTaskInterval(this._ctx, async () => {
       for (const collectionId of this._perCollectionStates.keys()) {
@@ -105,7 +109,7 @@ var CollectionSynchronizer = class extends Resource {
       state
     }, {
       F: __dxlog_file,
-      L: 76,
+      L: 78,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -124,7 +128,7 @@ var CollectionSynchronizer = class extends Resource {
       collectionId
     }, {
       F: __dxlog_file,
-      L: 90,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -207,7 +211,7 @@ var CollectionSynchronizer = class extends Resource {
       state
     }, {
       F: __dxlog_file,
-      L: 171,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -258,33 +262,28 @@ var CollectionSynchronizer = class extends Resource {
       }
     }
   }
-  constructor(params) {
-    super(), _define_property(this, "_sendCollectionState", void 0), _define_property(this, "_queryCollectionState", void 0), _define_property(this, "_shouldSyncCollection", void 0), /**
-    * CollectionId -> State.
-    */
-    _define_property(this, "_perCollectionStates", /* @__PURE__ */ new Map()), _define_property(this, "_activeCollections", /* @__PURE__ */ new Set()), _define_property(this, "_connectedPeers", /* @__PURE__ */ new Set()), _define_property(this, "remoteStateUpdated", new Event());
-    this._sendCollectionState = params.sendCollectionState;
-    this._queryCollectionState = params.queryCollectionState;
-    this._shouldSyncCollection = params.shouldSyncCollection;
-  }
 };
 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] || local.documents[documentId].length === 0) {
+    if (!localDocuments[documentId]) {
       missingOnLocal.push(documentId);
-    } else if (!remote.documents[documentId] || remote.documents[documentId].length === 0) {
+    } 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);
     }
   }
@@ -299,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}`);
     }
   });
@@ -325,19 +324,6 @@ var isCollectionQueryMessage = (message) => message.type === MESSAGE_TYPE_COLLEC
 var isCollectionStateMessage = (message) => message.type === MESSAGE_TYPE_COLLECTION_STATE;
 
 // src/automerge/echo-network-adapter.ts
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate2(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);
@@ -346,6 +332,18 @@ 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;
+  }
   isReady() {
     return this._lifecycleState === LifecycleState.OPEN;
   }
@@ -675,12 +673,6 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerMetadata: createEchoPeerMetadata()
     });
   }
-  constructor(_params) {
-    super(), _define_property2(this, "_params", void 0), _define_property2(this, "_replicators", void 0), /**
-    * Remote peer id -> connection.
-    */
-    _define_property2(this, "_connections", void 0), _define_property2(this, "_lifecycleState", void 0), _define_property2(this, "_connected", void 0), _define_property2(this, "_ready", void 0), 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();
-  }
 };
 _ts_decorate2([
   synchronized
@@ -702,20 +694,11 @@ var isEchoPeerMetadata = (metadata) => metadata?.dxos_peerSource === "EchoNetwor
 
 // src/automerge/heads-store.ts
 import { headsEncoding } from "@dxos/indexing";
-function _define_property3(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var HeadsStore = class {
+  _db;
+  constructor({ db }) {
+    this._db = db;
+  }
   setHeads(documentId, heads, batch) {
     batch.put(documentId, heads, {
       sublevel: this._db,
@@ -730,28 +713,15 @@ var HeadsStore = class {
       valueEncoding: headsEncoding
     });
   }
-  constructor({ db }) {
-    _define_property3(this, "_db", void 0);
-    this._db = db;
-  }
 };
 
 // src/automerge/leveldb-storage-adapter.ts
 import { Resource as Resource2 } from "@dxos/context";
-function _define_property4(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var LevelDBStorageAdapter = class extends Resource2 {
+  _params;
+  constructor(_params) {
+    super(), this._params = _params;
+  }
   async load(keyArray) {
     try {
       if (!this.isOpen) {
@@ -839,9 +809,6 @@ var LevelDBStorageAdapter = class extends Resource2 {
     }
     await batch.write();
   }
-  constructor(_params) {
-    super(), _define_property4(this, "_params", void 0), this._params = _params;
-  }
 };
 var keyEncoder = {
   encode: (key) => Buffer.from(key.map((k) => k.replaceAll("%", "%25").replaceAll("-", "%2D")).join("-")),
@@ -855,19 +822,6 @@ var encodingOptions = {
 var isLevelDbNotFoundError = (err) => err.code === "LEVEL_NOT_FOUND";
 
 // src/automerge/automerge-host.ts
-function _define_property5(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate3(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);
@@ -885,6 +839,57 @@ 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._db = db;
+    this._storage = new LevelDBStorageAdapter({
+      db: db.sublevel("automerge"),
+      callbacks: {
+        beforeSave: async (params) => this._beforeSave(params),
+        afterSave: async (key) => this._afterSave(key)
+      },
+      monitor: dataMonitor
+    });
+    this._echoNetworkAdapter = new EchoNetworkAdapter({
+      getContainingSpaceForDocument: this._getContainingSpaceForDocument.bind(this),
+      isDocumentInRemoteCollection: this._isDocumentInRemoteCollection.bind(this),
+      onCollectionStateQueried: this._onCollectionStateQueried.bind(this),
+      onCollectionStateReceived: this._onCollectionStateReceived.bind(this),
+      monitor: dataMonitor
+    });
+    this._headsStore = new HeadsStore({
+      db: db.sublevel("heads")
+    });
+    this._indexMetadataStore = indexMetadataStore;
+    this._peerIdProvider = peerIdProvider;
+    this._getSpaceKeyByRootDocumentId = getSpaceKeyByRootDocumentId;
+  }
   async _open() {
     this._peerId = `host-${this._peerIdProvider?.() ?? PublicKey.random().toHex()}`;
     this._onHeadsChangedTask = new DeferredTask(this._ctx, async () => {
@@ -934,7 +939,7 @@ var AutomergeHost = class extends Resource3 {
             err
           }, {
             F: __dxlog_file3,
-            L: 224,
+            L: 223,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -968,7 +973,7 @@ var AutomergeHost = class extends Resource3 {
   async addReplicator(replicator) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 260,
+      L: 259,
       S: this,
       A: [
         "this.isOpen",
@@ -980,7 +985,7 @@ var AutomergeHost = class extends Resource3 {
   async removeReplicator(replicator) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 265,
+      L: 264,
       S: this,
       A: [
         "this.isOpen",
@@ -995,7 +1000,7 @@ var AutomergeHost = class extends Resource3 {
   async loadDoc(ctx, documentId, opts) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 273,
+      L: 272,
       S: this,
       A: [
         "this.isOpen",
@@ -1021,7 +1026,7 @@ var AutomergeHost = class extends Resource3 {
   async exportDoc(ctx, id) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 296,
+      L: 295,
       S: this,
       A: [
         "this.isOpen",
@@ -1040,7 +1045,7 @@ var AutomergeHost = class extends Resource3 {
   createDoc(initialValue, opts) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 307,
+      L: 306,
       S: this,
       A: [
         "this.isOpen",
@@ -1065,7 +1070,7 @@ var AutomergeHost = class extends Resource3 {
   async waitUntilHeadsReplicated(heads) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 329,
+      L: 328,
       S: this,
       A: [
         "this.isOpen",
@@ -1087,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: 347
+          L: 346
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
       }));
@@ -1100,7 +1105,7 @@ var AutomergeHost = class extends Resource3 {
   async reIndexHeads(documentIds) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
       F: __dxlog_file3,
-      L: 360,
+      L: 359,
       S: this,
       A: [
         "this.isOpen",
@@ -1112,7 +1117,7 @@ var AutomergeHost = class extends Resource3 {
         documentId
       }, {
         F: __dxlog_file3,
-        L: 362,
+        L: 361,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1122,7 +1127,7 @@ var AutomergeHost = class extends Resource3 {
           documentId
         }, {
           F: __dxlog_file3,
-          L: 365,
+          L: 364,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1135,7 +1140,7 @@ var AutomergeHost = class extends Resource3 {
     }
     log3("done re-indexing heads", void 0, {
       F: __dxlog_file3,
-      L: 374,
+      L: 373,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1145,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;
     }
@@ -1213,7 +1215,7 @@ var AutomergeHost = class extends Resource3 {
     this._headsUpdates.set(documentId, heads);
     invariant2(this._onHeadsChangedTask, "onHeadsChangedTask is not initialized", {
       F: __dxlog_file3,
-      L: 450,
+      L: 445,
       S: this,
       A: [
         "this._onHeadsChangedTask",
@@ -1257,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 = [];
@@ -1396,7 +1399,7 @@ var AutomergeHost = class extends Resource3 {
         amount: missingOnRemote.length
       }, {
         F: __dxlog_file3,
-        L: 649,
+        L: 650,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1409,7 +1412,7 @@ var AutomergeHost = class extends Resource3 {
         amount: missingOnRemote.length
       }, {
         F: __dxlog_file3,
-        L: 653,
+        L: 654,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1420,7 +1423,7 @@ var AutomergeHost = class extends Resource3 {
         amount: missingOnLocal.length
       }, {
         F: __dxlog_file3,
-        L: 661,
+        L: 662,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1433,7 +1436,7 @@ var AutomergeHost = class extends Resource3 {
         amount: missingOnLocal.length
       }, {
         F: __dxlog_file3,
-        L: 665,
+        L: 666,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1449,7 +1452,7 @@ var AutomergeHost = class extends Resource3 {
       count: toReplicateWithoutBatching.length
     }, {
       F: __dxlog_file3,
-      L: 677,
+      L: 678,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1477,7 +1480,7 @@ var AutomergeHost = class extends Resource3 {
             err
           }, {
             F: __dxlog_file3,
-            L: 708,
+            L: 709,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1493,13 +1496,38 @@ var AutomergeHost = class extends Resource3 {
     if (this._ctx.disposed) {
       return;
     }
-    const handles = documentIds.map((documentId) => this._repo.handles[documentId]);
-    const bundle = exportBundle(this._repo, handles);
-    await this._echoNetworkAdapter.pushBundle(peerId, Array.from(bundle.docs.entries()).map(([documentId, doc]) => ({
-      documentId,
-      data: doc.data,
-      heads: doc.heads
-    })));
+    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 = [
@@ -1520,7 +1548,7 @@ var AutomergeHost = class extends Resource3 {
             err
           }, {
             F: __dxlog_file3,
-            L: 752,
+            L: 762,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1558,9 +1586,12 @@ var AutomergeHost = class extends Resource3 {
     const collectionsChanged = /* @__PURE__ */ new Set();
     for (const collectionId of this._collectionSynchronizer.getRegisteredCollectionIds()) {
       const state = this._collectionSynchronizer.getLocalCollectionState(collectionId);
+      if (!state) {
+        continue;
+      }
       let newState;
       for (const [documentId, heads] of docHeads) {
-        if (state?.documents[documentId]) {
+        if (documentId in state.documents) {
           if (!newState) {
             newState = structuredClone(state);
           }
@@ -1578,41 +1609,6 @@ var AutomergeHost = class extends Resource3 {
       });
     }
   }
-  constructor({ db, indexMetadataStore, dataMonitor, peerIdProvider, getSpaceKeyByRootDocumentId }) {
-    super(), _define_property5(this, "_db", void 0), _define_property5(this, "_indexMetadataStore", void 0), _define_property5(this, "_echoNetworkAdapter", void 0), _define_property5(this, "_collectionSynchronizer", new CollectionSynchronizer({
-      queryCollectionState: this._queryCollectionState.bind(this),
-      sendCollectionState: this._sendCollectionState.bind(this),
-      shouldSyncCollection: this._shouldSyncCollection.bind(this)
-    })), _define_property5(this, "_repo", void 0), _define_property5(this, "_storage", void 0), _define_property5(this, "_headsStore", void 0), _define_property5(this, "_syncTask", void 0), /**
-    * Cache of collections that would be synced on next sync task run.
-    */
-    _define_property5(this, "_collectionsToSync", new ComplexSet(({ collectionId, peerId }) => `${collectionId}|${peerId}`)), _define_property5(this, "_peerId", void 0), _define_property5(this, "_peerIdProvider", void 0), _define_property5(this, "_getSpaceKeyByRootDocumentId", void 0), _define_property5(this, "collectionStateUpdated", new Event2()), /**
-    * Fired after a batch of documents was saved to disk.
-    */
-    _define_property5(this, "documentsSaved", new Event2()), _define_property5(this, "_headsUpdates", /* @__PURE__ */ new Map()), _define_property5(this, "_onHeadsChangedTask", void 0);
-    this._db = db;
-    this._storage = new LevelDBStorageAdapter({
-      db: db.sublevel("automerge"),
-      callbacks: {
-        beforeSave: async (params) => this._beforeSave(params),
-        afterSave: async (key) => this._afterSave(key)
-      },
-      monitor: dataMonitor
-    });
-    this._echoNetworkAdapter = new EchoNetworkAdapter({
-      getContainingSpaceForDocument: this._getContainingSpaceForDocument.bind(this),
-      isDocumentInRemoteCollection: this._isDocumentInRemoteCollection.bind(this),
-      onCollectionStateQueried: this._onCollectionStateQueried.bind(this),
-      onCollectionStateReceived: this._onCollectionStateReceived.bind(this),
-      monitor: dataMonitor
-    });
-    this._headsStore = new HeadsStore({
-      db: db.sublevel("heads")
-    });
-    this._indexMetadataStore = indexMetadataStore;
-    this._peerIdProvider = peerIdProvider;
-    this._getSpaceKeyByRootDocumentId = getSpaceKeyByRootDocumentId;
-  }
 };
 _ts_decorate3([
   trace2.info()
@@ -1648,7 +1644,7 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 var decodeCollectionState = (state) => {
   invariant2(typeof state === "object" && state !== null, "Invalid state", {
     F: __dxlog_file3,
-    L: 832,
+    L: 845,
     S: void 0,
     A: [
       "typeof state === 'object' && state !== null",
@@ -1668,81 +1664,24 @@ import { log as log5 } from "@dxos/log";
 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";
 import { log as log4 } from "@dxos/log";
 import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
-function _define_property6(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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 {
-  _disconnectIfEnabled() {
-    if (this._isEnabled) {
-      this._params.onRemoteDisconnected();
-    }
-  }
-  get peerId() {
-    invariant3(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file4,
-      L: 106,
-      S: this,
-      A: [
-        "this._remotePeerId != null",
-        "'Remote peer has not connected yet.'"
-      ]
-    });
-    return this._remotePeerId;
-  }
-  get isEnabled() {
-    return this._isEnabled;
-  }
-  get bundleSyncEnabled() {
-    return false;
-  }
-  async shouldAdvertise(params) {
-    return this._params.shouldAdvertise(params);
-  }
-  shouldSyncCollection(params) {
-    return this._params.shouldSyncCollection(params);
-  }
-  /**
-  * Start exchanging messages with the remote peer.
-  * Call after the remote peer has connected.
-  */
-  enable() {
-    invariant3(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file4,
-      L: 131,
-      S: this,
-      A: [
-        "this._remotePeerId != null",
-        "'Remote peer has not connected yet.'"
-      ]
-    });
-    this._isEnabled = true;
-  }
-  /**
-  * Stop exchanging messages with the remote peer.
-  */
-  disable() {
-    this._isEnabled = false;
-  }
+  _params;
+  readable;
+  writable;
+  remoteDeviceKey = null;
+  replicatorExtension;
+  _remotePeerId = null;
+  _isEnabled = false;
   constructor(_params) {
-    super(), _define_property6(this, "_params", void 0), _define_property6(this, "readable", void 0), _define_property6(this, "writable", void 0), _define_property6(this, "remoteDeviceKey", void 0), _define_property6(this, "replicatorExtension", void 0), _define_property6(this, "_remotePeerId", void 0), _define_property6(this, "_isEnabled", void 0), this._params = _params, this.remoteDeviceKey = null, this._remotePeerId = null, this._isEnabled = false;
+    super(), this._params = _params;
     let readableStreamController;
     this.readable = new ReadableStream({
       start: (controller) => {
@@ -1806,10 +1745,61 @@ var MeshReplicatorConnection = class extends Resource4 {
       }
     ]);
   }
+  _disconnectIfEnabled() {
+    if (this._isEnabled) {
+      this._params.onRemoteDisconnected();
+    }
+  }
+  get peerId() {
+    invariant3(this._remotePeerId != null, "Remote peer has not connected yet.", {
+      F: __dxlog_file4,
+      L: 106,
+      S: this,
+      A: [
+        "this._remotePeerId != null",
+        "'Remote peer has not connected yet.'"
+      ]
+    });
+    return this._remotePeerId;
+  }
+  get isEnabled() {
+    return this._isEnabled;
+  }
+  get bundleSyncEnabled() {
+    return false;
+  }
+  async shouldAdvertise(params) {
+    return this._params.shouldAdvertise(params);
+  }
+  shouldSyncCollection(params) {
+    return this._params.shouldSyncCollection(params);
+  }
+  /**
+  * Start exchanging messages with the remote peer.
+  * Call after the remote peer has connected.
+  */
+  enable() {
+    invariant3(this._remotePeerId != null, "Remote peer has not connected yet.", {
+      F: __dxlog_file4,
+      L: 131,
+      S: this,
+      A: [
+        "this._remotePeerId != null",
+        "'Remote peer has not connected yet.'"
+      ]
+    });
+    this._isEnabled = true;
+  }
+  /**
+  * Stop exchanging messages with the remote peer.
+  */
+  disable() {
+    this._isEnabled = false;
+  }
 };
 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,
@@ -1848,21 +1838,24 @@ var getSpaceIdFromCollectionId = (collectionId) => {
 };
 
 // src/automerge/mesh-echo-replicator.ts
-function _define_property7(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file6 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
 var MeshEchoReplicator = class {
+  /**
+  * 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;
   }
@@ -2075,30 +2068,11 @@ var MeshEchoReplicator = class {
       }
     }
   }
-  constructor() {
-    _define_property7(this, "_connectionsPerPeer", /* @__PURE__ */ new Map());
-    _define_property7(this, "_connections", /* @__PURE__ */ new Set());
-    _define_property7(this, "_authorizedDevices", /* @__PURE__ */ new Map());
-    _define_property7(this, "_context", null);
-  }
 };
 
 // src/automerge/echo-data-monitor.ts
 import { trace as trace3 } from "@dxos/tracing";
 import { CircularBuffer, SlidingWindowSummary, mapValues } from "@dxos/util";
-function _define_property8(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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);
@@ -2108,6 +2082,22 @@ 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;
+  }
   tick(timeMs) {
     this._advanceTimeWindow(timeMs - this._lastTick);
     this._lastTick = timeMs;
@@ -2347,9 +2337,8 @@ var EchoDataMonitor = class {
     messageCounts.failed++;
   }
   _getStatsForType(message) {
-    var _this__sizeByMessage, _message_type, _this__activeCounters_byType, _message_type1;
-    const messageSize = (_this__sizeByMessage = this._sizeByMessage)[_message_type = message.type] ?? (_this__sizeByMessage[_message_type] = createSlidingWindow());
-    const messageCounts = (_this__activeCounters_byType = this._activeCounters.byType)[_message_type1 = message.type] ?? (_this__activeCounters_byType[_message_type1] = createMessageCounter());
+    const messageSize = this._sizeByMessage[message.type] ??= createSlidingWindow();
+    const messageCounts = this._activeCounters.byType[message.type] ??= createMessageCounter();
     return {
       messageCounts,
       messageSize
@@ -2358,48 +2347,21 @@ var EchoDataMonitor = class {
   _computeMessageHistogram(groupKey) {
     const result = {};
     for (const receivedMessage of this._lastReceivedMessages) {
-      var _result, _receivedMessage_groupKey;
-      const counters = (_result = result)[_receivedMessage_groupKey = receivedMessage[groupKey]] ?? (_result[_receivedMessage_groupKey] = {
+      const counters = result[receivedMessage[groupKey]] ??= {
         received: 0,
         sent: 0
-      });
+      };
       counters.received++;
     }
     for (const receivedMessage of this._lastSentMessages) {
-      var _result1, _receivedMessage_groupKey1;
-      const counters = (_result1 = result)[_receivedMessage_groupKey1 = receivedMessage[groupKey]] ?? (_result1[_receivedMessage_groupKey1] = {
+      const counters = result[receivedMessage[groupKey]] ??= {
         received: 0,
         sent: 0
-      });
+      };
       counters.sent++;
     }
     return result;
   }
-  constructor(_params = {
-    timeSeriesLength: 30
-  }) {
-    _define_property8(this, "_params", void 0);
-    _define_property8(this, "_lastTick", void 0);
-    _define_property8(this, "_activeCounters", void 0);
-    _define_property8(this, "_lastCompleteCounters", void 0);
-    _define_property8(this, "_localTimeSeries", void 0);
-    _define_property8(this, "_storageAverages", void 0);
-    _define_property8(this, "_replicationAverages", void 0);
-    _define_property8(this, "_sizeByMessage", void 0);
-    _define_property8(this, "_lastReceivedMessages", void 0);
-    _define_property8(this, "_lastSentMessages", void 0);
-    _define_property8(this, "_connectionsCount", void 0);
-    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;
-  }
 };
 EchoDataMonitor = _ts_decorate4([
   trace3.resource()
@@ -2472,29 +2434,30 @@ var getByteCount = (message) => {
 };
 
 // src/db-host/documents-synchronizer.ts
-import { next as A2 } from "@automerge/automerge";
+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";
-function _define_property9(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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;
+  }
   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", {
@@ -2613,11 +2576,11 @@ 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, isNew) {
@@ -2629,7 +2592,7 @@ var DocumentsSynchronizer = class extends Resource5 {
         docId: documentId
       });
       const syncState = this._startSync(newHandle);
-      syncState.lastSentHead = A2.getHeads(newHandle.doc());
+      syncState.lastSentHead = A3.getHeads(newHandle.doc());
     } else {
       const syncState = this._syncStates.get(documentId);
       invariant6(syncState, "Sync state for document not found", {
@@ -2641,43 +2604,33 @@ var DocumentsSynchronizer = class extends Resource5 {
           "'Sync state for document not found'"
         ]
       });
-      const headsBefore = A2.getHeads(syncState.handle.doc());
+      const headsBefore = A3.getHeads(syncState.handle.doc());
       this._params.repo.import(mutation, {
         docId: documentId
       });
-      if (A2.equals(headsBefore, syncState.lastSentHead)) {
-        syncState.lastSentHead = A2.getHeads(syncState.handle.doc());
+      if (A3.equals(headsBefore, syncState.lastSentHead)) {
+        syncState.lastSentHead = A3.getHeads(syncState.handle.doc());
       }
     }
   }
-  constructor(_params) {
-    super(), _define_property9(this, "_params", void 0), _define_property9(this, "_syncStates", void 0), /**
-    * Documents that have pending updates.
-    * Used to batch updates.
-    */
-    _define_property9(this, "_pendingUpdates", void 0), /**
-    * Job that schedules if there are pending updates.
-    */
-    _define_property9(this, "_sendUpdatesJob", void 0), this._params = _params, this._syncStates = /* @__PURE__ */ new Map(), this._pendingUpdates = /* @__PURE__ */ new Set(), this._sendUpdatesJob = void 0;
-  }
 };
 
 // src/db-host/data-service.ts
-function _define_property10(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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) {
+    this._automergeHost = params.automergeHost;
+    this._spaceStateManager = params.spaceStateManager;
+    this._updateIndexes = params.updateIndexes;
+  }
   subscribe(request) {
     return new Stream(({ next, ready }) => {
       const synchronizer = new DocumentsSynchronizer({
@@ -2798,15 +2751,6 @@ var DataServiceImpl = class {
       scheduler.trigger();
     });
   }
-  constructor(params) {
-    _define_property10(this, "_subscriptions", /* @__PURE__ */ new Map());
-    _define_property10(this, "_automergeHost", void 0);
-    _define_property10(this, "_spaceStateManager", void 0);
-    _define_property10(this, "_updateIndexes", void 0);
-    this._automergeHost = params.automergeHost;
-    this._spaceStateManager = params.spaceStateManager;
-    this._updateIndexes = params.updateIndexes;
-  }
 };
 
 // src/db-host/echo-host.ts
@@ -2819,7 +2763,7 @@ 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";
@@ -2850,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", {
@@ -2908,7 +2852,7 @@ var createSelectedDocumentsIterator = (automergeHost) => (
 
 // src/db-host/query-service.ts
 import { getHeads as getHeads3 } from "@automerge/automerge";
-import { Schema } from "effect";
+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";
@@ -2919,7 +2863,8 @@ import { objectPointerCodec as objectPointerCodec4 } from "@dxos/protocols";
 import { trace as trace4 } from "@dxos/tracing";
 
 // src/query/query-executor.ts
-import { Match, Predicate } 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, ObjectStructure, isEncodedReference } from "@dxos/echo-protocol";
 import { EscapedPropPath } from "@dxos/indexing";
@@ -2927,7 +2872,7 @@ 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";
@@ -2937,6 +2882,8 @@ import { invariant as invariant9 } from "@dxos/invariant";
 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) {
@@ -2960,24 +2907,18 @@ var QueryError = class extends BaseError.extend("QUERY_ERROR") {
 var QueryPlan;
 
 // src/query/query-planner.ts
-function _define_property11(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file10 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/query/query-planner.ts";
 var DEFAULT_OPTIONS = {
   defaultTextSearchKind: "full-text"
 };
 var QueryPlanner = class {
+  _options;
+  constructor(options) {
+    this._options = {
+      ...DEFAULT_OPTIONS,
+      ...options
+    };
+  }
   createPlan(query) {
     let plan = this._generate(query, {
       ...DEFAULT_CONTEXT,
@@ -3011,7 +2952,8 @@ var QueryPlanner = class {
       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
           }
@@ -3035,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"
@@ -3047,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",
@@ -3080,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
               }
             }
           ]);
@@ -3107,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([
           {
@@ -3120,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: 195,
+              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([
             {
@@ -3180,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
           }
@@ -3429,13 +3407,6 @@ var QueryPlanner = class {
       }
     ]);
   }
-  constructor(options) {
-    _define_property11(this, "_options", void 0);
-    this._options = {
-      ...DEFAULT_OPTIONS,
-      ...options
-    };
-  }
 };
 var DEFAULT_CONTEXT = {
   originalQuery: null,
@@ -3456,26 +3427,12 @@ 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
-function _define_property12(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file11 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/query/query-executor.ts";
-var isNullable = Predicate.isNullable;
 var ExecutionTrace = Object.freeze({
   makeEmpty: () => ({
     name: "Empty",
@@ -3483,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 [
@@ -3502,6 +3505,30 @@ 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._indexer = options.indexer;
+    this._automergeHost = options.automergeHost;
+    this._spaceStateManager = options.spaceStateManager;
+    this._id = options.queryId;
+    this._query = options.query;
+    this._reactivity = options.reactivity;
+    const queryPlanner = new QueryPlanner();
+    this._plan = queryPlanner.createPlan(this._query);
+  }
   get query() {
     return this._query;
   }
@@ -3527,7 +3554,7 @@ var QueryExecutor = class extends Resource6 {
   async execQuery() {
     invariant10(this._lifecycleState === LifecycleState3.OPEN, void 0, {
       F: __dxlog_file11,
-      L: 176,
+      L: 211,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3562,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
@@ -3606,7 +3633,8 @@ var QueryExecutor = class extends Resource6 {
       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
@@ -3619,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": {
@@ -3640,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;
       }
@@ -3650,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;
       }
@@ -3672,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;
       }
@@ -3697,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;
       }
@@ -3767,20 +3796,20 @@ var QueryExecutor = class extends Resource6 {
                     ref: ref2["/"]
                   }, {
                     F: __dxlog_file11,
-                    L: 432,
+                    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;
           }
@@ -3799,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;
           }
@@ -3825,19 +3854,19 @@ var QueryExecutor = class extends Resource6 {
                   ref: ref["/"]
                 }, {
                   F: __dxlog_file11,
-                  L: 495,
+                  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;
           }
@@ -3857,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;
           }
@@ -3915,15 +3944,9 @@ var QueryExecutor = class extends Resource6 {
     };
   }
   async _execOrderStep(step, workingSet) {
-    const compareItems = (a, b) => step.order.reduce((comparison, order) => {
-      if (comparison !== 0) {
-        return comparison;
-      }
-      return this._compareByOrder(a, b, order);
-    }, 0);
     const sortedWorkingSet = [
       ...workingSet
-    ].sort(compareItems);
+    ].sort((a, b) => this._compareMultiOrder(a, b, step.order));
     return {
       workingSet: sortedWorkingSet,
       trace: {
@@ -3934,64 +3957,69 @@ var QueryExecutor = class extends Resource6 {
       }
     };
   }
+  _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) {
-    return Match.type().pipe(Match.withReturnType(), Match.when({
-      kind: "natural"
-    }, () => a.objectId.localeCompare(b.objectId)), Match.when({
-      kind: "property"
-    }, ({ property, direction }) => {
-      const comparison = this._compareByProperty(a, b, property);
-      return direction === "desc" ? -comparison : comparison;
-    }), Match.exhaustive)(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];
-    return Match.type().pipe(
-      Match.withReturnType(),
-      Match.when({
-        a: isNullable,
-        b: isNullable
-      }, () => 0),
-      Match.when({
-        a: isNullable
-      }, () => 1),
-      Match.when({
-        b: isNullable
-      }, () => -1),
-      Match.when({
-        a: Match.string,
-        b: Match.string
-      }, ({ a: a2, b: b2 }) => a2.localeCompare(b2)),
-      Match.when({
-        a: Match.number,
-        b: Match.number
-      }, ({ a: a2, b: b2 }) => a2 - b2),
-      Match.when({
-        a: Match.boolean,
-        b: Match.boolean
-      }, ({ a: a2, b: b2 }) => a2 === b2 ? 0 : a2 ? 1 : -1),
-      Match.when({
-        a: Match.defined,
-        b: Match.defined
-      }, ({ a: a2, b: b2 }) => String(a2).localeCompare(String(b2))),
-      // TODO(wittjosiah): Why does Match.exhaustive fail here?
-      Match.orElse(() => 0)
-    )({
-      a: aValue,
-      b: bValue
-    });
+    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: 659
+      L: 738
     }), documentId);
     const doc = handle.doc();
     if (!doc) {
@@ -4001,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;
@@ -4008,7 +4041,7 @@ var QueryExecutor = class extends Resource6 {
     return {
       objectId,
       documentId,
-      spaceId: await createIdFromSpaceKey(PublicKey3.from(spaceKey)),
+      spaceId,
       doc: object
     };
   }
@@ -4019,7 +4052,7 @@ var QueryExecutor = class extends Resource6 {
         dxn
       }, {
         F: __dxlog_file11,
-        L: 686,
+        L: 771,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4032,7 +4065,7 @@ var QueryExecutor = class extends Resource6 {
         spaceId
       }, {
         F: __dxlog_file11,
-        L: 694,
+        L: 779,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4044,7 +4077,7 @@ var QueryExecutor = class extends Resource6 {
         spaceId
       }, {
         F: __dxlog_file11,
-        L: 699,
+        L: 784,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4065,7 +4098,7 @@ var QueryExecutor = class extends Resource6 {
     }
     const handle = await this._automergeHost.loadDoc(Context3.default(void 0, {
       F: __dxlog_file11,
-      L: 718
+      L: 803
     }), link);
     const doc = handle.doc();
     if (!doc) {
@@ -4082,37 +4115,9 @@ var QueryExecutor = class extends Resource6 {
       doc: object
     };
   }
-  constructor(options) {
-    super(), _define_property12(this, "_indexer", void 0), _define_property12(this, "_automergeHost", void 0), _define_property12(this, "_spaceStateManager", void 0), /**
-    * Id of this query.
-    */
-    _define_property12(this, "_id", void 0), _define_property12(this, "_query", void 0), // TODO(dmaretskyi): Might be used in the future.
-    _define_property12(this, "_reactivity", void 0), _define_property12(this, "_plan", void 0), _define_property12(this, "_trace", ExecutionTrace.makeEmpty()), _define_property12(this, "_lastResultSet", []);
-    this._indexer = options.indexer;
-    this._automergeHost = options.automergeHost;
-    this._spaceStateManager = options.spaceStateManager;
-    this._id = options.queryId;
-    this._query = options.query;
-    this._reactivity = options.reactivity;
-    const queryPlanner = new QueryPlanner();
-    this._plan = queryPlanner.createPlan(this._query);
-  }
 };
 
 // src/db-host/query-service.ts
-function _define_property13(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate5(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);
@@ -4121,6 +4126,27 @@ 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;
+    trace4.diagnostic({
+      id: "active-queries",
+      name: "Active Queries",
+      fetch: () => {
+        return Array.from(this._queries).map((query) => {
+          return {
+            query: JSON.stringify(query.executor.query),
+            plan: JSON.stringify(query.executor.plan),
+            trace: JSON.stringify(query.executor.trace)
+          };
+        });
+      }
+    });
+  }
   async _open() {
     this._params.indexer.updated.on(this._ctx, () => this.invalidateQueries());
     this._updateQueries = new DeferredTask2(this._ctx, this._executeQueries.bind(this));
@@ -4139,7 +4165,7 @@ var QueryServiceImpl = class extends Resource7 {
           config: this._params.indexer.config
         }, {
           F: __dxlog_file12,
-          L: 101,
+          L: 102,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4161,7 +4187,7 @@ var QueryServiceImpl = class extends Resource7 {
   async reindex() {
     log10("Reindexing all documents...", void 0, {
       F: __dxlog_file12,
-      L: 120,
+      L: 121,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4176,7 +4202,7 @@ var QueryServiceImpl = class extends Resource7 {
           count: ids.size
         }, {
           F: __dxlog_file12,
-          L: 128,
+          L: 129,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4186,7 +4212,7 @@ var QueryServiceImpl = class extends Resource7 {
       count: ids.size
     }, {
       F: __dxlog_file12,
-      L: 132,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4252,7 +4278,7 @@ var QueryServiceImpl = class extends Resource7 {
       } catch (err) {
         log10.catch(err, void 0, {
           F: __dxlog_file12,
-          L: 203,
+          L: 204,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4263,28 +4289,11 @@ var QueryServiceImpl = class extends Resource7 {
       duration: performance.now() - begin
     }, {
       F: __dxlog_file12,
-      L: 207,
+      L: 208,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  // TODO(burdon): OK for options, but not params. Pass separately and type readonly here.
-  constructor(_params) {
-    super(), _define_property13(this, "_params", void 0), _define_property13(this, "_queries", void 0), _define_property13(this, "_updateQueries", void 0), this._params = _params, this._queries = /* @__PURE__ */ new Set();
-    trace4.diagnostic({
-      id: "active-queries",
-      name: "Active Queries",
-      fetch: () => {
-        return Array.from(this._queries).map((query) => {
-          return {
-            query: JSON.stringify(query.executor.query),
-            plan: JSON.stringify(query.executor.plan),
-            trace: JSON.stringify(query.executor.trace)
-          };
-        });
-      }
-    });
-  }
 };
 _ts_decorate5([
   synchronized2
@@ -4331,7 +4340,7 @@ var createDocumentsIterator = (automergeHost) => (
           }
           const linkHandle = await automergeHost.loadDoc(Context4.default(void 0, {
             F: __dxlog_file12,
-            L: 247
+            L: 248
           }), urlString);
           for await (const result of getObjectsFromHandle(linkHandle)) {
             yield result;
@@ -4365,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", {
@@ -4395,21 +4404,9 @@ var measureDocMetrics = (doc) => {
 };
 
 // src/db-host/database-root.ts
-function _define_property14(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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) {
@@ -4423,6 +4420,9 @@ var DatabaseRoot = class {
       }
     });
   }
+  constructor(_rootHandle) {
+    this._rootHandle = _rootHandle;
+  }
   get documentId() {
     return this._rootHandle.documentId;
   }
@@ -4486,28 +4486,16 @@ var DatabaseRoot = class {
     }
     return measureDocMetrics(doc);
   }
-  constructor(_rootHandle) {
-    _define_property14(this, "_rootHandle", void 0);
-    this._rootHandle = _rootHandle;
-  }
 };
 
 // src/db-host/space-state-manager.ts
-function _define_property15(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file15 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/space-state-manager.ts";
 var SpaceStateManager = class extends Resource8 {
+  _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();
@@ -4580,16 +4568,13 @@ var SpaceStateManager = class extends Resource8 {
     documentListCheckScheduler.trigger();
     return root;
   }
-  constructor(...args) {
-    super(...args), _define_property15(this, "_roots", /* @__PURE__ */ new Map()), _define_property15(this, "_rootBySpace", /* @__PURE__ */ new Map()), _define_property15(this, "_perRootContext", /* @__PURE__ */ new Map()), _define_property15(this, "_lastSpaceDocumentList", /* @__PURE__ */ new Map()), _define_property15(this, "spaceDocumentListUpdated", new Event3());
-  }
 };
 var SpaceDocumentListUpdatedEvent = class {
+  spaceId;
+  spaceRootId;
+  previousRootId;
+  documentIds;
   constructor(spaceId, spaceRootId, previousRootId, documentIds) {
-    _define_property15(this, "spaceId", void 0);
-    _define_property15(this, "spaceRootId", void 0);
-    _define_property15(this, "previousRootId", void 0);
-    _define_property15(this, "documentIds", void 0);
     this.spaceId = spaceId;
     this.spaceRootId = spaceRootId;
     this.previousRootId = previousRootId;
@@ -4598,19 +4583,6 @@ var SpaceDocumentListUpdatedEvent = class {
 };
 
 // src/db-host/echo-host.ts
-function _define_property16(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file16 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/echo-host.ts";
 var DEFAULT_INDEXING_CONFIG = {
   // TODO(dmaretskyi): Disabled by default since embedding generation is expensive.
@@ -4618,6 +4590,111 @@ 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();
+    const indexingConfig = {
+      ...DEFAULT_INDEXING_CONFIG,
+      ...indexing
+    };
+    this._indexMetadataStore = new IndexMetadataStore({
+      db: kv.sublevel("index-metadata")
+    });
+    this._echoDataMonitor = new EchoDataMonitor();
+    this._automergeHost = new AutomergeHost({
+      db: kv,
+      dataMonitor: this._echoDataMonitor,
+      indexMetadataStore: this._indexMetadataStore,
+      peerIdProvider,
+      getSpaceKeyByRootDocumentId
+    });
+    this._indexer = new Indexer({
+      db: kv,
+      indexStore: new IndexStore({
+        db: kv.sublevel("index-storage")
+      }),
+      metadataStore: this._indexMetadataStore,
+      loadDocuments: createSelectedDocumentsIterator(this._automergeHost),
+      indexCooldownTime: false ? 0 : void 0
+    });
+    void this._indexer.setConfig({
+      enabled: true,
+      indexes: [
+        //
+        {
+          kind: IndexKind.Kind.SCHEMA_MATCH
+        },
+        {
+          kind: IndexKind.Kind.GRAPH
+        },
+        ...indexingConfig.fullText ? [
+          {
+            kind: IndexKind.Kind.FULL_TEXT
+          }
+        ] : [],
+        ...indexingConfig.vector ? [
+          {
+            kind: IndexKind.Kind.VECTOR
+          }
+        ] : []
+      ]
+    });
+    this._queryService = new QueryServiceImpl({
+      automergeHost: this._automergeHost,
+      indexer: this._indexer,
+      spaceStateManager: this._spaceStateManager
+    });
+    this._dataService = new DataServiceImpl({
+      automergeHost: this._automergeHost,
+      spaceStateManager: this._spaceStateManager,
+      updateIndexes: async () => {
+        await this._indexer.updateIndexes();
+      }
+    });
+    trace5.diagnostic({
+      id: "echo-stats",
+      name: "Echo Stats",
+      fetch: async () => {
+        return {
+          dataStats: this._echoDataMonitor.computeStats(),
+          loadedDocsCount: this._automergeHost.loadedDocsCount
+        };
+      }
+    });
+    trace5.diagnostic({
+      id: "database-roots",
+      name: "Database Roots",
+      fetch: async () => {
+        return Array.from(this._spaceStateManager.roots.values()).map((root) => ({
+          url: root.url,
+          isLoaded: root.isLoaded,
+          spaceKey: root.getSpaceKey(),
+          inlineObjects: root.getInlineObjectCount(),
+          linkedObjects: root.getLinkedObjectCount()
+        }));
+      }
+    });
+    trace5.diagnostic({
+      id: "database-root-metrics",
+      name: "Database Roots (with metrics)",
+      fetch: async () => {
+        return Array.from(this._spaceStateManager.roots.values()).map((root) => ({
+          url: root.url,
+          isLoaded: root.isLoaded,
+          spaceKey: root.getSpaceKey(),
+          inlineObjects: root.getInlineObjectCount(),
+          linkedObjects: root.getLinkedObjectCount(),
+          ...root.measureMetrics() ?? {}
+        }));
+      }
+    });
+  }
   get queryService() {
     return this._queryService;
   }
@@ -4658,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.
@@ -4742,107 +4819,10 @@ var EchoHost = class extends Resource9 {
   async removeReplicator(replicator) {
     await this._automergeHost.removeReplicator(replicator);
   }
-  constructor({ kv, indexing = {}, peerIdProvider, getSpaceKeyByRootDocumentId }) {
-    super(), _define_property16(this, "_indexMetadataStore", void 0), _define_property16(this, "_indexer", void 0), _define_property16(this, "_automergeHost", void 0), _define_property16(this, "_queryService", void 0), _define_property16(this, "_dataService", void 0), _define_property16(this, "_spaceStateManager", new SpaceStateManager()), _define_property16(this, "_echoDataMonitor", void 0);
-    const indexingConfig = {
-      ...DEFAULT_INDEXING_CONFIG,
-      ...indexing
-    };
-    this._indexMetadataStore = new IndexMetadataStore({
-      db: kv.sublevel("index-metadata")
-    });
-    this._echoDataMonitor = new EchoDataMonitor();
-    this._automergeHost = new AutomergeHost({
-      db: kv,
-      dataMonitor: this._echoDataMonitor,
-      indexMetadataStore: this._indexMetadataStore,
-      peerIdProvider,
-      getSpaceKeyByRootDocumentId
-    });
-    this._indexer = new Indexer({
-      db: kv,
-      indexStore: new IndexStore({
-        db: kv.sublevel("index-storage")
-      }),
-      metadataStore: this._indexMetadataStore,
-      loadDocuments: createSelectedDocumentsIterator(this._automergeHost),
-      indexCooldownTime: false ? 0 : void 0
-    });
-    void this._indexer.setConfig({
-      enabled: true,
-      indexes: [
-        //
-        {
-          kind: IndexKind.Kind.SCHEMA_MATCH
-        },
-        {
-          kind: IndexKind.Kind.GRAPH
-        },
-        ...indexingConfig.fullText ? [
-          {
-            kind: IndexKind.Kind.FULL_TEXT
-          }
-        ] : [],
-        ...indexingConfig.vector ? [
-          {
-            kind: IndexKind.Kind.VECTOR
-          }
-        ] : []
-      ]
-    });
-    this._queryService = new QueryServiceImpl({
-      automergeHost: this._automergeHost,
-      indexer: this._indexer,
-      spaceStateManager: this._spaceStateManager
-    });
-    this._dataService = new DataServiceImpl({
-      automergeHost: this._automergeHost,
-      spaceStateManager: this._spaceStateManager,
-      updateIndexes: async () => {
-        await this._indexer.updateIndexes();
-      }
-    });
-    trace5.diagnostic({
-      id: "echo-stats",
-      name: "Echo Stats",
-      fetch: async () => {
-        return {
-          dataStats: this._echoDataMonitor.computeStats(),
-          loadedDocsCount: this._automergeHost.loadedDocsCount
-        };
-      }
-    });
-    trace5.diagnostic({
-      id: "database-roots",
-      name: "Database Roots",
-      fetch: async () => {
-        return Array.from(this._spaceStateManager.roots.values()).map((root) => ({
-          url: root.url,
-          isLoaded: root.isLoaded,
-          spaceKey: root.getSpaceKey(),
-          inlineObjects: root.getInlineObjectCount(),
-          linkedObjects: root.getLinkedObjectCount()
-        }));
-      }
-    });
-    trace5.diagnostic({
-      id: "database-root-metrics",
-      name: "Database Roots (with metrics)",
-      fetch: async () => {
-        return Array.from(this._spaceStateManager.roots.values()).map((root) => ({
-          url: root.url,
-          isLoaded: root.isLoaded,
-          spaceKey: root.getSpaceKey(),
-          inlineObjects: root.getInlineObjectCount(),
-          linkedObjects: root.getLinkedObjectCount(),
-          ...root.measureMetrics() ?? {}
-        }));
-      }
-    });
-  }
 };
 
 // src/edge/echo-edge-replicator.ts
+import * as Automerge from "@automerge/automerge";
 import { cbor as cbor2 } from "@automerge/automerge-repo";
 import { Mutex, scheduleMicroTask as scheduleMicroTask2, scheduleTask as scheduleTask2 } from "@dxos/async";
 import { Context as Context6, Resource as Resource11 } from "@dxos/context";
@@ -4852,27 +4832,26 @@ import { log as log13 } from "@dxos/log";
 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";
 import { Resource as Resource10 } from "@dxos/context";
 import { log as log12 } from "@dxos/log";
-function _define_property17(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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;
+  }
   async _open() {
     this._inflightRequestBalance = 0;
     this._requestBarrier.reset();
@@ -4915,30 +4894,9 @@ var InflightRequestLimiter = class extends Resource10 {
       clearInterval(this._resetBalanceTimeout);
     }
   }
-  constructor(_config) {
-    super(), _define_property17(this, "_config", void 0), /**
-    * 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.
-    */
-    _define_property17(this, "_inflightRequestBalance", void 0), _define_property17(this, "_requestBarrier", void 0), _define_property17(this, "_resetBalanceTimeout", void 0), this._config = _config, this._inflightRequestBalance = 0, this._requestBarrier = new Trigger2();
-  }
 };
 
 // src/edge/echo-edge-replicator.ts
-function _define_property18(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_add_disposable_resource(env, value, async) {
   if (value !== null && value !== void 0) {
     if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
@@ -5009,20 +4967,33 @@ var INITIAL_RESTART_DELAY = 500;
 var RESTART_DELAY_JITTER = 250;
 var MAX_RESTART_DELAY = 5e3;
 var EchoEdgeReplicator = class {
+  _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) {
     log13("connecting...", {
       peerId: context.peerId,
       connectedSpaces: this._connectedSpaces.size
     }, {
       F: __dxlog_file18,
-      L: 72,
+      L: 73,
       S: this,
       C: (f, a) => f(...a)
     });
     this._context = context;
     this._ctx = Context6.default(void 0, {
       F: __dxlog_file18,
-      L: 74
+      L: 75
     });
     this._ctx.onDispose(this._edgeConnection.onReconnected(() => {
       this._ctx && scheduleMicroTask2(this._ctx, () => this._handleReconnect());
@@ -5121,7 +5092,7 @@ var EchoEdgeReplicator = class {
   async _openConnection(spaceId, reconnects = 0) {
     invariant14(this._context, void 0, {
       F: __dxlog_file18,
-      L: 135,
+      L: 136,
       S: this,
       A: [
         "this._context",
@@ -5130,7 +5101,7 @@ var EchoEdgeReplicator = class {
     });
     invariant14(!this._connections.has(spaceId), void 0, {
       F: __dxlog_file18,
-      L: 136,
+      L: 137,
       S: this,
       A: [
         "!this._connections.has(spaceId)",
@@ -5149,7 +5120,7 @@ var EchoEdgeReplicator = class {
           spaceId
         }, {
           F: __dxlog_file18,
-          L: 147,
+          L: 148,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5160,7 +5131,7 @@ var EchoEdgeReplicator = class {
           spaceId
         }, {
           F: __dxlog_file18,
-          L: 151,
+          L: 152,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5177,7 +5148,7 @@ var EchoEdgeReplicator = class {
           restartDelay
         }, {
           F: __dxlog_file18,
-          L: 162,
+          L: 163,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5205,7 +5176,7 @@ var EchoEdgeReplicator = class {
               restartDelay
             }, {
               F: __dxlog_file18,
-              L: 179,
+              L: 180,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5222,27 +5193,57 @@ var EchoEdgeReplicator = class {
     this._connections.set(spaceId, connection);
     await connection.open();
   }
-  constructor({ edgeConnection, edgeHttpClient, disableSharePolicy }) {
-    _define_property18(this, "_edgeConnection", void 0);
-    _define_property18(this, "_edgeHttpClient", void 0);
-    _define_property18(this, "_mutex", new Mutex());
-    _define_property18(this, "_ctx", void 0);
-    _define_property18(this, "_context", null);
-    _define_property18(this, "_connectedSpaces", /* @__PURE__ */ new Set());
-    _define_property18(this, "_connections", /* @__PURE__ */ new Map());
-    _define_property18(this, "_sharePolicyEnabled", true);
-    this._edgeConnection = edgeConnection;
-    this._edgeHttpClient = edgeHttpClient;
-    this._sharePolicyEnabled = !disableSharePolicy;
-  }
 };
 var MAX_INFLIGHT_REQUESTS = 5;
 var MAX_RATE_LIMIT_WAIT_TIME_MS = 3e3;
 var EdgeReplicatorConnection = class extends Resource11 {
+  _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._edgeConnection = edgeConnection;
+    this._edgeHttpClient = edgeHttpClient;
+    this._spaceId = spaceId;
+    this._context = context;
+    this._remotePeerId = `${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}-${this._connectionId}`;
+    this._targetServiceId = `${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}`;
+    this._sharedPolicyEnabled = sharedPolicyEnabled;
+    this._onRemoteConnected = onRemoteConnected;
+    this._onRemoteDisconnected = onRemoteDisconnected;
+    this._onRestartRequested = onRestartRequested;
+    this.readable = new ReadableStream({
+      start: (controller) => {
+        this._readableStreamController = controller;
+      }
+    });
+    this.writable = new WritableStream({
+      write: async (message, controller) => {
+        await this._requestLimiter.rateLimit(message);
+        await this._sendMessage(message);
+      }
+    });
+  }
   async _open(ctx) {
     log13("opening...", void 0, {
       F: __dxlog_file18,
-      L: 270,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5257,7 +5258,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
         if (firstReconnect) {
           log13.verbose("first reconnect skipped", void 0, {
             F: __dxlog_file18,
-            L: 285,
+            L: 288,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5272,7 +5273,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
   async _close() {
     log13("closing...", void 0, {
       F: __dxlog_file18,
-      L: 298,
+      L: 301,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5283,7 +5284,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
   get peerId() {
     invariant14(this._remotePeerId, "Not connected", {
       F: __dxlog_file18,
-      L: 307,
+      L: 310,
       S: this,
       A: [
         "this._remotePeerId",
@@ -5308,7 +5309,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
         remoteId: this._remotePeerId
       }, {
         F: __dxlog_file18,
-        L: 322,
+        L: 325,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5329,12 +5330,11 @@ 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: 351,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5365,7 +5365,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
     ]));
   }
   _processMessage(message) {
-    if (isForbiddenErrorMessage(message)) {
+    if (isErrorMessage(message)) {
       this._onRestartRequested();
       return;
     }
@@ -5374,13 +5374,20 @@ 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: 401,
+      L: 407,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5401,41 +5408,29 @@ var EdgeReplicatorConnection = class extends Resource11 {
         err
       }, {
         F: __dxlog_file18,
-        L: 421,
+        L: 426,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
-  constructor({ edgeConnection, edgeHttpClient, spaceId, context, sharedPolicyEnabled, onRemoteConnected, onRemoteDisconnected, onRestartRequested }) {
-    super(), _define_property18(this, "_edgeConnection", void 0), _define_property18(this, "_edgeHttpClient", void 0), _define_property18(this, "_remotePeerId", null), _define_property18(this, "_targetServiceId", void 0), _define_property18(this, "_spaceId", void 0), _define_property18(this, "_context", void 0), _define_property18(this, "_sharedPolicyEnabled", void 0), _define_property18(this, "_onRemoteConnected", void 0), _define_property18(this, "_onRemoteDisconnected", void 0), _define_property18(this, "_onRestartRequested", void 0), _define_property18(this, "_requestLimiter", new InflightRequestLimiter({
-      maxInflightRequests: MAX_INFLIGHT_REQUESTS,
-      resetBalanceTimeoutMs: MAX_RATE_LIMIT_WAIT_TIME_MS
-    })), _define_property18(this, "_readableStreamController", void 0), _define_property18(this, "readable", void 0), _define_property18(this, "writable", void 0);
-    this._edgeConnection = edgeConnection;
-    this._edgeHttpClient = edgeHttpClient;
-    this._spaceId = spaceId;
-    this._context = context;
-    this._remotePeerId = `${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}-${randomUUID()}`;
-    this._targetServiceId = `${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}`;
-    this._sharedPolicyEnabled = sharedPolicyEnabled;
-    this._onRemoteConnected = onRemoteConnected;
-    this._onRemoteDisconnected = onRemoteDisconnected;
-    this._onRestartRequested = onRestartRequested;
-    this.readable = new ReadableStream({
-      start: (controller) => {
-        this._readableStreamController = controller;
-      }
-    });
-    this.writable = new WritableStream({
-      write: async (message, controller) => {
-        await this._requestLimiter.rateLimit(message);
-        await this._sendMessage(message);
-      }
-    });
+  _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 { ObjectStructure as ObjectStructure2, decodeReference } from "@dxos/echo-protocol";