@dxos/echo-pipeline 0.8.4-main.21d9917 → 0.8.4-main.2244d791bb

package/dist/lib/{browser → neutral}/index.mjs

@@ -148,7 +148,7 @@ import { UpdateScheduler as UpdateScheduler2 } from "@dxos/async";
 import { Stream } from "@dxos/codec-protobuf/stream";
 import { invariant as invariant7 } from "@dxos/invariant";
 import { SpaceId as SpaceId2 } from "@dxos/keys";
-import { log as log8 } from "@dxos/log";
+import { log as log9 } from "@dxos/log";
 
 // src/automerge/automerge-host.ts
 import { getBackend, getHeads, equals as headsEquals, isAutomerge, save } from "@automerge/automerge";
@@ -158,8 +158,7 @@ import { Context as Context2, Resource as Resource3, cancelWithContext } from "@
 import { DatabaseDirectory as DatabaseDirectory2 } from "@dxos/echo-protocol";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
-import { log as log4 } from "@dxos/log";
-import { objectPointerCodec } from "@dxos/protocols";
+import { log as log5 } from "@dxos/log";
 import { trace as trace2 } from "@dxos/tracing";
 import { ComplexSet, bufferToArray, defaultMap as defaultMap2, isNonNullable as isNonNullable2, range } from "@dxos/util";
 
@@ -870,7 +869,35 @@ var createEchoPeerMetadata = () => ({
 var isEchoPeerMetadata = (metadata) => metadata?.dxos_peerSource === "EchoNetworkAdapter";
 
 // src/automerge/heads-store.ts
-import { headsEncoding } from "@dxos/indexing";
+import { log as log4 } from "@dxos/log";
+import { schema } from "@dxos/protocols/proto";
+var __dxlog_file4 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/heads-store.ts";
+var headsCodec2;
+var getHeadsCodec = () => headsCodec2 ??= schema.getCodecForType("dxos.echo.query.Heads");
+var headsEncoding = {
+  encode: (value) => getHeadsCodec().encode({
+    hashes: value
+  }),
+  decode: (encodedValue) => {
+    try {
+      return getHeadsCodec().decode(encodedValue).hashes;
+    } catch {
+      log4.warn("Detected legacy encoding of heads in storage.", void 0, {
+        F: __dxlog_file4,
+        L: 26,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      const concatenatedHeads = Buffer.from(encodedValue).toString("utf8").replace(/"/g, "");
+      const heads = [];
+      for (let i = 0; i < concatenatedHeads.length; i += 64) {
+        heads.push(concatenatedHeads.slice(i, i + 64));
+      }
+      return heads;
+    }
+  },
+  format: "buffer"
+};
 var HeadsStore = class {
   _db;
   constructor({ db }) {
@@ -1019,7 +1046,7 @@ function _ts_decorate3(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_file4 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
+var __dxlog_file5 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
 var FIND_PARAMS = {
   allowableStates: [
     "ready",
@@ -1032,7 +1059,6 @@ var BUNDLE_SYNC_THRESHOLD = 50;
 var OPTIMIZED_SHARE_POLICY = true;
 var AutomergeHost = class extends Resource3 {
   _db;
-  _indexMetadataStore;
   _echoNetworkAdapter;
   _collectionSynchronizer = new CollectionSynchronizer({
     queryCollectionState: this._queryCollectionState.bind(this),
@@ -1074,7 +1100,7 @@ var AutomergeHost = class extends Resource3 {
   */
   _documentsRequested = /* @__PURE__ */ new Map();
   _sharePolicyChangedTask;
-  constructor({ db, indexMetadataStore, dataMonitor, peerIdProvider, getSpaceKeyByRootDocumentId }) {
+  constructor({ db, dataMonitor, peerIdProvider, getSpaceKeyByRootDocumentId }) {
     super();
     this._db = db;
     this._storage = new LevelDBStorageAdapter({
@@ -1099,7 +1125,6 @@ var AutomergeHost = class extends Resource3 {
     this._headsStore = new HeadsStore({
       db: db.sublevel("heads")
     });
-    this._indexMetadataStore = indexMetadataStore;
     this._peerIdProvider = peerIdProvider;
     this._getSpaceKeyByRootDocumentId = getSpaceKeyByRootDocumentId;
   }
@@ -1146,13 +1171,13 @@ var AutomergeHost = class extends Resource3 {
         try {
           await this._handleCollectionSync(collectionId, peerId);
         } catch (err) {
-          log4.error("failed to sync collection", {
+          log5.error("failed to sync collection", {
             collectionId,
             peerId,
             err
           }, {
-            F: __dxlog_file4,
-            L: 263,
+            F: __dxlog_file5,
+            L: 252,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1160,9 +1185,9 @@ var AutomergeHost = class extends Resource3 {
       }));
     });
     this._sharePolicyChangedTask = new DeferredTask(this._ctx, async () => {
-      log4("share policy changed", void 0, {
-        F: __dxlog_file4,
-        L: 270,
+      log5("share policy changed", void 0, {
+        F: __dxlog_file5,
+        L: 259,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1192,8 +1217,8 @@ var AutomergeHost = class extends Resource3 {
   }
   async addReplicator(replicator) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file4,
-      L: 302,
+      F: __dxlog_file5,
+      L: 291,
       S: this,
       A: [
         "this.isOpen",
@@ -1204,8 +1229,8 @@ var AutomergeHost = class extends Resource3 {
   }
   async removeReplicator(replicator) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file4,
-      L: 307,
+      F: __dxlog_file5,
+      L: 296,
       S: this,
       A: [
         "this.isOpen",
@@ -1219,8 +1244,8 @@ var AutomergeHost = class extends Resource3 {
   */
   async loadDoc(ctx, documentId, opts) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file4,
-      L: 315,
+      F: __dxlog_file5,
+      L: 304,
       S: this,
       A: [
         "this.isOpen",
@@ -1248,12 +1273,12 @@ var AutomergeHost = class extends Resource3 {
             this._sharePolicyChangedTask.schedule();
           }
         } catch (err) {
-          log4.error("failed to load document", {
+          log5.error("failed to load document", {
             documentId,
             err
           }, {
-            F: __dxlog_file4,
-            L: 334,
+            F: __dxlog_file5,
+            L: 323,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1272,8 +1297,8 @@ var AutomergeHost = class extends Resource3 {
   }
   async exportDoc(ctx, id) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file4,
-      L: 353,
+      F: __dxlog_file5,
+      L: 342,
       S: this,
       A: [
         "this.isOpen",
@@ -1291,8 +1316,8 @@ var AutomergeHost = class extends Resource3 {
   */
   async createDoc(initialValue, opts) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file4,
-      L: 364,
+      F: __dxlog_file5,
+      L: 353,
       S: this,
       A: [
         "this.isOpen",
@@ -1329,8 +1354,8 @@ var AutomergeHost = class extends Resource3 {
   }
   async waitUntilHeadsReplicated(heads) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file4,
-      L: 395,
+      F: __dxlog_file5,
+      L: 384,
       S: this,
       A: [
         "this.isOpen",
@@ -1354,8 +1379,8 @@ var AutomergeHost = class extends Resource3 {
     if (headsToWait.length > 0) {
       await Promise.all(headsToWait.map(async (entry) => {
         const handle = await this.loadDoc(Context2.default(void 0, {
-          F: __dxlog_file4,
-          L: 413
+          F: __dxlog_file5,
+          L: 402
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
       }));
@@ -1364,8 +1389,8 @@ var AutomergeHost = class extends Resource3 {
   }
   async reIndexHeads(documentIds) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file4,
-      L: 426,
+      F: __dxlog_file5,
+      L: 415,
       S: this,
       A: [
         "this.isOpen",
@@ -1373,21 +1398,21 @@ var AutomergeHost = class extends Resource3 {
       ]
     });
     for (const documentId of documentIds) {
-      log4("re-indexing heads for document", {
+      log5("re-indexing heads for document", {
         documentId
       }, {
-        F: __dxlog_file4,
-        L: 428,
+        F: __dxlog_file5,
+        L: 417,
         S: this,
         C: (f, a) => f(...a)
       });
       const handle = await this._repo.find(documentId, FIND_PARAMS);
       if (!handle.isReady()) {
-        log4.warn("document is not available locally, skipping", {
+        log5.warn("document is not available locally, skipping", {
           documentId
         }, {
-          F: __dxlog_file4,
-          L: 431,
+          F: __dxlog_file5,
+          L: 420,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1398,9 +1423,9 @@ var AutomergeHost = class extends Resource3 {
       this._headsStore.setHeads(documentId, heads, batch);
       await batch.write();
     }
-    log4("done re-indexing heads", void 0, {
-      F: __dxlog_file4,
-      L: 440,
+    log5("done re-indexing heads", void 0, {
+      F: __dxlog_file5,
+      L: 429,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1443,18 +1468,6 @@ var AutomergeHost = class extends Resource3 {
     }
     const heads = getHeads(doc);
     this._headsStore.setHeads(handle.documentId, heads, batch);
-    const spaceKey = DatabaseDirectory2.getSpaceKey(doc) ?? void 0;
-    const objectIds = Object.keys(doc.objects ?? {});
-    const encodedIds = objectIds.map((objectId) => objectPointerCodec.encode({
-      documentId: handle.documentId,
-      objectId,
-      spaceKey
-    }));
-    const idToLastHash = new Map(encodedIds.map((id) => [
-      id,
-      heads
-    ]));
-    this._indexMetadataStore.markDirty(idToLastHash, batch);
   }
   _shouldSyncCollection(collectionId, peerId) {
     const peerMetadata = this._repo.peerMetadataByPeerId[peerId];
@@ -1472,7 +1485,6 @@ var AutomergeHost = class extends Resource3 {
     if (!this.isOpen) {
       return void 0;
     }
-    this._indexMetadataStore.notifyMarkedDirty();
     const documentId = path[0];
     const handle = this._repo.handles[documentId];
     if (!handle || !handle.isReady()) {
@@ -1485,8 +1497,8 @@ var AutomergeHost = class extends Resource3 {
     const heads = getHeads(document);
     this._headsUpdates.set(documentId, heads);
     invariant2(this._onHeadsChangedTask, "onHeadsChangedTask is not initialized", {
-      F: __dxlog_file4,
-      L: 530,
+      F: __dxlog_file5,
+      L: 510,
       S: this,
       A: [
         "this._onHeadsChangedTask",
@@ -1672,48 +1684,48 @@ var AutomergeHost = class extends Resource3 {
     ];
     const bundleSyncEnabled = this._echoNetworkAdapter.bundleSyncEnabledForPeer(peerId);
     if (bundleSyncEnabled && missingOnRemote.length >= BUNDLE_SYNC_THRESHOLD) {
-      log4("pushing bundle", {
+      log5("pushing bundle", {
         amount: missingOnRemote.length
       }, {
-        F: __dxlog_file4,
-        L: 742,
+        F: __dxlog_file5,
+        L: 722,
         S: this,
         C: (f, a) => f(...a)
       });
       const { syncInteractively } = await this._pushInBundles(peerId, missingOnRemote);
       toReplicateWithoutBatching.push(...syncInteractively);
     } else {
-      log4.verbose("failed to push bundle, replicating interactively", {
+      log5.verbose("failed to push bundle, replicating interactively", {
         collectionId,
         peerId,
         amount: missingOnRemote.length
       }, {
-        F: __dxlog_file4,
-        L: 746,
+        F: __dxlog_file5,
+        L: 726,
         S: this,
         C: (f, a) => f(...a)
       });
       toReplicateWithoutBatching.push(...missingOnRemote);
     }
     if (bundleSyncEnabled && missingOnLocal.length >= BUNDLE_SYNC_THRESHOLD) {
-      log4("pulling bundle", {
+      log5("pulling bundle", {
         amount: missingOnLocal.length
       }, {
-        F: __dxlog_file4,
-        L: 754,
+        F: __dxlog_file5,
+        L: 734,
         S: this,
         C: (f, a) => f(...a)
       });
       const { syncInteractively } = await this._pullInBundles(peerId, missingOnLocal);
       toReplicateWithoutBatching.push(...syncInteractively);
     } else {
-      log4.verbose("failed to pull bundle, replicating interactively", {
+      log5.verbose("failed to pull bundle, replicating interactively", {
         collectionId,
         peerId,
         amount: missingOnLocal.length
       }, {
-        F: __dxlog_file4,
-        L: 758,
+        F: __dxlog_file5,
+        L: 738,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1722,14 +1734,14 @@ var AutomergeHost = class extends Resource3 {
     if (toReplicateWithoutBatching.length === 0) {
       return;
     }
-    log4("replicating documents after collection sync", {
+    log5("replicating documents after collection sync", {
       collectionId,
       peerId,
       toReplicateWithoutBatching,
       count: toReplicateWithoutBatching.length
     }, {
-      F: __dxlog_file4,
-      L: 770,
+      F: __dxlog_file5,
+      L: 750,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1752,13 +1764,13 @@ var AutomergeHost = class extends Resource3 {
           return;
         }
         await this._pushBundle(peerId, bundle).catch((err) => {
-          log4.warn("failed to push bundle, replicating interactively", {
+          log5.warn("failed to push bundle, replicating interactively", {
             peerId,
             bundle,
             err
           }, {
-            F: __dxlog_file4,
-            L: 803,
+            F: __dxlog_file5,
+            L: 783,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1777,11 +1789,11 @@ var AutomergeHost = class extends Resource3 {
     const docs = documentIds.map((documentId) => {
       const handle = this._repo.handles[documentId];
       if (!handle || !handle.isReady()) {
-        log4.warn("document not ready, skipping", {
+        log5.warn("document not ready, skipping", {
           documentId
         }, {
-          F: __dxlog_file4,
-          L: 821,
+          F: __dxlog_file5,
+          L: 801,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1789,11 +1801,11 @@ var AutomergeHost = class extends Resource3 {
       }
       const doc = handle.doc();
       if (!doc) {
-        log4.warn("document not available, skipping", {
+        log5.warn("document not available, skipping", {
           documentId
         }, {
-          F: __dxlog_file4,
-          L: 826,
+          F: __dxlog_file5,
+          L: 806,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1820,13 +1832,13 @@ var AutomergeHost = class extends Resource3 {
           return;
         }
         const result = await this._pullBundle(peerId, bundle).catch((err) => {
-          log4.warn("failed to pull bundle, replicating interactively", {
+          log5.warn("failed to pull bundle, replicating interactively", {
             peerId,
             bundle,
             err
           }, {
-            F: __dxlog_file4,
-            L: 856,
+            F: __dxlog_file5,
+            L: 836,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1921,8 +1933,8 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 };
 var decodeCollectionState = (state) => {
   invariant2(typeof state === "object" && state !== null, "Invalid state", {
-    F: __dxlog_file4,
-    L: 939,
+    F: __dxlog_file5,
+    L: 919,
     S: void 0,
     A: [
       "typeof state === 'object' && state !== null",
@@ -1938,7 +1950,7 @@ var encodeCollectionState = (state) => {
 // src/automerge/mesh-echo-replicator.ts
 import { invariant as invariant5 } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
-import { log as log6 } from "@dxos/log";
+import { log as log7 } from "@dxos/log";
 import { ComplexSet as ComplexSet2, defaultMap as defaultMap3 } from "@dxos/util";
 
 // src/automerge/mesh-echo-replicator-connection.ts
@@ -1946,9 +1958,9 @@ import * as A2 from "@automerge/automerge";
 import { cbor } from "@automerge/automerge-repo";
 import { Resource as Resource4 } from "@dxos/context";
 import { invariant as invariant3 } from "@dxos/invariant";
-import { log as log5 } from "@dxos/log";
+import { log as log6 } from "@dxos/log";
 import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
-var __dxlog_file5 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator-connection.ts";
+var __dxlog_file6 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator-connection.ts";
 var DEFAULT_FACTORY = (params) => new AutomergeReplicator(...params);
 var MeshReplicatorConnection = class extends Resource4 {
   _params;
@@ -1970,7 +1982,7 @@ var MeshReplicatorConnection = class extends Resource4 {
     this.writable = new WritableStream({
       write: async (message, controller) => {
         invariant3(this._isEnabled, "Writing to a disabled connection", {
-          F: __dxlog_file5,
+          F: __dxlog_file6,
           L: 51,
           S: this,
           A: [
@@ -1998,12 +2010,12 @@ var MeshReplicatorConnection = class extends Resource4 {
         onStartReplication: async (info, remotePeerId) => {
           this.remoteDeviceKey = remotePeerId;
           this._remotePeerId = info.id;
-          log5("onStartReplication", {
+          log6("onStartReplication", {
             id: info.id,
             thisPeerId: this.peerId,
             remotePeerId: remotePeerId.toHex()
           }, {
-            F: __dxlog_file5,
+            F: __dxlog_file6,
             L: 80,
             S: this,
             C: (f, a) => f(...a)
@@ -2030,7 +2042,7 @@ var MeshReplicatorConnection = class extends Resource4 {
   }
   get peerId() {
     invariant3(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 106,
       S: this,
       A: [
@@ -2058,7 +2070,7 @@ var MeshReplicatorConnection = class extends Resource4 {
   */
   enable() {
     invariant3(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 131,
       S: this,
       A: [
@@ -2076,7 +2088,7 @@ var MeshReplicatorConnection = class extends Resource4 {
   }
 };
 var logSendSync = (message) => {
-  log5("sendSyncMessage", () => {
+  log6("sendSyncMessage", () => {
     const decodedSyncMessage = message.type === "sync" && message.data ? A2.decodeSyncMessage(message.data) : void 0;
     return {
       sync: decodedSyncMessage && {
@@ -2089,7 +2101,7 @@ var logSendSync = (message) => {
       to: message.targetId
     };
   }, {
-    F: __dxlog_file5,
+    F: __dxlog_file6,
     L: 144,
     S: void 0,
     C: (f, a) => f(...a)
@@ -2099,12 +2111,12 @@ var logSendSync = (message) => {
 // src/automerge/space-collection.ts
 import { invariant as invariant4 } from "@dxos/invariant";
 import { SpaceId } from "@dxos/keys";
-var __dxlog_file6 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/space-collection.ts";
+var __dxlog_file7 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/space-collection.ts";
 var deriveCollectionIdFromSpaceId = (spaceId, rootDocumentId) => rootDocumentId ? `space:${spaceId}:${rootDocumentId}` : `space:${spaceId}`;
 var getSpaceIdFromCollectionId = (collectionId) => {
   const spaceId = collectionId.split(":")[1];
   invariant4(SpaceId.isValid(spaceId), void 0, {
-    F: __dxlog_file6,
+    F: __dxlog_file7,
     L: 16,
     S: void 0,
     A: [
@@ -2116,7 +2128,7 @@ var getSpaceIdFromCollectionId = (collectionId) => {
 };
 
 // src/automerge/mesh-echo-replicator.ts
-var __dxlog_file7 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
+var __dxlog_file8 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
 var MeshEchoReplicator = class {
   /**
   * We might have multiple connections open with a peer (one per space), but there'll be only one enabled
@@ -2152,8 +2164,8 @@ var MeshEchoReplicator = class {
   }
   createExtension(extensionFactory) {
     invariant5(this._context, void 0, {
-      F: __dxlog_file7,
-      L: 68,
+      F: __dxlog_file8,
+      L: 71,
       S: this,
       A: [
         "this._context",
@@ -2164,17 +2176,17 @@ var MeshEchoReplicator = class {
       ownPeerId: this._context.peerId,
       replicatorFactory: extensionFactory,
       onRemoteConnected: async () => {
-        log6("onRemoteConnected", {
+        log7("onRemoteConnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file7,
-          L: 74,
+          F: __dxlog_file8,
+          L: 77,
           S: this,
           C: (f, a) => f(...a)
         });
         invariant5(this._context, void 0, {
-          F: __dxlog_file7,
-          L: 75,
+          F: __dxlog_file8,
+          L: 78,
           S: this,
           A: [
             "this._context",
@@ -2195,11 +2207,11 @@ var MeshEchoReplicator = class {
         }
       },
       onRemoteDisconnected: async () => {
-        log6("onRemoteDisconnected", {
+        log7("onRemoteDisconnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file7,
-          L: 89,
+          F: __dxlog_file8,
+          L: 92,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2207,11 +2219,11 @@ var MeshEchoReplicator = class {
         const existingConnections = this._connectionsPerPeer.get(connection.peerId) ?? [];
         const index = existingConnections.indexOf(connection);
         if (index < 0) {
-          log6.warn("disconnected connection not found", {
+          log7.warn("disconnected connection not found", {
             peerId: connection.peerId
           }, {
-            F: __dxlog_file7,
-            L: 97,
+            F: __dxlog_file8,
+            L: 100,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2228,18 +2240,18 @@ var MeshEchoReplicator = class {
         }
       },
       shouldAdvertise: async (params) => {
-        log6("shouldAdvertise", {
+        log7("shouldAdvertise", {
           peerId: connection.peerId,
           documentId: params.documentId
         }, {
-          F: __dxlog_file7,
-          L: 115,
+          F: __dxlog_file8,
+          L: 118,
           S: this,
           C: (f, a) => f(...a)
         });
         invariant5(this._context, void 0, {
-          F: __dxlog_file7,
-          L: 116,
+          F: __dxlog_file8,
+          L: 119,
           S: this,
           A: [
             "this._context",
@@ -2253,13 +2265,13 @@ var MeshEchoReplicator = class {
               documentId: params.documentId,
               peerId: connection.peerId
             });
-            log6("document not found locally for share policy check", {
+            log7("document not found locally for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId,
               acceptDocument: remoteDocumentExists
             }, {
-              F: __dxlog_file7,
-              L: 124,
+              F: __dxlog_file8,
+              L: 127,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2268,19 +2280,19 @@ var MeshEchoReplicator = class {
           const spaceId = await createIdFromSpaceKey(spaceKey);
           const authorizedDevices = this._authorizedDevices.get(spaceId);
           if (!connection.remoteDeviceKey) {
-            log6("device key not found for share policy check", {
+            log7("device key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file7,
-              L: 141,
+              F: __dxlog_file8,
+              L: 144,
               S: this,
               C: (f, a) => f(...a)
             });
             return false;
           }
           const isAuthorized = authorizedDevices?.has(connection.remoteDeviceKey) ?? false;
-          log6("share policy check", {
+          log7("share policy check", {
             localPeer: this._context.peerId,
             remotePeer: connection.peerId,
             documentId: params.documentId,
@@ -2288,16 +2300,16 @@ var MeshEchoReplicator = class {
             spaceKey,
             isAuthorized
           }, {
-            F: __dxlog_file7,
-            L: 149,
+            F: __dxlog_file8,
+            L: 152,
             S: this,
             C: (f, a) => f(...a)
           });
           return isAuthorized;
         } catch (err) {
-          log6.catch(err, void 0, {
-            F: __dxlog_file7,
-            L: 159,
+          log7.catch(err, void 0, {
+            F: __dxlog_file8,
+            L: 162,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2308,12 +2320,12 @@ var MeshEchoReplicator = class {
         const spaceId = getSpaceIdFromCollectionId(collectionId);
         const authorizedDevices = this._authorizedDevices.get(spaceId);
         if (!connection.remoteDeviceKey) {
-          log6("device key not found for collection sync check", {
+          log7("device key not found for collection sync check", {
             peerId: connection.peerId,
             collectionId
           }, {
-            F: __dxlog_file7,
-            L: 169,
+            F: __dxlog_file8,
+            L: 172,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2327,12 +2339,12 @@ var MeshEchoReplicator = class {
     return connection.replicatorExtension;
   }
   async authorizeDevice(spaceKey, deviceKey) {
-    log6("authorizeDevice", {
+    log7("authorizeDevice", {
       spaceKey,
       deviceKey
     }, {
-      F: __dxlog_file7,
-      L: 186,
+      F: __dxlog_file8,
+      L: 189,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2716,9 +2728,9 @@ import { next as A3 } from "@automerge/automerge";
 import { UpdateScheduler } from "@dxos/async";
 import { Context as Context3, LifecycleState as LifecycleState2, Resource as Resource5 } from "@dxos/context";
 import { invariant as invariant6 } from "@dxos/invariant";
-import { log as log7 } from "@dxos/log";
+import { log as log8 } from "@dxos/log";
 import { retry } from "@dxos/util";
-var __dxlog_file8 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/documents-synchronizer.ts";
+var __dxlog_file9 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/documents-synchronizer.ts";
 var MAX_UPDATE_FREQ = 10;
 var WRAP_AROUND_RETRY_LIMIT = 3;
 var WRAP_AROUND_RETRY_INITIAL_DELAY = 100;
@@ -2746,16 +2758,16 @@ var DocumentsSynchronizer = class extends Resource5 {
           exponent: 2
         }, async () => {
           try {
-            log7("loading document", {
+            log8("loading document", {
               documentId
             }, {
-              F: __dxlog_file8,
+              F: __dxlog_file9,
               L: 62,
               S: this,
               C: (f, a) => f(...a)
             });
             const doc = await this._params.automergeHost.loadDoc(Context3.default(void 0, {
-              F: __dxlog_file8,
+              F: __dxlog_file9,
               L: 64
             }), documentId, {
               fetchFromNetwork: true
@@ -2764,10 +2776,10 @@ var DocumentsSynchronizer = class extends Resource5 {
             this._pendingUpdates.add(doc.documentId);
             this._sendUpdatesJob.trigger();
           } catch (err) {
-            log7.warn("failed to load document", {
+            log8.warn("failed to load document", {
               err
             }, {
-              F: __dxlog_file8,
+              F: __dxlog_file9,
               L: 72,
               S: this,
               C: (f, a) => f(...a)
@@ -2776,8 +2788,8 @@ var DocumentsSynchronizer = class extends Resource5 {
           }
         });
       } catch (err) {
-        log7.catch(err, void 0, {
-          F: __dxlog_file8,
+        log8.catch(err, void 0, {
+          F: __dxlog_file9,
           L: 78,
           S: this,
           C: (f, a) => f(...a)
@@ -2811,10 +2823,10 @@ var DocumentsSynchronizer = class extends Resource5 {
   }
   _startSync(doc) {
     if (this._syncStates.has(doc.documentId)) {
-      log7("Document already being synced", {
+      log8("Document already being synced", {
         documentId: doc.documentId
       }, {
-        F: __dxlog_file8,
+        F: __dxlog_file9,
         L: 113,
         S: this,
         C: (f, a) => f(...a)
@@ -2858,7 +2870,7 @@ var DocumentsSynchronizer = class extends Resource5 {
   _getPendingChanges(documentId) {
     const syncState = this._syncStates.get(documentId);
     invariant6(syncState, "Sync state for document not found", {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 155,
       S: this,
       A: [
@@ -2882,17 +2894,17 @@ var DocumentsSynchronizer = class extends Resource5 {
     if (this._lifecycleState === LifecycleState2.CLOSED) {
       return;
     }
-    log7("write mutation", {
+    log8("write mutation", {
       documentId
     }, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
     const syncState = this._syncStates.get(documentId);
     invariant6(syncState, "Sync state for document not found", {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 176,
       S: this,
       A: [
@@ -2912,7 +2924,7 @@ var DocumentsSynchronizer = class extends Resource5 {
 };
 
 // src/db-host/data-service.ts
-var __dxlog_file9 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/data-service.ts";
+var __dxlog_file10 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/data-service.ts";
 var DataServiceImpl = class {
   /**
   * Map of subscriptions.
@@ -2936,8 +2948,8 @@ var DataServiceImpl = class {
       synchronizer.open().then(() => {
         this._subscriptions.set(request.subscriptionId, synchronizer);
         ready();
-      }).catch((err) => log8.catch(err, void 0, {
-        F: __dxlog_file9,
+      }).catch((err) => log9.catch(err, void 0, {
+        F: __dxlog_file10,
         L: 74,
         S: this,
         C: (f, a) => f(...a)
@@ -2948,7 +2960,7 @@ var DataServiceImpl = class {
   async updateSubscription(request) {
     const synchronizer = this._subscriptions.get(request.subscriptionId);
     invariant7(synchronizer, "Subscription not found", {
-      F: __dxlog_file9,
+      F: __dxlog_file10,
       L: 81,
       S: this,
       A: [
@@ -2975,7 +2987,7 @@ var DataServiceImpl = class {
     }
     const synchronizer = this._subscriptions.get(request.subscriptionId);
     invariant7(synchronizer, "Subscription not found", {
-      F: __dxlog_file9,
+      F: __dxlog_file10,
       L: 101,
       S: this,
       A: [
@@ -3020,7 +3032,7 @@ var DataServiceImpl = class {
     return new Stream(({ ctx, next, ready }) => {
       const spaceId = request.spaceId;
       invariant7(SpaceId2.isValid(spaceId), void 0, {
-        F: __dxlog_file9,
+        F: __dxlog_file10,
         L: 141,
         S: this,
         A: [
@@ -3057,128 +3069,38 @@ var DataServiceImpl = class {
 
 // src/db-host/echo-host.ts
 import { DeferredTask as DeferredTask3, sleep } from "@dxos/async";
-import { Context as Context8, LifecycleState as LifecycleState5, Resource as Resource9 } from "@dxos/context";
+import { Context as Context6, LifecycleState as LifecycleState5, Resource as Resource9 } from "@dxos/context";
 import { todo } from "@dxos/debug";
-import { SpaceDocVersion as SpaceDocVersion4, createIdFromSpaceKey as createIdFromSpaceKey2 } from "@dxos/echo-protocol";
+import { SpaceDocVersion as SpaceDocVersion3, createIdFromSpaceKey as createIdFromSpaceKey2 } from "@dxos/echo-protocol";
 import { RuntimeProvider as RuntimeProvider3 } from "@dxos/effect";
 import { FeedStore } from "@dxos/feed";
 import { IndexEngine } from "@dxos/index-core";
-import { IndexMetadataStore, IndexStore, Indexer } from "@dxos/indexing";
-import { invariant as invariant14 } from "@dxos/invariant";
+import { invariant as invariant13 } from "@dxos/invariant";
 import { log as log14 } from "@dxos/log";
-import { IndexKind } from "@dxos/protocols/proto/dxos/echo/indexing";
 import { trace as trace5 } from "@dxos/tracing";
 
-// src/db-host/documents-iterator.ts
-import * as A4 from "@automerge/automerge";
-import { Context as Context4 } from "@dxos/context";
-import { DatabaseDirectory as DatabaseDirectory3, SpaceDocVersion as SpaceDocVersion2 } from "@dxos/echo-protocol";
-import { invariant as invariant8 } from "@dxos/invariant";
-import { log as log9 } from "@dxos/log";
-import { ObjectPointerVersion, objectPointerCodec as objectPointerCodec2 } from "@dxos/protocols";
-var __dxlog_file10 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/documents-iterator.ts";
-var LOG_VIEW_OPERATION_THRESHOLD = 300;
-var createSelectedDocumentsIterator = (automergeHost) => (
-  /**
-  * Get object data blobs from Automerge Repo by ids.
-  */
-  // TODO(mykola): Unload automerge handles after usage.
-  async function* loadDocuments(objects) {
-    for (const [id, heads] of objects.entries()) {
-      try {
-        const { documentId, objectId } = objectPointerCodec2.decode(id);
-        const handle = await automergeHost.loadDoc(Context4.default(void 0, {
-          F: __dxlog_file10,
-          L: 31
-        }), documentId, {
-          fetchFromNetwork: true
-        });
-        let doc = handle.doc();
-        invariant8(doc, void 0, {
-          F: __dxlog_file10,
-          L: 36,
-          S: this,
-          A: [
-            "doc",
-            ""
-          ]
-        });
-        const currentHeads = A4.getHeads(doc);
-        if (!A4.equals(currentHeads, heads)) {
-          const begin = Date.now();
-          doc = A4.view(doc, heads);
-          const end = Date.now();
-          if (end - begin > LOG_VIEW_OPERATION_THRESHOLD) {
-            log9("Checking out document version is taking too long", {
-              duration: end - begin,
-              requestedHeads: heads,
-              originalHeads: currentHeads
-            }, {
-              F: __dxlog_file10,
-              L: 47,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-          }
-        }
-        if (doc.version !== SpaceDocVersion2.CURRENT) {
-          continue;
-        }
-        if (!doc.objects?.[objectId]) {
-          continue;
-        }
-        let newId = id;
-        if (objectPointerCodec2.getVersion(id) === ObjectPointerVersion.V0) {
-          const spaceKey = DatabaseDirectory3.getSpaceKey(doc) ?? void 0;
-          newId = objectPointerCodec2.encode({
-            documentId,
-            objectId,
-            spaceKey
-          });
-        }
-        yield [
-          {
-            id: newId,
-            object: doc.objects[objectId],
-            heads
-          }
-        ];
-      } catch (error) {
-        log9.error("Error loading document", {
-          heads,
-          id,
-          error
-        }, {
-          F: __dxlog_file10,
-          L: 73,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    }
-  }
-);
-
 // src/db-host/local-queue-service.ts
 import * as Effect2 from "effect/Effect";
 import * as Function from "effect/Function";
-import { ATTR_META } from "@dxos/echo/internal";
+import { EchoFeedCodec } from "@dxos/echo-protocol";
 import { RuntimeProvider } from "@dxos/effect";
-import { invariant as invariant9 } from "@dxos/invariant";
-import { KEY_QUEUE_POSITION } from "@dxos/protocols";
+import { assertArgument, invariant as invariant8 } from "@dxos/invariant";
+import { FeedProtocol } from "@dxos/protocols";
 var __dxlog_file11 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/local-queue-service.ts";
 var LocalQueueServiceImpl = class {
   #runtime;
   #feedStore;
-  constructor(runtime, feedStore) {
+  #syncQueue;
+  constructor(runtime, feedStore, syncQueue) {
     this.#runtime = runtime;
     this.#feedStore = feedStore;
+    this.#syncQueue = syncQueue;
   }
   queryQueue(request) {
     const { query } = request;
-    invariant9(query, "query is required", {
+    invariant8(query, "query is required", {
       F: __dxlog_file11,
-      L: 37,
+      L: 46,
       S: this,
       A: [
         "query",
@@ -3190,6 +3112,7 @@ var LocalQueueServiceImpl = class {
       const cursor = query.after ? parseInt(query.after) : -1;
       const result = yield* this.#feedStore.query({
         requestId: crypto.randomUUID(),
+        feedNamespace: request.query.queuesNamespace || FeedProtocol.WellKnownNamespaces.data,
         spaceId,
         query: {
           feedIds: queueIds ?? []
@@ -3197,13 +3120,7 @@ var LocalQueueServiceImpl = class {
         position: cursor,
         limit: query.limit
       });
-      const objects = result.blocks.map((block) => {
-        const data = JSON.parse(new TextDecoder().decode(block.data));
-        if (block.position !== null) {
-          setQueuePosition(data, block.position);
-        }
-        return data;
-      });
+      const objects = result.blocks.map((block) => EchoFeedCodec.decode(block.data, block.position ?? void 0));
       const lastBlock = result.blocks[result.blocks.length - 1];
       const nextCursor = lastBlock && lastBlock.position != null ? String(lastBlock.position) : null;
       return Function.identity({
@@ -3216,85 +3133,65 @@ var LocalQueueServiceImpl = class {
   }
   insertIntoQueue(request) {
     const { subspaceTag, spaceId, queueId, objects } = request;
+    const feedNamespace = subspaceTag ?? FeedProtocol.WellKnownNamespaces.data;
+    assertArgument(FeedProtocol.isWellKnownNamespace(feedNamespace), "request.subspaceTag", "expected a well-known queue namespace");
     return RuntimeProvider.runPromise(this.#runtime)(Effect2.gen(this, function* () {
-      const messages = objects.map((obj) => {
-        const data = structuredClone(obj);
-        if (data[ATTR_META]?.keys?.find((key) => key.source === KEY_QUEUE_POSITION)) {
-          data[ATTR_META].keys = data[ATTR_META].keys.filter((key) => key.source !== KEY_QUEUE_POSITION);
-        }
-        return {
-          spaceId,
-          feedId: queueId,
-          feedNamespace: subspaceTag,
-          data: new TextEncoder().encode(JSON.stringify(obj))
-        };
-      });
+      const messages = objects.map((obj) => ({
+        spaceId,
+        feedId: queueId,
+        feedNamespace,
+        data: EchoFeedCodec.encode(obj)
+      }));
       yield* this.#feedStore.appendLocal(messages);
     }));
   }
   deleteFromQueue(request) {
     const { subspaceTag, spaceId, queueId, objectIds } = request;
+    const feedNamespace = subspaceTag ?? FeedProtocol.WellKnownNamespaces.data;
+    assertArgument(FeedProtocol.isWellKnownNamespace(feedNamespace), "request.subspaceTag", "expected a well-known queue namespace");
     return RuntimeProvider.runPromise(this.#runtime)(Effect2.gen(this, function* () {
       const messages = objectIds.map((id) => ({
         spaceId,
         feedId: queueId,
-        feedNamespace: subspaceTag,
-        data: new TextEncoder().encode(JSON.stringify({
+        feedNamespace,
+        data: EchoFeedCodec.encode({
           id,
           "@deleted": true
-        }))
+        })
       }));
       yield* this.#feedStore.appendLocal(messages);
     }));
   }
-};
-var setQueuePosition = (obj, position) => {
-  obj[ATTR_META] ??= {
-    keys: []
-  };
-  obj[ATTR_META].keys ??= [];
-  for (let i = 0; i < obj[ATTR_META].keys.length; i++) {
-    const key = obj[ATTR_META].keys[i];
-    if (key.source === KEY_QUEUE_POSITION) {
-      obj[ATTR_META].keys.splice(i, 1);
-      i--;
-    }
+  async syncQueue(request) {
+    await this.#syncQueue?.(request);
   }
-  obj[ATTR_META].keys.push({
-    source: KEY_QUEUE_POSITION,
-    id: position.toString()
-  });
 };
 
 // src/db-host/query-service.ts
-import { getHeads as getHeads3 } from "@automerge/automerge";
 import * as Schema from "effect/Schema";
 import { DeferredTask as DeferredTask2, scheduleMicroTask, synchronized as synchronized2 } from "@dxos/async";
 import { Stream as Stream2 } from "@dxos/codec-protobuf/stream";
-import { Context as Context6, Resource as Resource7 } from "@dxos/context";
+import { Resource as Resource7 } from "@dxos/context";
 import { raise } from "@dxos/debug";
-import { DatabaseDirectory as DatabaseDirectory5, QueryAST } from "@dxos/echo-protocol";
+import { QueryAST } from "@dxos/echo-protocol";
 import { log as log11 } from "@dxos/log";
-import { objectPointerCodec as objectPointerCodec4 } from "@dxos/protocols";
 import { trace as trace4 } from "@dxos/tracing";
 
 // src/query/query-executor.ts
-import * as Match from "effect/Match";
 import * as Runtime from "effect/Runtime";
-import { Context as Context5, ContextDisposedError, LifecycleState as LifecycleState3, Resource as Resource6 } from "@dxos/context";
-import { ATTR_RELATION_SOURCE, ATTR_RELATION_TARGET } from "@dxos/echo/internal";
-import { DatabaseDirectory as DatabaseDirectory4, ObjectStructure, isEncodedReference } from "@dxos/echo-protocol";
+import { Context as Context4, ContextDisposedError, LifecycleState as LifecycleState3, Resource as Resource6 } from "@dxos/context";
+import { ATTR_PARENT, ATTR_RELATION_SOURCE, ATTR_RELATION_TARGET } from "@dxos/echo/internal";
+import { DatabaseDirectory as DatabaseDirectory3, EncodedReference, ObjectStructure, isEncodedReference } from "@dxos/echo-protocol";
 import { runAndForwardErrors, unwrapExit } from "@dxos/effect";
-import { EscapedPropPath } from "@dxos/indexing";
-import { invariant as invariant11 } from "@dxos/invariant";
-import { DXN, PublicKey as PublicKey4 } from "@dxos/keys";
+import { EscapedPropPath } from "@dxos/index-core";
+import { invariant as invariant10 } from "@dxos/invariant";
+import { DXN } from "@dxos/keys";
 import { log as log10 } from "@dxos/log";
-import { objectPointerCodec as objectPointerCodec3 } from "@dxos/protocols";
 import { getDeep, isNonNullable as isNonNullable3 } from "@dxos/util";
 
 // src/query/query-planner.ts
 import { Order } from "@dxos/echo";
-import { invariant as invariant10 } from "@dxos/invariant";
+import { invariant as invariant9 } from "@dxos/invariant";
 
 // src/query/errors.ts
 import { BaseError } from "@dxos/errors";
@@ -3364,6 +3261,8 @@ var QueryPlanner = class {
         return this._generateRelationTraversalClause(query, context);
       case "reference-traversal":
         return this._generateReferenceTraversalClause(query, context);
+      case "hierarchy-traversal":
+        return this._generateHierarchyTraversalClause(query, context);
       case "union":
         return this._generateUnionClause(query, context);
       case "set-difference":
@@ -3567,9 +3466,9 @@ var QueryPlanner = class {
       case "or":
         if (filter2.filters.every(isTrivialTypenameFilter)) {
           const typenames = filter2.filters.map((filter3) => {
-            invariant10(filter3.type === "object" && filter3.typename !== null, void 0, {
+            invariant9(filter3.type === "object" && filter3.typename !== null, void 0, {
               F: __dxlog_file12,
-              L: 245,
+              L: 247,
               S: this,
               A: [
                 "filter.type === 'object' && filter.typename !== null",
@@ -3781,6 +3680,19 @@ var QueryPlanner = class {
       }
     ]);
   }
+  _generateHierarchyTraversalClause(query, context) {
+    return QueryPlan.Plan.make([
+      ...this._generate(query.anchor, context).steps,
+      {
+        _tag: "TraverseStep",
+        traversal: {
+          _tag: "HierarchyTraversal",
+          direction: query.direction
+        }
+      },
+      ...this._generateDeletedHandlingSteps(context)
+    ]);
+  }
   /**
   * Removes filter steps that have no predicates.
   */
@@ -3990,6 +3902,10 @@ var isTrivialTypenameFilter = (filter2) => {
 // src/query/query-executor.ts
 var __dxlog_file13 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/query/query-executor.ts";
 var QueryItem = Object.freeze({
+  /**
+  * Checks if the item is deleted.
+  * Only applies to this item, not its parents.
+  */
   isDeleted: (item) => {
     if (item.doc) {
       return ObjectStructure.isDeleted(item.doc);
@@ -4008,6 +3924,15 @@ var QueryItem = Object.freeze({
       throw new Error("Invalid query item");
     }
   },
+  getParent: (item) => {
+    if (item.doc) {
+      return ObjectStructure.getParent(item.doc)?.["/"];
+    } else if (item.data) {
+      return item.data[ATTR_PARENT];
+    } else {
+      throw new Error("Invalid query item");
+    }
+  },
   getRelationSource: (item) => {
     if (item.doc) {
       return ObjectStructure.getRelationSource(item.doc)?.["/"];
@@ -4098,9 +4023,9 @@ var ExecutionTrace = Object.freeze({
   }
 });
 var TRACE_QUERY_EXECUTION = false;
-var QueryExecutor = class extends Resource6 {
-  _indexer;
-  _indexer2;
+var MAX_DEPTH_FOR_DELETION_TRACING = 10;
+var QueryExecutor = class _QueryExecutor extends Resource6 {
+  _indexEngine;
   _runtime;
   _automergeHost;
   _spaceStateManager;
@@ -4116,8 +4041,7 @@ var QueryExecutor = class extends Resource6 {
   _lastResultSet = [];
   constructor(options) {
     super();
-    this._indexer = options.indexer;
-    this._indexer2 = options.indexer2;
+    this._indexEngine = options.indexEngine;
     this._runtime = options.runtime;
     this._automergeHost = options.automergeHost;
     this._spaceStateManager = options.spaceStateManager;
@@ -4136,10 +4060,6 @@ var QueryExecutor = class extends Resource6 {
   get trace() {
     return this._trace;
   }
-  async _open(ctx) {
-  }
-  async _close(ctx) {
-  }
   getResults() {
     return this._lastResultSet.map((item) => ({
       id: item.objectId,
@@ -4152,9 +4072,9 @@ var QueryExecutor = class extends Resource6 {
     }));
   }
   async execQuery() {
-    invariant11(this._lifecycleState === LifecycleState3.OPEN, void 0, {
+    invariant10(this._lifecycleState === LifecycleState3.OPEN, void 0, {
       F: __dxlog_file13,
-      L: 288,
+      L: 295,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -4166,7 +4086,8 @@ var QueryExecutor = class extends Resource6 {
     this._lastResultSet = workingSet;
     trace6.name = "Root";
     trace6.details = JSON.stringify({
-      id: this._id
+      id: this._id,
+      query: prettyQuery(this._query)
     });
     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);
@@ -4179,7 +4100,6 @@ var QueryExecutor = class extends Resource6 {
   }
   async _execPlan(plan, workingSet) {
     const trace6 = ExecutionTrace.makeEmpty();
-    const begin = performance.now();
     for (const step of plan.steps) {
       if (this._ctx.disposed) {
         throw new ContextDisposedError();
@@ -4256,11 +4176,8 @@ var QueryExecutor = class extends Resource6 {
     switch (step.selector._tag) {
       case "WildcardSelector": {
         const beginIndexQuery = performance.now();
-        const indexHits = await this._indexer.execQuery({
-          typenames: [],
-          inverted: false
-        });
-        trace6.indexHits = +indexHits.length;
+        const metas = await this._queryAllFromSqlIndex(step.spaces);
+        trace6.indexHits = metas.length;
         trace6.indexQueryTime += performance.now() - beginIndexQuery;
         if (this._ctx.disposed) {
           return {
@@ -4269,10 +4186,10 @@ var QueryExecutor = class extends Resource6 {
           };
         }
         const documentLoadStart = performance.now();
-        const results = await this._loadDocumentsAfterIndexQuery(indexHits);
+        const results = await this._loadDocumentsAfterSqlQuery(metas);
         trace6.documentsLoaded += results.length;
         trace6.documentLoadTime += performance.now() - documentLoadStart;
-        workingSet.push(...results.filter(isNonNullable3).filter((item) => step.spaces.includes(item.spaceId)));
+        workingSet.push(...results.filter(isNonNullable3));
         trace6.objectCount = workingSet.length;
         break;
       }
@@ -4288,11 +4205,8 @@ var QueryExecutor = class extends Resource6 {
       }
       case "TypeSelector": {
         const beginIndexQuery = performance.now();
-        const indexHits = await this._indexer.execQuery({
-          typenames: step.selector.typename,
-          inverted: step.selector.inverted
-        });
-        trace6.indexHits = +indexHits.length;
+        const metas = await this._queryTypesFromSqlIndex(step.spaces, step.selector.typename, step.selector.inverted);
+        trace6.indexHits = metas.length;
         trace6.indexQueryTime += performance.now() - beginIndexQuery;
         if (this._ctx.disposed) {
           return {
@@ -4301,114 +4215,97 @@ var QueryExecutor = class extends Resource6 {
           };
         }
         const documentLoadStart = performance.now();
-        const results = await this._loadDocumentsAfterIndexQuery(indexHits);
+        const results = await this._loadDocumentsAfterSqlQuery(metas);
         trace6.documentsLoaded += results.length;
         trace6.documentLoadTime += performance.now() - documentLoadStart;
-        workingSet.push(...results.filter(isNonNullable3).filter((item) => step.spaces.includes(item.spaceId)));
+        workingSet.push(...results.filter(isNonNullable3));
         trace6.objectCount = workingSet.length;
         break;
       }
       case "TextSelector": {
-        if (step.selector.searchKind === "full-text" && this._indexer2 && this._runtime) {
-          const beginIndexQuery = performance.now();
-          const runtime = await runAndForwardErrors(this._runtime);
-          invariant11(step.spaces.length <= 1, "Multiple spaces are not supported for full-text search", {
+        if (step.selector.searchKind === "vector") {
+          log10.warn("Vector search is not supported", void 0, {
             F: __dxlog_file13,
-            L: 461,
+            L: 459,
             S: this,
-            A: [
-              "step.spaces.length <= 1",
-              "'Multiple spaces are not supported for full-text search'"
-            ]
+            C: (f, a) => f(...a)
           });
-          const queueIds = step.queues.length > 0 ? step.queues.map((dxnStr) => DXN.parse(dxnStr).asQueueDXN()?.queueId).filter(Boolean) : null;
-          const textResults = await unwrapExit(await this._indexer2.queryText({
-            query: step.selector.text,
-            spaceId: step.spaces,
-            includeAllQueues: step.allQueuesFromSpaces,
-            queueIds
-          }).pipe(Runtime.runPromiseExit(runtime)));
-          trace6.indexHits = textResults.length;
-          trace6.indexQueryTime += performance.now() - beginIndexQuery;
-          if (this._ctx.disposed) {
-            return {
-              workingSet,
-              trace: trace6
-            };
-          }
-          const documentLoadStart = performance.now();
-          const queueResults = textResults.filter((r) => r.queueId);
-          const spaceResults = textResults.filter((r) => !r.queueId);
-          const rankMap = new Map(textResults.map((r) => [
-            r.recordId,
-            r.rank
+          break;
+        }
+        const beginIndexQuery = performance.now();
+        invariant10(step.spaces.length <= 1, "Multiple spaces are not supported for full-text search", {
+          F: __dxlog_file13,
+          L: 465,
+          S: this,
+          A: [
+            "step.spaces.length <= 1",
+            "'Multiple spaces are not supported for full-text search'"
+          ]
+        });
+        const queueIds = step.queues.length > 0 ? step.queues.map((dxnStr) => DXN.parse(dxnStr).asQueueDXN()?.queueId).filter(Boolean) : null;
+        const textResults = await this._runInRuntime(this._indexEngine.queryText({
+          query: step.selector.text,
+          spaceId: step.spaces,
+          includeAllQueues: step.allQueuesFromSpaces,
+          queueIds
+        }));
+        trace6.indexHits = textResults.length;
+        trace6.indexQueryTime += performance.now() - beginIndexQuery;
+        if (this._ctx.disposed) {
+          return {
+            workingSet,
+            trace: trace6
+          };
+        }
+        const documentLoadStart = performance.now();
+        const queueResults = textResults.filter((r) => r.queueId);
+        const spaceResults = textResults.filter((r) => !r.queueId);
+        const rankMap = new Map(textResults.map((r) => [
+          r.recordId,
+          r.rank
+        ]));
+        let queueItems = [];
+        if (queueResults.length > 0) {
+          const snapshots = await this._runInRuntime(this._indexEngine.querySnapshotsJSON(queueResults.map((r) => r.recordId)));
+          const snapshotMap = new Map(snapshots.map((s) => [
+            s.recordId,
+            s.snapshot
           ]));
-          let queueItems = [];
-          if (queueResults.length > 0) {
-            const snapshots = await unwrapExit(await this._indexer2.querySnapshotsJSON(queueResults.map((r) => r.recordId)).pipe(Runtime.runPromiseExit(runtime)));
-            const snapshotMap = new Map(snapshots.map((s) => [
-              s.recordId,
-              s.snapshot
-            ]));
-            queueItems = queueResults.map((result) => {
-              const snapshot = snapshotMap.get(result.recordId);
-              if (!snapshot || typeof snapshot !== "object") {
-                return null;
-              }
-              return {
-                objectId: result.objectId,
-                spaceId: result.spaceId,
-                queueId: result.queueId,
-                queueNamespace: "data",
-                documentId: null,
-                doc: null,
-                data: snapshot,
-                rank: rankMap.get(result.recordId) ?? 1
-              };
-            }).filter(isNonNullable3);
-          }
-          const spaceItems = await Promise.all(spaceResults.map(async (result) => {
-            const dxn = DXN.fromLocalObjectId(result.objectId);
-            const item = await this._loadFromDXN(dxn, {
-              sourceSpaceId: result.spaceId
-            });
-            if (item) {
-              item.rank = rankMap.get(result.recordId) ?? 1;
+          queueItems = queueResults.map((result) => {
+            const snapshot = snapshotMap.get(result.recordId);
+            if (!snapshot || typeof snapshot !== "object") {
+              return null;
             }
-            return item;
-          }));
-          const items = [
-            ...queueItems,
-            ...spaceItems.filter(isNonNullable3)
-          ];
-          trace6.documentsLoaded += items.length;
-          trace6.documentLoadTime += performance.now() - documentLoadStart;
-          workingSet.push(...items.filter((item) => step.spaces.includes(item.spaceId)));
-          trace6.objectCount = workingSet.length;
-        } else {
-          const beginIndexQuery = performance.now();
-          const indexHits = await this._indexer.execQuery({
-            typenames: [],
-            text: {
-              query: step.selector.text,
-              kind: Match.type().pipe(Match.withReturnType(), Match.when("full-text", () => "text"), Match.when("vector", () => "vector"), Match.orElseAbsurd)(step.selector.searchKind)
-            }
-          });
-          trace6.indexHits = +indexHits.length;
-          trace6.indexQueryTime += performance.now() - beginIndexQuery;
-          if (this._ctx.disposed) {
             return {
-              workingSet,
-              trace: trace6
+              objectId: result.objectId,
+              spaceId: result.spaceId,
+              queueId: result.queueId,
+              queueNamespace: "data",
+              documentId: null,
+              doc: null,
+              data: snapshot,
+              rank: rankMap.get(result.recordId) ?? 1
             };
-          }
-          const documentLoadStart = performance.now();
-          const results = await this._loadDocumentsAfterIndexQuery(indexHits);
-          trace6.documentsLoaded += results.length;
-          trace6.documentLoadTime += performance.now() - documentLoadStart;
-          workingSet.push(...results.filter(isNonNullable3).filter((item) => step.spaces.includes(item.spaceId)));
-          trace6.objectCount = workingSet.length;
+          }).filter(isNonNullable3);
         }
+        const spaceItems = await Promise.all(spaceResults.map(async (result) => {
+          const dxn = DXN.fromLocalObjectId(result.objectId);
+          const item = await this._loadFromDXN(dxn, {
+            sourceSpaceId: result.spaceId
+          });
+          if (item) {
+            item.rank = rankMap.get(result.recordId) ?? 1;
+          }
+          return item;
+        }));
+        const items = [
+          ...queueItems,
+          ...spaceItems.filter(isNonNullable3)
+        ];
+        trace6.documentsLoaded += items.length;
+        trace6.documentLoadTime += performance.now() - documentLoadStart;
+        workingSet.push(...items.filter((item) => step.spaces.includes(item.spaceId)));
+        trace6.objectCount = workingSet.length;
         break;
       }
       default:
@@ -4434,6 +4331,7 @@ var QueryExecutor = class extends Resource6 {
       } else if (item.data) {
         return filterMatchObjectJSON(step.filter, item.data);
       } else {
+        return false;
       }
     });
     return {
@@ -4448,7 +4346,14 @@ var QueryExecutor = class extends Resource6 {
   }
   async _execFilterDeletedStep(step, workingSet) {
     const expected = step.mode === "only-deleted";
-    const result = workingSet.filter((item) => QueryItem.isDeleted(item) === expected);
+    const deletedState = workingSet.map((item) => QueryItem.isDeleted(item));
+    await Promise.all(workingSet.map(async (item, index) => {
+      if (deletedState[index]) {
+        return;
+      }
+      deletedState[index] ||= await this._getTransitiveDeletionState(item, MAX_DEPTH_FOR_DELETION_TRACING);
+    }));
+    const result = workingSet.filter((item, index) => deletedState[index] === expected);
     return {
       workingSet: result,
       trace: {
@@ -4471,9 +4376,9 @@ var QueryExecutor = class extends Resource6 {
       case "ReferenceTraversal": {
         switch (step.traversal.direction) {
           case "outgoing": {
-            invariant11(step.traversal.property !== null, "Outgoing reference traversal requires a property", {
+            invariant10(step.traversal.property !== null, "Outgoing reference traversal requires a property", {
               F: __dxlog_file13,
-              L: 645,
+              L: 628,
               S: this,
               A: [
                 "step.traversal.property !== null",
@@ -4497,7 +4402,7 @@ var QueryExecutor = class extends Resource6 {
                     ref: ref2["/"]
                   }, {
                     F: __dxlog_file13,
-                    L: 661,
+                    L: 644,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -4515,18 +4420,12 @@ var QueryExecutor = class extends Resource6 {
             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 beginIndexQuery = performance.now();
+            const metas = await this._queryIncomingReferencesFromSqlIndex(workingSet, step.traversal.property);
+            trace6.indexHits += metas.length;
+            trace6.indexQueryTime += performance.now() - beginIndexQuery;
             const documentLoadStart = performance.now();
-            const results = await this._loadDocumentsAfterIndexQuery(indexHits);
+            const results = await this._loadDocumentsAfterSqlQuery(metas);
             trace6.documentsLoaded += results.length;
             trace6.documentLoadTime += performance.now() - documentLoadStart;
             newWorkingSet.push(...results.filter(isNonNullable3));
@@ -4542,6 +4441,9 @@ var QueryExecutor = class extends Resource6 {
           case "relation-to-target": {
             const refs = workingSet.map((item) => {
               const dxn = step.traversal.direction === "relation-to-source" ? QueryItem.getRelationSource(item) : QueryItem.getRelationTarget(item);
+              if (!dxn) {
+                return null;
+              }
               try {
                 return {
                   ref: DXN.parse(dxn),
@@ -4552,7 +4454,7 @@ var QueryExecutor = class extends Resource6 {
                   ref: dxn
                 }, {
                   F: __dxlog_file13,
-                  L: 720,
+                  L: 700,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -4570,18 +4472,12 @@ var QueryExecutor = class extends Resource6 {
           }
           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 beginIndexQuery = performance.now();
+            const metas = await this._queryRelationsFromSqlIndex(workingSet, step.traversal.direction === "source-to-relation" ? "source" : "target");
+            trace6.indexHits += metas.length;
+            trace6.indexQueryTime += performance.now() - beginIndexQuery;
             const documentLoadStart = performance.now();
-            const results = await this._loadDocumentsAfterIndexQuery(indexHits);
+            const results = await this._loadDocumentsAfterSqlQuery(metas);
             trace6.documentsLoaded += results.length;
             trace6.documentLoadTime += performance.now() - documentLoadStart;
             newWorkingSet.push(...results.filter(isNonNullable3));
@@ -4591,6 +4487,84 @@ var QueryExecutor = class extends Resource6 {
         }
         break;
       }
+      case "HierarchyTraversal": {
+        switch (step.traversal.direction) {
+          case "to-parent": {
+            const refs = workingSet.map((item) => {
+              if (!item.doc) {
+                return null;
+              }
+              const ref = ObjectStructure.getParent(item.doc);
+              if (!EncodedReference.isEncodedReference(ref)) {
+                return null;
+              }
+              try {
+                return {
+                  ref: DXN.parse(ref["/"]),
+                  spaceId: item.spaceId
+                };
+              } catch {
+                log10.warn("invalid parent reference", {
+                  ref: ref["/"]
+                }, {
+                  F: __dxlog_file13,
+                  L: 760,
+                  S: this,
+                  C: (f, a) => f(...a)
+                });
+                return null;
+              }
+            }).filter(isNonNullable3);
+            const beginLoad = performance.now();
+            const items = await Promise.all(refs.map(({ ref, spaceId }) => this._loadFromDXN(ref, {
+              sourceSpaceId: spaceId
+            })));
+            trace6.documentLoadTime += performance.now() - beginLoad;
+            newWorkingSet.push(...items.filter(isNonNullable3));
+            trace6.objectCount = newWorkingSet.length;
+            break;
+          }
+          case "to-children": {
+            const bySpace = /* @__PURE__ */ new Map();
+            for (const item of workingSet) {
+              const existing = bySpace.get(item.spaceId);
+              if (existing) {
+                existing.push(item.objectId);
+              } else {
+                bySpace.set(item.spaceId, [
+                  item.objectId
+                ]);
+              }
+            }
+            const allChildren = [];
+            for (const [spaceId, parentIds] of bySpace) {
+              const children = await this._runInRuntime(this._indexEngine.queryChildren({
+                spaceId: [
+                  spaceId
+                ],
+                parentIds
+              }));
+              for (const child of children) {
+                allChildren.push({
+                  spaceId,
+                  objectId: child.objectId
+                });
+              }
+            }
+            trace6.indexHits += allChildren.length;
+            const documentLoadStart = performance.now();
+            const results = await Promise.all(allChildren.map(({ spaceId, objectId }) => this._loadFromDXN(DXN.fromLocalObjectId(objectId), {
+              sourceSpaceId: spaceId
+            })));
+            trace6.documentsLoaded += results.filter(isNonNullable3).length;
+            trace6.documentLoadTime += performance.now() - documentLoadStart;
+            newWorkingSet.push(...results.filter(isNonNullable3));
+            trace6.objectCount = newWorkingSet.length;
+            break;
+          }
+        }
+        break;
+      }
       default:
         throw new Error(`Unknown traversal type: ${step.traversal._tag}`);
     }
@@ -4732,49 +4706,166 @@ var QueryExecutor = class extends Resource6 {
     }
     return String(aValue).localeCompare(String(bValue));
   }
-  async _loadDocumentsAfterIndexQuery(indexHits) {
-    return Promise.all(indexHits.map(async (hit) => {
-      return this._loadFromIndexHit(hit);
+  async _runInRuntime(effect) {
+    const runtimeProvider = this._runtime;
+    invariant10(runtimeProvider, "SQL runtime is required.", {
+      F: __dxlog_file13,
+      L: 983,
+      S: this,
+      A: [
+        "runtimeProvider",
+        "'SQL runtime is required.'"
+      ]
+    });
+    const runtime = await runAndForwardErrors(runtimeProvider);
+    return await unwrapExit(await effect.pipe(Runtime.runPromiseExit(runtime)));
+  }
+  async _queryAllFromSqlIndex(spaceIds) {
+    return await this._runInRuntime(this._indexEngine.queryAll({
+      spaceIds
+    }));
+  }
+  async _queryTypesFromSqlIndex(spaceIds, typeDxns, inverted) {
+    return await this._runInRuntime(this._indexEngine.queryTypes({
+      spaceIds,
+      typeDxns,
+      inverted
     }));
   }
+  async _queryIncomingReferencesFromSqlIndex(workingSet, property) {
+    const anchorDxns = workingSet.map((item) => DXN.fromLocalObjectId(item.objectId).toString());
+    const rows = (await Promise.all(anchorDxns.map((targetDxn) => this._runInRuntime(this._indexEngine.queryReverseRef({
+      targetDxn
+    }))))).flat();
+    const recordIds = rows.filter((row) => {
+      if (property === null) {
+        return true;
+      }
+      const queryPath = EscapedPropPath.unescape(property);
+      const rowPath = EscapedPropPath.unescape(row.propPath);
+      return _QueryExecutor._matchesReferencePropertyPath(rowPath, queryPath);
+    }).map((row) => row.recordId);
+    const uniqueRecordIds = Array.from(new Set(recordIds));
+    return await this._runInRuntime(this._indexEngine.lookupByRecordIds(uniqueRecordIds));
+  }
   /**
-  * Space key hex -> SpaceId.
+  * Matches a reverse-reference row path against a query property path.
+  * Allows numeric segments in the row path (array indices) that are not present in the query.
+  *
+  * Examples:
+  * - query: ['assignee'] matches row: ['assignee'] and ['assignee', '0'].
+  * - query: ['items', 'assignee'] matches row: ['items', '0', 'assignee'].
+  * - query: ['a', 'b'] does NOT match row: ['a'].
+  * - query: ['a'] does NOT match row: ['a', 'b'].
   */
-  _spaceIdCache = /* @__PURE__ */ new Map();
-  async _loadFromIndexHit(hit) {
-    const { objectId, documentId, spaceKey: spaceKeyInIndex } = objectPointerCodec3.decode(hit.id);
-    const handle = await this._automergeHost.loadDoc(Context5.default(void 0, {
+  static _matchesReferencePropertyPath(rowPath, queryPath) {
+    const isNumericSegment = (segment) => /^[0-9]+$/.test(segment);
+    let i = 0;
+    let j = 0;
+    while (i < queryPath.length && j < rowPath.length) {
+      if (rowPath[j] === queryPath[i]) {
+        i++;
+        j++;
+        continue;
+      }
+      if (isNumericSegment(rowPath[j])) {
+        j++;
+        continue;
+      }
+      return false;
+    }
+    if (i !== queryPath.length) {
+      return false;
+    }
+    for (; j < rowPath.length; j++) {
+      if (!isNumericSegment(rowPath[j])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  async _queryRelationsFromSqlIndex(workingSet, endpoint) {
+    const anchorDxns = workingSet.map((item) => DXN.fromLocalObjectId(item.objectId).toString());
+    return await this._runInRuntime(this._indexEngine.queryRelations({
+      endpoint,
+      anchorDxns
+    }));
+  }
+  async _loadDocumentsAfterSqlQuery(metas) {
+    const snapshotMap = await this._loadQueueSnapshotMap(metas);
+    return await Promise.all(metas.map(async (meta) => {
+      if (meta.documentId) {
+        return this._loadFromAutomerge(meta);
+      }
+      if (meta.queueId) {
+        return this._loadFromQueue(meta, snapshotMap);
+      }
+      return null;
+    }));
+  }
+  async _loadQueueSnapshotMap(metas) {
+    const queueMetas = metas.filter((meta) => !meta.documentId && !!meta.queueId);
+    if (queueMetas.length === 0) {
+      return /* @__PURE__ */ new Map();
+    }
+    const snapshots = await this._runInRuntime(this._indexEngine.querySnapshotsJSON(queueMetas.map((meta) => meta.recordId)));
+    return new Map(snapshots.map((s) => [
+      s.recordId,
+      s.snapshot
+    ]));
+  }
+  /**
+  * Loads a queue-backed object from an indexed snapshot (by `recordId`).
+  * Returns `null` when the snapshot is missing or is not a JSON object.
+  */
+  _loadFromQueue(meta, snapshotMap) {
+    const snapshot = snapshotMap.get(meta.recordId);
+    if (!snapshot || typeof snapshot !== "object") {
+      return null;
+    }
+    return {
+      objectId: meta.objectId,
+      spaceId: meta.spaceId,
+      queueId: meta.queueId,
+      queueNamespace: "data",
+      documentId: null,
+      doc: null,
+      data: snapshot,
+      rank: 1
+    };
+  }
+  /**
+  * Loads a document-backed object from an Automerge `DatabaseDirectory`.
+  * Returns `null` if the document can't be loaded, the inline object isn't present, or if the meta does not have a
+  * document id (e.g. queue-backed objects).
+  */
+  async _loadFromAutomerge(meta) {
+    if (!meta.documentId) {
+      return null;
+    }
+    const handle = await this._automergeHost.loadDoc(Context4.default(void 0, {
       F: __dxlog_file13,
-      L: 942
-    }), documentId, {
+      L: 1145
+    }), meta.documentId, {
       fetchFromNetwork: true
     });
     const doc = handle.doc();
     if (!doc) {
       return null;
     }
-    const spaceKey = spaceKeyInIndex ?? DatabaseDirectory4.getSpaceKey(doc);
-    if (!spaceKey) {
-      return null;
-    }
-    let spaceId = this._spaceIdCache.get(spaceKey);
-    if (!spaceId) {
-      spaceId = await createIdFromSpaceKey(PublicKey4.from(spaceKey));
-      this._spaceIdCache.set(spaceKey, spaceId);
-    }
-    const object = DatabaseDirectory4.getInlineObject(doc, objectId);
+    const object = DatabaseDirectory3.getInlineObject(doc, meta.objectId);
     if (!object) {
       return null;
     }
     return {
-      objectId,
-      documentId,
-      spaceId,
+      objectId: meta.objectId,
+      documentId: meta.documentId,
+      spaceId: meta.spaceId,
       queueId: null,
       queueNamespace: null,
-      data: null,
       doc: object,
-      rank: hit.rank
+      data: null,
+      rank: 1
     };
   }
   async _loadFromDXN(dxn, { sourceSpaceId }) {
@@ -4784,7 +4875,7 @@ var QueryExecutor = class extends Resource6 {
         dxn
       }, {
         F: __dxlog_file13,
-        L: 981,
+        L: 1174,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4797,7 +4888,7 @@ var QueryExecutor = class extends Resource6 {
         spaceId
       }, {
         F: __dxlog_file13,
-        L: 989,
+        L: 1182,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4809,13 +4900,13 @@ var QueryExecutor = class extends Resource6 {
         spaceId
       }, {
         F: __dxlog_file13,
-        L: 994,
+        L: 1187,
         S: this,
         C: (f, a) => f(...a)
       });
       return null;
     }
-    const inlineObject = DatabaseDirectory4.getInlineObject(dbDirectory, echoDxn.echoId);
+    const inlineObject = DatabaseDirectory3.getInlineObject(dbDirectory, echoDxn.echoId);
     if (inlineObject) {
       return {
         objectId: echoDxn.echoId,
@@ -4828,13 +4919,13 @@ var QueryExecutor = class extends Resource6 {
         rank: 1
       };
     }
-    const link = DatabaseDirectory4.getLink(dbDirectory, echoDxn.echoId);
+    const link = DatabaseDirectory3.getLink(dbDirectory, echoDxn.echoId);
     if (!link) {
       return null;
     }
-    const handle = await this._automergeHost.loadDoc(Context5.default(void 0, {
+    const handle = await this._automergeHost.loadDoc(Context4.default(void 0, {
       F: __dxlog_file13,
-      L: 1017
+      L: 1210
     }), link, {
       fetchFromNetwork: true
     });
@@ -4842,7 +4933,7 @@ var QueryExecutor = class extends Resource6 {
     if (!doc) {
       return null;
     }
-    const object = DatabaseDirectory4.getInlineObject(doc, echoDxn.echoId);
+    const object = DatabaseDirectory3.getInlineObject(doc, echoDxn.echoId);
     if (!object) {
       return null;
     }
@@ -4857,6 +4948,136 @@ var QueryExecutor = class extends Resource6 {
       rank: 1
     };
   }
+  async _getTransitiveDeletionState(item, remainingDepth) {
+    const strongDeps = [
+      QueryItem.getParent(item),
+      QueryItem.getRelationSource(item),
+      QueryItem.getRelationTarget(item)
+    ].filter((x) => x !== void 0);
+    if (strongDeps.length === 0) {
+      return false;
+    }
+    const strongDepStates = await Promise.all(strongDeps.map(async (dxn) => {
+      const dep = await this._loadFromDXN(DXN.parse(dxn), {
+        sourceSpaceId: item.spaceId
+      });
+      if (!dep) {
+        return false;
+      }
+      if (QueryItem.isDeleted(dep)) {
+        return true;
+      }
+      if (remainingDepth > 0) {
+        return this._getTransitiveDeletionState(dep, remainingDepth - 1);
+      }
+      return false;
+    }));
+    return strongDepStates.some((x) => x);
+  }
+};
+var prettyFilter = (filter2) => {
+  switch (filter2.type) {
+    case "object": {
+      const parts = [];
+      if (filter2.typename !== null) {
+        parts.push(String(filter2.typename));
+      }
+      if (filter2.id !== void 0 && filter2.id.length > 0) {
+        parts.push(`id: [${filter2.id.join(", ")}]`);
+      }
+      const propEntries = Object.entries(filter2.props);
+      if (propEntries.length > 0) {
+        const propsStr = propEntries.map(([k, v]) => `${k}: ${prettyFilter(v)}`).join(", ");
+        parts.push(`{ ${propsStr} }`);
+      }
+      if (filter2.foreignKeys !== void 0 && filter2.foreignKeys.length > 0) {
+        parts.push(`foreignKeys: [${filter2.foreignKeys.map((fk) => JSON.stringify(fk)).join(", ")}]`);
+      }
+      return parts.length > 0 ? `Filter.type(${parts.join(", ")})` : "Filter.everything()";
+    }
+    case "compare":
+      return `Filter.${filter2.operator}(${JSON.stringify(filter2.value)})`;
+    case "in":
+      return `Filter.in([${filter2.values.map((v) => JSON.stringify(v)).join(", ")}])`;
+    case "contains":
+      return `Filter.contains(${JSON.stringify(filter2.value)})`;
+    case "tag":
+      return `Filter.tag(${JSON.stringify(filter2.tag)})`;
+    case "range":
+      return `Filter.range(${JSON.stringify(filter2.from)}, ${JSON.stringify(filter2.to)})`;
+    case "text-search":
+      return filter2.searchKind ? `Filter.textSearch(${JSON.stringify(filter2.text)}, ${JSON.stringify(filter2.searchKind)})` : `Filter.textSearch(${JSON.stringify(filter2.text)})`;
+    case "not":
+      return `Filter.not(${prettyFilter(filter2.filter)})`;
+    case "and":
+      return `Filter.and(${filter2.filters.map(prettyFilter).join(", ")})`;
+    case "or":
+      return `Filter.or(${filter2.filters.map(prettyFilter).join(", ")})`;
+  }
+};
+var prettyQuery = (query) => {
+  switch (query.type) {
+    case "select":
+      return `Query.select(${prettyFilter(query.filter)})`;
+    case "filter":
+      return `${prettyQuery(query.selection)}.select(${prettyFilter(query.filter)})`;
+    case "reference-traversal":
+      return `${prettyQuery(query.anchor)}.reference(${JSON.stringify(query.property)})`;
+    case "incoming-references": {
+      const args = [];
+      if (query.typename !== null) {
+        args.push(String(query.typename));
+      }
+      if (query.property !== null) {
+        args.push(JSON.stringify(query.property));
+      }
+      return `${prettyQuery(query.anchor)}.referencedBy(${args.join(", ")})`;
+    }
+    case "relation": {
+      const method = query.direction === "outgoing" ? "sourceOf" : query.direction === "incoming" ? "targetOf" : "relationOf";
+      const filterStr = query.filter !== void 0 ? prettyFilter(query.filter) : "";
+      return `${prettyQuery(query.anchor)}.${method}(${filterStr})`;
+    }
+    case "relation-traversal":
+      return `${prettyQuery(query.anchor)}.${query.direction}()`;
+    case "hierarchy-traversal":
+      return query.direction === "to-parent" ? `${prettyQuery(query.anchor)}.parent()` : `${prettyQuery(query.anchor)}.children()`;
+    case "union":
+      return `Query.all(${query.queries.map(prettyQuery).join(", ")})`;
+    case "set-difference":
+      return `Query.without(${prettyQuery(query.source)}, ${prettyQuery(query.exclude)})`;
+    case "order": {
+      const orders = query.order.map((o) => {
+        if (o.kind === "natural") {
+          return "Order.natural()";
+        } else if (o.kind === "rank") {
+          return `Order.rank(${JSON.stringify(o.direction)})`;
+        } else {
+          return `Order.property(${JSON.stringify(o.property)}, ${JSON.stringify(o.direction)})`;
+        }
+      });
+      return `${prettyQuery(query.query)}.orderBy(${orders.join(", ")})`;
+    }
+    case "options": {
+      const opts = query.options;
+      const parts = [];
+      if (opts.spaceIds !== void 0) {
+        parts.push(`spaceIds: [${opts.spaceIds.map((s) => JSON.stringify(s)).join(", ")}]`);
+      }
+      if (opts.queues !== void 0) {
+        parts.push(`queues: [${opts.queues.map(String).join(", ")}]`);
+      }
+      if (opts.deleted !== void 0) {
+        parts.push(`deleted: ${JSON.stringify(opts.deleted)}`);
+      }
+      if (opts.allQueuesFromSpaces !== void 0) {
+        parts.push(`allQueuesFromSpaces: ${opts.allQueuesFromSpaces}`);
+      }
+      return `${prettyQuery(query.query)}.options({ ${parts.join(", ")} })`;
+    }
+    case "limit":
+      return `${prettyQuery(query.query)}.limit(${query.limit})`;
+  }
 };
 
 // src/db-host/query-service.ts
@@ -4890,30 +5111,30 @@ var QueryServiceImpl = class extends Resource7 {
     });
   }
   async _open() {
-    this._params.indexer.updated.on(this._ctx, () => this.invalidateQueries());
     this._updateQueries = new DeferredTask2(this._ctx, this._executeQueries.bind(this));
   }
   async _close() {
     await this._updateQueries.join();
     await Promise.all(Array.from(this._queries).map((query) => query.close()));
   }
-  async setConfig(config) {
-    await this._params.indexer.setConfig(config);
+  /**
+  * @deprecated No longer needed with SQL-based indexing.
+  */
+  async setConfig() {
+  }
+  /**
+  * @deprecated No longer needed with SQL-based indexing.
+  */
+  async reindex() {
+    log11.warn("reindex() is deprecated and no longer has any effect", void 0, {
+      F: __dxlog_file14,
+      L: 104,
+      S: this,
+      C: (f, a) => f(...a)
+    });
   }
   execQuery(request) {
     return new Stream2(({ next, close, ctx }) => {
-      if (this._params.indexer.config?.enabled !== true) {
-        log11.error("indexer is disabled", {
-          config: this._params.indexer.config
-        }, {
-          F: __dxlog_file14,
-          L: 107,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        close();
-        return;
-      }
       const queryEntry = this._createQuery(ctx, request, next, close, close);
       scheduleMicroTask(ctx, async () => {
         await queryEntry.executor.open();
@@ -4924,43 +5145,6 @@ var QueryServiceImpl = class extends Resource7 {
     });
   }
   /**
-  * Re-index all loaded documents.
-  */
-  async reindex() {
-    log11("Reindexing all documents...", void 0, {
-      F: __dxlog_file14,
-      L: 126,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    const iterator = createDocumentsIterator(this._params.automergeHost);
-    const ids = /* @__PURE__ */ new Map();
-    for await (const documents of iterator()) {
-      for (const { id, heads } of documents) {
-        ids.set(id, heads);
-      }
-      if (ids.size % 100 === 0) {
-        log11("Collected documents...", {
-          count: ids.size
-        }, {
-          F: __dxlog_file14,
-          L: 134,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    }
-    log11("Marking all documents as dirty...", {
-      count: ids.size
-    }, {
-      F: __dxlog_file14,
-      L: 138,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    await this._params.indexer.reindex(ids);
-  }
-  /**
   * Schedule re-execution of all queries.
   */
   invalidateQueries() {
@@ -4973,8 +5157,7 @@ var QueryServiceImpl = class extends Resource7 {
     const parsedQuery = QueryAST.Query.pipe(Schema.decodeUnknownSync)(JSON.parse(request.query));
     const queryEntry = {
       executor: new QueryExecutor({
-        indexer: this._params.indexer,
-        indexer2: this._params.indexer2,
+        indexEngine: this._params.indexEngine,
         runtime: this._params.runtime,
         automergeHost: this._params.automergeHost,
         queryId: request.queryId ?? raise(new Error("query id required")),
@@ -5022,7 +5205,7 @@ var QueryServiceImpl = class extends Resource7 {
       } catch (err) {
         log11.catch(err, void 0, {
           F: __dxlog_file14,
-          L: 211,
+          L: 187,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5033,7 +5216,7 @@ var QueryServiceImpl = class extends Resource7 {
       duration: performance.now() - begin
     }, {
       F: __dxlog_file14,
-      L: 215,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5050,69 +5233,14 @@ _ts_decorate5([
 QueryServiceImpl = _ts_decorate5([
   trace4.resource()
 ], QueryServiceImpl);
-var createDocumentsIterator = (automergeHost) => (
-  /**
-  * Recursively get all object data blobs from loaded documents from Automerge Repo.
-  */
-  // TODO(mykola): Unload automerge handles after usage.
-  async function* getAllDocuments() {
-    const visited = /* @__PURE__ */ new Set();
-    async function* getObjectsFromHandle(handle) {
-      if (visited.has(handle.documentId) || !handle.isReady()) {
-        return;
-      }
-      const doc = handle.doc();
-      const spaceKey = DatabaseDirectory5.getSpaceKey(doc) ?? void 0;
-      if (doc.objects) {
-        yield Object.entries(doc.objects).map(([objectId, object]) => {
-          return {
-            id: objectPointerCodec4.encode({
-              documentId: handle.documentId,
-              objectId,
-              spaceKey
-            }),
-            object,
-            heads: getHeads3(doc)
-          };
-        });
-      }
-      if (doc.links) {
-        for (const id of Object.values(doc.links)) {
-          const urlString = id.toString();
-          if (visited.has(urlString)) {
-            continue;
-          }
-          const linkHandle = await automergeHost.loadDoc(Context6.default(void 0, {
-            F: __dxlog_file14,
-            L: 256
-          }), urlString, {
-            fetchFromNetwork: true
-          });
-          for await (const result of getObjectsFromHandle(linkHandle)) {
-            yield result;
-          }
-        }
-      }
-      visited.add(handle.documentId);
-    }
-    for (const handle of Object.values(automergeHost.handles)) {
-      if (visited.has(handle.documentId)) {
-        continue;
-      }
-      for await (const result of getObjectsFromHandle(handle)) {
-        yield result;
-      }
-      visited.add(handle.documentId);
-    }
-  }
-);
 
 // src/db-host/queue-data-source.ts
 import * as Effect3 from "effect/Effect";
+import { EchoFeedCodec as EchoFeedCodec2 } from "@dxos/echo-protocol";
 import { RuntimeProvider as RuntimeProvider2 } from "@dxos/effect";
-import { FeedCursor } from "@dxos/feed";
 import { failedInvariant } from "@dxos/invariant";
 import { log as log12 } from "@dxos/log";
+import { FeedProtocol as FeedProtocol2 } from "@dxos/protocols";
 var __dxlog_file15 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/queue-data-source.ts";
 var QueueDataSource = class {
   sourceName = "queue";
@@ -5152,21 +5280,17 @@ var QueueDataSource = class {
           updatedCursors.push(cursor);
           continue;
         }
-        const currentCursor = typeof cursor.cursor === "string" && cursor.cursor !== "" ? FeedCursor.make(cursor.cursor) : void 0;
+        const currentCursor = typeof cursor.cursor === "string" && cursor.cursor !== "" ? FeedProtocol2.FeedCursor.make(cursor.cursor) : void 0;
         try {
           const result = yield* this._feedStore.query({
             spaceId: cursor.spaceId,
+            feedNamespace: FeedProtocol2.WellKnownNamespaces.data,
             cursor: currentCursor,
-            query: {
-              // Query all feeds in data namespace
-              feedNamespace: "data"
-            },
             limit: remainingLimit
           });
           for (const block of result.blocks) {
             try {
-              const dataString = new TextDecoder().decode(block.data);
-              const data = JSON.parse(dataString);
+              const data = EchoFeedCodec2.decode(block.data);
               objects.push({
                 spaceId: cursor.spaceId,
                 queueId: block.feedId ?? failedInvariant(),
@@ -5216,26 +5340,26 @@ var QueueDataSource = class {
 import { interpretAsDocumentId as interpretAsDocumentId3 } from "@automerge/automerge-repo";
 import isEqual from "lodash.isequal";
 import { Event as Event4, UpdateScheduler as UpdateScheduler3 } from "@dxos/async";
-import { Context as Context7, LifecycleState as LifecycleState4, Resource as Resource8 } from "@dxos/context";
-import { invariant as invariant13 } from "@dxos/invariant";
+import { Context as Context5, LifecycleState as LifecycleState4, Resource as Resource8 } from "@dxos/context";
+import { invariant as invariant12 } from "@dxos/invariant";
 
 // src/db-host/database-root.ts
 import { interpretAsDocumentId as interpretAsDocumentId2 } from "@automerge/automerge-repo";
-import { DatabaseDirectory as DatabaseDirectory6, SpaceDocVersion as SpaceDocVersion3 } from "@dxos/echo-protocol";
-import { invariant as invariant12 } from "@dxos/invariant";
+import { DatabaseDirectory as DatabaseDirectory4, SpaceDocVersion as SpaceDocVersion2 } from "@dxos/echo-protocol";
+import { invariant as invariant11 } from "@dxos/invariant";
 
 // src/db-host/automerge-metrics.ts
-import * as A5 from "@automerge/automerge";
+import * as A4 from "@automerge/automerge";
 import { log as log13 } from "@dxos/log";
 var __dxlog_file16 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/automerge-metrics.ts";
 var measureDocMetrics = (doc) => {
-  const snapshot = A5.save(doc);
+  const snapshot = A4.save(doc);
   const start = Date.now();
-  const temp = A5.load(snapshot);
+  const temp = A4.load(snapshot);
   const end = Date.now();
-  A5.free(temp);
+  A4.free(temp);
   const getAllChangesStart = Date.now();
-  const mutationCount = A5.getAllChanges(doc).length;
+  const mutationCount = A4.getAllChanges(doc).length;
   const getAllChangesEnd = Date.now();
   if (getAllChangesEnd - getAllChangesStart > 300) {
     log13.warn("getAllChanges took too long", {
@@ -5294,14 +5418,14 @@ var DatabaseRoot = class {
     if (!doc) {
       return null;
     }
-    return doc.version ?? SpaceDocVersion3.LEGACY;
+    return doc.version ?? SpaceDocVersion2.LEGACY;
   }
   getSpaceKey() {
     const doc = this.doc();
     if (!doc) {
       return null;
     }
-    return DatabaseDirectory6.getSpaceKey(doc);
+    return DatabaseDirectory4.getSpaceKey(doc);
   }
   getInlineObjectCount() {
     const doc = this.doc();
@@ -5319,7 +5443,7 @@ var DatabaseRoot = class {
   }
   getAllLinkedDocuments() {
     const doc = this.doc();
-    invariant12(doc, void 0, {
+    invariant11(doc, void 0, {
       F: __dxlog_file17,
       L: 88,
       S: this,
@@ -5366,7 +5490,7 @@ var SpaceStateManager = class extends Resource8 {
     return this._rootBySpace.get(spaceId);
   }
   getRootBySpaceId(spaceId) {
-    invariant13(this._lifecycleState === LifecycleState4.OPEN, void 0, {
+    invariant12(this._lifecycleState === LifecycleState4.OPEN, void 0, {
       F: __dxlog_file18,
       L: 48,
       S: this,
@@ -5398,7 +5522,7 @@ var SpaceStateManager = class extends Resource8 {
       this._perRootContext.delete(prevRootId);
     }
     this._rootBySpace.set(spaceId, root.handle.documentId);
-    const ctx = new Context7(void 0, {
+    const ctx = new Context5(void 0, {
       F: __dxlog_file18,
       L: 76
     });
@@ -5447,46 +5571,33 @@ var QueueServiceStub = class {
   deleteFromQueue(request) {
     throw new Error("Not available.");
   }
+  syncQueue(request) {
+    throw new Error("Not available.");
+  }
 };
 
 // src/db-host/echo-host.ts
 var __dxlog_file19 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/echo-host.ts";
-var DEFAULT_INDEXING_CONFIG = {
-  // TODO(mykola): Enable by default when SQLite indexer is stable.
-  fullText: false,
-  vector: false
-};
 var EchoHost = class extends Resource9 {
-  _indexMetadataStore;
-  _indexer;
   _automergeHost;
   _queryService;
   _dataService;
   _spaceStateManager = new SpaceStateManager();
   _echoDataMonitor;
   _automergeDataSource;
-  _indexer2;
-  _indexConfig;
+  _indexEngine;
   _runtime;
   _feedStore;
   _queueDataSource;
   _updateIndexes;
   _queuesService;
   _indexesUpToDate = false;
-  constructor({ kv, localQueues, indexing = {}, peerIdProvider, getSpaceKeyByRootDocumentId, runtime, assignQueuePositions = false }) {
+  constructor({ kv, localQueues, peerIdProvider, getSpaceKeyByRootDocumentId, runtime, assignQueuePositions = false, syncQueue }) {
     super();
-    this._indexConfig = {
-      ...DEFAULT_INDEXING_CONFIG,
-      ...indexing
-    };
-    this._indexMetadataStore = new IndexMetadataStore({
-      db: kv.sublevel("index-metadata")
-    });
     this._echoDataMonitor = new EchoDataMonitor();
     this._automergeHost = new AutomergeHost({
       db: kv,
       dataMonitor: this._echoDataMonitor,
-      indexMetadataStore: this._indexMetadataStore,
       peerIdProvider,
       getSpaceKeyByRootDocumentId
     });
@@ -5502,54 +5613,24 @@ var EchoHost = class extends Resource9 {
         runtime: this._runtime,
         getSpaceIds: () => this._spaceStateManager.spaceIds
       });
-      this._queuesService = new LocalQueueServiceImpl(runtime, this._feedStore);
+      this._queuesService = new LocalQueueServiceImpl(runtime, this._feedStore, syncQueue);
     } else {
       this._queuesService = new QueueServiceStub();
     }
-    this._indexer = new Indexer({
-      db: kv,
-      indexStore: new IndexStore({
-        db: kv.sublevel("index-storage")
-      }),
-      metadataStore: this._indexMetadataStore,
-      loadDocuments: createSelectedDocumentsIterator(this._automergeHost),
-      indexCooldownTime: false ? 0 : void 0
-    });
-    void this._indexer.setConfig({
-      enabled: true,
-      indexes: [
-        //
-        {
-          kind: IndexKind.Kind.SCHEMA_MATCH
-        },
-        {
-          kind: IndexKind.Kind.GRAPH
-        },
-        ...this._indexConfig.vector ? [
-          {
-            kind: IndexKind.Kind.VECTOR
-          }
-        ] : []
-      ]
-    });
-    this._indexer2 = new IndexEngine();
+    this._indexEngine = new IndexEngine();
     this._queryService = new QueryServiceImpl({
       automergeHost: this._automergeHost,
-      indexer: this._indexer,
-      indexer2: this._indexConfig.fullText ? this._indexer2 : void 0,
-      runtime: this._indexConfig.fullText ? this._runtime : void 0,
+      indexEngine: this._indexEngine,
+      runtime: this._runtime,
       spaceStateManager: this._spaceStateManager
     });
     this._dataService = new DataServiceImpl({
       automergeHost: this._automergeHost,
       spaceStateManager: this._spaceStateManager,
       updateIndexes: async () => {
-        await this._indexer.updateIndexes();
-        if (this._indexConfig.fullText) {
-          do {
-            await this._updateIndexes.runBlocking();
-          } while (!this._indexesUpToDate);
-        }
+        do {
+          await this._updateIndexes.runBlocking();
+        } while (!this._indexesUpToDate);
       }
     });
     trace5.diagnostic({
@@ -5590,6 +5671,9 @@ var EchoHost = class extends Resource9 {
       }
     });
   }
+  get spaceIds() {
+    return this._spaceStateManager.spaceIds;
+  }
   get queryService() {
     return this._queryService;
   }
@@ -5602,30 +5686,28 @@ var EchoHost = class extends Resource9 {
   get roots() {
     return this._spaceStateManager.roots;
   }
+  get feedStore() {
+    return this._feedStore;
+  }
   /**
-  * New index-core indexer for text and other queries.
+  * Index engine for queries.
   */
-  get indexer2() {
-    return this._indexer2;
+  get indexEngine() {
+    return this._indexEngine;
   }
   async _open(ctx) {
     await this._automergeHost.open();
-    await this._indexer.open(ctx);
     await this._queryService.open(ctx);
     await this._spaceStateManager.open(ctx);
     if (this._feedStore) {
       await RuntimeProvider3.runPromise(this._runtime)(this._feedStore.migrate());
       this._feedStore.onNewBlocks.on(this._ctx, () => {
         this._queryService.invalidateQueries();
-        if (this._indexConfig.fullText) {
-          this._updateIndexes.schedule();
-        }
+        this._updateIndexes.schedule();
       });
     }
-    if (this._indexConfig.fullText) {
-      await RuntimeProvider3.runPromise(this._runtime)(this._indexer2.migrate());
-      this._updateIndexes = new DeferredTask3(this._ctx, this._runUpdateIndexes);
-    }
+    await RuntimeProvider3.runPromise(this._runtime)(this._indexEngine.migrate());
+    this._updateIndexes = new DeferredTask3(this._ctx, this._runUpdateIndexes);
     this._spaceStateManager.spaceDocumentListUpdated.on(this._ctx, (e) => {
       if (e.previousRootId) {
         void this._automergeHost.clearLocalCollectionState(deriveCollectionIdFromSpaceId(e.spaceId, e.previousRootId));
@@ -5634,18 +5716,13 @@ var EchoHost = class extends Resource9 {
     });
     this._automergeHost.documentsSaved.on(this._ctx, () => {
       this._queryService.invalidateQueries();
-      if (this._indexConfig.fullText) {
-        this._updateIndexes.schedule();
-      }
-    });
-    if (this._indexConfig.fullText) {
       this._updateIndexes.schedule();
-    }
+    });
+    this._updateIndexes.schedule();
   }
   async _close(ctx) {
     await this._queryService.close(ctx);
     await this._spaceStateManager.close(ctx);
-    await this._indexer.close(ctx);
     await this._automergeHost.close();
   }
   /**
@@ -5658,7 +5735,9 @@ var EchoHost = class extends Resource9 {
   * Perform any pending index updates.
   */
   async updateIndexes() {
-    await this._indexer.updateIndexes();
+    do {
+      await this._updateIndexes.runBlocking();
+    } while (!this._indexesUpToDate);
   }
   /**
   * Loads the document handle from the repo and waits for it to be ready.
@@ -5679,9 +5758,9 @@ var EchoHost = class extends Resource9 {
   * Create new space root.
   */
   async createSpaceRoot(spaceKey) {
-    invariant14(this._lifecycleState === LifecycleState5.OPEN, void 0, {
+    invariant13(this._lifecycleState === LifecycleState5.OPEN, void 0, {
       F: __dxlog_file19,
-      L: 342,
+      L: 297,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -5690,7 +5769,7 @@ var EchoHost = class extends Resource9 {
     });
     const spaceId = await createIdFromSpaceKey2(spaceKey);
     const automergeRoot = await this._automergeHost.createDoc({
-      version: SpaceDocVersion4.CURRENT,
+      version: SpaceDocVersion3.CURRENT,
       access: {
         spaceKey: spaceKey.toHex()
       },
@@ -5707,18 +5786,18 @@ var EchoHost = class extends Resource9 {
   }
   // TODO(dmaretskyi): Change to document id.
   async openSpaceRoot(spaceId, automergeUrl) {
-    invariant14(this._lifecycleState === LifecycleState5.OPEN, void 0, {
+    invariant13(this._lifecycleState === LifecycleState5.OPEN, void 0, {
       F: __dxlog_file19,
-      L: 361,
+      L: 316,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
         ""
       ]
     });
-    const handle = await this._automergeHost.loadDoc(Context8.default(void 0, {
+    const handle = await this._automergeHost.loadDoc(Context6.default(void 0, {
       F: __dxlog_file19,
-      L: 362
+      L: 317
     }), automergeUrl, {
       fetchFromNetwork: true
     });
@@ -5753,21 +5832,18 @@ var EchoHost = class extends Resource9 {
     this._automergeHost.refreshCollection(deriveCollectionIdFromSpaceId(spaceId, root.documentId));
   }
   _runUpdateIndexes = async () => {
-    if (!this._indexer2) {
-      return;
-    }
     let totalUpdated = 0;
     let totalDone = true;
     {
-      performance.mark("indexer2.update.automerge:start");
-      const { updated, done } = await this._indexer2.update(this._automergeDataSource, {
+      performance.mark("indexEngine.update.automerge:start");
+      const { updated, done } = await this._indexEngine.update(this._automergeDataSource, {
         spaceId: null,
         limit: 50
       }).pipe(RuntimeProvider3.runPromise(this._runtime));
       totalUpdated += updated;
       totalDone &&= done;
       performance.measure("Index Automerge", {
-        start: "indexer2.update.automerge:start",
+        start: "indexEngine.update.automerge:start",
         detail: {
           devtools: {
             dataType: "track-entry",
@@ -5785,15 +5861,15 @@ var EchoHost = class extends Resource9 {
       });
     }
     if (this._queueDataSource) {
-      performance.mark("indexer2.update.queue:start");
-      const { updated, done } = await this._indexer2.update(this._queueDataSource, {
+      performance.mark("indexEngine.update.queue:start");
+      const { updated, done } = await this._indexEngine.update(this._queueDataSource, {
         spaceId: null,
         limit: 50
       }).pipe(RuntimeProvider3.runPromise(this._runtime));
       totalUpdated += updated;
       totalDone &&= done;
       performance.measure("Index Queues", {
-        start: "indexer2.update.queue:start",
+        start: "indexEngine.update.queue:start",
         detail: {
           devtools: {
             dataType: "track-entry",
@@ -5810,12 +5886,12 @@ var EchoHost = class extends Resource9 {
         }
       });
     }
-    log14.verbose("indexer2 update completed", {
+    log14.verbose("indexEngine update completed", {
       updated: totalUpdated,
       done: totalDone
     }, {
       F: __dxlog_file19,
-      L: 452,
+      L: 402,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5826,6 +5902,9 @@ var EchoHost = class extends Resource9 {
     } else {
       this._indexesUpToDate = true;
     }
+    if (totalUpdated > 0) {
+      this._queryService.invalidateQueries();
+    }
   };
 };
 
@@ -5833,9 +5912,9 @@ var EchoHost = class extends Resource9 {
 import * as Automerge from "@automerge/automerge";
 import { cbor as cbor2 } from "@automerge/automerge-repo";
 import { Mutex, scheduleMicroTask as scheduleMicroTask2, scheduleTask as scheduleTask2 } from "@dxos/async";
-import { Context as Context9, Resource as Resource11 } from "@dxos/context";
+import { Context as Context7, Resource as Resource11 } from "@dxos/context";
 import { randomUUID } from "@dxos/crypto";
-import { invariant as invariant15 } from "@dxos/invariant";
+import { invariant as invariant14 } from "@dxos/invariant";
 import { log as log16 } from "@dxos/log";
 import { DocumentCodec, EdgeService } from "@dxos/protocols";
 import { buf } from "@dxos/protocols/buf";
@@ -5999,7 +6078,7 @@ var EchoEdgeReplicator = class {
       C: (f, a) => f(...a)
     });
     this._context = context;
-    this._ctx = Context9.default(void 0, {
+    this._ctx = Context7.default(void 0, {
       F: __dxlog_file21,
       L: 76
     });
@@ -6106,7 +6185,7 @@ var EchoEdgeReplicator = class {
     }
   }
   async _openConnection(spaceId, reconnects = 0) {
-    invariant15(this._context, void 0, {
+    invariant14(this._context, void 0, {
       F: __dxlog_file21,
       L: 138,
       S: this,
@@ -6115,7 +6194,7 @@ var EchoEdgeReplicator = class {
         ""
       ]
     });
-    invariant15(!this._connections.has(spaceId), void 0, {
+    invariant14(!this._connections.has(spaceId), void 0, {
       F: __dxlog_file21,
       L: 139,
       S: this,
@@ -6298,7 +6377,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
     await this._onRemoteDisconnected();
   }
   get peerId() {
-    invariant15(this._remotePeerId, "Not connected", {
+    invariant14(this._remotePeerId, "Not connected", {
       F: __dxlog_file21,
       L: 312,
       S: this,
@@ -6458,13 +6537,13 @@ var getMessageInfo = (msg) => {
 };
 
 // src/util.ts
-import { EncodedReference, ObjectStructure as ObjectStructure2 } from "@dxos/echo-protocol";
+import { EncodedReference as EncodedReference2, ObjectStructure as ObjectStructure2 } from "@dxos/echo-protocol";
 var findInlineObjectOfType = (spaceDoc, typename) => {
   for (const id in spaceDoc.objects ?? {}) {
     const obj = spaceDoc.objects[id];
     const objType = ObjectStructure2.getTypeReference(obj);
     if (objType) {
-      const typeDXN = EncodedReference.toDXN(objType);
+      const typeDXN = EncodedReference2.toDXN(objType);
       const typeDXNInfo = typeDXN.asTypeDXN();
       if (typeDXNInfo?.type === typename) {
         return [