@dxos/echo-pipeline 0.8.1 → 0.8.2-main.10c050d

package/dist/lib/node/index.cjs

@@ -28,77 +28,85 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
-  AuthExtension: () => import_chunk_TC2PRBEU.AuthExtension,
-  AuthStatus: () => import_chunk_TC2PRBEU.AuthStatus,
+  AuthExtension: () => import_chunk_SG2PL5RH.AuthExtension,
+  AuthStatus: () => import_chunk_SG2PL5RH.AuthStatus,
   AutomergeHost: () => AutomergeHost,
-  CredentialRetrieverExtension: () => import_chunk_TC2PRBEU.CredentialRetrieverExtension,
-  CredentialServerExtension: () => import_chunk_TC2PRBEU.CredentialServerExtension,
+  CredentialRetrieverExtension: () => import_chunk_SG2PL5RH.CredentialRetrieverExtension,
+  CredentialServerExtension: () => import_chunk_SG2PL5RH.CredentialServerExtension,
   DataServiceImpl: () => DataServiceImpl,
   DatabaseRoot: () => DatabaseRoot,
   DocumentsSynchronizer: () => DocumentsSynchronizer,
   EchoDataMonitor: () => EchoDataMonitor,
   EchoEdgeReplicator: () => EchoEdgeReplicator,
   EchoHost: () => EchoHost,
+  ExecutionTrace: () => ExecutionTrace,
+  FIND_PARAMS: () => FIND_PARAMS,
   LevelDBStorageAdapter: () => LevelDBStorageAdapter,
-  MOCK_AUTH_PROVIDER: () => import_chunk_TC2PRBEU.MOCK_AUTH_PROVIDER,
-  MOCK_AUTH_VERIFIER: () => import_chunk_TC2PRBEU.MOCK_AUTH_VERIFIER,
+  MOCK_AUTH_PROVIDER: () => import_chunk_SG2PL5RH.MOCK_AUTH_PROVIDER,
+  MOCK_AUTH_VERIFIER: () => import_chunk_SG2PL5RH.MOCK_AUTH_VERIFIER,
   MeshEchoReplicator: () => MeshEchoReplicator,
-  MetadataStore: () => import_chunk_TC2PRBEU.MetadataStore,
-  Pipeline: () => import_chunk_TC2PRBEU.Pipeline,
+  MetadataStore: () => import_chunk_SG2PL5RH.MetadataStore,
+  Pipeline: () => import_chunk_SG2PL5RH.Pipeline,
+  QueryExecutor: () => QueryExecutor,
+  QueryPlan: () => QueryPlan,
+  QueryPlanner: () => QueryPlanner,
   QueryServiceImpl: () => QueryServiceImpl,
-  QueryState: () => QueryState,
-  Space: () => import_chunk_TC2PRBEU.Space,
+  Space: () => import_chunk_SG2PL5RH.Space,
   SpaceDocumentListUpdatedEvent: () => SpaceDocumentListUpdatedEvent,
-  SpaceManager: () => import_chunk_TC2PRBEU.SpaceManager,
-  SpaceProtocol: () => import_chunk_TC2PRBEU.SpaceProtocol,
-  SpaceProtocolSession: () => import_chunk_TC2PRBEU.SpaceProtocolSession,
+  SpaceManager: () => import_chunk_SG2PL5RH.SpaceManager,
+  SpaceProtocol: () => import_chunk_SG2PL5RH.SpaceProtocol,
+  SpaceProtocolSession: () => import_chunk_SG2PL5RH.SpaceProtocolSession,
   SpaceStateManager: () => SpaceStateManager,
-  TimeframeClock: () => import_chunk_TC2PRBEU.TimeframeClock,
-  codec: () => import_chunk_TC2PRBEU.codec,
-  createIdFromSpaceKey: () => import_chunk_TC2PRBEU.createIdFromSpaceKey,
-  createMappedFeedWriter: () => import_chunk_TC2PRBEU.createMappedFeedWriter,
+  TimeframeClock: () => import_chunk_SG2PL5RH.TimeframeClock,
+  codec: () => import_chunk_SG2PL5RH.codec,
+  createIdFromSpaceKey: () => import_chunk_SG2PL5RH.createIdFromSpaceKey,
+  createMappedFeedWriter: () => import_chunk_SG2PL5RH.createMappedFeedWriter,
   deriveCollectionIdFromSpaceId: () => deriveCollectionIdFromSpaceId,
   diffCollectionState: () => diffCollectionState,
   encodingOptions: () => encodingOptions,
+  filterMatchObject: () => import_chunk_HOPOFWAL.filterMatchObject,
+  filterMatchValue: () => import_chunk_HOPOFWAL.filterMatchValue,
   findInlineObjectOfType: () => findInlineObjectOfType,
   getSpaceIdFromCollectionId: () => getSpaceIdFromCollectionId,
-  getSpaceKeyFromDoc: () => getSpaceKeyFromDoc,
-  hasInvitationExpired: () => import_chunk_TC2PRBEU.hasInvitationExpired,
-  mapFeedIndexesToTimeframe: () => import_chunk_TC2PRBEU.mapFeedIndexesToTimeframe,
-  mapTimeframeToFeedIndexes: () => import_chunk_TC2PRBEU.mapTimeframeToFeedIndexes,
-  startAfter: () => import_chunk_TC2PRBEU.startAfter,
-  valueEncoding: () => import_chunk_TC2PRBEU.valueEncoding
+  hasInvitationExpired: () => import_chunk_SG2PL5RH.hasInvitationExpired,
+  mapFeedIndexesToTimeframe: () => import_chunk_SG2PL5RH.mapFeedIndexesToTimeframe,
+  mapTimeframeToFeedIndexes: () => import_chunk_SG2PL5RH.mapTimeframeToFeedIndexes,
+  startAfter: () => import_chunk_SG2PL5RH.startAfter,
+  valueEncoding: () => import_chunk_SG2PL5RH.valueEncoding
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_TC2PRBEU = require("./chunk-TC2PRBEU.cjs");
+var import_chunk_HOPOFWAL = require("./chunk-HOPOFWAL.cjs");
+var import_chunk_SG2PL5RH = require("./chunk-SG2PL5RH.cjs");
+var import_chunk_Q7SFCCGT = require("./chunk-Q7SFCCGT.cjs");
 var import_async = require("@dxos/async");
 var import_stream = require("@dxos/codec-protobuf/stream");
 var import_invariant = require("@dxos/invariant");
 var import_keys = require("@dxos/keys");
 var import_log = require("@dxos/log");
+var import_automerge = require("@automerge/automerge");
 var import_async2 = require("@dxos/async");
-var import_automerge = require("@dxos/automerge/automerge");
 var import_context = require("@dxos/context");
 var import_invariant2 = require("@dxos/invariant");
 var import_log2 = require("@dxos/log");
+var import_automerge2 = require("@automerge/automerge");
+var import_automerge_repo = require("@automerge/automerge-repo");
 var import_async3 = require("@dxos/async");
-var import_automerge2 = require("@dxos/automerge/automerge");
-var import_automerge_repo = require("@dxos/automerge/automerge-repo");
 var import_context2 = require("@dxos/context");
+var import_echo_protocol = require("@dxos/echo-protocol");
 var import_invariant3 = require("@dxos/invariant");
 var import_keys2 = require("@dxos/keys");
 var import_log3 = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
 var import_tracing = require("@dxos/tracing");
 var import_util = require("@dxos/util");
+var import_automerge3 = require("@automerge/automerge");
 var import_async4 = require("@dxos/async");
-var import_automerge3 = require("@dxos/automerge/automerge");
 var import_context3 = require("@dxos/context");
 var import_log4 = require("@dxos/log");
 var import_tracing2 = require("@dxos/tracing");
 var import_util2 = require("@dxos/util");
+var import_automerge_repo2 = require("@automerge/automerge-repo");
 var import_async5 = require("@dxos/async");
-var import_automerge_repo2 = require("@dxos/automerge/automerge-repo");
 var import_context4 = require("@dxos/context");
 var import_invariant4 = require("@dxos/invariant");
 var import_log5 = require("@dxos/log");
@@ -110,8 +118,8 @@ var import_invariant5 = require("@dxos/invariant");
 var import_keys3 = require("@dxos/keys");
 var import_log6 = require("@dxos/log");
 var import_util4 = require("@dxos/util");
-var A2 = __toESM(require("@dxos/automerge/automerge"));
-var import_automerge_repo3 = require("@dxos/automerge/automerge-repo");
+var A2 = __toESM(require("@automerge/automerge"));
+var import_automerge_repo3 = require("@automerge/automerge-repo");
 var import_context6 = require("@dxos/context");
 var import_invariant6 = require("@dxos/invariant");
 var import_log7 = require("@dxos/log");
@@ -122,63 +130,67 @@ var import_tracing3 = require("@dxos/tracing");
 var import_util5 = require("@dxos/util");
 var import_context7 = require("@dxos/context");
 var import_debug = require("@dxos/debug");
-var import_echo_protocol = require("@dxos/echo-protocol");
+var import_echo_protocol2 = require("@dxos/echo-protocol");
 var import_indexing2 = require("@dxos/indexing");
 var import_invariant8 = require("@dxos/invariant");
 var import_indexing3 = require("@dxos/protocols/proto/dxos/echo/indexing");
 var import_tracing4 = require("@dxos/tracing");
-var A3 = __toESM(require("@dxos/automerge/automerge"));
+var A3 = __toESM(require("@automerge/automerge"));
 var import_context8 = require("@dxos/context");
-var import_echo_protocol2 = require("@dxos/echo-protocol");
+var import_echo_protocol3 = require("@dxos/echo-protocol");
 var import_invariant9 = require("@dxos/invariant");
 var import_log8 = require("@dxos/log");
 var import_protocols3 = require("@dxos/protocols");
+var import_automerge4 = require("@automerge/automerge");
+var import_effect = require("effect");
 var import_async6 = require("@dxos/async");
-var import_automerge4 = require("@dxos/automerge/automerge");
 var import_stream2 = require("@dxos/codec-protobuf/stream");
 var import_context9 = require("@dxos/context");
+var import_debug2 = require("@dxos/debug");
+var import_echo_protocol4 = require("@dxos/echo-protocol");
 var import_log9 = require("@dxos/log");
 var import_protocols4 = require("@dxos/protocols");
 var import_tracing5 = require("@dxos/tracing");
+var import_effect2 = require("effect");
 var import_context10 = require("@dxos/context");
-var import_echo_protocol3 = require("@dxos/echo-protocol");
+var import_echo_protocol5 = require("@dxos/echo-protocol");
+var import_indexing4 = require("@dxos/indexing");
 var import_invariant10 = require("@dxos/invariant");
 var import_keys5 = require("@dxos/keys");
+var import_log10 = require("@dxos/log");
 var import_protocols5 = require("@dxos/protocols");
-var import_tracing6 = require("@dxos/tracing");
 var import_util6 = require("@dxos/util");
+var import_invariant11 = require("@dxos/invariant");
+var import_errors = require("@dxos/errors");
+var import_automerge_repo4 = require("@automerge/automerge-repo");
 var import_lodash = __toESM(require("lodash.isequal"));
 var import_async7 = require("@dxos/async");
-var import_automerge_repo4 = require("@dxos/automerge/automerge-repo");
 var import_context11 = require("@dxos/context");
-var import_automerge_repo5 = require("@dxos/automerge/automerge-repo");
-var import_echo_protocol4 = require("@dxos/echo-protocol");
-var import_invariant11 = require("@dxos/invariant");
-var A4 = __toESM(require("@dxos/automerge/automerge"));
-var import_log10 = require("@dxos/log");
+var import_invariant12 = require("@dxos/invariant");
+var import_automerge_repo5 = require("@automerge/automerge-repo");
+var import_echo_protocol6 = require("@dxos/echo-protocol");
+var import_invariant13 = require("@dxos/invariant");
+var A4 = __toESM(require("@automerge/automerge"));
+var import_log11 = require("@dxos/log");
+var import_automerge_repo6 = require("@automerge/automerge-repo");
 var import_async8 = require("@dxos/async");
-var import_automerge_repo6 = require("@dxos/automerge/automerge-repo");
 var import_context12 = require("@dxos/context");
 var import_crypto = require("@dxos/crypto");
-var import_invariant12 = require("@dxos/invariant");
-var import_log11 = require("@dxos/log");
+var import_invariant14 = require("@dxos/invariant");
+var import_log12 = require("@dxos/log");
 var import_protocols6 = require("@dxos/protocols");
 var import_buf = require("@dxos/protocols/buf");
 var import_messenger_pb = require("@dxos/protocols/buf/dxos/edge/messenger_pb");
 var import_util7 = require("@dxos/util");
 var import_async9 = require("@dxos/async");
 var import_context13 = require("@dxos/context");
-var import_log12 = require("@dxos/log");
-var import_echo_protocol5 = require("@dxos/echo-protocol");
+var import_log13 = require("@dxos/log");
+var import_echo_protocol7 = require("@dxos/echo-protocol");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/documents-synchronizer.ts";
 var MAX_UPDATE_FREQ = 10;
 var DocumentsSynchronizer = class extends import_context.Resource {
   constructor(_params) {
-    super();
-    this._params = _params;
-    this._syncStates = /* @__PURE__ */ new Map();
-    this._pendingUpdates = /* @__PURE__ */ new Set();
-    this._sendUpdatesJob = void 0;
+    super(), this._params = _params, this._syncStates = /* @__PURE__ */ new Map(), this._pendingUpdates = /* @__PURE__ */ new Set(), this._sendUpdatesJob = void 0;
   }
   addDocuments(documentIds, retryCounter = 0) {
     if (retryCounter > 3) {
@@ -186,15 +198,15 @@ var DocumentsSynchronizer = class extends import_context.Resource {
         documentIds
       }, {
         F: __dxlog_file,
-        L: 49,
+        L: 50,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
     for (const documentId of documentIds) {
-      const doc = this._params.repo.find(documentId);
-      doc.whenReady().then(() => {
+      this._params.repo.find(documentId).then(async (doc) => {
+        await doc.whenReady();
         this._startSync(doc);
         this._pendingUpdates.add(doc.documentId);
         this._sendUpdatesJob.trigger();
@@ -204,7 +216,7 @@ var DocumentsSynchronizer = class extends import_context.Resource {
           error
         }, {
           F: __dxlog_file,
-          L: 63,
+          L: 64,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -233,7 +245,7 @@ var DocumentsSynchronizer = class extends import_context.Resource {
   update(updates) {
     for (const { documentId, mutation, isNew } of updates) {
       if (isNew) {
-        const doc = this._params.repo.find(documentId);
+        const { handle: doc } = this._params.repo.findWithProgress(documentId);
         doc.update((doc2) => import_automerge.next.loadIncremental(doc2, mutation));
         this._startSync(doc);
       } else {
@@ -247,7 +259,7 @@ var DocumentsSynchronizer = class extends import_context.Resource {
         documentId: doc.documentId
       }, {
         F: __dxlog_file,
-        L: 102,
+        L: 103,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -290,17 +302,18 @@ var DocumentsSynchronizer = class extends import_context.Resource {
     const syncState = this._syncStates.get(documentId);
     (0, import_invariant2.invariant)(syncState, "Sync state for document not found", {
       F: __dxlog_file,
-      L: 143,
+      L: 144,
       S: this,
       A: [
         "syncState",
         "'Sync state for document not found'"
       ]
     });
-    const doc = syncState.handle.docSync();
-    if (!doc) {
+    const handle = syncState.handle;
+    if (!handle || !handle.isReady() || !handle.doc()) {
       return;
     }
+    const doc = handle.doc();
     const mutation = syncState.lastSentHead ? import_automerge.next.saveSince(doc, syncState.lastSentHead) : import_automerge.next.save(doc);
     if (mutation.length === 0) {
       return;
@@ -312,7 +325,7 @@ var DocumentsSynchronizer = class extends import_context.Resource {
     const syncState = this._syncStates.get(documentId);
     (0, import_invariant2.invariant)(syncState, "Sync state for document not found", {
       F: __dxlog_file,
-      L: 158,
+      L: 160,
       S: this,
       A: [
         "syncState",
@@ -374,7 +387,7 @@ var CollectionSynchronizer = class extends import_context3.Resource {
       state
     }, {
       F: __dxlog_file2,
-      L: 75,
+      L: 76,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -393,7 +406,7 @@ var CollectionSynchronizer = class extends import_context3.Resource {
       collectionId
     }, {
       F: __dxlog_file2,
-      L: 89,
+      L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -476,7 +489,7 @@ var CollectionSynchronizer = class extends import_context3.Resource {
       state
     }, {
       F: __dxlog_file2,
-      L: 170,
+      L: 171,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -581,12 +594,13 @@ function _ts_decorate2(decorators, target, key, desc) {
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts";
 var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
   constructor(_params) {
-    super();
-    this._params = _params;
-    this._replicators = /* @__PURE__ */ new Set();
-    this._connections = /* @__PURE__ */ new Map();
-    this._lifecycleState = import_context4.LifecycleState.CLOSED;
-    this._connected = new import_async5.Trigger();
+    super(), this._params = _params, this._replicators = /* @__PURE__ */ new Set(), this._connections = /* @__PURE__ */ new Map(), this._lifecycleState = import_context4.LifecycleState.CLOSED, this._connected = new import_async5.Trigger(), this._ready = new import_async5.Trigger();
+  }
+  isReady() {
+    return this._lifecycleState === import_context4.LifecycleState.OPEN;
+  }
+  whenReady() {
+    return this._ready.wait();
   }
   connect(peerId, peerMetadata) {
     this.peerId = peerId;
@@ -603,15 +617,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       return;
     }
     this._lifecycleState = import_context4.LifecycleState.OPEN;
-    (0, import_log5.log)("emit ready", void 0, {
-      F: __dxlog_file3,
-      L: 82,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this.emit("ready", {
-      network: this
-    });
+    this._ready.wake();
   }
   async close() {
     if (this._lifecycleState === import_context4.LifecycleState.CLOSED) {
@@ -621,6 +627,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       await replicator.disconnect();
     }
     this._replicators.clear();
+    this._ready.reset();
     this._lifecycleState = import_context4.LifecycleState.CLOSED;
   }
   async whenConnected() {
@@ -631,7 +638,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
   async addReplicator(replicator) {
     (0, import_invariant4.invariant)(this._lifecycleState === import_context4.LifecycleState.OPEN, void 0, {
       F: __dxlog_file3,
-      L: 108,
+      L: 115,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -640,7 +647,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
     (0, import_invariant4.invariant)(this.peerId, void 0, {
       F: __dxlog_file3,
-      L: 109,
+      L: 116,
       S: this,
       A: [
         "this.peerId",
@@ -649,7 +656,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
     (0, import_invariant4.invariant)(!this._replicators.has(replicator), void 0, {
       F: __dxlog_file3,
-      L: 110,
+      L: 117,
       S: this,
       A: [
         "!this._replicators.has(replicator)",
@@ -666,14 +673,14 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       getContainingSpaceForDocument: this._params.getContainingSpaceForDocument,
       getContainingSpaceIdForDocument: async (documentId) => {
         const key = await this._params.getContainingSpaceForDocument(documentId);
-        return key ? (0, import_chunk_TC2PRBEU.createIdFromSpaceKey)(key) : null;
+        return key ? (0, import_chunk_SG2PL5RH.createIdFromSpaceKey)(key) : null;
       }
     });
   }
   async removeReplicator(replicator) {
     (0, import_invariant4.invariant)(this._lifecycleState === import_context4.LifecycleState.OPEN, void 0, {
       F: __dxlog_file3,
-      L: 129,
+      L: 136,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -682,7 +689,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     });
     (0, import_invariant4.invariant)(this._replicators.has(replicator), void 0, {
       F: __dxlog_file3,
-      L: 130,
+      L: 137,
       S: this,
       A: [
         "this._replicators.has(replicator)",
@@ -738,7 +745,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       if (connectionEntry.isOpen) {
         import_log5.log.catch(err, void 0, {
           F: __dxlog_file3,
-          L: 190,
+          L: 197,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -759,13 +766,13 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 208,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant4.invariant)(!this._connections.has(connection.peerId), void 0, {
       F: __dxlog_file3,
-      L: 209,
+      L: 216,
       S: this,
       A: [
         "!this._connections.has(connection.peerId as PeerId)",
@@ -794,7 +801,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
         if (connectionEntry.isOpen) {
           import_log5.log.catch(err, void 0, {
             F: __dxlog_file3,
-            L: 228,
+            L: 235,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -805,7 +812,7 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 233,
+      L: 240,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -837,14 +844,14 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 261,
+      L: 268,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     (0, import_invariant4.invariant)(entry, void 0, {
       F: __dxlog_file3,
-      L: 263,
+      L: 270,
       S: this,
       A: [
         "entry",
@@ -861,14 +868,14 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
       peerId: connection.peerId
     }, {
       F: __dxlog_file3,
-      L: 269,
+      L: 276,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     (0, import_invariant4.invariant)(entry, void 0, {
       F: __dxlog_file3,
-      L: 271,
+      L: 278,
       S: this,
       A: [
         "entry",
@@ -882,13 +889,13 @@ var EchoNetworkAdapter = class extends import_automerge_repo2.NetworkAdapter {
     this._params.monitor?.recordPeerDisconnected(connection.peerId);
     void entry.reader.cancel().catch((err) => import_log5.log.catch(err, void 0, {
       F: __dxlog_file3,
-      L: 277,
+      L: 284,
       S: this,
       C: (f, a) => f(...a)
     }));
     void entry.writer.abort().catch((err) => import_log5.log.catch(err, void 0, {
       F: __dxlog_file3,
-      L: 278,
+      L: 285,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -939,8 +946,7 @@ var HeadsStore = class {
 };
 var LevelDBStorageAdapter = class extends import_context5.Resource {
   constructor(_params) {
-    super();
-    this._params = _params;
+    super(), this._params = _params;
   }
   async load(keyArray) {
     try {
@@ -1047,6 +1053,12 @@ function _ts_decorate3(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
+var FIND_PARAMS = {
+  allowableStates: [
+    "ready",
+    "requesting"
+  ]
+};
 var AutomergeHost = class extends import_context2.Resource {
   constructor({ db, indexMetadataStore, dataMonitor, peerIdProvider, getSpaceKeyByRootDocumentId }) {
     super();
@@ -1146,7 +1158,7 @@ var AutomergeHost = class extends import_context2.Resource {
       handle = this._repo.handles[documentId];
     }
     if (!handle) {
-      handle = this._repo.find(documentId);
+      handle = await this._repo.find(documentId, FIND_PARAMS);
     }
     if (!handle.isReady()) {
       if (!opts?.timeout) {
@@ -1202,12 +1214,12 @@ var AutomergeHost = class extends import_context2.Resource {
       await Promise.all(headsToWait.map(async (entry, index) => {
         const handle = await this.loadDoc(import_context2.Context.default(void 0, {
           F: __dxlog_file4,
-          L: 282
+          L: 288
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
       }));
     }
-    await this._repo.flush(documentIds.filter((documentId) => !!this._repo.handles[documentId]));
+    await this._repo.flush(documentIds.filter((documentId) => this._repo.handles[documentId] && this._repo.handles[documentId].isReady()));
   }
   async reIndexHeads(documentIds) {
     for (const documentId of documentIds) {
@@ -1215,46 +1227,30 @@ var AutomergeHost = class extends import_context2.Resource {
         documentId
       }, {
         F: __dxlog_file4,
-        L: 294,
+        L: 302,
         S: this,
         C: (f, a) => f(...a)
       });
-      const handle = this._repo.find(documentId);
-      await handle.whenReady([
-        "ready",
-        "requesting"
-      ]);
-      if (handle.inState([
-        "requesting"
-      ])) {
+      const handle = await this._repo.find(documentId, FIND_PARAMS);
+      if (!handle.isReady()) {
         import_log3.log.warn("document is not available locally, skipping", {
           documentId
         }, {
           F: __dxlog_file4,
-          L: 298,
+          L: 305,
           S: this,
           C: (f, a) => f(...a)
         });
         continue;
       }
-      const doc = handle.docSync();
-      (0, import_invariant3.invariant)(doc, void 0, {
-        F: __dxlog_file4,
-        L: 303,
-        S: this,
-        A: [
-          "doc",
-          ""
-        ]
-      });
-      const heads = (0, import_automerge2.getHeads)(doc);
+      const heads = handle.heads();
       const batch = this._db.batch();
       this._headsStore.setHeads(documentId, heads, batch);
       await batch.write();
     }
     import_log3.log.info("done re-indexing heads", void 0, {
       F: __dxlog_file4,
-      L: 310,
+      L: 314,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1280,16 +1276,16 @@ var AutomergeHost = class extends import_context2.Resource {
   }
   async _beforeSave({ path, batch }) {
     const handle = this._repo.handles[path[0]];
-    if (!handle) {
+    if (!handle || !handle.isReady()) {
       return;
     }
-    const doc = handle.docSync();
+    const doc = handle.doc();
     if (!doc) {
       return;
     }
     const heads = (0, import_automerge2.getHeads)(doc);
     this._headsStore.setHeads(handle.documentId, heads, batch);
-    const spaceKey = getSpaceKeyFromDoc(doc) ?? void 0;
+    const spaceKey = import_echo_protocol.DatabaseDirectory.getSpaceKey(doc) ?? void 0;
     const objectIds = Object.keys(doc.objects ?? {});
     const encodedIds = objectIds.map((objectId) => import_protocols.objectPointerCodec.encode({
       documentId: handle.documentId,
@@ -1317,7 +1313,7 @@ var AutomergeHost = class extends import_context2.Resource {
   async _afterSave(path) {
     this._indexMetadataStore.notifyMarkedDirty();
     const documentId = path[0];
-    const document = this._repo.handles[documentId]?.docSync();
+    const document = this._repo.handles[documentId]?.doc();
     if (document) {
       const heads = (0, import_automerge2.getHeads)(document);
       this._onHeadsChanged(documentId, heads);
@@ -1337,9 +1333,12 @@ var AutomergeHost = class extends import_context2.Resource {
     return false;
   }
   async _getContainingSpaceForDocument(documentId) {
-    const doc = this._repo.handles[documentId]?.docSync();
-    if (doc) {
-      const spaceKeyHex = getSpaceKeyFromDoc(doc);
+    const handle = this._repo.handles[documentId];
+    if (handle.state === "loading") {
+      await handle.whenReady();
+    }
+    if (handle && handle.isReady() && handle.doc()) {
+      const spaceKeyHex = import_echo_protocol.DatabaseDirectory.getSpaceKey(handle.doc());
       if (spaceKeyHex) {
         return import_keys2.PublicKey.from(spaceKeyHex);
       }
@@ -1354,7 +1353,10 @@ var AutomergeHost = class extends import_context2.Resource {
   * Flush documents to disk.
   */
   async flush({ documentIds } = {}) {
-    const loadedDocuments = documentIds?.filter((documentId) => !!this._repo.handles[documentId]);
+    const loadedDocuments = documentIds?.filter((documentId) => {
+      const handle = this._repo.handles[documentId];
+      return handle && handle.isReady();
+    });
     await this._repo.flush(loadedDocuments);
   }
   async getHeads(documentIds) {
@@ -1362,9 +1364,9 @@ var AutomergeHost = class extends import_context2.Resource {
     const storeRequestIds = [];
     const storeResultIndices = [];
     for (const documentId of documentIds) {
-      const doc = this._repo.handles[documentId]?.docSync();
-      if (doc) {
-        result.push((0, import_automerge2.getHeads)(doc));
+      const handle = this._repo.handles[documentId];
+      if (handle && handle.isReady() && handle.doc()) {
+        result.push((0, import_automerge2.getHeads)(handle.doc()));
       } else {
         storeRequestIds.push(documentId);
         storeResultIndices.push(result.length);
@@ -1469,12 +1471,12 @@ var AutomergeHost = class extends import_context2.Resource {
       count: toReplicate.length
     }, {
       F: __dxlog_file4,
-      L: 549,
+      L: 557,
       S: this,
       C: (f, a) => f(...a)
     });
     for (const documentId of toReplicate) {
-      this._repo.find(documentId);
+      this._repo.findWithProgress(documentId);
     }
   }
   _onHeadsChanged(documentId, heads) {
@@ -1511,19 +1513,12 @@ _ts_decorate3([
 AutomergeHost = _ts_decorate3([
   import_tracing.trace.resource()
 ], AutomergeHost);
-var getSpaceKeyFromDoc = (doc) => {
-  const rawSpaceKey = doc.access?.spaceKey ?? doc.experimental_spaceKey;
-  if (rawSpaceKey == null) {
-    return null;
-  }
-  return String(rawSpaceKey);
-};
 var waitForHeads = async (handle, heads) => {
   const unavailableHeads = new Set(heads);
   await handle.whenReady();
   await import_async3.Event.wrap(handle, "change").waitForCondition(() => {
     for (const changeHash of unavailableHeads.values()) {
-      if (changeIsPresentInDoc(handle.docSync(), changeHash)) {
+      if (changeIsPresentInDoc(handle.doc(), changeHash)) {
         unavailableHeads.delete(changeHash);
       }
     }
@@ -1536,7 +1531,7 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 var decodeCollectionState = (state) => {
   (0, import_invariant3.invariant)(typeof state === "object" && state !== null, "Invalid state", {
     F: __dxlog_file4,
-    L: 610,
+    L: 608,
     S: void 0,
     A: [
       "typeof state === 'object' && state !== null",
@@ -1552,11 +1547,7 @@ var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipelin
 var DEFAULT_FACTORY = (params) => new import_teleport_extension_automerge_replicator.AutomergeReplicator(...params);
 var MeshReplicatorConnection = class extends import_context6.Resource {
   constructor(_params) {
-    super();
-    this._params = _params;
-    this.remoteDeviceKey = null;
-    this._remotePeerId = null;
-    this._isEnabled = false;
+    super(), this._params = _params, this.remoteDeviceKey = null, this._remotePeerId = null, this._isEnabled = false;
     let readableStreamController;
     this.readable = new ReadableStream({
       start: (controller) => {
@@ -1568,7 +1559,7 @@ var MeshReplicatorConnection = class extends import_context6.Resource {
       write: async (message, controller) => {
         (0, import_invariant6.invariant)(this._isEnabled, "Writing to a disabled connection", {
           F: __dxlog_file5,
-          L: 50,
+          L: 51,
           S: this,
           A: [
             "this._isEnabled",
@@ -1601,7 +1592,7 @@ var MeshReplicatorConnection = class extends import_context6.Resource {
             remotePeerId: remotePeerId.toHex()
           }, {
             F: __dxlog_file5,
-            L: 79,
+            L: 80,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1628,7 +1619,7 @@ var MeshReplicatorConnection = class extends import_context6.Resource {
   get peerId() {
     (0, import_invariant6.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
-      L: 105,
+      L: 106,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1653,7 +1644,7 @@ var MeshReplicatorConnection = class extends import_context6.Resource {
   enable() {
     (0, import_invariant6.invariant)(this._remotePeerId != null, "Remote peer has not connected yet.", {
       F: __dxlog_file5,
-      L: 126,
+      L: 127,
       S: this,
       A: [
         "this._remotePeerId != null",
@@ -1684,7 +1675,7 @@ var logSendSync = (message) => {
     };
   }, {
     F: __dxlog_file5,
-    L: 139,
+    L: 140,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -1695,7 +1686,7 @@ var getSpaceIdFromCollectionId = (collectionId) => {
   const spaceId = collectionId.split(":")[1];
   (0, import_invariant7.invariant)(import_keys4.SpaceId.isValid(spaceId), void 0, {
     F: __dxlog_file6,
-    L: 15,
+    L: 16,
     S: void 0,
     A: [
       "SpaceId.isValid(spaceId)",
@@ -1843,7 +1834,7 @@ var MeshEchoReplicator = class {
             });
             return remoteDocumentExists;
           }
-          const spaceId = await (0, import_chunk_TC2PRBEU.createIdFromSpaceKey)(spaceKey);
+          const spaceId = await (0, import_chunk_SG2PL5RH.createIdFromSpaceKey)(spaceKey);
           const authorizedDevices = this._authorizedDevices.get(spaceId);
           if (!connection.remoteDeviceKey) {
             (0, import_log6.log)("device key not found for share policy check", {
@@ -1914,7 +1905,7 @@ var MeshEchoReplicator = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    const spaceId = await (0, import_chunk_TC2PRBEU.createIdFromSpaceKey)(spaceKey);
+    const spaceId = await (0, import_chunk_SG2PL5RH.createIdFromSpaceKey)(spaceKey);
     (0, import_util4.defaultMap)(this._authorizedDevices, spaceId, () => new import_util4.ComplexSet(import_keys3.PublicKey.hash)).add(deviceKey);
     for (const connection of this._connections) {
       if (connection.isEnabled && connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
@@ -1943,7 +1934,7 @@ var EchoDataMonitor = class {
     this._localTimeSeries = createLocalTimeSeries();
     this._storageAverages = createStorageAverages();
     this._replicationAverages = createNetworkAverages();
-    this._sizeByMessageType = {};
+    this._sizeByMessage = {};
     this._lastReceivedMessages = new import_util5.CircularBuffer(100);
     this._lastSentMessages = new import_util5.CircularBuffer(100);
     this._connectionsCount = 0;
@@ -1981,8 +1972,8 @@ var EchoDataMonitor = class {
           countPerSecond: this._replicationAverages.sentPerSecond.average(),
           failedPerSecond: this._replicationAverages.sendsFailedPerSecond.average()
         },
-        countByMessageType: this._computeMessageHistogram("type"),
-        avgSizeByMessageType: (0, import_util5.mapValues)(this._sizeByMessageType, (summary) => summary.average())
+        countByMessage: this._computeMessageHistogram("type"),
+        avgSizeByMessage: (0, import_util5.mapValues)(this._sizeByMessage, (summary) => summary.average())
       }
     };
   }
@@ -2187,7 +2178,7 @@ var EchoDataMonitor = class {
     messageCounts.failed++;
   }
   _getStatsForType(message) {
-    const messageSize = this._sizeByMessageType[message.type] ??= createSlidingWindow();
+    const messageSize = this._sizeByMessage[message.type] ??= createSlidingWindow();
     const messageCounts = this._activeCounters.byType[message.type] ??= createMessageCounter();
     return {
       messageCounts,
@@ -2301,7 +2292,7 @@ var DataServiceImpl = class {
         ready();
       }).catch((err) => import_log.log.catch(err, void 0, {
         F: __dxlog_file8,
-        L: 70,
+        L: 71,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -2312,7 +2303,7 @@ var DataServiceImpl = class {
     const synchronizer = this._subscriptions.get(request.subscriptionId);
     (0, import_invariant.invariant)(synchronizer, "Subscription not found", {
       F: __dxlog_file8,
-      L: 77,
+      L: 78,
       S: this,
       A: [
         "synchronizer",
@@ -2333,7 +2324,7 @@ var DataServiceImpl = class {
     const synchronizer = this._subscriptions.get(request.subscriptionId);
     (0, import_invariant.invariant)(synchronizer, "Subscription not found", {
       F: __dxlog_file8,
-      L: 92,
+      L: 93,
       S: this,
       A: [
         "synchronizer",
@@ -2378,7 +2369,7 @@ var DataServiceImpl = class {
       const spaceId = request.spaceId;
       (0, import_invariant.invariant)(import_keys.SpaceId.isValid(spaceId), void 0, {
         F: __dxlog_file8,
-        L: 132,
+        L: 133,
         S: this,
         A: [
           "SpaceId.isValid(spaceId)",
@@ -2431,12 +2422,12 @@ var createSelectedDocumentsIterator = (automergeHost) => (
         const { documentId, objectId } = import_protocols3.objectPointerCodec.decode(id);
         const handle = await automergeHost.loadDoc(import_context8.Context.default(void 0, {
           F: __dxlog_file9,
-          L: 30
+          L: 31
         }), documentId);
-        let doc = handle.docSync();
+        let doc = handle.doc();
         (0, import_invariant9.invariant)(doc, void 0, {
           F: __dxlog_file9,
-          L: 33,
+          L: 34,
           S: this,
           A: [
             "doc",
@@ -2455,13 +2446,13 @@ var createSelectedDocumentsIterator = (automergeHost) => (
               originalHeads: currentHeads
             }, {
               F: __dxlog_file9,
-              L: 44,
+              L: 45,
               S: this,
               C: (f, a) => f(...a)
             });
           }
         }
-        if (doc.version !== import_echo_protocol2.SpaceDocVersion.CURRENT) {
+        if (doc.version !== import_echo_protocol3.SpaceDocVersion.CURRENT) {
           continue;
         }
         if (!doc.objects?.[objectId]) {
@@ -2469,7 +2460,7 @@ var createSelectedDocumentsIterator = (automergeHost) => (
         }
         let newId = id;
         if (import_protocols3.objectPointerCodec.getVersion(id) === import_protocols3.ObjectPointerVersion.V0) {
-          const spaceKey = getSpaceKeyFromDoc(doc) ?? void 0;
+          const spaceKey = import_echo_protocol3.DatabaseDirectory.getSpaceKey(doc) ?? void 0;
           newId = import_protocols3.objectPointerCodec.encode({
             documentId,
             objectId,
@@ -2490,7 +2481,7 @@ var createSelectedDocumentsIterator = (automergeHost) => (
           error
         }, {
           F: __dxlog_file9,
-          L: 70,
+          L: 71,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2498,187 +2489,992 @@ var createSelectedDocumentsIterator = (automergeHost) => (
     }
   }
 );
-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);
-  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/query-state.ts";
-var QueryState = class extends import_context10.Resource {
-  get active() {
-    return this._lifecycleState === import_context10.LifecycleState.OPEN;
+var QueryError = class extends import_errors.BaseError.extend("QUERY_ERROR") {
+};
+(function(QueryPlan2) {
+  QueryPlan2.Plan = Object.freeze({
+    make: (steps) => ({
+      steps
+    })
+  });
+  QueryPlan2.FilterStep = Object.freeze({
+    isNoop: (step) => {
+      switch (step.filter.type) {
+        case "object": {
+          return step.filter.typename === null && (step.filter.id === void 0 || step.filter.id.length === 0) && (step.filter.props === void 0 || Object.keys(step.filter.props).length === 0) && (step.filter.foreignKeys === void 0 || step.filter.foreignKeys.length === 0);
+        }
+        default:
+          return false;
+      }
+    }
+  });
+})(QueryPlan || (QueryPlan = {}));
+var QueryPlan;
+var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/query/query-planner.ts";
+var DEFAULT_OPTIONS = {
+  defaultTextSearchKind: "full-text"
+};
+var QueryPlanner = class {
+  constructor(options) {
+    this._options = {
+      ...DEFAULT_OPTIONS,
+      ...options
+    };
   }
-  constructor(_params) {
-    super();
-    this._params = _params;
-    this._results = [];
-    this._firstRun = true;
-    this.metrics = {
-      objectsReturned: 0,
-      objectsReturnedFromIndex: 0,
-      documentsLoaded: 0,
-      executionTime: 0,
-      indexQueryTime: 0,
-      documentLoadTime: 0
+  createPlan(query) {
+    let plan = this._generate(query, {
+      ...DEFAULT_CONTEXT,
+      originalQuery: query
+    });
+    plan = this._optimizeEmptyFilters(plan);
+    plan = this._optimizeSoloUnions(plan);
+    return plan;
+  }
+  _generate(query, context) {
+    switch (query.type) {
+      case "options":
+        return this._generateOptionsClause(query, context);
+      case "select":
+        return this._generateSelectClause(query, context);
+      case "filter":
+        return this._generateFilterClause(query, context);
+      case "incoming-references":
+        return this._generateIncomingReferencesClause(query, context);
+      case "relation":
+        return this._generateRelationClause(query, context);
+      case "relation-traversal":
+        return this._generateRelationTraversalClause(query, context);
+      case "reference-traversal":
+        return this._generateReferenceTraversalClause(query, context);
+      case "union":
+        return this._generateUnionClause(query, context);
+      default:
+        throw new QueryError(`Unsupported query type: ${query.type}`, {
+          context: {
+            query: context.originalQuery
+          }
+        });
+    }
+  }
+  _generateOptionsClause(query, context) {
+    const newContext = {
+      ...context
     };
-    this.filter = _params.request.filter;
+    if (query.options.spaceIds) {
+      newContext.selectionSpaces = query.options.spaceIds;
+    }
+    if (query.options.deleted) {
+      newContext.deletedHandling = query.options.deleted;
+    }
+    return this._generate(query.query, newContext);
+  }
+  _generateSelectClause(query, context) {
+    return this._generateSelectionFromFilter(query.filter, context);
+  }
+  // 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) {
+      case "object": {
+        if (context.selectionInverted && filter.id === void 0 && filter.typename === null && Object.keys(filter.props).length === 0) {
+          return QueryPlan.Plan.make([
+            {
+              _tag: "ClearWorkingSetStep"
+            },
+            ...this._generateDeletedHandlingSteps(context)
+          ]);
+        }
+        if (context.selectionInverted) {
+          throw new QueryError("Query too complex", {
+            context: {
+              query: context.originalQuery
+            }
+          });
+        }
+        if (filter.id && filter.id?.length > 0) {
+          return QueryPlan.Plan.make([
+            {
+              _tag: "SelectStep",
+              spaces: context.selectionSpaces,
+              selector: {
+                _tag: "IdSelector",
+                objectIds: filter.id
+              }
+            },
+            ...this._generateDeletedHandlingSteps(context),
+            {
+              _tag: "FilterStep",
+              filter: {
+                ...filter,
+                id: void 0
+              }
+            }
+          ]);
+        } else if (filter.typename) {
+          return QueryPlan.Plan.make([
+            {
+              _tag: "SelectStep",
+              spaces: context.selectionSpaces,
+              selector: {
+                _tag: "TypeSelector",
+                typename: [
+                  filter.typename
+                ],
+                inverted: false
+              }
+            },
+            ...this._generateDeletedHandlingSteps(context),
+            {
+              _tag: "FilterStep",
+              filter: {
+                ...filter,
+                typename: null
+              }
+            }
+          ]);
+        } else {
+          return QueryPlan.Plan.make([
+            {
+              _tag: "SelectStep",
+              spaces: context.selectionSpaces,
+              selector: {
+                _tag: "WildcardSelector"
+              }
+            },
+            ...this._generateDeletedHandlingSteps(context),
+            {
+              _tag: "FilterStep",
+              filter: {
+                ...filter
+              }
+            }
+          ]);
+        }
+      }
+      case "text-search": {
+        return QueryPlan.Plan.make([
+          {
+            _tag: "SelectStep",
+            spaces: context.selectionSpaces,
+            selector: {
+              _tag: "TextSelector",
+              text: filter.text,
+              searchKind: filter.searchKind ?? this._options.defaultTextSearchKind
+            }
+          },
+          ...this._generateDeletedHandlingSteps(context)
+        ]);
+      }
+      case "compare":
+        throw new QueryError("Query too complex", {
+          context: {
+            query: context.originalQuery
+          }
+        });
+      case "in":
+        throw new QueryError("Query too complex", {
+          context: {
+            query: context.originalQuery
+          }
+        });
+      case "range":
+        throw new QueryError("Query too complex", {
+          context: {
+            query: context.originalQuery
+          }
+        });
+      case "not":
+        return this._generateSelectionFromFilter(filter.filter, {
+          ...context,
+          selectionInverted: !context.selectionInverted
+        });
+      case "and":
+        throw new QueryError("Query too complex", {
+          context: {
+            query: context.originalQuery
+          }
+        });
+      case "or":
+        if (filter.filters.every(isTrivialTypenameFilter)) {
+          const typenames = filter.filters.map((f) => {
+            (0, import_invariant11.invariant)(f.type === "object" && f.typename !== null, void 0, {
+              F: __dxlog_file10,
+              L: 189,
+              S: this,
+              A: [
+                "f.type === 'object' && f.typename !== null",
+                ""
+              ]
+            });
+            return f.typename;
+          });
+          return QueryPlan.Plan.make([
+            {
+              _tag: "SelectStep",
+              spaces: context.selectionSpaces,
+              selector: {
+                _tag: "TypeSelector",
+                typename: typenames,
+                inverted: context.selectionInverted
+              }
+            },
+            ...this._generateDeletedHandlingSteps(context)
+          ]);
+        } else {
+          throw new QueryError("Query too complex", {
+            context: {
+              query: context.originalQuery
+            }
+          });
+        }
+      default:
+        throw new QueryError(`Unsupported filter type: ${filter.type}`, {
+          context: {
+            query: context.originalQuery
+          }
+        });
+    }
   }
-  getResults() {
-    return this._results;
+  _generateDeletedHandlingSteps(context) {
+    switch (context.deletedHandling) {
+      case "include":
+        return [];
+      case "exclude":
+        return [
+          {
+            _tag: "FilterDeletedStep",
+            mode: "only-non-deleted"
+          }
+        ];
+      case "only":
+        return [
+          {
+            _tag: "FilterDeletedStep",
+            mode: "only-deleted"
+          }
+        ];
+    }
   }
-  // https://github.com/open-telemetry/semantic-conventions/blob/main/docs/attributes-registry/db.md#generic-database-attributes
-  async execQuery() {
-    const filter = this._params.request.filter;
-    const beginQuery = performance.now();
-    const hits = filter.objectIds && filter.objectIds?.length > 0 ? [] : await this._params.indexer.execQuery(filterToIndexQuery(filter));
-    if (this._firstRun) {
-      this.metrics.indexQueryTime = performance.now() - beginQuery;
-    }
-    const beginFilter = performance.now();
-    const results = (await Promise.all(hits.map(async (result) => {
-      if (this._firstRun) {
-        this.metrics.objectsReturnedFromIndex++;
-      }
-      const { objectId, documentId, spaceKey: spaceKeyInIndex } = import_protocols5.objectPointerCodec.decode(result.id);
-      let spaceKey;
-      if (spaceKeyInIndex !== void 0) {
-        spaceKey = spaceKeyInIndex;
-      } else {
-        if (this._firstRun) {
-          this.metrics.documentsLoaded++;
+  _generateUnionClause(query, context) {
+    return QueryPlan.Plan.make([
+      {
+        _tag: "UnionStep",
+        plans: query.queries.map((query2) => this._generate(query2, context))
+      }
+    ]);
+  }
+  _generateReferenceTraversalClause(query, context) {
+    return QueryPlan.Plan.make([
+      ...this._generate(query.anchor, context).steps,
+      {
+        _tag: "TraverseStep",
+        traversal: {
+          _tag: "ReferenceTraversal",
+          direction: "outgoing",
+          property: query.property
         }
-        const handle = await this._params.automergeHost.loadDoc(import_context10.Context.default(void 0, {
-          F: __dxlog_file10,
-          L: 117
-        }), documentId);
-        if (this._ctx.disposed) {
-          return;
+      },
+      ...this._generateDeletedHandlingSteps(context)
+    ]);
+  }
+  _generateIncomingReferencesClause(query, context) {
+    return QueryPlan.Plan.make([
+      ...this._generate(query.anchor, context).steps,
+      {
+        _tag: "TraverseStep",
+        traversal: {
+          _tag: "ReferenceTraversal",
+          direction: "incoming",
+          property: query.property
+        }
+      },
+      ...this._generateDeletedHandlingSteps(context),
+      {
+        _tag: "FilterStep",
+        filter: {
+          type: "object",
+          typename: query.typename,
+          props: {}
         }
-        spaceKey = getSpaceKeyFromDoc(handle.docSync());
       }
-      if (!spaceKey) {
-        return;
+    ]);
+  }
+  _generateRelationTraversalClause(query, context) {
+    switch (query.direction) {
+      case "source": {
+        return QueryPlan.Plan.make([
+          ...this._generate(query.anchor, context).steps,
+          createRelationTraversalStep("relation-to-source"),
+          ...this._generateDeletedHandlingSteps(context)
+        ]);
       }
-      if (this._params.request.filter.options?.spaces?.length && !this._params.request.filter.options.spaces.some((key) => key.equals(spaceKey))) {
-        return;
+      case "target": {
+        return QueryPlan.Plan.make([
+          ...this._generate(query.anchor, context).steps,
+          createRelationTraversalStep("relation-to-target"),
+          ...this._generateDeletedHandlingSteps(context)
+        ]);
       }
-      if (this._firstRun) {
-        this.metrics.objectsReturned++;
+      case "both": {
+        const anchorPlan = this._generate(query.anchor, context);
+        return QueryPlan.Plan.make([
+          ...anchorPlan.steps,
+          {
+            _tag: "UnionStep",
+            plans: [
+              QueryPlan.Plan.make([
+                createRelationTraversalStep("relation-to-source")
+              ]),
+              QueryPlan.Plan.make([
+                createRelationTraversalStep("relation-to-target")
+              ])
+            ]
+          },
+          ...this._generateDeletedHandlingSteps(context)
+        ]);
       }
-      return {
-        id: objectId,
-        documentId,
-        spaceId: await (0, import_echo_protocol3.createIdFromSpaceKey)(import_keys5.PublicKey.from(spaceKey)),
-        spaceKey: import_keys5.PublicKey.from(spaceKey),
-        rank: result.rank
-      };
-    }))).filter(import_util6.isNonNullable);
-    if (this._firstRun) {
-      this.metrics.documentLoadTime = performance.now() - beginFilter;
     }
+  }
+  _generateRelationClause(query, context) {
+    switch (query.direction) {
+      case "outgoing": {
+        return QueryPlan.Plan.make([
+          ...this._generate(query.anchor, context).steps,
+          createRelationTraversalStep("source-to-relation"),
+          ...this._generateDeletedHandlingSteps(context),
+          {
+            _tag: "FilterStep",
+            filter: query.filter ?? NOOP_FILTER
+          }
+        ]);
+      }
+      case "incoming": {
+        return QueryPlan.Plan.make([
+          ...this._generate(query.anchor, context).steps,
+          createRelationTraversalStep("target-to-relation"),
+          ...this._generateDeletedHandlingSteps(context),
+          {
+            _tag: "FilterStep",
+            filter: query.filter ?? NOOP_FILTER
+          }
+        ]);
+      }
+      case "both": {
+        const anchorPlan = this._generate(query.anchor, context);
+        return QueryPlan.Plan.make([
+          ...anchorPlan.steps,
+          {
+            _tag: "UnionStep",
+            plans: [
+              QueryPlan.Plan.make([
+                createRelationTraversalStep("source-to-relation")
+              ]),
+              QueryPlan.Plan.make([
+                createRelationTraversalStep("target-to-relation")
+              ])
+            ]
+          },
+          ...this._generateDeletedHandlingSteps(context),
+          {
+            _tag: "FilterStep",
+            filter: query.filter ?? NOOP_FILTER
+          }
+        ]);
+      }
+    }
+  }
+  _generateFilterClause(query, context) {
+    return QueryPlan.Plan.make([
+      ...this._generate(query.selection, context).steps,
+      {
+        _tag: "FilterStep",
+        filter: query.filter
+      }
+    ]);
+  }
+  /**
+  * Removes filter steps that have no predicates.
+  */
+  _optimizeEmptyFilters(plan) {
+    return QueryPlan.Plan.make(plan.steps.filter((step) => {
+      if (step._tag === "FilterStep") {
+        return !QueryPlan.FilterStep.isNoop(step);
+      } else {
+        return true;
+      }
+    }).map((step) => {
+      if (step._tag === "UnionStep") {
+        return {
+          _tag: "UnionStep",
+          plans: step.plans.map((plan2) => this._optimizeEmptyFilters(plan2))
+        };
+      } else {
+        return step;
+      }
+    }));
+  }
+  /**
+  * Removes union steps that have only one child.
+  */
+  _optimizeSoloUnions(plan) {
+    return plan;
+  }
+};
+var DEFAULT_CONTEXT = {
+  originalQuery: null,
+  selectionSpaces: [],
+  deletedHandling: "exclude",
+  selectionInverted: false
+};
+var NOOP_FILTER = {
+  type: "object",
+  typename: null,
+  id: [],
+  props: {}
+};
+var createRelationTraversalStep = (direction) => ({
+  _tag: "TraverseStep",
+  traversal: {
+    _tag: "RelationTraversal",
+    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 __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/query/query-executor.ts";
+var ExecutionTrace = Object.freeze({
+  makeEmpty: () => ({
+    name: "Empty",
+    details: "",
+    objectCount: 0,
+    documentsLoaded: 0,
+    indexHits: 0,
+    indexQueryTime: 0,
+    documentLoadTime: 0,
+    executionTime: 0,
+    children: []
+  }),
+  format: (trace6) => {
+    const go = (trace7, indent) => {
+      return [
+        `${" ".repeat(indent)} - ${trace7.name}(${trace7.details})`,
+        `${" ".repeat(indent)}   objects: ${trace7.objectCount}  docs: ${trace7.documentsLoaded}  index hits: ${trace7.indexHits} | total: ${trace7.executionTime.toFixed(0)}ms  index: ${trace7.indexQueryTime.toFixed(0)}ms  load: ${trace7.documentLoadTime.toFixed(0)}ms`,
+        "",
+        ...trace7.children.map((child) => go(child, indent + 2))
+      ].join("\n");
+    };
+    return go(trace6, 0);
+  }
+});
+var QueryExecutor = class extends import_context10.Resource {
+  constructor(options) {
+    super();
+    this._trace = ExecutionTrace.makeEmpty();
+    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);
+  }
+  get query() {
+    return this._query;
+  }
+  get plan() {
+    return this._plan;
+  }
+  get trace() {
+    return this._trace;
+  }
+  async _open(ctx) {
+  }
+  async _close(ctx) {
+  }
+  getResults() {
+    return this._lastResultSet.map((item) => ({
+      id: item.objectId,
+      documentId: item.documentId,
+      spaceId: item.spaceId,
+      // TODO(dmaretskyi): Plumb through the rank.
+      rank: 0
+    }));
+  }
+  async execQuery() {
+    (0, import_invariant10.invariant)(this._lifecycleState === import_context10.LifecycleState.OPEN, void 0, {
+      F: __dxlog_file11,
+      L: 171,
+      S: this,
+      A: [
+        "this._lifecycleState === LifecycleState.OPEN",
+        ""
+      ]
+    });
+    const prevResultSet = this._lastResultSet;
+    const { workingSet, trace: trace6 } = await this._execPlan(this._plan, this._lastResultSet);
+    this._lastResultSet = workingSet;
+    trace6.name = "Root";
+    trace6.details = JSON.stringify({
+      id: this._id
+    });
+    this._trace = trace6;
+    const changed = prevResultSet.length !== workingSet.length || prevResultSet.some((item, index) => workingSet[index].objectId !== item.objectId || workingSet[index].spaceId !== item.spaceId || workingSet[index].documentId !== item.documentId);
+    return {
+      changed
+    };
+  }
+  async _execPlan(plan, workingSet) {
+    const trace6 = ExecutionTrace.makeEmpty();
+    for (const step of plan.steps) {
+      if (this._ctx.disposed) {
+        throw new import_context10.ContextDisposedError();
+      }
+      const result = await this._execStep(step, workingSet);
+      workingSet = result.workingSet;
+      trace6.children.push(result.trace);
+    }
+    return {
+      workingSet,
+      trace: trace6
+    };
+  }
+  async _execStep(step, workingSet) {
     if (this._ctx.disposed) {
       return {
-        changed: false
+        workingSet,
+        trace: ExecutionTrace.makeEmpty()
       };
     }
-    const areResultsUnchanged = !this._firstRun && this._results.length === results.length && this._results.every((oldResult) => results.some((result) => result.id === oldResult.id)) && results.every((result) => this._results.some((oldResult) => oldResult.id === result.id));
-    if (this._firstRun) {
-      this.metrics.executionTime = performance.now() - beginQuery;
+    let newWorkingSet, trace6;
+    const begin = performance.now();
+    switch (step._tag) {
+      case "ClearWorkingSetStep":
+        newWorkingSet = [];
+        trace6 = ExecutionTrace.makeEmpty();
+        break;
+      case "SelectStep":
+        ({ workingSet: newWorkingSet, trace: trace6 } = await this._execSelectStep(step, workingSet));
+        break;
+      case "FilterStep":
+        ({ workingSet: newWorkingSet, trace: trace6 } = await this._execFilterStep(step, workingSet));
+        break;
+      case "FilterDeletedStep":
+        ({ workingSet: newWorkingSet, trace: trace6 } = await this._execFilterDeletedStep(step, workingSet));
+        break;
+      case "UnionStep":
+        ({ workingSet: newWorkingSet, trace: trace6 } = await this._execUnionStep(step, workingSet));
+        break;
+      case "TraverseStep":
+        ({ workingSet: newWorkingSet, trace: trace6 } = await this._execTraverseStep(step, workingSet));
+        break;
+      default:
+        throw new Error(`Unknown step type: ${step._tag}`);
     }
-    this._firstRun = false;
-    if (areResultsUnchanged) {
-      return {
-        changed: false
-      };
+    trace6.executionTime = performance.now() - begin;
+    return {
+      workingSet: newWorkingSet,
+      trace: trace6
+    };
+  }
+  async _execSelectStep(step, workingSet) {
+    workingSet = [
+      ...workingSet
+    ];
+    const trace6 = {
+      ...ExecutionTrace.makeEmpty(),
+      name: "Select",
+      details: JSON.stringify(step.selector)
+    };
+    switch (step.selector._tag) {
+      case "WildcardSelector": {
+        const beginIndexQuery = performance.now();
+        const indexHits = await this._indexer.execQuery({
+          typenames: [],
+          inverted: false
+        });
+        trace6.indexHits = +indexHits.length;
+        trace6.indexQueryTime += performance.now() - beginIndexQuery;
+        if (this._ctx.disposed) {
+          return {
+            workingSet,
+            trace: trace6
+          };
+        }
+        const documentLoadStart = performance.now();
+        const results = await this._loadDocumentsAfterIndexQuery(indexHits);
+        trace6.documentsLoaded += results.length;
+        trace6.documentLoadTime += performance.now() - documentLoadStart;
+        workingSet.push(...results.filter(import_util6.isNonNullable).filter((item) => step.spaces.includes(item.spaceId)));
+        trace6.objectCount = workingSet.length;
+        break;
+      }
+      case "IdSelector": {
+        const beginLoad = performance.now();
+        const items = await Promise.all(step.selector.objectIds.map((id) => this._loadFromDXN(import_keys5.DXN.fromLocalObjectId(id), {
+          sourceSpaceId: step.spaces[0]
+        })));
+        trace6.documentLoadTime += performance.now() - beginLoad;
+        workingSet.push(...items.filter(import_util6.isNonNullable));
+        trace6.objectCount = workingSet.length;
+        break;
+      }
+      case "TypeSelector": {
+        const beginIndexQuery = performance.now();
+        const indexHits = await this._indexer.execQuery({
+          typenames: step.selector.typename,
+          inverted: step.selector.inverted
+        });
+        trace6.indexHits = +indexHits.length;
+        trace6.indexQueryTime += performance.now() - beginIndexQuery;
+        if (this._ctx.disposed) {
+          return {
+            workingSet,
+            trace: trace6
+          };
+        }
+        const documentLoadStart = performance.now();
+        const results = await this._loadDocumentsAfterIndexQuery(indexHits);
+        trace6.documentsLoaded += results.length;
+        trace6.documentLoadTime += performance.now() - documentLoadStart;
+        workingSet.push(...results.filter(import_util6.isNonNullable).filter((item) => step.spaces.includes(item.spaceId)));
+        trace6.objectCount = workingSet.length;
+        break;
+      }
+      case "TextSelector": {
+        const beginIndexQuery = performance.now();
+        const indexHits = await this._indexer.execQuery({
+          typenames: [],
+          text: {
+            query: step.selector.text,
+            kind: import_effect2.Match.type().pipe(import_effect2.Match.withReturnType(), import_effect2.Match.when("full-text", () => "text"), import_effect2.Match.when("vector", () => "vector"), import_effect2.Match.orElseAbsurd)(step.selector.searchKind)
+          }
+        });
+        trace6.indexHits = +indexHits.length;
+        trace6.indexQueryTime += performance.now() - beginIndexQuery;
+        if (this._ctx.disposed) {
+          return {
+            workingSet,
+            trace: trace6
+          };
+        }
+        const documentLoadStart = performance.now();
+        const results = await this._loadDocumentsAfterIndexQuery(indexHits);
+        trace6.documentsLoaded += results.length;
+        trace6.documentLoadTime += performance.now() - documentLoadStart;
+        workingSet.push(...results.filter(import_util6.isNonNullable).filter((item) => step.spaces.includes(item.spaceId)));
+        trace6.objectCount = workingSet.length;
+        break;
+      }
+      default:
+        throw new Error(`Unknown selector type: ${step.selector._tag}`);
     }
-    this._results = results;
     return {
-      changed: true
+      workingSet,
+      trace: trace6
     };
   }
-};
-_ts_decorate5([
-  import_tracing6.trace.info({
-    depth: null
-  })
-], QueryState.prototype, "filter", void 0);
-_ts_decorate5([
-  import_tracing6.trace.info()
-], QueryState.prototype, "metrics", void 0);
-_ts_decorate5([
-  import_tracing6.trace.info()
-], QueryState.prototype, "active", null);
-_ts_decorate5([
-  import_tracing6.trace.span({
-    showInBrowserTimeline: true,
-    op: "db.query",
-    attributes: {
-      "db.system": "echo"
+  async _execFilterStep(step, workingSet) {
+    const result = workingSet.filter((item) => (0, import_chunk_HOPOFWAL.filterMatchObject)(step.filter, {
+      id: item.objectId,
+      spaceId: item.spaceId,
+      doc: item.doc
+    }));
+    return {
+      workingSet: result,
+      trace: {
+        ...ExecutionTrace.makeEmpty(),
+        name: "Filter",
+        details: JSON.stringify(step.filter),
+        objectCount: result.length
+      }
+    };
+  }
+  async _execFilterDeletedStep(step, workingSet) {
+    const expected = step.mode === "only-deleted";
+    const result = workingSet.filter((item) => import_echo_protocol5.ObjectStructure.isDeleted(item.doc) === expected);
+    return {
+      workingSet: result,
+      trace: {
+        ...ExecutionTrace.makeEmpty(),
+        name: "FilterDeleted",
+        details: step.mode,
+        objectCount: result.length
+      }
+    };
+  }
+  // TODO(dmaretskyi): This needs to be completed.
+  async _execTraverseStep(step, workingSet) {
+    const trace6 = {
+      ...ExecutionTrace.makeEmpty(),
+      name: "Traverse",
+      details: JSON.stringify(step.traversal)
+    };
+    const newWorkingSet = [];
+    switch (step.traversal._tag) {
+      case "ReferenceTraversal": {
+        switch (step.traversal.direction) {
+          case "outgoing": {
+            const property = import_indexing4.EscapedPropPath.unescape(step.traversal.property);
+            const refs = workingSet.map((item) => {
+              const ref = (0, import_util6.getDeep)(item.doc.data, property);
+              if (!(0, import_echo_protocol5.isEncodedReference)(ref)) {
+                return null;
+              }
+              try {
+                return {
+                  ref: import_keys5.DXN.parse(ref["/"]),
+                  spaceId: item.spaceId
+                };
+              } catch {
+                import_log10.log.warn("Invalid reference", {
+                  ref: ref["/"]
+                }, {
+                  F: __dxlog_file11,
+                  L: 421,
+                  S: this,
+                  C: (f, a) => f(...a)
+                });
+                return null;
+              }
+            }).filter(import_util6.isNonNullable);
+            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(import_util6.isNonNullable));
+            trace6.objectCount = newWorkingSet.length;
+            break;
+          }
+          case "incoming": {
+            const indexHits = await this._indexer.execQuery({
+              typenames: [],
+              inverted: false,
+              graph: {
+                kind: "inbound-reference",
+                property: step.traversal.property,
+                anchors: workingSet.map((item) => item.objectId)
+              }
+            });
+            trace6.indexHits += indexHits.length;
+            const documentLoadStart = performance.now();
+            const results = await this._loadDocumentsAfterIndexQuery(indexHits);
+            trace6.documentsLoaded += results.length;
+            trace6.documentLoadTime += performance.now() - documentLoadStart;
+            newWorkingSet.push(...results.filter(import_util6.isNonNullable));
+            trace6.objectCount = newWorkingSet.length;
+            break;
+          }
+        }
+        break;
+      }
+      case "RelationTraversal": {
+        switch (step.traversal.direction) {
+          case "relation-to-source":
+          case "relation-to-target": {
+            const refs = workingSet.map((item) => {
+              const ref = step.traversal.direction === "relation-to-source" ? import_echo_protocol5.ObjectStructure.getRelationSource(item.doc) : import_echo_protocol5.ObjectStructure.getRelationTarget(item.doc);
+              if (!(0, import_echo_protocol5.isEncodedReference)(ref)) {
+                return null;
+              }
+              try {
+                return {
+                  ref: import_keys5.DXN.parse(ref["/"]),
+                  spaceId: item.spaceId
+                };
+              } catch {
+                import_log10.log.warn("Invalid reference", {
+                  ref: ref["/"]
+                }, {
+                  F: __dxlog_file11,
+                  L: 483,
+                  S: this,
+                  C: (f, a) => f(...a)
+                });
+                return null;
+              }
+            }).filter(import_util6.isNonNullable);
+            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(import_util6.isNonNullable));
+            trace6.objectCount = newWorkingSet.length;
+            break;
+          }
+          case "source-to-relation":
+          case "target-to-relation": {
+            const indexHits = await this._indexer.execQuery({
+              typenames: [],
+              inverted: false,
+              graph: {
+                kind: step.traversal.direction === "source-to-relation" ? "relation-source" : "relation-target",
+                anchors: workingSet.map((item) => item.objectId),
+                property: null
+              }
+            });
+            trace6.indexHits += indexHits.length;
+            const documentLoadStart = performance.now();
+            const results = await this._loadDocumentsAfterIndexQuery(indexHits);
+            trace6.documentsLoaded += results.length;
+            trace6.documentLoadTime += performance.now() - documentLoadStart;
+            newWorkingSet.push(...results.filter(import_util6.isNonNullable));
+            trace6.objectCount = newWorkingSet.length;
+            break;
+          }
+        }
+        break;
+      }
+      default:
+        throw new Error(`Unknown traversal type: ${step.traversal._tag}`);
     }
-  })
-], QueryState.prototype, "execQuery", null);
-QueryState = _ts_decorate5([
-  import_tracing6.trace.resource()
-], QueryState);
-var filterToIndexQuery = (filter) => {
-  (0, import_invariant10.invariant)(!(filter.type && (filter.or ?? []).length > 0), "Cannot mix type and or filters.", {
-    F: __dxlog_file10,
-    L: 184,
-    S: void 0,
-    A: [
-      "!(filter.type && (filter.or ?? []).length > 0)",
-      "'Cannot mix type and or filters.'"
-    ]
-  });
-  (0, import_invariant10.invariant)((filter.or ?? []).every((subFilter) => !(subFilter.type && (subFilter.or ?? []).length > 0)), "Cannot mix type and or filters.", {
-    F: __dxlog_file10,
-    L: 185,
-    S: void 0,
-    A: [
-      "(filter.or ?? []).every((subFilter) => !(subFilter.type && (subFilter.or ?? []).length > 0))",
-      "'Cannot mix type and or filters.'"
-    ]
-  });
-  if (filter.type || (filter.or ?? []).length > 0 && (filter.or ?? []).every((subFilter) => !subFilter.not && subFilter.type)) {
     return {
-      typenames: filter.type && filter.type.length > 0 ? filter.type.map((type) => dxnToIndexerTypename(import_keys5.DXN.parse(type))) : (filter.or ?? []).flatMap((f) => f.type?.map((type) => dxnToIndexerTypename(import_keys5.DXN.parse(type))) ?? []).filter(import_util6.isNonNullable),
-      inverted: filter.not
+      workingSet: newWorkingSet,
+      trace: trace6
+    };
+  }
+  async _execUnionStep(step, workingSet) {
+    const results = /* @__PURE__ */ new Map();
+    const resultSets = await Promise.all(step.plans.map((plan) => this._execPlan(plan, [
+      ...workingSet
+    ])));
+    const trace6 = {
+      ...ExecutionTrace.makeEmpty(),
+      name: "Union"
     };
-  } else {
+    for (const resultSet of resultSets) {
+      for (const item of resultSet.workingSet) {
+        results.set(`${item.spaceId}:${item.documentId}:${item.objectId}`, item);
+      }
+      trace6.children.push(resultSet.trace);
+    }
     return {
-      typenames: []
+      workingSet: [
+        ...results.values()
+      ],
+      trace: trace6
     };
   }
-};
-var dxnToIndexerTypename = (dxn) => {
-  switch (dxn.kind) {
-    case import_keys5.DXN.kind.TYPE:
-      return dxn.parts[0];
-    case import_keys5.DXN.kind.ECHO:
-      return dxn.parts[1];
-    default:
-      throw new Error(`Invalid DXN kind: ${dxn.kind}`);
+  async _loadDocumentsAfterIndexQuery(indexHits) {
+    return Promise.all(indexHits.map(async (hit) => {
+      return this._loadFromIndexHit(hit);
+    }));
+  }
+  async _loadFromIndexHit(hit) {
+    const { objectId, documentId, spaceKey: spaceKeyInIndex } = import_protocols5.objectPointerCodec.decode(hit.id);
+    const handle = await this._automergeHost.loadDoc(import_context10.Context.default(void 0, {
+      F: __dxlog_file11,
+      L: 571
+    }), documentId);
+    const doc = handle.doc();
+    if (!doc) {
+      return null;
+    }
+    const spaceKey = spaceKeyInIndex ?? import_echo_protocol5.DatabaseDirectory.getSpaceKey(doc);
+    if (!spaceKey) {
+      return null;
+    }
+    const object = import_echo_protocol5.DatabaseDirectory.getInlineObject(doc, objectId);
+    if (!object) {
+      return null;
+    }
+    return {
+      objectId,
+      documentId,
+      spaceId: await (0, import_chunk_SG2PL5RH.createIdFromSpaceKey)(import_keys5.PublicKey.from(spaceKey)),
+      doc: object
+    };
+  }
+  async _loadFromDXN(dxn, { sourceSpaceId }) {
+    const echoDxn = dxn.asEchoDXN();
+    if (!echoDxn) {
+      import_log10.log.warn("unable to resolve DXN", {
+        dxn
+      }, {
+        F: __dxlog_file11,
+        L: 598,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return null;
+    }
+    const spaceId = echoDxn.spaceId ?? sourceSpaceId;
+    const spaceRoot = this._spaceStateManager.getRootBySpaceId(spaceId);
+    if (!spaceRoot) {
+      import_log10.log.warn("no space state found for", {
+        spaceId
+      }, {
+        F: __dxlog_file11,
+        L: 606,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return null;
+    }
+    const dbDirectory = spaceRoot.doc();
+    if (!dbDirectory) {
+      import_log10.log.warn("no space state found for", {
+        spaceId
+      }, {
+        F: __dxlog_file11,
+        L: 611,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return null;
+    }
+    const inlineObject = import_echo_protocol5.DatabaseDirectory.getInlineObject(dbDirectory, echoDxn.echoId);
+    if (inlineObject) {
+      return {
+        objectId: echoDxn.echoId,
+        documentId: spaceRoot.documentId,
+        spaceId,
+        doc: inlineObject
+      };
+    }
+    const link = import_echo_protocol5.DatabaseDirectory.getLink(dbDirectory, echoDxn.echoId);
+    if (!link) {
+      return null;
+    }
+    const handle = await this._automergeHost.loadDoc(import_context10.Context.default(void 0, {
+      F: __dxlog_file11,
+      L: 630
+    }), link);
+    const doc = handle.doc();
+    if (!doc) {
+      return null;
+    }
+    const object = import_echo_protocol5.DatabaseDirectory.getInlineObject(doc, echoDxn.echoId);
+    if (!object) {
+      return null;
+    }
+    return {
+      objectId: echoDxn.echoId,
+      documentId: handle.documentId,
+      spaceId,
+      doc: object
+    };
   }
 };
-var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/query-service.ts";
+var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/query-service.ts";
 var QueryServiceImpl = class extends import_context9.Resource {
   // TODO(burdon): OK for options, but not params. Pass separately and type readonly here.
   constructor(_params) {
-    super();
-    this._params = _params;
-    this._queries = /* @__PURE__ */ new Set();
-    this._updateQueries = new import_async6.DeferredTask(this._ctx, async () => {
+    super(), this._params = _params, this._queries = /* @__PURE__ */ new Set(), this._updateQueries = new import_async6.DeferredTask(this._ctx, async () => {
       await Promise.all(Array.from(this._queries).map(async (query) => {
         try {
-          const { changed } = await query.state.execQuery();
+          const { changed } = await query.executor.execQuery();
           if (changed) {
-            query.sendResults(query.state.getResults());
+            query.sendResults(query.executor.getResults());
           }
         } catch (err) {
           import_log9.log.catch(err, void 0, {
-            F: __dxlog_file11,
-            L: 52,
+            F: __dxlog_file12,
+            L: 57,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2691,8 +3487,9 @@ var QueryServiceImpl = class extends import_context9.Resource {
       fetch: () => {
         return Array.from(this._queries).map((query) => {
           return {
-            filter: JSON.stringify(query.state.filter),
-            metrics: query.state.metrics
+            query: JSON.stringify(query.executor.query),
+            plan: JSON.stringify(query.executor.plan),
+            trace: JSON.stringify(query.executor.trace)
           };
         });
       }
@@ -2705,24 +3502,19 @@ var QueryServiceImpl = class extends import_context9.Resource {
     await Promise.all(Array.from(this._queries).map((query) => query.close()));
   }
   async setConfig(config) {
-    if (this._params.indexer.initialized) {
-      import_log9.log.warn("Indexer already initialized.", void 0, {
-        F: __dxlog_file11,
-        L: 86,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return;
-    }
-    this._params.indexer.setConfig(config);
+    await this._params.indexer.setConfig(config);
   }
   execQuery(request) {
     return new import_stream2.Stream(({ next, close, ctx }) => {
-      const query = {
-        state: new QueryState({
+      const parsedQuery = import_echo_protocol4.QueryAST.Query.pipe(import_effect.Schema.decodeUnknownSync)(JSON.parse(request.query));
+      const queryEntry = {
+        executor: new QueryExecutor({
           indexer: this._params.indexer,
           automergeHost: this._params.automergeHost,
-          request
+          queryId: request.queryId ?? (0, import_debug2.raise)(new Error("query id required")),
+          query: parsedQuery,
+          reactivity: request.reactivity,
+          spaceStateManager: this._params.spaceStateManager
         }),
         sendResults: (results) => {
           if (ctx.disposed) {
@@ -2735,28 +3527,21 @@ var QueryServiceImpl = class extends import_context9.Resource {
         },
         close: async () => {
           close();
-          await query.state.close();
-          this._queries.delete(query);
+          await queryEntry.executor.close();
+          this._queries.delete(queryEntry);
         }
       };
-      this._queries.add(query);
+      this._queries.add(queryEntry);
       queueMicrotask(async () => {
-        await query.state.open();
+        await queryEntry.executor.open();
         try {
-          const { changed } = await query.state.execQuery();
-          if (changed) {
-            query.sendResults(query.state.getResults());
-          }
+          await queryEntry.executor.execQuery();
+          queryEntry.sendResults(queryEntry.executor.getResults());
         } catch (error) {
-          import_log9.log.catch(error, void 0, {
-            F: __dxlog_file11,
-            L: 123,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          close(error);
         }
       });
-      return query.close;
+      return queryEntry.close;
     });
   }
   /**
@@ -2764,8 +3549,8 @@ var QueryServiceImpl = class extends import_context9.Resource {
   */
   async reindex() {
     import_log9.log.info("Reindexing all documents...", void 0, {
-      F: __dxlog_file11,
-      L: 135,
+      F: __dxlog_file12,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2779,8 +3564,8 @@ var QueryServiceImpl = class extends import_context9.Resource {
         import_log9.log.info("Collected documents...", {
           count: ids.size
         }, {
-          F: __dxlog_file11,
-          L: 143,
+          F: __dxlog_file12,
+          L: 149,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2789,8 +3574,8 @@ var QueryServiceImpl = class extends import_context9.Resource {
     import_log9.log.info("Marking all documents as dirty...", {
       count: ids.size
     }, {
-      F: __dxlog_file11,
-      L: 147,
+      F: __dxlog_file12,
+      L: 153,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2805,11 +3590,11 @@ var createDocumentsIterator = (automergeHost) => (
   async function* getAllDocuments() {
     const visited = /* @__PURE__ */ new Set();
     async function* getObjectsFromHandle(handle) {
-      if (visited.has(handle.documentId)) {
+      if (visited.has(handle.documentId) || !handle.isReady()) {
         return;
       }
-      const doc = handle.docSync();
-      const spaceKey = getSpaceKeyFromDoc(doc) ?? void 0;
+      const doc = handle.doc();
+      const spaceKey = import_echo_protocol4.DatabaseDirectory.getSpaceKey(doc) ?? void 0;
       if (doc.objects) {
         yield Object.entries(doc.objects).map(([objectId, object]) => {
           return {
@@ -2830,8 +3615,8 @@ var createDocumentsIterator = (automergeHost) => (
             continue;
           }
           const linkHandle = await automergeHost.loadDoc(import_context9.Context.default(void 0, {
-            F: __dxlog_file11,
-            L: 189
+            F: __dxlog_file12,
+            L: 195
           }), urlString);
           for await (const result of getObjectsFromHandle(linkHandle)) {
             yield result;
@@ -2851,7 +3636,7 @@ var createDocumentsIterator = (automergeHost) => (
     }
   }
 );
-var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/automerge-metrics.ts";
+var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/automerge-metrics.ts";
 var measureDocMetrics = (doc) => {
   const snapshot = A4.save(doc);
   const start = Date.now();
@@ -2862,11 +3647,11 @@ var measureDocMetrics = (doc) => {
   const mutationCount = A4.getAllChanges(doc).length;
   const getAllChangesEnd = Date.now();
   if (getAllChangesEnd - getAllChangesStart > 300) {
-    import_log10.log.warn("getAllChanges took too long", {
+    import_log11.log.warn("getAllChanges took too long", {
       elapsed: getAllChangesEnd - getAllChangesStart
     }, {
-      F: __dxlog_file12,
-      L: 30,
+      F: __dxlog_file13,
+      L: 31,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2877,7 +3662,7 @@ var measureDocMetrics = (doc) => {
     mutationCount
   };
 };
-var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/database-root.ts";
+var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/database-root.ts";
 var DatabaseRoot = class {
   static mapLinks(doc, mapping) {
     doc.change((d) => {
@@ -2902,47 +3687,47 @@ var DatabaseRoot = class {
     return this._rootHandle.url;
   }
   get isLoaded() {
-    return !!this._rootHandle.docSync();
+    return this._rootHandle.isReady();
   }
   get handle() {
     return this._rootHandle;
   }
-  docSync() {
-    return this._rootHandle.docSync() ?? null;
+  doc() {
+    return this._rootHandle.isReady() ? this._rootHandle.doc() : null;
   }
   getVersion() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
-    return doc.version ?? import_echo_protocol4.SpaceDocVersion.LEGACY;
+    return doc.version ?? import_echo_protocol6.SpaceDocVersion.LEGACY;
   }
   getSpaceKey() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
-    return getSpaceKeyFromDoc(doc);
+    return import_echo_protocol6.DatabaseDirectory.getSpaceKey(doc);
   }
   getInlineObjectCount() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
     return Object.keys(doc.objects ?? {}).length;
   }
   getLinkedObjectCount() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
     return Object.keys(doc.links ?? {}).length;
   }
   getAllLinkedDocuments() {
-    const doc = this.docSync();
-    (0, import_invariant11.invariant)(doc, void 0, {
-      F: __dxlog_file13,
-      L: 93,
+    const doc = this.doc();
+    (0, import_invariant13.invariant)(doc, void 0, {
+      F: __dxlog_file14,
+      L: 88,
       S: this,
       A: [
         "doc",
@@ -2952,14 +3737,14 @@ var DatabaseRoot = class {
     return Object.values(doc.links ?? {}).map((s) => s.toString());
   }
   measureMetrics() {
-    const doc = this.docSync();
+    const doc = this.doc();
     if (!doc) {
       return null;
     }
     return measureDocMetrics(doc);
   }
 };
-var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/space-state-manager.ts";
+var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/space-state-manager.ts";
 var SpaceStateManager = class extends import_context11.Resource {
   constructor() {
     super(...arguments);
@@ -2984,6 +3769,22 @@ var SpaceStateManager = class extends import_context11.Resource {
   getSpaceRootDocumentId(spaceId) {
     return this._rootBySpace.get(spaceId);
   }
+  getRootBySpaceId(spaceId) {
+    (0, import_invariant12.invariant)(this._lifecycleState === import_context11.LifecycleState.OPEN, void 0, {
+      F: __dxlog_file15,
+      L: 44,
+      S: this,
+      A: [
+        "this._lifecycleState === LifecycleState.OPEN",
+        ""
+      ]
+    });
+    const documentId = this._rootBySpace.get(spaceId);
+    if (!documentId) {
+      return void 0;
+    }
+    return this._roots.get(documentId);
+  }
   async assignRootToSpace(spaceId, handle) {
     let root;
     if (this._roots.has(handle.documentId)) {
@@ -3002,8 +3803,8 @@ var SpaceStateManager = class extends import_context11.Resource {
     }
     this._rootBySpace.set(spaceId, root.handle.documentId);
     const ctx = new import_context11.Context(void 0, {
-      F: __dxlog_file14,
-      L: 62
+      F: __dxlog_file15,
+      L: 72
     });
     this._perRootContext.set(root.handle.documentId, ctx);
     await root.handle.whenReady();
@@ -3034,19 +3835,20 @@ var SpaceDocumentListUpdatedEvent = class {
     this.documentIds = documentIds;
   }
 };
-var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/echo-host.ts";
-var INDEXER_CONFIG = {
-  enabled: true,
-  indexes: [
-    {
-      kind: import_indexing3.IndexKind.Kind.SCHEMA_MATCH
-    }
-  ]
+var __dxlog_file16 = "/home/runner/work/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.
+  fullText: false,
+  vector: false
 };
 var EchoHost = class extends import_context7.Resource {
-  constructor({ kv, peerIdProvider, getSpaceKeyByRootDocumentId }) {
+  constructor({ kv, indexing = {}, peerIdProvider, getSpaceKeyByRootDocumentId }) {
     super();
     this._spaceStateManager = new SpaceStateManager();
+    const indexingConfig = {
+      ...DEFAULT_INDEXING_CONFIG,
+      ...indexing
+    };
     this._indexMetadataStore = new import_indexing2.IndexMetadataStore({
       db: kv.sublevel("index-metadata")
     });
@@ -3067,10 +3869,32 @@ var EchoHost = class extends import_context7.Resource {
       loadDocuments: createSelectedDocumentsIterator(this._automergeHost),
       indexCooldownTime: process.env.NODE_ENV === "test" ? 0 : void 0
     });
-    this._indexer.setConfig(INDEXER_CONFIG);
+    void this._indexer.setConfig({
+      enabled: true,
+      indexes: [
+        //
+        {
+          kind: import_indexing3.IndexKind.Kind.SCHEMA_MATCH
+        },
+        {
+          kind: import_indexing3.IndexKind.Kind.GRAPH
+        },
+        ...indexingConfig.fullText ? [
+          {
+            kind: import_indexing3.IndexKind.Kind.FULL_TEXT
+          }
+        ] : [],
+        ...indexingConfig.vector ? [
+          {
+            kind: import_indexing3.IndexKind.Kind.VECTOR
+          }
+        ] : []
+      ]
+    });
     this._queryService = new QueryServiceImpl({
       automergeHost: this._automergeHost,
-      indexer: this._indexer
+      indexer: this._indexer,
+      spaceStateManager: this._spaceStateManager
     });
     this._dataService = new DataServiceImpl({
       automergeHost: this._automergeHost,
@@ -3146,8 +3970,8 @@ var EchoHost = class extends import_context7.Resource {
     });
   }
   async _close(ctx) {
-    await this._spaceStateManager.close();
     await this._queryService.close(ctx);
+    await this._spaceStateManager.close(ctx);
     await this._indexer.close(ctx);
     await this._automergeHost.close();
   }
@@ -3183,17 +4007,17 @@ var EchoHost = class extends import_context7.Resource {
   */
   async createSpaceRoot(spaceKey) {
     (0, import_invariant8.invariant)(this._lifecycleState === import_context7.LifecycleState.OPEN, void 0, {
-      F: __dxlog_file15,
-      L: 224,
+      F: __dxlog_file16,
+      L: 252,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
         ""
       ]
     });
-    const spaceId = await (0, import_echo_protocol.createIdFromSpaceKey)(spaceKey);
+    const spaceId = await (0, import_echo_protocol2.createIdFromSpaceKey)(spaceKey);
     const automergeRoot = this._automergeHost.createDoc({
-      version: import_echo_protocol.SpaceDocVersion.CURRENT,
+      version: import_echo_protocol2.SpaceDocVersion.CURRENT,
       access: {
         spaceKey: spaceKey.toHex()
       },
@@ -3211,15 +4035,16 @@ var EchoHost = class extends import_context7.Resource {
   // TODO(dmaretskyi): Change to document id.
   async openSpaceRoot(spaceId, automergeUrl) {
     (0, import_invariant8.invariant)(this._lifecycleState === import_context7.LifecycleState.OPEN, void 0, {
-      F: __dxlog_file15,
-      L: 243,
+      F: __dxlog_file16,
+      L: 271,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
         ""
       ]
     });
-    const handle = this._automergeHost.repo.find(automergeUrl);
+    const handle = await this._automergeHost.repo.find(automergeUrl, FIND_PARAMS);
+    await handle.whenReady();
     return this._spaceStateManager.assignRootToSpace(spaceId, handle);
   }
   // TODO(dmaretskyi): Change to document id.
@@ -3239,13 +4064,10 @@ var EchoHost = class extends import_context7.Resource {
     await this._automergeHost.removeReplicator(replicator);
   }
 };
-var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/edge/inflight-request-limiter.ts";
+var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/edge/inflight-request-limiter.ts";
 var InflightRequestLimiter = class extends import_context13.Resource {
   constructor(_config) {
-    super();
-    this._config = _config;
-    this._inflightRequestBalance = 0;
-    this._requestBarrier = new import_async9.Trigger();
+    super(), this._config = _config, this._inflightRequestBalance = 0, this._requestBarrier = new import_async9.Trigger();
   }
   async _open() {
     this._inflightRequestBalance = 0;
@@ -3268,8 +4090,8 @@ var InflightRequestLimiter = class extends import_context13.Resource {
     if (this._inflightRequestBalance === this._config.maxInflightRequests) {
       this._requestBarrier.reset();
       this._resetBalanceTimeout = setTimeout(() => {
-        import_log12.log.warn("Request balance has not changed during specified timeout, resetting request limiter.", void 0, {
-          F: __dxlog_file16,
+        import_log13.log.warn("Request balance has not changed during specified timeout, resetting request limiter.", void 0, {
+          F: __dxlog_file17,
           L: 52,
           S: this,
           C: (f, a) => f(...a)
@@ -3290,69 +4112,72 @@ var InflightRequestLimiter = class extends import_context13.Resource {
     }
   }
 };
-function _using_ctx() {
-  var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
-    var err = new Error();
-    err.name = "SuppressedError";
-    err.suppressed = suppressed;
-    err.error = error;
-    return err;
-  }, empty = {}, stack = [];
-  function using(isAwait, value) {
-    if (value != null) {
-      if (Object(value) !== value) {
-        throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
-      }
-      if (isAwait) {
-        var dispose = value[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")];
-      }
-      if (dispose == null) {
-        dispose = value[Symbol.dispose || Symbol.for("Symbol.dispose")];
-      }
-      if (typeof dispose !== "function") {
-        throw new TypeError(`Property [Symbol.dispose] is not a function.`);
-      }
-      stack.push({
-        v: value,
-        d: dispose,
-        a: isAwait
-      });
-    } else if (isAwait) {
-      stack.push({
-        d: value,
-        a: isAwait
-      });
+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.");
+    var dispose, inner;
+    if (async) {
+      if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+      dispose = value[Symbol.asyncDispose];
+    }
+    if (dispose === void 0) {
+      if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+      dispose = value[Symbol.dispose];
+      if (async) inner = dispose;
     }
-    return value;
+    if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    env.stack.push({
+      value,
+      dispose,
+      async
+    });
+  } else if (async) {
+    env.stack.push({
+      async: true
+    });
   }
-  return {
-    e: empty,
-    u: using.bind(null, false),
-    a: using.bind(null, true),
-    d: function() {
-      var error = this.e;
-      function next() {
-        while (resource = stack.pop()) {
-          try {
-            var resource, disposalResult = resource.d && resource.d.call(resource.v);
-            if (resource.a) {
-              return Promise.resolve(disposalResult).then(next, err);
-            }
-          } catch (e) {
-            return err(e);
-          }
+  return value;
+}
+function _ts_dispose_resources(env) {
+  var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+  };
+  return (_ts_dispose_resources = function _ts_dispose_resources2(env2) {
+    function fail(e) {
+      env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
+      env2.hasError = true;
+    }
+    var r, s = 0;
+    function next() {
+      while (r = env2.stack.pop()) {
+        try {
+          if (!r.async && s === 1) return s = 0, env2.stack.push(r), Promise.resolve().then(next);
+          if (r.dispose) {
+            var result = r.dispose.call(r.value);
+            if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+              fail(e);
+              return next();
+            });
+          } else s |= 1;
+        } catch (e) {
+          fail(e);
         }
-        if (error !== empty) throw error;
-      }
-      function err(e) {
-        error = error !== empty ? new _disposeSuppressedError(error, e) : e;
-        return next();
       }
-      return next();
+      if (s === 1) return env2.hasError ? Promise.reject(env2.error) : Promise.resolve();
+      if (env2.hasError) throw env2.error;
     }
-  };
+    return next();
+  })(env);
 }
-var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/edge/echo-edge-replicator.ts";
+var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/core/echo/echo-pipeline/src/edge/echo-edge-replicator.ts";
 var INITIAL_RESTART_DELAY = 500;
 var RESTART_DELAY_JITTER = 250;
 var MAX_RESTART_DELAY = 5e3;
@@ -3368,28 +4193,32 @@ var EchoEdgeReplicator = class {
     this._sharePolicyEnabled = !disableSharePolicy;
   }
   async connect(context) {
-    import_log11.log.info("connecting...", {
+    import_log12.log.info("connecting...", {
       peerId: context.peerId,
       connectedSpaces: this._connectedSpaces.size
     }, {
-      F: __dxlog_file17,
-      L: 60,
+      F: __dxlog_file18,
+      L: 61,
       S: this,
       C: (f, a) => f(...a)
     });
     this._context = context;
     this._ctx = import_context12.Context.default(void 0, {
-      F: __dxlog_file17,
-      L: 63
+      F: __dxlog_file18,
+      L: 64
     });
     this._ctx.onDispose(this._edgeConnection.onReconnected(() => {
       this._ctx && (0, import_async8.scheduleMicroTask)(this._ctx, () => this._handleReconnect());
     }));
   }
   async _handleReconnect() {
+    const env = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
     try {
-      var _usingCtx = _using_ctx();
-      const _guard = _usingCtx.u(await this._mutex.acquire());
+      const _guard = _ts_add_disposable_resource(env, await this._mutex.acquire(), false);
       const spaces = [
         ...this._connectedSpaces
       ];
@@ -3402,31 +4231,41 @@ var EchoEdgeReplicator = class {
           await this._openConnection(spaceId);
         }
       }
-    } catch (_) {
-      _usingCtx.e = _;
+    } catch (e) {
+      env.error = e;
+      env.hasError = true;
     } finally {
-      _usingCtx.d();
+      _ts_dispose_resources(env);
     }
   }
   async disconnect() {
+    const env = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
     try {
-      var _usingCtx = _using_ctx();
-      const _guard = _usingCtx.u(await this._mutex.acquire());
+      const _guard = _ts_add_disposable_resource(env, await this._mutex.acquire(), false);
       await this._ctx?.dispose();
       for (const connection of this._connections.values()) {
         await connection.close();
       }
       this._connections.clear();
-    } catch (_) {
-      _usingCtx.e = _;
+    } catch (e) {
+      env.error = e;
+      env.hasError = true;
     } finally {
-      _usingCtx.d();
+      _ts_dispose_resources(env);
     }
   }
   async connectToSpace(spaceId) {
+    const env = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
     try {
-      var _usingCtx = _using_ctx();
-      const _guard = _usingCtx.u(await this._mutex.acquire());
+      const _guard = _ts_add_disposable_resource(env, await this._mutex.acquire(), false);
       if (this._connectedSpaces.has(spaceId)) {
         return;
       }
@@ -3434,41 +4273,47 @@ var EchoEdgeReplicator = class {
       if (this._context !== null) {
         await this._openConnection(spaceId);
       }
-    } catch (_) {
-      _usingCtx.e = _;
+    } catch (e) {
+      env.error = e;
+      env.hasError = true;
     } finally {
-      _usingCtx.d();
+      _ts_dispose_resources(env);
     }
   }
   async disconnectFromSpace(spaceId) {
+    const env = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
     try {
-      var _usingCtx = _using_ctx();
-      const _guard = _usingCtx.u(await this._mutex.acquire());
+      const _guard = _ts_add_disposable_resource(env, await this._mutex.acquire(), false);
       this._connectedSpaces.delete(spaceId);
       const connection = this._connections.get(spaceId);
       if (connection) {
         await connection.close();
         this._connections.delete(spaceId);
       }
-    } catch (_) {
-      _usingCtx.e = _;
+    } catch (e) {
+      env.error = e;
+      env.hasError = true;
     } finally {
-      _usingCtx.d();
+      _ts_dispose_resources(env);
     }
   }
   async _openConnection(spaceId, reconnects = 0) {
-    (0, import_invariant12.invariant)(this._context, void 0, {
-      F: __dxlog_file17,
-      L: 124,
+    (0, import_invariant14.invariant)(this._context, void 0, {
+      F: __dxlog_file18,
+      L: 125,
       S: this,
       A: [
         "this._context",
         ""
       ]
     });
-    (0, import_invariant12.invariant)(!this._connections.has(spaceId), void 0, {
-      F: __dxlog_file17,
-      L: 125,
+    (0, import_invariant14.invariant)(!this._connections.has(spaceId), void 0, {
+      F: __dxlog_file18,
+      L: 126,
       S: this,
       A: [
         "!this._connections.has(spaceId)",
@@ -3492,21 +4337,25 @@ var EchoEdgeReplicator = class {
           return;
         }
         const restartDelay = Math.min(MAX_RESTART_DELAY, INITIAL_RESTART_DELAY * reconnects) + Math.random() * RESTART_DELAY_JITTER;
-        import_log11.log.info("connection restart scheduled", {
+        import_log12.log.info("connection restart scheduled", {
           spaceId,
           reconnects,
           restartDelay
         }, {
-          F: __dxlog_file17,
-          L: 148,
+          F: __dxlog_file18,
+          L: 149,
           S: this,
           C: (f, a) => f(...a)
         });
         restartScheduled = true;
         (0, import_async8.scheduleTask)(this._ctx, async () => {
+          const env = {
+            stack: [],
+            error: void 0,
+            hasError: false
+          };
           try {
-            var _usingCtx = _using_ctx();
-            const _guard = _usingCtx.u(await this._mutex.acquire());
+            const _guard = _ts_add_disposable_resource(env, await this._mutex.acquire(), false);
             if (this._connections.get(spaceId) !== connection) {
               return;
             }
@@ -3517,10 +4366,11 @@ var EchoEdgeReplicator = class {
               return;
             }
             await this._openConnection(spaceId, reconnects + 1);
-          } catch (_) {
-            _usingCtx.e = _;
+          } catch (e) {
+            env.error = e;
+            env.hasError = true;
           } finally {
-            _usingCtx.d();
+            _ts_dispose_resources(env);
           }
         }, restartDelay);
       }
@@ -3561,9 +4411,9 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
     });
   }
   async _open(ctx) {
-    (0, import_log11.log)("opening...", void 0, {
-      F: __dxlog_file17,
-      L: 251,
+    (0, import_log12.log)("opening...", void 0, {
+      F: __dxlog_file18,
+      L: 252,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3574,9 +4424,9 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
     await this._onRemoteConnected();
   }
   async _close() {
-    (0, import_log11.log)("closing...", void 0, {
-      F: __dxlog_file17,
-      L: 266,
+    (0, import_log12.log)("closing...", void 0, {
+      F: __dxlog_file18,
+      L: 267,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3585,9 +4435,9 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
     await this._onRemoteDisconnected();
   }
   get peerId() {
-    (0, import_invariant12.invariant)(this._remotePeerId, "Not connected", {
-      F: __dxlog_file17,
-      L: 275,
+    (0, import_invariant14.invariant)(this._remotePeerId, "Not connected", {
+      F: __dxlog_file18,
+      L: 276,
       S: this,
       A: [
         "this._remotePeerId",
@@ -3606,13 +4456,13 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
         documentId: params.documentId,
         peerId: this._remotePeerId
       });
-      import_log11.log.verbose("document not found locally for share policy check", {
+      import_log12.log.verbose("document not found locally for share policy check", {
         documentId: params.documentId,
         acceptDocument: remoteDocumentExists,
         remoteId: this._remotePeerId
       }, {
-        F: __dxlog_file17,
-        L: 290,
+        F: __dxlog_file18,
+        L: 291,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3632,13 +4482,13 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
       return;
     }
     const payload = import_automerge_repo6.cbor.decode(message.payload.value);
-    import_log11.log.verbose("received", {
+    import_log12.log.verbose("received", {
       type: payload.type,
       documentId: payload.type === "sync" && payload.documentId,
       remoteId: this._remotePeerId
     }, {
-      F: __dxlog_file17,
-      L: 319,
+      F: __dxlog_file18,
+      L: 320,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3655,13 +4505,13 @@ var EdgeReplicatorConnection = class extends import_context12.Resource {
   }
   async _sendMessage(message) {
     message.targetId = this._targetServiceId;
-    import_log11.log.verbose("sending...", {
+    import_log12.log.verbose("sending...", {
       type: message.type,
       documentId: message.type === "sync" && message.documentId,
       remoteId: this._remotePeerId
     }, {
-      F: __dxlog_file17,
-      L: 348,
+      F: __dxlog_file18,
+      L: 349,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3682,7 +4532,8 @@ var isForbiddenErrorMessage = (message) => message.type === "error" && message.m
 var findInlineObjectOfType = (spaceDoc, typename) => {
   for (const id in spaceDoc.objects ?? {}) {
     const obj = spaceDoc.objects[id];
-    if (obj.system.type && (0, import_echo_protocol5.decodeReference)(obj.system.type).objectId === typename) {
+    const objType = import_echo_protocol7.ObjectStructure.getTypeReference(obj);
+    if (objType && (0, import_echo_protocol7.decodeReference)(objType).objectId === typename) {
       return [
         id,
         obj
@@ -3704,14 +4555,18 @@ var findInlineObjectOfType = (spaceDoc, typename) => {
   EchoDataMonitor,
   EchoEdgeReplicator,
   EchoHost,
+  ExecutionTrace,
+  FIND_PARAMS,
   LevelDBStorageAdapter,
   MOCK_AUTH_PROVIDER,
   MOCK_AUTH_VERIFIER,
   MeshEchoReplicator,
   MetadataStore,
   Pipeline,
+  QueryExecutor,
+  QueryPlan,
+  QueryPlanner,
   QueryServiceImpl,
-  QueryState,
   Space,
   SpaceDocumentListUpdatedEvent,
   SpaceManager,
@@ -3725,9 +4580,10 @@ var findInlineObjectOfType = (spaceDoc, typename) => {
   deriveCollectionIdFromSpaceId,
   diffCollectionState,
   encodingOptions,
+  filterMatchObject,
+  filterMatchValue,
   findInlineObjectOfType,
   getSpaceIdFromCollectionId,
-  getSpaceKeyFromDoc,
   hasInvitationExpired,
   mapFeedIndexesToTimeframe,
   mapTimeframeToFeedIndexes,