@dxos/echo-pipeline 0.8.4-main.ae835ea → 0.8.4-main.bc674ce

package/dist/lib/browser/index.mjs

@@ -3,7 +3,7 @@ import {
   filterMatchObject,
   filterMatchObjectJSON,
   filterMatchValue
-} from "./chunk-WJJXJTNS.mjs";
+} from "./chunk-FJPXA75J.mjs";
 import {
   AuthExtension,
   AuthStatus,
@@ -26,28 +26,142 @@ import {
   mapTimeframeToFeedIndexes,
   startAfter,
   valueEncoding
-} from "./chunk-FR6GJ4S4.mjs";
-import "./chunk-CGS2ULMK.mjs";
+} from "./chunk-WIQUYO7H.mjs";
+
+// src/db-host/automerge-data-source.ts
+import * as Effect from "effect/Effect";
+import { Context } from "@dxos/context";
+import { objectStructureToJson } from "@dxos/echo/internal";
+import { DatabaseDirectory, SpaceDocVersion } from "@dxos/echo-protocol";
+import { PublicKey } from "@dxos/keys";
+import { log } from "@dxos/log";
+var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/automerge-data-source.ts";
+var HEADS_DELIMITER = "|";
+var headsCodec = {
+  /**
+  * Serialize automerge heads to a cursor string.
+  * Heads are sorted to ensure consistent comparison.
+  */
+  encode: (heads) => [
+    ...heads
+  ].sort().join(HEADS_DELIMITER),
+  /**
+  * Deserialize a cursor string back to heads array.
+  */
+  decode: (cursor) => cursor ? cursor.split(HEADS_DELIMITER) : []
+};
+var hasChanged = (cursor, currentHeads) => {
+  if (!cursor) {
+    return true;
+  }
+  return cursor !== headsCodec.encode(currentHeads);
+};
+var AutomergeDataSource = class {
+  sourceName = "automerge";
+  #automergeHost;
+  constructor(automergeHost) {
+    this.#automergeHost = automergeHost;
+  }
+  getChangedObjects(cursors, opts) {
+    return Effect.gen(this, function* () {
+      const cursorMap = /* @__PURE__ */ new Map();
+      for (const cursor of cursors) {
+        if (cursor.resourceId) {
+          cursorMap.set(cursor.resourceId, String(cursor.cursor));
+        }
+      }
+      const changedDocuments = yield* Effect.promise(async () => {
+        const result = [];
+        const limit = opts?.limit ?? Infinity;
+        for await (const { documentId, heads } of this.#automergeHost.listDocumentHeads()) {
+          const existingCursor = cursorMap.get(documentId);
+          if (hasChanged(existingCursor, heads)) {
+            result.push({
+              documentId,
+              heads
+            });
+            if (result.length >= limit) {
+              break;
+            }
+          }
+        }
+        return result;
+      });
+      const objects = [];
+      const updatedCursors = [];
+      for (const { documentId, heads: docHeads } of changedDocuments) {
+        try {
+          const handle = yield* Effect.promise(() => this.#automergeHost.loadDoc(Context.default(void 0, {
+            F: __dxlog_file,
+            L: 97
+          }), documentId));
+          const doc = handle.doc();
+          if (!doc) {
+            continue;
+          }
+          if (doc.version !== SpaceDocVersion.CURRENT) {
+            continue;
+          }
+          const spaceKeyHex = DatabaseDirectory.getSpaceKey(doc);
+          if (!spaceKeyHex) {
+            continue;
+          }
+          const spaceKey = PublicKey.fromHex(spaceKeyHex);
+          const spaceId = yield* Effect.promise(() => createIdFromSpaceKey(spaceKey));
+          const docObjects = doc.objects ?? {};
+          for (const [objectId, structure] of Object.entries(docObjects)) {
+            objects.push({
+              spaceId,
+              documentId,
+              queueId: null,
+              recordId: null,
+              data: objectStructureToJson(objectId, structure)
+            });
+          }
+          updatedCursors.push({
+            spaceId,
+            resourceId: documentId,
+            cursor: headsCodec.encode(docHeads)
+          });
+        } catch (error) {
+          log.error("Error loading document for indexing", {
+            documentId,
+            error
+          }, {
+            F: __dxlog_file,
+            L: 137,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+        }
+      }
+      return {
+        objects,
+        cursors: updatedCursors
+      };
+    });
+  }
+};
 
 // src/db-host/data-service.ts
 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 log7 } from "@dxos/log";
+import { log as log8 } from "@dxos/log";
 
 // src/automerge/automerge-host.ts
 import { getBackend, getHeads, equals as headsEquals, isAutomerge, save } from "@automerge/automerge";
 import { Repo, interpretAsDocumentId } from "@automerge/automerge-repo";
-import { DeferredTask, Event as Event2, asyncTimeout } from "@dxos/async";
-import { Context, Resource as Resource3, cancelWithContext } from "@dxos/context";
-import { DatabaseDirectory } from "@dxos/echo-protocol";
+import { DeferredTask, Event as Event3, asyncTimeout } from "@dxos/async";
+import { Context as Context2, Resource as Resource3, cancelWithContext } from "@dxos/context";
+import { DatabaseDirectory as DatabaseDirectory2 } from "@dxos/echo-protocol";
 import { invariant as invariant2 } from "@dxos/invariant";
-import { PublicKey } from "@dxos/keys";
-import { log as log3 } from "@dxos/log";
+import { PublicKey as PublicKey2 } from "@dxos/keys";
+import { log as log4 } from "@dxos/log";
 import { objectPointerCodec } from "@dxos/protocols";
 import { trace as trace2 } from "@dxos/tracing";
-import { ComplexSet, bufferToArray, isNonNullable as isNonNullable2, range } from "@dxos/util";
+import { ComplexSet, bufferToArray, defaultMap as defaultMap2, isNonNullable as isNonNullable2, range } from "@dxos/util";
 
 // src/automerge/collection-synchronizer.ts
 import { next as A } from "@automerge/automerge";
@@ -55,7 +169,7 @@ import * as Array2 from "effect/Array";
 import * as Record from "effect/Record";
 import { Event, asyncReturn, scheduleTask, scheduleTaskInterval } from "@dxos/async";
 import { Resource } from "@dxos/context";
-import { log } from "@dxos/log";
+import { log as log2 } from "@dxos/log";
 import { trace } from "@dxos/tracing";
 import { defaultMap } from "@dxos/util";
 function _ts_decorate(decorators, target, key, desc) {
@@ -64,9 +178,9 @@ function _ts_decorate(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/collection-synchronizer.ts";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/collection-synchronizer.ts";
 var MIN_QUERY_INTERVAL = 5e3;
-var POLL_INTERVAL = 3e4;
+var POLL_INTERVAL = 1e4;
 var CollectionSynchronizer = class extends Resource {
   _sendCollectionState;
   _queryCollectionState;
@@ -104,16 +218,19 @@ var CollectionSynchronizer = class extends Resource {
   }
   setLocalCollectionState(collectionId, state) {
     this._activeCollections.add(collectionId);
-    log("setLocalCollectionState", {
+    log2("setLocalCollectionState", {
       collectionId,
       state
     }, {
-      F: __dxlog_file,
+      F: __dxlog_file2,
       L: 78,
       S: this,
       C: (f, a) => f(...a)
     });
     this._getOrCreatePerCollectionState(collectionId).localState = state;
+    for (const peerId of this._connectedPeers) {
+      this._diffCollectionState(collectionId, peerId);
+    }
     queueMicrotask(async () => {
       if (!this._ctx.disposed && this._activeCollections.has(collectionId)) {
         this._refreshInterestedPeers(collectionId);
@@ -124,11 +241,11 @@ var CollectionSynchronizer = class extends Resource {
   clearLocalCollectionState(collectionId) {
     this._activeCollections.delete(collectionId);
     this._perCollectionStates.delete(collectionId);
-    log("clearLocalCollectionState", {
+    log2("clearLocalCollectionState", {
       collectionId
     }, {
-      F: __dxlog_file,
-      L: 92,
+      F: __dxlog_file2,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -158,6 +275,14 @@ var CollectionSynchronizer = class extends Resource {
   * Callback when a connection to a peer is established.
   */
   onConnectionOpen(peerId) {
+    log2("onConnectionOpen", {
+      peerId
+    }, {
+      F: __dxlog_file2,
+      L: 126,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     const spanId = getSpanName(peerId);
     trace.spanStart({
       id: spanId,
@@ -187,6 +312,14 @@ var CollectionSynchronizer = class extends Resource {
   * Callback when a connection to a peer is closed.
   */
   onConnectionClosed(peerId) {
+    log2("onConnectionClosed", {
+      peerId
+    }, {
+      F: __dxlog_file2,
+      L: 156,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this._connectedPeers.delete(peerId);
     for (const perCollectionState of this._perCollectionStates.values()) {
       perCollectionState.remoteStates.delete(peerId);
@@ -205,22 +338,40 @@ var CollectionSynchronizer = class extends Resource {
   * Callback when a peer sends the state of a collection.
   */
   onRemoteStateReceived(collectionId, peerId, state) {
-    log("onRemoteStateReceived", {
+    log2("onRemoteStateReceived", {
       collectionId,
       peerId,
       state
     }, {
-      F: __dxlog_file,
-      L: 173,
+      F: __dxlog_file2,
+      L: 180,
       S: this,
       C: (f, a) => f(...a)
     });
     validateCollectionState(state);
     const perCollectionState = this._getOrCreatePerCollectionState(collectionId);
-    const existingState = perCollectionState.remoteStates.get(peerId) ?? {
+    perCollectionState.remoteStates.set(peerId, state);
+    this._diffCollectionState(collectionId, peerId);
+  }
+  _diffCollectionState(collectionId, peerId) {
+    const perCollectionState = this._getOrCreatePerCollectionState(collectionId);
+    const remoteState = perCollectionState.remoteStates.get(peerId);
+    if (!remoteState) {
+      return;
+    }
+    log2("diffCollectionState", {
+      collectionId,
+      peerId
+    }, {
+      F: __dxlog_file2,
+      L: 194,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const localState = perCollectionState.localState ?? {
       documents: {}
     };
-    const diff = diffCollectionState(existingState, state);
+    const diff = diffCollectionState(localState, remoteState);
     const spanId = getSpanName(peerId);
     if (diff.different.length === 0) {
       trace.spanEnd(spanId);
@@ -236,8 +387,25 @@ var CollectionSynchronizer = class extends Resource {
         }
       });
     }
-    if (diff.missingOnLocal.length > 0 || diff.different.length > 0) {
-      perCollectionState.remoteStates.set(peerId, state);
+    log2("diff", {
+      localState: localState.documents,
+      remoteState: remoteState.documents,
+      missingOnLocal: diff.missingOnLocal,
+      missingOnRemote: diff.missingOnRemote,
+      different: diff.different
+    }, {
+      F: __dxlog_file2,
+      L: 210,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    if (diff.missingOnLocal.length > 0 || diff.different.length > 0 || diff.missingOnRemote.length > 0) {
+      log2("emit remote state update", void 0, {
+        F: __dxlog_file2,
+        L: 218,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       this.remoteStateUpdated.emit({
         peerId,
         collectionId,
@@ -312,10 +480,10 @@ var getSpanName = (peerId) => {
 
 // src/automerge/echo-network-adapter.ts
 import { NetworkAdapter } from "@automerge/automerge-repo";
-import { Trigger, synchronized } from "@dxos/async";
+import { Event as Event2, Trigger, synchronized } from "@dxos/async";
 import { LifecycleState } from "@dxos/context";
 import { invariant } from "@dxos/invariant";
-import { log as log2 } from "@dxos/log";
+import { log as log3 } from "@dxos/log";
 import { isNonNullable } from "@dxos/util";
 
 // src/automerge/network-protocol.ts
@@ -330,7 +498,7 @@ function _ts_decorate2(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_file2 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/echo-network-adapter.ts";
 var EchoNetworkAdapter = class extends NetworkAdapter {
   _params;
   _replicators = /* @__PURE__ */ new Set();
@@ -341,6 +509,7 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   _lifecycleState = LifecycleState.CLOSED;
   _connected = new Trigger();
   _ready = new Trigger();
+  documentRequested = new Event2();
   constructor(_params) {
     super(), this._params = _params;
   }
@@ -391,8 +560,8 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   }
   async addReplicator(replicator) {
     invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file2,
-      L: 137,
+      F: __dxlog_file3,
+      L: 140,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -400,8 +569,8 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       ]
     });
     invariant(this.peerId, void 0, {
-      F: __dxlog_file2,
-      L: 138,
+      F: __dxlog_file3,
+      L: 141,
       S: this,
       A: [
         "this.peerId",
@@ -409,8 +578,8 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       ]
     });
     invariant(!this._replicators.has(replicator), void 0, {
-      F: __dxlog_file2,
-      L: 139,
+      F: __dxlog_file3,
+      L: 142,
       S: this,
       A: [
         "!this._replicators.has(replicator)",
@@ -433,8 +602,8 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   }
   async removeReplicator(replicator) {
     invariant(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file2,
-      L: 158,
+      F: __dxlog_file3,
+      L: 161,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -442,8 +611,8 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       ]
     });
     invariant(this._replicators.has(replicator), void 0, {
-      F: __dxlog_file2,
-      L: 159,
+      F: __dxlog_file3,
+      L: 162,
       S: this,
       A: [
         "this._replicators.has(replicator)",
@@ -525,9 +694,9 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       this._params.monitor?.recordMessageSent(message, Date.now() - start);
     }).catch((err) => {
       if (connectionEntry.isOpen) {
-        log2.catch(err, void 0, {
-          F: __dxlog_file2,
-          L: 253,
+        log3.catch(err, void 0, {
+          F: __dxlog_file3,
+          L: 256,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -536,17 +705,17 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     });
   }
   _onConnectionOpen(connection) {
-    log2("connection opened", {
+    log3("connection opened", {
       peerId: connection.peerId
     }, {
-      F: __dxlog_file2,
-      L: 261,
+      F: __dxlog_file3,
+      L: 264,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant(!this._connections.has(connection.peerId), void 0, {
-      F: __dxlog_file2,
-      L: 262,
+      F: __dxlog_file3,
+      L: 265,
       S: this,
       A: [
         "!this._connections.has(connection.peerId as PeerId)",
@@ -557,7 +726,8 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       isOpen: true,
       connection,
       reader: connection.readable.getReader(),
-      writer: connection.writable.getWriter()
+      writer: connection.writable.getWriter(),
+      requestedDocuments: /* @__PURE__ */ new Set()
     };
     this._connections.set(connection.peerId, connectionEntry);
     queueMicrotask(async () => {
@@ -567,31 +737,38 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
           if (done) {
             break;
           }
-          this._onMessage(value);
+          this._onMessage(connectionEntry, value);
         }
       } catch (err) {
         if (connectionEntry.isOpen) {
-          log2.catch(err, void 0, {
-            F: __dxlog_file2,
-            L: 286,
+          log3.catch(err, void 0, {
+            F: __dxlog_file3,
+            L: 290,
             S: this,
             C: (f, a) => f(...a)
           });
         }
       }
     });
-    log2("emit peer-candidate", {
+    log3("emit peer-candidate", {
       peerId: connection.peerId
     }, {
-      F: __dxlog_file2,
-      L: 291,
+      F: __dxlog_file3,
+      L: 295,
       S: this,
       C: (f, a) => f(...a)
     });
     this._emitPeerCandidate(connection);
     this._params.monitor?.recordPeerConnected(connection.peerId);
   }
-  _onMessage(message) {
+  _onMessage(connectionEntry, message) {
+    const amMessage = message;
+    if (amMessage.type === "request") {
+      this.documentRequested.emit({
+        documentId: amMessage.documentId,
+        peerId: connectionEntry.connection.peerId
+      });
+    }
     if (isCollectionQueryMessage(message)) {
       this._params.onCollectionStateQueried(message.collectionId, message.senderId);
     } else if (isCollectionStateMessage(message)) {
@@ -602,18 +779,18 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
     this._params.monitor?.recordMessageReceived(message);
   }
   _onConnectionClosed(connection) {
-    log2("connection closed", {
+    log3("connection closed", {
       peerId: connection.peerId
     }, {
-      F: __dxlog_file2,
-      L: 308,
+      F: __dxlog_file3,
+      L: 320,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     invariant(entry, void 0, {
-      F: __dxlog_file2,
-      L: 310,
+      F: __dxlog_file3,
+      L: 322,
       S: this,
       A: [
         "entry",
@@ -625,15 +802,15 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
       peerId: connection.peerId
     });
     this._params.monitor?.recordPeerDisconnected(connection.peerId);
-    void entry.writer.abort().catch((err) => log2.catch(err, void 0, {
-      F: __dxlog_file2,
-      L: 316,
+    void entry.writer.abort().catch((err) => log3.catch(err, void 0, {
+      F: __dxlog_file3,
+      L: 328,
       S: this,
       C: (f, a) => f(...a)
     }));
-    void entry.reader.cancel().catch((err) => log2.catch(err, void 0, {
-      F: __dxlog_file2,
-      L: 317,
+    void entry.reader.cancel().catch((err) => log3.catch(err, void 0, {
+      F: __dxlog_file3,
+      L: 329,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -644,18 +821,18 @@ var EchoNetworkAdapter = class extends NetworkAdapter {
   * TODO(y): replace with a proper API call when sharePolicy update becomes supported by automerge-repo
   */
   _onConnectionAuthScopeChanged(connection) {
-    log2("Connection auth scope changed", {
+    log3("Connection auth scope changed", {
       peerId: connection.peerId
     }, {
-      F: __dxlog_file2,
-      L: 327,
+      F: __dxlog_file3,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
     const entry = this._connections.get(connection.peerId);
     invariant(entry, void 0, {
-      F: __dxlog_file2,
-      L: 329,
+      F: __dxlog_file3,
+      L: 341,
       S: this,
       A: [
         "entry",
@@ -713,6 +890,20 @@ var HeadsStore = class {
       valueEncoding: headsEncoding
     });
   }
+  /**
+  * Iterate over all document IDs and their heads.
+  */
+  async *iterateAll() {
+    for await (const [documentId, heads] of this._db.iterator({
+      keyEncoding: "utf8",
+      valueEncoding: headsEncoding
+    })) {
+      yield {
+        documentId,
+        heads
+      };
+    }
+  }
 };
 
 // src/automerge/leveldb-storage-adapter.ts
@@ -828,7 +1019,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_file3 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
+var __dxlog_file4 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/automerge-host.ts";
 var FIND_PARAMS = {
   allowableStates: [
     "ready",
@@ -838,6 +1029,7 @@ var FIND_PARAMS = {
 var BUNDLE_SIZE = 100;
 var BUNDLE_SYNC_CONCURRENCY = 2;
 var BUNDLE_SYNC_THRESHOLD = 50;
+var OPTIMIZED_SHARE_POLICY = true;
 var AutomergeHost = class extends Resource3 {
   _db;
   _indexMetadataStore;
@@ -858,13 +1050,30 @@ var AutomergeHost = class extends Resource3 {
   _peerId;
   _peerIdProvider;
   _getSpaceKeyByRootDocumentId;
-  collectionStateUpdated = new Event2();
+  collectionStateUpdated = new Event3();
   /**
   * Fired after a batch of documents was saved to disk.
   */
-  documentsSaved = new Event2();
+  documentsSaved = new Event3();
   _headsUpdates = /* @__PURE__ */ new Map();
   _onHeadsChangedTask;
+  /**
+  * Documents created in this session.
+  */
+  _createdDocuments = /* @__PURE__ */ new Set();
+  /**
+  * Documents that need to be synced based on the result of collection-sync.
+  */
+  _documentsToSync = /* @__PURE__ */ new Set();
+  /**
+  * Documents that are not avaiale locally that should be requested.
+  */
+  _documentsToRequest = /* @__PURE__ */ new Set();
+  /**
+  * Documents requested by remote peers.
+  */
+  _documentsRequested = /* @__PURE__ */ new Map();
+  _sharePolicyChangedTask;
   constructor({ db, indexMetadataStore, dataMonitor, peerIdProvider, getSpaceKeyByRootDocumentId }) {
     super();
     this._db = db;
@@ -883,6 +1092,10 @@ var AutomergeHost = class extends Resource3 {
       onCollectionStateReceived: this._onCollectionStateReceived.bind(this),
       monitor: dataMonitor
     });
+    this._echoNetworkAdapter.documentRequested.on(({ peerId, documentId }) => {
+      defaultMap2(this._documentsRequested, peerId, () => /* @__PURE__ */ new Set()).add(documentId);
+      this._sharePolicyChangedTask.schedule();
+    });
     this._headsStore = new HeadsStore({
       db: db.sublevel("heads")
     });
@@ -891,7 +1104,7 @@ var AutomergeHost = class extends Resource3 {
     this._getSpaceKeyByRootDocumentId = getSpaceKeyByRootDocumentId;
   }
   async _open() {
-    this._peerId = `host-${this._peerIdProvider?.() ?? PublicKey.random().toHex()}`;
+    this._peerId = `host-${this._peerIdProvider?.() ?? PublicKey2.random().toHex()}`;
     this._onHeadsChangedTask = new DeferredTask(this._ctx, async () => {
       const docHeads = Array.from(this._headsUpdates.entries());
       this._headsUpdates.clear();
@@ -900,7 +1113,7 @@ var AutomergeHost = class extends Resource3 {
     await this._storage.open?.();
     this._repo = new Repo({
       peerId: this._peerId,
-      sharePolicy: this._sharePolicy.bind(this),
+      shareConfig: this._shareConfig,
       storage: this._storage,
       network: [
         // Upstream swarm.
@@ -908,8 +1121,8 @@ var AutomergeHost = class extends Resource3 {
       ]
     });
     let updatingAuthScope = false;
-    Event2.wrap(this._echoNetworkAdapter, "peer-candidate").on(this._ctx, (e) => !updatingAuthScope && this._onPeerConnected(e.peerId));
-    Event2.wrap(this._echoNetworkAdapter, "peer-disconnected").on(this._ctx, (e) => !updatingAuthScope && this._onPeerDisconnected(e.peerId));
+    Event3.wrap(this._echoNetworkAdapter, "peer-candidate").on(this._ctx, (e) => !updatingAuthScope && this._onPeerConnected(e.peerId));
+    Event3.wrap(this._echoNetworkAdapter, "peer-disconnected").on(this._ctx, (e) => !updatingAuthScope && this._onPeerDisconnected(e.peerId));
     this._collectionSynchronizer.remoteStateUpdated.on(this._ctx, ({ collectionId, peerId, newDocsAppeared }) => {
       this._onRemoteCollectionStateUpdated(collectionId, peerId);
       this.collectionStateUpdated.emit({
@@ -933,19 +1146,28 @@ var AutomergeHost = class extends Resource3 {
         try {
           await this._handleCollectionSync(collectionId, peerId);
         } catch (err) {
-          log3.error("failed to sync collection", {
+          log4.error("failed to sync collection", {
             collectionId,
             peerId,
             err
           }, {
-            F: __dxlog_file3,
-            L: 223,
+            F: __dxlog_file4,
+            L: 263,
             S: this,
             C: (f, a) => f(...a)
           });
         }
       }));
     });
+    this._sharePolicyChangedTask = new DeferredTask(this._ctx, async () => {
+      log4("share policy changed", void 0, {
+        F: __dxlog_file4,
+        L: 270,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._repo.shareConfigChanged();
+    });
     await this._echoNetworkAdapter.open();
     await this._collectionSynchronizer.open();
     await this._echoNetworkAdapter.open();
@@ -957,12 +1179,7 @@ var AutomergeHost = class extends Resource3 {
     await this._echoNetworkAdapter.close();
     this._syncTask = void 0;
     this._onHeadsChangedTask = void 0;
-  }
-  /**
-  * @deprecated To be abstracted away.
-  */
-  get repo() {
-    return this._repo;
+    this._sharePolicyChangedTask = void 0;
   }
   get peerId() {
     return this._peerId;
@@ -970,10 +1187,13 @@ var AutomergeHost = class extends Resource3 {
   get loadedDocsCount() {
     return Object.keys(this._repo.handles).length;
   }
+  get handles() {
+    return this._repo.handles;
+  }
   async addReplicator(replicator) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file3,
-      L: 259,
+      F: __dxlog_file4,
+      L: 302,
       S: this,
       A: [
         "this.isOpen",
@@ -984,8 +1204,8 @@ var AutomergeHost = class extends Resource3 {
   }
   async removeReplicator(replicator) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file3,
-      L: 264,
+      F: __dxlog_file4,
+      L: 307,
       S: this,
       A: [
         "this.isOpen",
@@ -999,8 +1219,8 @@ var AutomergeHost = class extends Resource3 {
   */
   async loadDoc(ctx, documentId, opts) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file3,
-      L: 272,
+      F: __dxlog_file4,
+      L: 315,
       S: this,
       A: [
         "this.isOpen",
@@ -1012,7 +1232,34 @@ var AutomergeHost = class extends Resource3 {
       handle = this._repo.handles[documentId];
     }
     if (!handle) {
-      handle = await this._repo.find(documentId, FIND_PARAMS);
+      if (!opts?.fetchFromNetwork) {
+        handle = await this._repo.find(documentId, FIND_PARAMS);
+      } else {
+        try {
+          handle = await this._repo.find(documentId, {
+            allowableStates: [
+              "ready",
+              "requesting",
+              "unavailable"
+            ]
+          });
+          if (handle.state === "requesting" || handle.state === "unavailable") {
+            this._documentsToRequest.add(handle.documentId);
+            this._sharePolicyChangedTask.schedule();
+          }
+        } catch (err) {
+          log4.error("failed to load document", {
+            documentId,
+            err
+          }, {
+            F: __dxlog_file4,
+            L: 334,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          throw err;
+        }
+      }
     }
     if (!handle.isReady()) {
       if (!opts?.timeout) {
@@ -1025,8 +1272,8 @@ var AutomergeHost = class extends Resource3 {
   }
   async exportDoc(ctx, id) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file3,
-      L: 295,
+      F: __dxlog_file4,
+      L: 353,
       S: this,
       A: [
         "this.isOpen",
@@ -1042,10 +1289,10 @@ var AutomergeHost = class extends Resource3 {
   /**
   * Create new persisted document.
   */
-  createDoc(initialValue, opts) {
+  async createDoc(initialValue, opts) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file3,
-      L: 306,
+      F: __dxlog_file4,
+      L: 364,
       S: this,
       A: [
         "this.isOpen",
@@ -1054,23 +1301,36 @@ var AutomergeHost = class extends Resource3 {
     });
     if (opts?.preserveHistory) {
       if (initialValue instanceof Uint8Array) {
-        return this._repo.import(initialValue);
+        return this._repo.import(initialValue, {
+          docId: opts?.documentId
+        });
       }
       if (!isAutomerge(initialValue)) {
         throw new TypeError("Initial value must be an Automerge document");
       }
-      return this._repo.import(save(initialValue));
+      const handle = this._repo.import(save(initialValue), {
+        docId: opts?.documentId
+      });
+      this._createdDocuments.add(handle.documentId);
+      this._sharePolicyChangedTask.schedule();
+      return handle;
     } else {
       if (initialValue instanceof Uint8Array) {
         throw new Error("Cannot create document from Uint8Array without preserving history");
       }
-      return this._repo.create(initialValue);
+      if (opts?.documentId) {
+        throw new Error("Cannot prefil document id when not importing an existing doc");
+      }
+      const handle = await this._repo.create2(initialValue);
+      this._createdDocuments.add(handle.documentId);
+      this._sharePolicyChangedTask.schedule();
+      return handle;
     }
   }
   async waitUntilHeadsReplicated(heads) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file3,
-      L: 328,
+      F: __dxlog_file4,
+      L: 395,
       S: this,
       A: [
         "this.isOpen",
@@ -1093,9 +1353,9 @@ var AutomergeHost = class extends Resource3 {
     });
     if (headsToWait.length > 0) {
       await Promise.all(headsToWait.map(async (entry) => {
-        const handle = await this.loadDoc(Context.default(void 0, {
-          F: __dxlog_file3,
-          L: 346
+        const handle = await this.loadDoc(Context2.default(void 0, {
+          F: __dxlog_file4,
+          L: 413
         }), entry.documentId);
         await waitForHeads(handle, entry.heads);
       }));
@@ -1104,8 +1364,8 @@ var AutomergeHost = class extends Resource3 {
   }
   async reIndexHeads(documentIds) {
     invariant2(this.isOpen, "AutomergeHost is not open", {
-      F: __dxlog_file3,
-      L: 359,
+      F: __dxlog_file4,
+      L: 426,
       S: this,
       A: [
         "this.isOpen",
@@ -1113,21 +1373,21 @@ var AutomergeHost = class extends Resource3 {
       ]
     });
     for (const documentId of documentIds) {
-      log3("re-indexing heads for document", {
+      log4("re-indexing heads for document", {
         documentId
       }, {
-        F: __dxlog_file3,
-        L: 361,
+        F: __dxlog_file4,
+        L: 428,
         S: this,
         C: (f, a) => f(...a)
       });
       const handle = await this._repo.find(documentId, FIND_PARAMS);
       if (!handle.isReady()) {
-        log3.warn("document is not available locally, skipping", {
+        log4.warn("document is not available locally, skipping", {
           documentId
         }, {
-          F: __dxlog_file3,
-          L: 364,
+          F: __dxlog_file4,
+          L: 431,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1138,29 +1398,40 @@ var AutomergeHost = class extends Resource3 {
       this._headsStore.setHeads(documentId, heads, batch);
       await batch.write();
     }
-    log3("done re-indexing heads", void 0, {
-      F: __dxlog_file3,
-      L: 373,
+    log4("done re-indexing heads", void 0, {
+      F: __dxlog_file4,
+      L: 440,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  // TODO(dmaretskyi): Share based on HALO permissions and space affinity.
-  // Hosts, running in the worker, don't share documents unless requested by other peers.
-  // NOTE: If both peers return sharePolicy=false the replication will not happen
-  // https://github.com/automerge/automerge-repo/pull/292
-  async _sharePolicy(peerId, documentId) {
-    if (!documentId) {
+  _shareConfig = {
+    access: async (peerId, documentId) => {
+      return true;
+    },
+    // TODO(dmaretskyi): Share based on HALO permissions and space affinity.
+    // Hosts, running in the worker, don't share documents unless requested by other peers.
+    // NOTE: If both peers return sharePolicy=false the replication will not happen
+    // https://github.com/automerge/automerge-repo/pull/292
+    // Called for all loaded documents so they could be advertised to the sync server.
+    announce: async (peerId, documentId) => {
+      if (!documentId) {
+        return false;
+      }
+      if (OPTIMIZED_SHARE_POLICY) {
+        if (!this._createdDocuments.has(documentId) && !this._documentsToSync.has(documentId) && !this._documentsToRequest.has(documentId)) {
+          return false;
+        }
+      }
+      const peerMetadata = this._repo.peerMetadataByPeerId[peerId];
+      if (isEchoPeerMetadata(peerMetadata)) {
+        return this._echoNetworkAdapter.shouldAdvertise(peerId, {
+          documentId
+        });
+      }
       return false;
     }
-    const peerMetadata = this.repo.peerMetadataByPeerId[peerId];
-    if (isEchoPeerMetadata(peerMetadata)) {
-      return this._echoNetworkAdapter.shouldAdvertise(peerId, {
-        documentId
-      });
-    }
-    return false;
-  }
+  };
   async _beforeSave({ path, batch }) {
     const handle = this._repo.handles[path[0]];
     if (!handle || !handle.isReady()) {
@@ -1172,7 +1443,7 @@ var AutomergeHost = class extends Resource3 {
     }
     const heads = getHeads(doc);
     this._headsStore.setHeads(handle.documentId, heads, batch);
-    const spaceKey = DatabaseDirectory.getSpaceKey(doc) ?? void 0;
+    const spaceKey = DatabaseDirectory2.getSpaceKey(doc) ?? void 0;
     const objectIds = Object.keys(doc.objects ?? {});
     const encodedIds = objectIds.map((objectId) => objectPointerCodec.encode({
       documentId: handle.documentId,
@@ -1214,8 +1485,8 @@ var AutomergeHost = class extends Resource3 {
     const heads = getHeads(document);
     this._headsUpdates.set(documentId, heads);
     invariant2(this._onHeadsChangedTask, "onHeadsChangedTask is not initialized", {
-      F: __dxlog_file3,
-      L: 445,
+      F: __dxlog_file4,
+      L: 530,
       S: this,
       A: [
         "this._onHeadsChangedTask",
@@ -1244,9 +1515,9 @@ var AutomergeHost = class extends Resource3 {
       await handle.whenReady();
     }
     if (handle && handle.isReady() && handle.doc()) {
-      const spaceKeyHex = DatabaseDirectory.getSpaceKey(handle.doc());
+      const spaceKeyHex = DatabaseDirectory2.getSpaceKey(handle.doc());
       if (spaceKeyHex) {
-        return PublicKey.from(spaceKeyHex);
+        return PublicKey2.from(spaceKeyHex);
       }
     }
     const rootDocSpaceKey = this._getSpaceKeyByRootDocumentId?.(documentId);
@@ -1288,6 +1559,12 @@ var AutomergeHost = class extends Resource3 {
     }
     return result;
   }
+  /**
+  * Iterate over all document heads stored on disk.
+  */
+  listDocumentHeads() {
+    return this._headsStore.iterateAll();
+  }
   //
   // Collection sync.
   //
@@ -1395,48 +1672,48 @@ var AutomergeHost = class extends Resource3 {
     ];
     const bundleSyncEnabled = this._echoNetworkAdapter.bundleSyncEnabledForPeer(peerId);
     if (bundleSyncEnabled && missingOnRemote.length >= BUNDLE_SYNC_THRESHOLD) {
-      log3("pushing bundle", {
+      log4("pushing bundle", {
         amount: missingOnRemote.length
       }, {
-        F: __dxlog_file3,
-        L: 650,
+        F: __dxlog_file4,
+        L: 742,
         S: this,
         C: (f, a) => f(...a)
       });
       const { syncInteractively } = await this._pushInBundles(peerId, missingOnRemote);
       toReplicateWithoutBatching.push(...syncInteractively);
     } else {
-      log3.verbose("failed to push bundle, replicating interactively", {
+      log4.verbose("failed to push bundle, replicating interactively", {
         collectionId,
         peerId,
         amount: missingOnRemote.length
       }, {
-        F: __dxlog_file3,
-        L: 654,
+        F: __dxlog_file4,
+        L: 746,
         S: this,
         C: (f, a) => f(...a)
       });
       toReplicateWithoutBatching.push(...missingOnRemote);
     }
     if (bundleSyncEnabled && missingOnLocal.length >= BUNDLE_SYNC_THRESHOLD) {
-      log3("pulling bundle", {
+      log4("pulling bundle", {
         amount: missingOnLocal.length
       }, {
-        F: __dxlog_file3,
-        L: 662,
+        F: __dxlog_file4,
+        L: 754,
         S: this,
         C: (f, a) => f(...a)
       });
       const { syncInteractively } = await this._pullInBundles(peerId, missingOnLocal);
       toReplicateWithoutBatching.push(...syncInteractively);
     } else {
-      log3.verbose("failed to pull bundle, replicating interactively", {
+      log4.verbose("failed to pull bundle, replicating interactively", {
         collectionId,
         peerId,
         amount: missingOnLocal.length
       }, {
-        F: __dxlog_file3,
-        L: 666,
+        F: __dxlog_file4,
+        L: 758,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1445,23 +1722,24 @@ var AutomergeHost = class extends Resource3 {
     if (toReplicateWithoutBatching.length === 0) {
       return;
     }
-    log3("replicating documents after collection sync", {
+    log4("replicating documents after collection sync", {
       collectionId,
       peerId,
       toReplicateWithoutBatching,
       count: toReplicateWithoutBatching.length
     }, {
-      F: __dxlog_file3,
-      L: 678,
+      F: __dxlog_file4,
+      L: 770,
       S: this,
       C: (f, a) => f(...a)
     });
     for (const documentId of toReplicateWithoutBatching) {
+      this._documentsToSync.add(documentId);
       this._repo.findWithProgress(documentId);
     }
+    this._sharePolicyChangedTask.schedule();
   }
   // TODO(mykola): Add retries of batches https://gist.github.com/mykola-vrmchk/fde270259e9209fcbf1331e5abbf12cf
-  // TODO(mykola): Use effect to retry batches.
   async _pushInBundles(peerId, documentIds) {
     const documentsToPush = [
       ...documentIds
@@ -1474,13 +1752,13 @@ var AutomergeHost = class extends Resource3 {
           return;
         }
         await this._pushBundle(peerId, bundle).catch((err) => {
-          log3.warn("failed to push bundle, replicating interactively", {
+          log4.warn("failed to push bundle, replicating interactively", {
             peerId,
             bundle,
             err
           }, {
-            F: __dxlog_file3,
-            L: 709,
+            F: __dxlog_file4,
+            L: 803,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1499,11 +1777,11 @@ var AutomergeHost = class extends Resource3 {
     const docs = documentIds.map((documentId) => {
       const handle = this._repo.handles[documentId];
       if (!handle || !handle.isReady()) {
-        log3.warn("document not ready, skipping", {
+        log4.warn("document not ready, skipping", {
           documentId
         }, {
-          F: __dxlog_file3,
-          L: 727,
+          F: __dxlog_file4,
+          L: 821,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1511,11 +1789,11 @@ var AutomergeHost = class extends Resource3 {
       }
       const doc = handle.doc();
       if (!doc) {
-        log3.warn("document not available, skipping", {
+        log4.warn("document not available, skipping", {
           documentId
         }, {
-          F: __dxlog_file3,
-          L: 732,
+          F: __dxlog_file4,
+          L: 826,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1542,13 +1820,13 @@ var AutomergeHost = class extends Resource3 {
           return;
         }
         const result = await this._pullBundle(peerId, bundle).catch((err) => {
-          log3.warn("failed to pull bundle, replicating interactively", {
+          log4.warn("failed to pull bundle, replicating interactively", {
             peerId,
             bundle,
             err
           }, {
-            F: __dxlog_file3,
-            L: 762,
+            F: __dxlog_file4,
+            L: 856,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1629,7 +1907,7 @@ AutomergeHost = _ts_decorate3([
 var waitForHeads = async (handle, heads) => {
   const unavailableHeads = new Set(heads);
   await handle.whenReady();
-  await Event2.wrap(handle, "change").waitForCondition(() => {
+  await Event3.wrap(handle, "change").waitForCondition(() => {
     for (const changeHash of unavailableHeads.values()) {
       if (changeIsPresentInDoc(handle.doc(), changeHash)) {
         unavailableHeads.delete(changeHash);
@@ -1643,8 +1921,8 @@ var changeIsPresentInDoc = (doc, changeHash) => {
 };
 var decodeCollectionState = (state) => {
   invariant2(typeof state === "object" && state !== null, "Invalid state", {
-    F: __dxlog_file3,
-    L: 845,
+    F: __dxlog_file4,
+    L: 939,
     S: void 0,
     A: [
       "typeof state === 'object' && state !== null",
@@ -1659,18 +1937,18 @@ var encodeCollectionState = (state) => {
 
 // src/automerge/mesh-echo-replicator.ts
 import { invariant as invariant5 } from "@dxos/invariant";
-import { PublicKey as PublicKey2 } from "@dxos/keys";
-import { log as log5 } from "@dxos/log";
-import { ComplexSet as ComplexSet2, defaultMap as defaultMap2 } from "@dxos/util";
+import { PublicKey as PublicKey3 } from "@dxos/keys";
+import { log as log6 } from "@dxos/log";
+import { ComplexSet as ComplexSet2, defaultMap as defaultMap3 } from "@dxos/util";
 
 // src/automerge/mesh-echo-replicator-connection.ts
 import * as A2 from "@automerge/automerge";
 import { cbor } from "@automerge/automerge-repo";
 import { Resource as Resource4 } from "@dxos/context";
 import { invariant as invariant3 } from "@dxos/invariant";
-import { log as log4 } from "@dxos/log";
+import { log as log5 } from "@dxos/log";
 import { AutomergeReplicator } from "@dxos/teleport-extension-automerge-replicator";
-var __dxlog_file4 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator-connection.ts";
+var __dxlog_file5 = "/__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;
@@ -1692,7 +1970,7 @@ var MeshReplicatorConnection = class extends Resource4 {
     this.writable = new WritableStream({
       write: async (message, controller) => {
         invariant3(this._isEnabled, "Writing to a disabled connection", {
-          F: __dxlog_file4,
+          F: __dxlog_file5,
           L: 51,
           S: this,
           A: [
@@ -1720,12 +1998,12 @@ var MeshReplicatorConnection = class extends Resource4 {
         onStartReplication: async (info, remotePeerId) => {
           this.remoteDeviceKey = remotePeerId;
           this._remotePeerId = info.id;
-          log4("onStartReplication", {
+          log5("onStartReplication", {
             id: info.id,
             thisPeerId: this.peerId,
             remotePeerId: remotePeerId.toHex()
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file5,
             L: 80,
             S: this,
             C: (f, a) => f(...a)
@@ -1752,7 +2030,7 @@ var MeshReplicatorConnection = class extends Resource4 {
   }
   get peerId() {
     invariant3(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 106,
       S: this,
       A: [
@@ -1780,7 +2058,7 @@ var MeshReplicatorConnection = class extends Resource4 {
   */
   enable() {
     invariant3(this._remotePeerId != null, "Remote peer has not connected yet.", {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 131,
       S: this,
       A: [
@@ -1798,7 +2076,7 @@ var MeshReplicatorConnection = class extends Resource4 {
   }
 };
 var logSendSync = (message) => {
-  log4("sendSyncMessage", () => {
+  log5("sendSyncMessage", () => {
     const decodedSyncMessage = message.type === "sync" && message.data ? A2.decodeSyncMessage(message.data) : void 0;
     return {
       sync: decodedSyncMessage && {
@@ -1811,7 +2089,7 @@ var logSendSync = (message) => {
       to: message.targetId
     };
   }, {
-    F: __dxlog_file4,
+    F: __dxlog_file5,
     L: 144,
     S: void 0,
     C: (f, a) => f(...a)
@@ -1821,12 +2099,12 @@ var logSendSync = (message) => {
 // src/automerge/space-collection.ts
 import { invariant as invariant4 } from "@dxos/invariant";
 import { SpaceId } from "@dxos/keys";
-var __dxlog_file5 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/space-collection.ts";
+var __dxlog_file6 = "/__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_file5,
+    F: __dxlog_file6,
     L: 16,
     S: void 0,
     A: [
@@ -1838,7 +2116,7 @@ var getSpaceIdFromCollectionId = (collectionId) => {
 };
 
 // src/automerge/mesh-echo-replicator.ts
-var __dxlog_file6 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/automerge/mesh-echo-replicator.ts";
+var __dxlog_file7 = "/__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
@@ -1874,7 +2152,7 @@ var MeshEchoReplicator = class {
   }
   createExtension(extensionFactory) {
     invariant5(this._context, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 68,
       S: this,
       A: [
@@ -1886,16 +2164,16 @@ var MeshEchoReplicator = class {
       ownPeerId: this._context.peerId,
       replicatorFactory: extensionFactory,
       onRemoteConnected: async () => {
-        log5("onRemoteConnected", {
+        log6("onRemoteConnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file6,
+          F: __dxlog_file7,
           L: 74,
           S: this,
           C: (f, a) => f(...a)
         });
         invariant5(this._context, void 0, {
-          F: __dxlog_file6,
+          F: __dxlog_file7,
           L: 75,
           S: this,
           A: [
@@ -1917,10 +2195,10 @@ var MeshEchoReplicator = class {
         }
       },
       onRemoteDisconnected: async () => {
-        log5("onRemoteDisconnected", {
+        log6("onRemoteDisconnected", {
           peerId: connection.peerId
         }, {
-          F: __dxlog_file6,
+          F: __dxlog_file7,
           L: 89,
           S: this,
           C: (f, a) => f(...a)
@@ -1929,10 +2207,10 @@ var MeshEchoReplicator = class {
         const existingConnections = this._connectionsPerPeer.get(connection.peerId) ?? [];
         const index = existingConnections.indexOf(connection);
         if (index < 0) {
-          log5.warn("disconnected connection not found", {
+          log6.warn("disconnected connection not found", {
             peerId: connection.peerId
           }, {
-            F: __dxlog_file6,
+            F: __dxlog_file7,
             L: 97,
             S: this,
             C: (f, a) => f(...a)
@@ -1950,17 +2228,17 @@ var MeshEchoReplicator = class {
         }
       },
       shouldAdvertise: async (params) => {
-        log5("shouldAdvertise", {
+        log6("shouldAdvertise", {
           peerId: connection.peerId,
           documentId: params.documentId
         }, {
-          F: __dxlog_file6,
+          F: __dxlog_file7,
           L: 115,
           S: this,
           C: (f, a) => f(...a)
         });
         invariant5(this._context, void 0, {
-          F: __dxlog_file6,
+          F: __dxlog_file7,
           L: 116,
           S: this,
           A: [
@@ -1975,12 +2253,12 @@ var MeshEchoReplicator = class {
               documentId: params.documentId,
               peerId: connection.peerId
             });
-            log5("document not found locally for share policy check", {
+            log6("document not found locally for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId,
               acceptDocument: remoteDocumentExists
             }, {
-              F: __dxlog_file6,
+              F: __dxlog_file7,
               L: 124,
               S: this,
               C: (f, a) => f(...a)
@@ -1990,11 +2268,11 @@ var MeshEchoReplicator = class {
           const spaceId = await createIdFromSpaceKey(spaceKey);
           const authorizedDevices = this._authorizedDevices.get(spaceId);
           if (!connection.remoteDeviceKey) {
-            log5("device key not found for share policy check", {
+            log6("device key not found for share policy check", {
               peerId: connection.peerId,
               documentId: params.documentId
             }, {
-              F: __dxlog_file6,
+              F: __dxlog_file7,
               L: 141,
               S: this,
               C: (f, a) => f(...a)
@@ -2002,7 +2280,7 @@ var MeshEchoReplicator = class {
             return false;
           }
           const isAuthorized = authorizedDevices?.has(connection.remoteDeviceKey) ?? false;
-          log5("share policy check", {
+          log6("share policy check", {
             localPeer: this._context.peerId,
             remotePeer: connection.peerId,
             documentId: params.documentId,
@@ -2010,15 +2288,15 @@ var MeshEchoReplicator = class {
             spaceKey,
             isAuthorized
           }, {
-            F: __dxlog_file6,
+            F: __dxlog_file7,
             L: 149,
             S: this,
             C: (f, a) => f(...a)
           });
           return isAuthorized;
         } catch (err) {
-          log5.catch(err, void 0, {
-            F: __dxlog_file6,
+          log6.catch(err, void 0, {
+            F: __dxlog_file7,
             L: 159,
             S: this,
             C: (f, a) => f(...a)
@@ -2030,11 +2308,11 @@ var MeshEchoReplicator = class {
         const spaceId = getSpaceIdFromCollectionId(collectionId);
         const authorizedDevices = this._authorizedDevices.get(spaceId);
         if (!connection.remoteDeviceKey) {
-          log5("device key not found for collection sync check", {
+          log6("device key not found for collection sync check", {
             peerId: connection.peerId,
             collectionId
           }, {
-            F: __dxlog_file6,
+            F: __dxlog_file7,
             L: 169,
             S: this,
             C: (f, a) => f(...a)
@@ -2049,17 +2327,17 @@ var MeshEchoReplicator = class {
     return connection.replicatorExtension;
   }
   async authorizeDevice(spaceKey, deviceKey) {
-    log5("authorizeDevice", {
+    log6("authorizeDevice", {
       spaceKey,
       deviceKey
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 186,
       S: this,
       C: (f, a) => f(...a)
     });
     const spaceId = await createIdFromSpaceKey(spaceKey);
-    defaultMap2(this._authorizedDevices, spaceId, () => new ComplexSet2(PublicKey2.hash)).add(deviceKey);
+    defaultMap3(this._authorizedDevices, spaceId, () => new ComplexSet2(PublicKey3.hash)).add(deviceKey);
     for (const connection of this._connections) {
       if (connection.isEnabled && connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
         if (this._connectionsPerPeer.has(connection.peerId)) {
@@ -2435,11 +2713,12 @@ var getByteCount = (message) => {
 
 // src/db-host/documents-synchronizer.ts
 import { next as A3 } from "@automerge/automerge";
-import { UpdateScheduler, sleep } from "@dxos/async";
-import { LifecycleState as LifecycleState2, Resource as Resource5, cancelWithContext as cancelWithContext2 } from "@dxos/context";
+import { 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 log6 } from "@dxos/log";
-var __dxlog_file7 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/documents-synchronizer.ts";
+import { log as log7 } 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 MAX_UPDATE_FREQ = 10;
 var WRAP_AROUND_RETRY_LIMIT = 3;
 var WRAP_AROUND_RETRY_INITIAL_DELAY = 100;
@@ -2458,39 +2737,53 @@ var DocumentsSynchronizer = class extends Resource5 {
   constructor(_params) {
     super(), this._params = _params;
   }
-  addDocuments(documentIds, retryCounter = 0, wrapAroundRetryDelay = WRAP_AROUND_RETRY_INITIAL_DELAY) {
-    if (retryCounter > WRAP_AROUND_RETRY_LIMIT) {
-      log6.warn("Failed to load document, retry limit reached", {
-        documentIds
-      }, {
-        F: __dxlog_file7,
-        L: 57,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return;
-    }
-    for (const documentId of documentIds) {
-      this._params.repo.find(documentId).then(async (doc) => {
-        await doc.whenReady();
-        this._startSync(doc);
-        this._pendingUpdates.add(doc.documentId);
-        this._sendUpdatesJob.trigger();
-      }).catch((error) => {
-        log6.warn("Failed to load document, wraparound", {
-          documentId,
-          error
-        }, {
-          F: __dxlog_file7,
-          L: 71,
+  async addDocuments(documentIds) {
+    await Promise.all(documentIds.map(async (documentId) => {
+      try {
+        await retry({
+          count: WRAP_AROUND_RETRY_LIMIT,
+          delayMs: WRAP_AROUND_RETRY_INITIAL_DELAY,
+          exponent: 2
+        }, async () => {
+          try {
+            log7("loading document", {
+              documentId
+            }, {
+              F: __dxlog_file8,
+              L: 62,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            const doc = await this._params.automergeHost.loadDoc(Context3.default(void 0, {
+              F: __dxlog_file8,
+              L: 64
+            }), documentId, {
+              fetchFromNetwork: true
+            });
+            this._startSync(doc);
+            this._pendingUpdates.add(doc.documentId);
+            this._sendUpdatesJob.trigger();
+          } catch (err) {
+            log7.warn("failed to load document", {
+              err
+            }, {
+              F: __dxlog_file8,
+              L: 72,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            throw err;
+          }
+        });
+      } catch (err) {
+        log7.catch(err, void 0, {
+          F: __dxlog_file8,
+          L: 78,
           S: this,
           C: (f, a) => f(...a)
         });
-        void cancelWithContext2(this._ctx, sleep(wrapAroundRetryDelay)).then(() => this.addDocuments([
-          documentId
-        ], retryCounter + 1, wrapAroundRetryDelay * 2));
-      });
-    }
+      }
+    }));
   }
   removeDocuments(documentIds) {
     for (const documentId of documentIds) {
@@ -2509,18 +2802,20 @@ var DocumentsSynchronizer = class extends Resource5 {
     this._syncStates.clear();
   }
   async update(updates) {
-    for (const { documentId, mutation, isNew } of updates) {
-      this._writeMutation(documentId, mutation, isNew);
+    for (const { documentId, mutation } of updates) {
+      await this._writeMutation(documentId, mutation);
     }
-    await this._params.repo.flush(updates.map(({ documentId }) => documentId));
+    await this._params.automergeHost.flush({
+      documentIds: updates.map(({ documentId }) => documentId)
+    });
   }
   _startSync(doc) {
     if (this._syncStates.has(doc.documentId)) {
-      log6("Document already being synced", {
+      log7("Document already being synced", {
         documentId: doc.documentId
       }, {
-        F: __dxlog_file7,
-        L: 108,
+        F: __dxlog_file8,
+        L: 113,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2563,8 +2858,8 @@ var DocumentsSynchronizer = class extends Resource5 {
   _getPendingChanges(documentId) {
     const syncState = this._syncStates.get(documentId);
     invariant6(syncState, "Sync state for document not found", {
-      F: __dxlog_file7,
-      L: 150,
+      F: __dxlog_file8,
+      L: 155,
       S: this,
       A: [
         "syncState",
@@ -2583,40 +2878,41 @@ var DocumentsSynchronizer = class extends Resource5 {
     syncState.lastSentHead = A3.getHeads(doc);
     return mutation;
   }
-  _writeMutation(documentId, mutation, isNew) {
+  async _writeMutation(documentId, mutation) {
     if (this._lifecycleState === LifecycleState2.CLOSED) {
       return;
     }
-    if (isNew) {
-      const newHandle = this._params.repo.import(mutation, {
-        docId: documentId
-      });
-      const syncState = this._startSync(newHandle);
-      syncState.lastSentHead = A3.getHeads(newHandle.doc());
-    } else {
-      const syncState = this._syncStates.get(documentId);
-      invariant6(syncState, "Sync state for document not found", {
-        F: __dxlog_file7,
-        L: 174,
-        S: this,
-        A: [
-          "syncState",
-          "'Sync state for document not found'"
-        ]
-      });
-      const headsBefore = A3.getHeads(syncState.handle.doc());
-      this._params.repo.import(mutation, {
-        docId: documentId
-      });
-      if (A3.equals(headsBefore, syncState.lastSentHead)) {
-        syncState.lastSentHead = A3.getHeads(syncState.handle.doc());
-      }
+    log7("write mutation", {
+      documentId
+    }, {
+      F: __dxlog_file8,
+      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,
+      L: 176,
+      S: this,
+      A: [
+        "syncState",
+        "'Sync state for document not found'"
+      ]
+    });
+    const headsBefore = A3.getHeads(syncState.handle.doc());
+    await this._params.automergeHost.createDoc(mutation, {
+      documentId,
+      preserveHistory: true
+    });
+    if (A3.equals(headsBefore, syncState.lastSentHead)) {
+      syncState.lastSentHead = A3.getHeads(syncState.handle.doc());
     }
   }
 };
 
 // src/db-host/data-service.ts
-var __dxlog_file8 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/data-service.ts";
+var __dxlog_file9 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/data-service.ts";
 var DataServiceImpl = class {
   /**
   * Map of subscriptions.
@@ -2634,15 +2930,15 @@ var DataServiceImpl = class {
   subscribe(request) {
     return new Stream(({ next, ready }) => {
       const synchronizer = new DocumentsSynchronizer({
-        repo: this._automergeHost.repo,
+        automergeHost: this._automergeHost,
         sendUpdates: (updates) => next(updates)
       });
       synchronizer.open().then(() => {
         this._subscriptions.set(request.subscriptionId, synchronizer);
         ready();
-      }).catch((err) => log7.catch(err, void 0, {
-        F: __dxlog_file8,
-        L: 72,
+      }).catch((err) => log8.catch(err, void 0, {
+        F: __dxlog_file9,
+        L: 74,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -2652,8 +2948,8 @@ var DataServiceImpl = class {
   async updateSubscription(request) {
     const synchronizer = this._subscriptions.get(request.subscriptionId);
     invariant7(synchronizer, "Subscription not found", {
-      F: __dxlog_file8,
-      L: 79,
+      F: __dxlog_file9,
+      L: 81,
       S: this,
       A: [
         "synchronizer",
@@ -2667,14 +2963,20 @@ var DataServiceImpl = class {
       await synchronizer.removeDocuments(request.removeIds);
     }
   }
+  async createDocument(request) {
+    const handle = await this._automergeHost.createDoc(request.initialValue);
+    return {
+      documentId: handle.documentId
+    };
+  }
   async update(request) {
     if (!request.updates) {
       return;
     }
     const synchronizer = this._subscriptions.get(request.subscriptionId);
     invariant7(synchronizer, "Subscription not found", {
-      F: __dxlog_file8,
-      L: 94,
+      F: __dxlog_file9,
+      L: 101,
       S: this,
       A: [
         "synchronizer",
@@ -2718,8 +3020,8 @@ var DataServiceImpl = class {
     return new Stream(({ ctx, next, ready }) => {
       const spaceId = request.spaceId;
       invariant7(SpaceId2.isValid(spaceId), void 0, {
-        F: __dxlog_file8,
-        L: 134,
+        F: __dxlog_file9,
+        L: 141,
         S: this,
         A: [
           "SpaceId.isValid(spaceId)",
@@ -2754,22 +3056,27 @@ var DataServiceImpl = class {
 };
 
 // src/db-host/echo-host.ts
-import { LifecycleState as LifecycleState5, Resource as Resource9 } from "@dxos/context";
+import { DeferredTask as DeferredTask3, sleep } from "@dxos/async";
+import { Context as Context8, LifecycleState as LifecycleState5, Resource as Resource9 } from "@dxos/context";
 import { todo } from "@dxos/debug";
-import { SpaceDocVersion as SpaceDocVersion3, createIdFromSpaceKey as createIdFromSpaceKey2 } from "@dxos/echo-protocol";
+import { SpaceDocVersion as SpaceDocVersion4, 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 invariant13 } from "@dxos/invariant";
+import { invariant as invariant14 } 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 Context2 } from "@dxos/context";
-import { DatabaseDirectory as DatabaseDirectory2, SpaceDocVersion } from "@dxos/echo-protocol";
+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 log8 } from "@dxos/log";
+import { log as log9 } from "@dxos/log";
 import { ObjectPointerVersion, objectPointerCodec as objectPointerCodec2 } from "@dxos/protocols";
-var __dxlog_file9 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/documents-iterator.ts";
+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) => (
   /**
@@ -2780,14 +3087,16 @@ var createSelectedDocumentsIterator = (automergeHost) => (
     for (const [id, heads] of objects.entries()) {
       try {
         const { documentId, objectId } = objectPointerCodec2.decode(id);
-        const handle = await automergeHost.loadDoc(Context2.default(void 0, {
-          F: __dxlog_file9,
+        const handle = await automergeHost.loadDoc(Context4.default(void 0, {
+          F: __dxlog_file10,
           L: 31
-        }), documentId);
+        }), documentId, {
+          fetchFromNetwork: true
+        });
         let doc = handle.doc();
         invariant8(doc, void 0, {
-          F: __dxlog_file9,
-          L: 34,
+          F: __dxlog_file10,
+          L: 36,
           S: this,
           A: [
             "doc",
@@ -2800,19 +3109,19 @@ var createSelectedDocumentsIterator = (automergeHost) => (
           doc = A4.view(doc, heads);
           const end = Date.now();
           if (end - begin > LOG_VIEW_OPERATION_THRESHOLD) {
-            log8("Checking out document version is taking too long", {
+            log9("Checking out document version is taking too long", {
               duration: end - begin,
               requestedHeads: heads,
               originalHeads: currentHeads
             }, {
-              F: __dxlog_file9,
-              L: 45,
+              F: __dxlog_file10,
+              L: 47,
               S: this,
               C: (f, a) => f(...a)
             });
           }
         }
-        if (doc.version !== SpaceDocVersion.CURRENT) {
+        if (doc.version !== SpaceDocVersion2.CURRENT) {
           continue;
         }
         if (!doc.objects?.[objectId]) {
@@ -2820,7 +3129,7 @@ var createSelectedDocumentsIterator = (automergeHost) => (
         }
         let newId = id;
         if (objectPointerCodec2.getVersion(id) === ObjectPointerVersion.V0) {
-          const spaceKey = DatabaseDirectory2.getSpaceKey(doc) ?? void 0;
+          const spaceKey = DatabaseDirectory3.getSpaceKey(doc) ?? void 0;
           newId = objectPointerCodec2.encode({
             documentId,
             objectId,
@@ -2835,13 +3144,13 @@ var createSelectedDocumentsIterator = (automergeHost) => (
           }
         ];
       } catch (error) {
-        log8.error("Error loading document", {
+        log9.error("Error loading document", {
           heads,
           id,
           error
         }, {
-          F: __dxlog_file9,
-          L: 71,
+          F: __dxlog_file10,
+          L: 73,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2850,39 +3159,148 @@ var createSelectedDocumentsIterator = (automergeHost) => (
   }
 );
 
+// 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 { RuntimeProvider } from "@dxos/effect";
+import { invariant as invariant9 } from "@dxos/invariant";
+import { KEY_QUEUE_POSITION } 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) {
+    this.#runtime = runtime;
+    this.#feedStore = feedStore;
+  }
+  queryQueue(request) {
+    const { query } = request;
+    invariant9(query, "query is required", {
+      F: __dxlog_file11,
+      L: 37,
+      S: this,
+      A: [
+        "query",
+        "'query is required'"
+      ]
+    });
+    const { spaceId, queueIds } = query;
+    return RuntimeProvider.runPromise(this.#runtime)(Effect2.gen(this, function* () {
+      const cursor = query.after ? parseInt(query.after) : -1;
+      const result = yield* this.#feedStore.query({
+        requestId: crypto.randomUUID(),
+        spaceId,
+        query: {
+          feedIds: queueIds ?? []
+        },
+        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 lastBlock = result.blocks[result.blocks.length - 1];
+      const nextCursor = lastBlock && lastBlock.position != null ? String(lastBlock.position) : null;
+      return Function.identity({
+        objects,
+        // TODO(dmaretskyi): This is wrong, fix later - cursors should come directly from the feed.
+        nextCursor: nextCursor?.toString() ?? "",
+        prevCursor: ""
+      });
+    }));
+  }
+  insertIntoQueue(request) {
+    const { subspaceTag, spaceId, queueId, objects } = request;
+    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))
+        };
+      });
+      yield* this.#feedStore.appendLocal(messages);
+    }));
+  }
+  deleteFromQueue(request) {
+    const { subspaceTag, spaceId, queueId, objectIds } = request;
+    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({
+          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--;
+    }
+  }
+  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 Context4, Resource as Resource7 } from "@dxos/context";
+import { Context as Context6, Resource as Resource7 } from "@dxos/context";
 import { raise } from "@dxos/debug";
-import { DatabaseDirectory as DatabaseDirectory4, QueryAST } from "@dxos/echo-protocol";
-import { log as log10 } from "@dxos/log";
+import { DatabaseDirectory as DatabaseDirectory5, 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 Predicate from "effect/Predicate";
-import { Context as Context3, ContextDisposedError, LifecycleState as LifecycleState3, Resource as Resource6 } from "@dxos/context";
-import { DatabaseDirectory as DatabaseDirectory3, ObjectStructure, isEncodedReference } from "@dxos/echo-protocol";
+import * 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 { runAndForwardErrors, unwrapExit } from "@dxos/effect";
 import { EscapedPropPath } from "@dxos/indexing";
-import { invariant as invariant10 } from "@dxos/invariant";
-import { DXN, PublicKey as PublicKey3 } from "@dxos/keys";
-import { log as log9 } from "@dxos/log";
+import { invariant as invariant11 } from "@dxos/invariant";
+import { DXN, PublicKey as PublicKey4 } 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 invariant9 } from "@dxos/invariant";
+import { invariant as invariant10 } from "@dxos/invariant";
 
 // src/query/errors.ts
 import { BaseError } from "@dxos/errors";
-var QueryError = class extends BaseError.extend("QUERY_ERROR") {
+var QueryError = class extends BaseError.extend("QueryError") {
 };
-var InvalidQueryError = class extends QueryError.extend("INVALID_QUERY") {
+var InvalidQueryError = class extends QueryError.extend("InvalidQueryError") {
 };
 
 // src/query/plan.ts
@@ -2907,7 +3325,7 @@ var InvalidQueryError = class extends QueryError.extend("INVALID_QUERY") {
 var QueryPlan;
 
 // src/query/query-planner.ts
-var __dxlog_file10 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/query/query-planner.ts";
+var __dxlog_file12 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/query/query-planner.ts";
 var DEFAULT_OPTIONS = {
   defaultTextSearchKind: "full-text"
 };
@@ -2927,6 +3345,7 @@ var QueryPlanner = class {
     plan = this._optimizeEmptyFilters(plan);
     plan = this._optimizeSoloUnions(plan);
     plan = this._ensureOrderStep(plan);
+    plan = this._optimizeLimits(plan);
     return plan;
   }
   _generate(query, context) {
@@ -2951,6 +3370,8 @@ var QueryPlanner = class {
         return this._generateSetDifferenceClause(query, context);
       case "order":
         return this._generateOrderClause(query, context);
+      case "limit":
+        return this._generateLimitClause(query, context);
       default:
         throw new QueryError({
           message: `Unsupported query type: ${query.type}`,
@@ -2967,6 +3388,12 @@ var QueryPlanner = class {
     if (query.options.spaceIds) {
       newContext.selectionSpaces = query.options.spaceIds;
     }
+    if (query.options.allQueuesFromSpaces !== void 0) {
+      newContext.selectionAllQueuesFromSpaces = query.options.allQueuesFromSpaces;
+    }
+    if (query.options.queues) {
+      newContext.selectionQueues = query.options.queues;
+    }
     if (query.options.deleted) {
       newContext.deletedHandling = query.options.deleted;
     }
@@ -3002,6 +3429,8 @@ var QueryPlanner = class {
             {
               _tag: "SelectStep",
               spaces: context.selectionSpaces,
+              allQueuesFromSpaces: context.selectionAllQueuesFromSpaces,
+              queues: context.selectionQueues,
               selector: {
                 _tag: "IdSelector",
                 objectIds: filter2.id
@@ -3021,6 +3450,8 @@ var QueryPlanner = class {
             {
               _tag: "SelectStep",
               spaces: context.selectionSpaces,
+              allQueuesFromSpaces: context.selectionAllQueuesFromSpaces,
+              queues: context.selectionQueues,
               selector: {
                 _tag: "TypeSelector",
                 typename: [
@@ -3030,11 +3461,11 @@ var QueryPlanner = class {
               }
             },
             ...this._generateDeletedHandlingSteps(context),
+            // TODO(dmaretskyi): Normally we could skip filtering by typename here, but since the index does not separate schema versions, we need to do additional filter to only select the correct version.
             {
               _tag: "FilterStep",
               filter: {
-                ...filter2,
-                typename: null
+                ...filter2
               }
             }
           ]);
@@ -3043,6 +3474,8 @@ var QueryPlanner = class {
             {
               _tag: "SelectStep",
               spaces: context.selectionSpaces,
+              allQueuesFromSpaces: context.selectionAllQueuesFromSpaces,
+              queues: context.selectionQueues,
               selector: {
                 _tag: "WildcardSelector"
               }
@@ -3063,6 +3496,8 @@ var QueryPlanner = class {
           {
             _tag: "SelectStep",
             spaces: context.selectionSpaces,
+            allQueuesFromSpaces: context.selectionAllQueuesFromSpaces,
+            queues: context.selectionQueues,
             selector: {
               _tag: "WildcardSelector"
             }
@@ -3082,10 +3517,13 @@ var QueryPlanner = class {
           {
             _tag: "SelectStep",
             spaces: context.selectionSpaces,
+            allQueuesFromSpaces: context.selectionAllQueuesFromSpaces,
+            queues: context.selectionQueues,
             selector: {
               _tag: "TextSelector",
               text: filter2.text,
-              searchKind: filter2.searchKind ?? this._options.defaultTextSearchKind
+              searchKind: filter2.searchKind ?? this._options.defaultTextSearchKind,
+              typename: null
             }
           },
           ...this._generateDeletedHandlingSteps(context)
@@ -3129,9 +3567,9 @@ var QueryPlanner = class {
       case "or":
         if (filter2.filters.every(isTrivialTypenameFilter)) {
           const typenames = filter2.filters.map((filter3) => {
-            invariant9(filter3.type === "object" && filter3.typename !== null, void 0, {
-              F: __dxlog_file10,
-              L: 224,
+            invariant10(filter3.type === "object" && filter3.typename !== null, void 0, {
+              F: __dxlog_file12,
+              L: 245,
               S: this,
               A: [
                 "filter.type === 'object' && filter.typename !== null",
@@ -3144,13 +3582,21 @@ var QueryPlanner = class {
             {
               _tag: "SelectStep",
               spaces: context.selectionSpaces,
+              allQueuesFromSpaces: context.selectionAllQueuesFromSpaces,
+              queues: context.selectionQueues,
               selector: {
                 _tag: "TypeSelector",
                 typename: typenames,
                 inverted: context.selectionInverted
               }
             },
-            ...this._generateDeletedHandlingSteps(context)
+            ...this._generateDeletedHandlingSteps(context),
+            {
+              _tag: "FilterStep",
+              filter: {
+                ...filter2
+              }
+            }
           ]);
         } else {
           throw new QueryError({
@@ -3228,7 +3674,7 @@ var QueryPlanner = class {
         traversal: {
           _tag: "ReferenceTraversal",
           direction: "incoming",
-          property: query.property
+          property: query.property ?? null
         }
       },
       ...this._generateDeletedHandlingSteps(context),
@@ -3371,40 +3817,156 @@ var QueryPlanner = class {
       }
     ]);
   }
+  _generateLimitClause(query, context) {
+    return QueryPlan.Plan.make([
+      ...this._generate(query.query, context).steps,
+      {
+        _tag: "LimitStep",
+        limit: query.limit
+      }
+    ]);
+  }
   // After complete plan is built, inspect it from the end:
   //   - Walk backwards until hitting an object set changer.
   //   - If an order step is found, skip.
-  //   - Otherwise append natural order to the end.
+  //   - Otherwise insert natural order before any limit steps (since limit should be applied after ordering).
+  // This method is recursive and also processes sub-plans in unions and set differences.
   _ensureOrderStep(plan) {
+    const processedSteps = plan.steps.map((step) => {
+      if (step._tag === "UnionStep") {
+        return {
+          _tag: "UnionStep",
+          plans: step.plans.map((subPlan) => this._ensureOrderStep(subPlan))
+        };
+      } else if (step._tag === "SetDifferenceStep") {
+        return {
+          _tag: "SetDifferenceStep",
+          source: this._ensureOrderStep(step.source),
+          exclude: this._ensureOrderStep(step.exclude)
+        };
+      }
+      return step;
+    });
+    const processedPlan = QueryPlan.Plan.make(processedSteps);
     const OBJECT_SET_CHANGERS = /* @__PURE__ */ new Set([
       "SelectStep",
       "TraverseStep",
       "UnionStep",
       "SetDifferenceStep"
     ]);
-    for (let i = plan.steps.length - 1; i >= 0; i--) {
-      const step = plan.steps[i];
+    for (let i = processedPlan.steps.length - 1; i >= 0; i--) {
+      const step = processedPlan.steps[i];
       if (step._tag === "OrderStep") {
-        return plan;
+        return processedPlan;
       }
       if (OBJECT_SET_CHANGERS.has(step._tag)) {
         break;
       }
     }
-    return QueryPlan.Plan.make([
-      ...plan.steps,
-      {
-        _tag: "OrderStep",
-        order: [
-          Order.natural.ast
-        ]
+    let insertIndex = processedPlan.steps.length;
+    for (let i = processedPlan.steps.length - 1; i >= 0; i--) {
+      if (processedPlan.steps[i]._tag === "LimitStep") {
+        insertIndex = i;
+      } else {
+        break;
+      }
+    }
+    const newSteps = [
+      ...processedPlan.steps
+    ];
+    newSteps.splice(insertIndex, 0, {
+      _tag: "OrderStep",
+      order: [
+        Order.natural.ast
+      ]
+    });
+    return QueryPlan.Plan.make(newSteps);
+  }
+  /**
+  * Propagates limits from LimitStep to SelectStep and OrderStep when possible.
+  * Limits can only be propagated if there are no unions or traversals between the LimitStep and SelectStep/OrderStep.
+  */
+  _optimizeLimits(plan) {
+    const processedSteps = plan.steps.map((step) => {
+      if (step._tag === "UnionStep") {
+        return {
+          _tag: "UnionStep",
+          plans: step.plans.map((subPlan) => this._optimizeLimits(subPlan))
+        };
+      } else if (step._tag === "SetDifferenceStep") {
+        return {
+          _tag: "SetDifferenceStep",
+          source: this._optimizeLimits(step.source),
+          exclude: this._optimizeLimits(step.exclude)
+        };
+      }
+      return step;
+    });
+    let limitStepIndex = -1;
+    let limitValue;
+    for (let i = processedSteps.length - 1; i >= 0; i--) {
+      const step = processedSteps[i];
+      if (step._tag === "LimitStep") {
+        limitStepIndex = i;
+        limitValue = step.limit;
+        break;
+      }
+      if (step._tag !== "OrderStep") {
+        break;
       }
+    }
+    if (limitStepIndex === -1 || limitValue === void 0) {
+      return QueryPlan.Plan.make(processedSteps);
+    }
+    const BLOCKERS = /* @__PURE__ */ new Set([
+      "UnionStep",
+      "TraverseStep",
+      "SetDifferenceStep"
     ]);
+    let selectStepIndex = -1;
+    let orderStepIndex = -1;
+    for (let i = 0; i < limitStepIndex; i++) {
+      const step = processedSteps[i];
+      if (step._tag === "SelectStep") {
+        selectStepIndex = i;
+      }
+      if (step._tag === "OrderStep") {
+        orderStepIndex = i;
+      }
+      if (BLOCKERS.has(step._tag)) {
+        selectStepIndex = -1;
+        orderStepIndex = -1;
+      }
+    }
+    if (selectStepIndex === -1 && orderStepIndex === -1) {
+      return QueryPlan.Plan.make(processedSteps);
+    }
+    const newSteps = [
+      ...processedSteps
+    ];
+    if (selectStepIndex !== -1) {
+      const selectStep = newSteps[selectStepIndex];
+      newSteps[selectStepIndex] = {
+        ...selectStep,
+        limit: limitValue
+      };
+    }
+    if (orderStepIndex !== -1) {
+      const orderStep = newSteps[orderStepIndex];
+      newSteps[orderStepIndex] = {
+        ...orderStep,
+        limit: limitValue
+      };
+    }
+    newSteps.splice(limitStepIndex, 1);
+    return QueryPlan.Plan.make(newSteps);
   }
 };
 var DEFAULT_CONTEXT = {
   originalQuery: null,
   selectionSpaces: [],
+  selectionAllQueuesFromSpaces: false,
+  selectionQueues: [],
   deletedHandling: "exclude",
   selectionInverted: false
 };
@@ -3426,7 +3988,45 @@ var isTrivialTypenameFilter = (filter2) => {
 };
 
 // src/query/query-executor.ts
-var __dxlog_file11 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/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({
+  isDeleted: (item) => {
+    if (item.doc) {
+      return ObjectStructure.isDeleted(item.doc);
+    } else if (item.data) {
+      return item.data["@deleted"] === true;
+    } else {
+      throw new Error("Invalid query item");
+    }
+  },
+  getProperty: (item, property) => {
+    if (item.doc) {
+      return getDeep(item.doc.data, property);
+    } else if (item.data) {
+      return getDeep(item.data, property);
+    } else {
+      throw new Error("Invalid query item");
+    }
+  },
+  getRelationSource: (item) => {
+    if (item.doc) {
+      return ObjectStructure.getRelationSource(item.doc)?.["/"];
+    } else if (item.data) {
+      return item.data[ATTR_RELATION_SOURCE];
+    } else {
+      throw new Error("Invalid query item");
+    }
+  },
+  getRelationTarget: (item) => {
+    if (item.doc) {
+      return ObjectStructure.getRelationTarget(item.doc)?.["/"];
+    } else if (item.data) {
+      return item.data[ATTR_RELATION_TARGET];
+    } else {
+      throw new Error("Invalid query item");
+    }
+  }
+});
 var ExecutionTrace = Object.freeze({
   makeEmpty: () => ({
     name: "Empty",
@@ -3498,8 +4098,10 @@ var ExecutionTrace = Object.freeze({
   }
 });
 var TRACE_QUERY_EXECUTION = false;
-var QueryExecutor = class extends Resource6 {
+var QueryExecutor = class _QueryExecutor extends Resource6 {
   _indexer;
+  _indexer2;
+  _runtime;
   _automergeHost;
   _spaceStateManager;
   /**
@@ -3515,6 +4117,8 @@ var QueryExecutor = class extends Resource6 {
   constructor(options) {
     super();
     this._indexer = options.indexer;
+    this._indexer2 = options.indexer2;
+    this._runtime = options.runtime;
     this._automergeHost = options.automergeHost;
     this._spaceStateManager = options.spaceStateManager;
     this._id = options.queryId;
@@ -3532,23 +4136,21 @@ 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,
-      documentId: item.documentId,
+      documentId: item.documentId ?? void 0,
+      queueId: item.queueId ?? void 0,
+      queueNamespace: item.queueNamespace ?? void 0,
       spaceId: item.spaceId,
-      // TODO(dmaretskyi): Plumb through the rank.
-      rank: 0
+      rank: item.rank,
+      documentJson: item.doc ? JSON.stringify(item.doc) : item.data ? JSON.stringify(item.data) : void 0
     }));
   }
   async execQuery() {
-    invariant10(this._lifecycleState === LifecycleState3.OPEN, void 0, {
-      F: __dxlog_file11,
-      L: 211,
+    invariant11(this._lifecycleState === LifecycleState3.OPEN, void 0, {
+      F: __dxlog_file13,
+      L: 285,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -3573,7 +4175,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();
@@ -3624,6 +4225,9 @@ var QueryExecutor = class extends Resource6 {
       case "OrderStep":
         ({ workingSet: newWorkingSet, trace: trace6 } = await this._execOrderStep(step, workingSet));
         break;
+      case "LimitStep":
+        ({ workingSet: newWorkingSet, trace: trace6 } = await this._execLimitStep(step, workingSet));
+        break;
       default:
         throw new Error(`Unknown step type: ${step._tag}`);
     }
@@ -3646,24 +4250,42 @@ 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;
-        trace6.indexQueryTime += performance.now() - beginIndexQuery;
-        if (this._ctx.disposed) {
-          return {
-            workingSet,
-            trace: trace6
-          };
+        if (this._supportsSqlIndexing()) {
+          const beginIndexQuery = performance.now();
+          const metas = await this._queryAllFromSqlIndex(step.spaces);
+          trace6.indexHits = metas.length;
+          trace6.indexQueryTime += performance.now() - beginIndexQuery;
+          if (this._ctx.disposed) {
+            return {
+              workingSet,
+              trace: trace6
+            };
+          }
+          const documentLoadStart = performance.now();
+          const results = await this._loadDocumentsAfterSqlQuery(metas);
+          trace6.documentsLoaded += results.length;
+          trace6.documentLoadTime += performance.now() - documentLoadStart;
+          workingSet.push(...results.filter(isNonNullable3));
+        } else {
+          const beginIndexQuery = performance.now();
+          const indexHits = await this._indexer.execQuery({
+            typenames: [],
+            inverted: false
+          });
+          trace6.indexHits = +indexHits.length;
+          trace6.indexQueryTime += performance.now() - beginIndexQuery;
+          if (this._ctx.disposed) {
+            return {
+              workingSet,
+              trace: trace6
+            };
+          }
+          const documentLoadStart = performance.now();
+          const results = await this._loadDocumentsAfterIndexQuery(indexHits);
+          trace6.documentsLoaded += results.length;
+          trace6.documentLoadTime += performance.now() - documentLoadStart;
+          workingSet.push(...results.filter(isNonNullable3).filter((item) => step.spaces.includes(item.spaceId)));
         }
-        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;
         break;
       }
@@ -3678,66 +4300,182 @@ var QueryExecutor = class extends Resource6 {
         break;
       }
       case "TypeSelector": {
-        const beginIndexQuery = performance.now();
-        const indexHits = await this._indexer.execQuery({
-          typenames: step.selector.typename,
-          inverted: step.selector.inverted
-        });
-        trace6.indexHits = +indexHits.length;
-        trace6.indexQueryTime += performance.now() - beginIndexQuery;
-        if (this._ctx.disposed) {
-          return {
-            workingSet,
-            trace: trace6
-          };
+        if (this._supportsSqlIndexing()) {
+          const beginIndexQuery = performance.now();
+          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 {
+              workingSet,
+              trace: trace6
+            };
+          }
+          const documentLoadStart = performance.now();
+          const results = await this._loadDocumentsAfterSqlQuery(metas);
+          trace6.documentsLoaded += results.length;
+          trace6.documentLoadTime += performance.now() - documentLoadStart;
+          workingSet.push(...results.filter(isNonNullable3));
+        } else {
+          const beginIndexQuery = performance.now();
+          const indexHits = await this._indexer.execQuery({
+            typenames: step.selector.typename,
+            inverted: step.selector.inverted
+          });
+          trace6.indexHits = +indexHits.length;
+          trace6.indexQueryTime += performance.now() - beginIndexQuery;
+          if (this._ctx.disposed) {
+            return {
+              workingSet,
+              trace: trace6
+            };
+          }
+          const documentLoadStart = performance.now();
+          const results = await this._loadDocumentsAfterIndexQuery(indexHits);
+          trace6.documentsLoaded += results.length;
+          trace6.documentLoadTime += performance.now() - documentLoadStart;
+          workingSet.push(...results.filter(isNonNullable3).filter((item) => step.spaces.includes(item.spaceId)));
         }
-        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;
         break;
       }
       case "TextSelector": {
-        const beginIndexQuery = performance.now();
-        const indexHits = await this._indexer.execQuery({
-          typenames: [],
-          text: {
+        if (step.selector.searchKind === "full-text" && this._supportsSqlIndexing()) {
+          const beginIndexQuery = performance.now();
+          invariant11(this._indexer2, "SQL indexer is required.", {
+            F: __dxlog_file13,
+            L: 492,
+            S: this,
+            A: [
+              "this._indexer2",
+              "'SQL indexer is required.'"
+            ]
+          });
+          invariant11(step.spaces.length <= 1, "Multiple spaces are not supported for full-text search", {
+            F: __dxlog_file13,
+            L: 493,
+            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._indexer2.queryText({
             query: step.selector.text,
-            kind: Match.type().pipe(Match.withReturnType(), Match.when("full-text", () => "text"), Match.when("vector", () => "vector"), Match.orElseAbsurd)(step.selector.searchKind)
+            spaceId: step.spaces,
+            includeAllQueues: step.allQueuesFromSpaces,
+            queueIds
+          }));
+          trace6.indexHits = textResults.length;
+          trace6.indexQueryTime += performance.now() - beginIndexQuery;
+          if (this._ctx.disposed) {
+            return {
+              workingSet,
+              trace: trace6
+            };
           }
-        });
-        trace6.indexHits = +indexHits.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._indexer2.querySnapshotsJSON(queueResults.map((r) => r.recordId)));
+            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;
+            }
+            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
+            };
+          }
+          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;
         }
-        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;
         break;
       }
       default:
         throw new Error(`Unknown selector type: ${step.selector._tag}`);
     }
+    if (step.limit !== void 0 && workingSet.length > step.limit) {
+      workingSet = workingSet.slice(0, step.limit);
+      trace6.objectCount = workingSet.length;
+    }
     return {
       workingSet,
       trace: trace6
     };
   }
   async _execFilterStep(step, workingSet) {
-    const result = workingSet.filter((item) => filterMatchObject(step.filter, {
-      id: item.objectId,
-      spaceId: item.spaceId,
-      doc: item.doc
-    }));
+    const result = workingSet.filter((item) => {
+      if (item.doc) {
+        return filterMatchObject(step.filter, {
+          id: item.objectId,
+          spaceId: item.spaceId,
+          doc: item.doc
+        });
+      } else if (item.data) {
+        return filterMatchObjectJSON(step.filter, item.data);
+      } else {
+        return false;
+      }
+    });
     return {
       workingSet: result,
       trace: {
@@ -3750,7 +4488,7 @@ var QueryExecutor = class extends Resource6 {
   }
   async _execFilterDeletedStep(step, workingSet) {
     const expected = step.mode === "only-deleted";
-    const result = workingSet.filter((item) => ObjectStructure.isDeleted(item.doc) === expected);
+    const result = workingSet.filter((item) => QueryItem.isDeleted(item) === expected);
     return {
       workingSet: result,
       trace: {
@@ -3773,9 +4511,18 @@ var QueryExecutor = class extends Resource6 {
       case "ReferenceTraversal": {
         switch (step.traversal.direction) {
           case "outgoing": {
+            invariant11(step.traversal.property !== null, "Outgoing reference traversal requires a property", {
+              F: __dxlog_file13,
+              L: 674,
+              S: this,
+              A: [
+                "step.traversal.property !== null",
+                "'Outgoing reference traversal requires a property'"
+              ]
+            });
             const property = EscapedPropPath.unescape(step.traversal.property);
             const refs = workingSet.flatMap((item) => {
-              const ref = getDeep(item.doc.data, property);
+              const ref = QueryItem.getProperty(item, property);
               const refs2 = Array.isArray(ref) ? ref : [
                 ref
               ];
@@ -3786,11 +4533,11 @@ var QueryExecutor = class extends Resource6 {
                     spaceId: item.spaceId
                   } : null;
                 } catch {
-                  log9.warn("invalid reference", {
+                  log10.warn("invalid reference", {
                     ref: ref2["/"]
                   }, {
-                    F: __dxlog_file11,
-                    L: 477,
+                    F: __dxlog_file13,
+                    L: 690,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -3808,22 +4555,35 @@ 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 documentLoadStart = performance.now();
-            const results = await this._loadDocumentsAfterIndexQuery(indexHits);
-            trace6.documentsLoaded += results.length;
-            trace6.documentLoadTime += performance.now() - documentLoadStart;
-            newWorkingSet.push(...results.filter(isNonNullable3));
-            trace6.objectCount = newWorkingSet.length;
+            if (this._supportsSqlIndexing()) {
+              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._loadDocumentsAfterSqlQuery(metas);
+              trace6.documentsLoaded += results.length;
+              trace6.documentLoadTime += performance.now() - documentLoadStart;
+              newWorkingSet.push(...results.filter(isNonNullable3));
+              trace6.objectCount = newWorkingSet.length;
+            } else {
+              const indexHits = await this._indexer.execQuery({
+                typenames: [],
+                inverted: false,
+                graph: {
+                  kind: "inbound-reference",
+                  property: step.traversal.property,
+                  anchors: workingSet.map((item) => item.objectId)
+                }
+              });
+              trace6.indexHits += indexHits.length;
+              const documentLoadStart = performance.now();
+              const results = await this._loadDocumentsAfterIndexQuery(indexHits);
+              trace6.documentsLoaded += results.length;
+              trace6.documentLoadTime += performance.now() - documentLoadStart;
+              newWorkingSet.push(...results.filter(isNonNullable3));
+              trace6.objectCount = newWorkingSet.length;
+            }
             break;
           }
         }
@@ -3834,21 +4594,18 @@ var QueryExecutor = class extends Resource6 {
           case "relation-to-source":
           case "relation-to-target": {
             const refs = workingSet.map((item) => {
-              const ref = step.traversal.direction === "relation-to-source" ? ObjectStructure.getRelationSource(item.doc) : ObjectStructure.getRelationTarget(item.doc);
-              if (!isEncodedReference(ref)) {
-                return null;
-              }
+              const dxn = step.traversal.direction === "relation-to-source" ? QueryItem.getRelationSource(item) : QueryItem.getRelationTarget(item);
               try {
                 return {
-                  ref: DXN.parse(ref["/"]),
+                  ref: DXN.parse(dxn),
                   spaceId: item.spaceId
                 };
               } catch {
-                log9.warn("invalid reference", {
-                  ref: ref["/"]
+                log10.warn("invalid reference", {
+                  ref: dxn
                 }, {
-                  F: __dxlog_file11,
-                  L: 540,
+                  F: __dxlog_file13,
+                  L: 764,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -3866,22 +4623,35 @@ 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 documentLoadStart = performance.now();
-            const results = await this._loadDocumentsAfterIndexQuery(indexHits);
-            trace6.documentsLoaded += results.length;
-            trace6.documentLoadTime += performance.now() - documentLoadStart;
-            newWorkingSet.push(...results.filter(isNonNullable3));
-            trace6.objectCount = newWorkingSet.length;
+            if (this._supportsSqlIndexing()) {
+              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._loadDocumentsAfterSqlQuery(metas);
+              trace6.documentsLoaded += results.length;
+              trace6.documentLoadTime += performance.now() - documentLoadStart;
+              newWorkingSet.push(...results.filter(isNonNullable3));
+              trace6.objectCount = newWorkingSet.length;
+            } else {
+              const indexHits = await this._indexer.execQuery({
+                typenames: [],
+                inverted: false,
+                graph: {
+                  kind: step.traversal.direction === "source-to-relation" ? "relation-source" : "relation-target",
+                  anchors: workingSet.map((item) => item.objectId),
+                  property: null
+                }
+              });
+              trace6.indexHits += indexHits.length;
+              const documentLoadStart = performance.now();
+              const results = await this._loadDocumentsAfterIndexQuery(indexHits);
+              trace6.documentsLoaded += results.length;
+              trace6.documentLoadTime += performance.now() - documentLoadStart;
+              newWorkingSet.push(...results.filter(isNonNullable3));
+              trace6.objectCount = newWorkingSet.length;
+            }
             break;
           }
         }
@@ -3938,19 +4708,39 @@ var QueryExecutor = class extends Resource6 {
     };
   }
   async _execOrderStep(step, workingSet) {
-    const sortedWorkingSet = [
+    let sortedWorkingSet = [
       ...workingSet
     ].sort((a, b) => this._compareMultiOrder(a, b, step.order));
+    if (step.limit !== void 0 && sortedWorkingSet.length > step.limit) {
+      sortedWorkingSet = sortedWorkingSet.slice(0, step.limit);
+    }
     return {
       workingSet: sortedWorkingSet,
       trace: {
         ...ExecutionTrace.makeEmpty(),
         name: "Order",
-        details: JSON.stringify(step.order),
+        details: JSON.stringify({
+          order: step.order,
+          limit: step.limit
+        }),
         objectCount: sortedWorkingSet.length
       }
     };
   }
+  async _execLimitStep(step, workingSet) {
+    const limitedWorkingSet = workingSet.slice(0, step.limit);
+    return {
+      workingSet: limitedWorkingSet,
+      trace: {
+        ...ExecutionTrace.makeEmpty(),
+        name: "Limit",
+        details: JSON.stringify({
+          limit: step.limit
+        }),
+        objectCount: limitedWorkingSet.length
+      }
+    };
+  }
   _compareMultiOrder(a, b, orders) {
     if (orders.length === 0) {
       return 0;
@@ -3973,13 +4763,21 @@ var QueryExecutor = class extends Resource6 {
         const comparison = this._compareByProperty(a, b, order.property);
         return order.direction === "desc" ? -comparison : comparison;
       }
+      case "rank": {
+        const comparison = a.rank - b.rank;
+        return order.direction === "desc" ? -comparison : comparison;
+      }
       default:
         return 0;
     }
   }
   _compareByProperty(a, b, property) {
-    const aValue = a.doc.data[property];
-    const bValue = b.doc.data[property];
+    const aValue = QueryItem.getProperty(a, [
+      property
+    ]);
+    const bValue = QueryItem.getProperty(b, [
+      property
+    ]);
     if (aValue == null && bValue == null) {
       return 0;
     }
@@ -4005,30 +4803,242 @@ var QueryExecutor = class extends Resource6 {
       return this._loadFromIndexHit(hit);
     }));
   }
+  _supportsSqlIndexing() {
+    return !!this._indexer2 && !!this._runtime;
+  }
+  async _runInRuntime(effect) {
+    const runtimeProvider = this._runtime;
+    invariant11(runtimeProvider, "SQL runtime is required.", {
+      F: __dxlog_file13,
+      L: 1002,
+      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) {
+    invariant11(this._indexer2, "SQL indexer is required.", {
+      F: __dxlog_file13,
+      L: 1008,
+      S: this,
+      A: [
+        "this._indexer2",
+        "'SQL indexer is required.'"
+      ]
+    });
+    return await this._runInRuntime(this._indexer2.queryAll({
+      spaceIds
+    }));
+  }
+  async _queryTypesFromSqlIndex(spaceIds, typeDxns, inverted) {
+    invariant11(this._indexer2, "SQL indexer is required.", {
+      F: __dxlog_file13,
+      L: 1017,
+      S: this,
+      A: [
+        "this._indexer2",
+        "'SQL indexer is required.'"
+      ]
+    });
+    return await this._runInRuntime(this._indexer2.queryTypes({
+      spaceIds,
+      typeDxns,
+      inverted
+    }));
+  }
+  async _queryIncomingReferencesFromSqlIndex(workingSet, property) {
+    const anchorDxns = workingSet.map((item) => DXN.fromLocalObjectId(item.objectId).toString());
+    invariant11(this._indexer2, "SQL indexer is required.", {
+      F: __dxlog_file13,
+      L: 1026,
+      S: this,
+      A: [
+        "this._indexer2",
+        "'SQL indexer is required.'"
+      ]
+    });
+    const rows = (await Promise.all(anchorDxns.map((targetDxn) => this._runInRuntime(this._indexer2.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._indexer2.lookupByRecordIds(uniqueRecordIds));
+  }
+  /**
+  * 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'].
+  */
+  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) {
+    invariant11(this._indexer2, "SQL indexer is required.", {
+      F: __dxlog_file13,
+      L: 1100,
+      S: this,
+      A: [
+        "this._indexer2",
+        "'SQL indexer is required.'"
+      ]
+    });
+    const anchorDxns = workingSet.map((item) => DXN.fromLocalObjectId(item.objectId).toString());
+    return await this._runInRuntime(this._indexer2.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();
+    }
+    invariant11(this._indexer2, "SQL indexer is required.", {
+      F: __dxlog_file13,
+      L: 1130,
+      S: this,
+      A: [
+        "this._indexer2",
+        "'SQL indexer is required.'"
+      ]
+    });
+    const snapshots = await this._runInRuntime(this._indexer2.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(Context5.default(void 0, {
+      F: __dxlog_file13,
+      L: 1169
+    }), meta.documentId, {
+      fetchFromNetwork: true
+    });
+    const doc = handle.doc();
+    if (!doc) {
+      return null;
+    }
+    const object = DatabaseDirectory4.getInlineObject(doc, meta.objectId);
+    if (!object) {
+      return null;
+    }
+    return {
+      objectId: meta.objectId,
+      documentId: meta.documentId,
+      spaceId: meta.spaceId,
+      queueId: null,
+      queueNamespace: null,
+      doc: object,
+      data: null,
+      rank: 1
+    };
+  }
   /**
   * Space key hex -> SpaceId.
   */
   _spaceIdCache = /* @__PURE__ */ new Map();
   async _loadFromIndexHit(hit) {
     const { objectId, documentId, spaceKey: spaceKeyInIndex } = objectPointerCodec3.decode(hit.id);
-    const handle = await this._automergeHost.loadDoc(Context3.default(void 0, {
-      F: __dxlog_file11,
-      L: 738
-    }), documentId);
+    const handle = await this._automergeHost.loadDoc(Context5.default(void 0, {
+      F: __dxlog_file13,
+      L: 1203
+    }), documentId, {
+      fetchFromNetwork: true
+    });
     const doc = handle.doc();
     if (!doc) {
       return null;
     }
-    const spaceKey = spaceKeyInIndex ?? DatabaseDirectory3.getSpaceKey(doc);
+    const spaceKey = spaceKeyInIndex ?? DatabaseDirectory4.getSpaceKey(doc);
     if (!spaceKey) {
       return null;
     }
     let spaceId = this._spaceIdCache.get(spaceKey);
     if (!spaceId) {
-      spaceId = await createIdFromSpaceKey(PublicKey3.from(spaceKey));
+      spaceId = await createIdFromSpaceKey(PublicKey4.from(spaceKey));
       this._spaceIdCache.set(spaceKey, spaceId);
     }
-    const object = DatabaseDirectory3.getInlineObject(doc, objectId);
+    const object = DatabaseDirectory4.getInlineObject(doc, objectId);
     if (!object) {
       return null;
     }
@@ -4036,17 +5046,21 @@ var QueryExecutor = class extends Resource6 {
       objectId,
       documentId,
       spaceId,
-      doc: object
+      queueId: null,
+      queueNamespace: null,
+      data: null,
+      doc: object,
+      rank: hit.rank
     };
   }
   async _loadFromDXN(dxn, { sourceSpaceId }) {
     const echoDxn = dxn.asEchoDXN();
     if (!echoDxn) {
-      log9.warn("unable to resolve DXN", {
+      log10.warn("unable to resolve DXN", {
         dxn
       }, {
-        F: __dxlog_file11,
-        L: 771,
+        F: __dxlog_file13,
+        L: 1242,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4055,11 +5069,11 @@ var QueryExecutor = class extends Resource6 {
     const spaceId = echoDxn.spaceId ?? sourceSpaceId;
     const spaceRoot = this._spaceStateManager.getRootBySpaceId(spaceId);
     if (!spaceRoot) {
-      log9.warn("no space state found for", {
+      log10.warn("no space state found for", {
         spaceId
       }, {
-        F: __dxlog_file11,
-        L: 779,
+        F: __dxlog_file13,
+        L: 1250,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4067,38 +5081,44 @@ var QueryExecutor = class extends Resource6 {
     }
     const dbDirectory = spaceRoot.doc();
     if (!dbDirectory) {
-      log9.warn("no space state found for", {
+      log10.warn("no space state found for", {
         spaceId
       }, {
-        F: __dxlog_file11,
-        L: 784,
+        F: __dxlog_file13,
+        L: 1255,
         S: this,
         C: (f, a) => f(...a)
       });
       return null;
     }
-    const inlineObject = DatabaseDirectory3.getInlineObject(dbDirectory, echoDxn.echoId);
+    const inlineObject = DatabaseDirectory4.getInlineObject(dbDirectory, echoDxn.echoId);
     if (inlineObject) {
       return {
         objectId: echoDxn.echoId,
         documentId: spaceRoot.documentId,
         spaceId,
-        doc: inlineObject
+        queueId: null,
+        queueNamespace: null,
+        data: null,
+        doc: inlineObject,
+        rank: 1
       };
     }
-    const link = DatabaseDirectory3.getLink(dbDirectory, echoDxn.echoId);
+    const link = DatabaseDirectory4.getLink(dbDirectory, echoDxn.echoId);
     if (!link) {
       return null;
     }
-    const handle = await this._automergeHost.loadDoc(Context3.default(void 0, {
-      F: __dxlog_file11,
-      L: 803
-    }), link);
+    const handle = await this._automergeHost.loadDoc(Context5.default(void 0, {
+      F: __dxlog_file13,
+      L: 1278
+    }), link, {
+      fetchFromNetwork: true
+    });
     const doc = handle.doc();
     if (!doc) {
       return null;
     }
-    const object = DatabaseDirectory3.getInlineObject(doc, echoDxn.echoId);
+    const object = DatabaseDirectory4.getInlineObject(doc, echoDxn.echoId);
     if (!object) {
       return null;
     }
@@ -4106,7 +5126,11 @@ var QueryExecutor = class extends Resource6 {
       objectId: echoDxn.echoId,
       documentId: handle.documentId,
       spaceId,
-      doc: object
+      queueId: null,
+      queueNamespace: null,
+      data: null,
+      doc: object,
+      rank: 1
     };
   }
 };
@@ -4118,7 +5142,7 @@ function _ts_decorate5(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_file12 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/query-service.ts";
+var __dxlog_file14 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/query-service.ts";
 var QueryServiceImpl = class extends Resource7 {
   _params;
   // TODO(dmaretskyi): We need to implement query deduping. Idle composer has 80 queries with only 10 being unique.
@@ -4155,11 +5179,11 @@ var QueryServiceImpl = class extends Resource7 {
   execQuery(request) {
     return new Stream2(({ next, close, ctx }) => {
       if (this._params.indexer.config?.enabled !== true) {
-        log10.error("indexer is disabled", {
+        log11.error("indexer is disabled", {
           config: this._params.indexer.config
         }, {
-          F: __dxlog_file12,
-          L: 102,
+          F: __dxlog_file14,
+          L: 107,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4179,9 +5203,9 @@ var QueryServiceImpl = class extends Resource7 {
   * Re-index all loaded documents.
   */
   async reindex() {
-    log10("Reindexing all documents...", void 0, {
-      F: __dxlog_file12,
-      L: 121,
+    log11("Reindexing all documents...", void 0, {
+      F: __dxlog_file14,
+      L: 126,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4192,21 +5216,21 @@ var QueryServiceImpl = class extends Resource7 {
         ids.set(id, heads);
       }
       if (ids.size % 100 === 0) {
-        log10("Collected documents...", {
+        log11("Collected documents...", {
           count: ids.size
         }, {
-          F: __dxlog_file12,
-          L: 129,
+          F: __dxlog_file14,
+          L: 134,
           S: this,
           C: (f, a) => f(...a)
         });
       }
     }
-    log10("Marking all documents as dirty...", {
+    log11("Marking all documents as dirty...", {
       count: ids.size
     }, {
-      F: __dxlog_file12,
-      L: 133,
+      F: __dxlog_file14,
+      L: 138,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4226,6 +5250,8 @@ var QueryServiceImpl = class extends Resource7 {
     const queryEntry = {
       executor: new QueryExecutor({
         indexer: this._params.indexer,
+        indexer2: this._params.indexer2,
+        runtime: this._params.runtime,
         automergeHost: this._params.automergeHost,
         queryId: request.queryId ?? raise(new Error("query id required")),
         query: parsedQuery,
@@ -4270,20 +5296,20 @@ var QueryServiceImpl = class extends Resource7 {
           query.sendResults(query.executor.getResults());
         }
       } catch (err) {
-        log10.catch(err, void 0, {
-          F: __dxlog_file12,
-          L: 204,
+        log11.catch(err, void 0, {
+          F: __dxlog_file14,
+          L: 211,
           S: this,
           C: (f, a) => f(...a)
         });
       }
     }));
-    log10.verbose("executed queries", {
+    log11.verbose("executed queries", {
       count,
       duration: performance.now() - begin
     }, {
-      F: __dxlog_file12,
-      L: 208,
+      F: __dxlog_file14,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4312,7 +5338,7 @@ var createDocumentsIterator = (automergeHost) => (
         return;
       }
       const doc = handle.doc();
-      const spaceKey = DatabaseDirectory4.getSpaceKey(doc) ?? void 0;
+      const spaceKey = DatabaseDirectory5.getSpaceKey(doc) ?? void 0;
       if (doc.objects) {
         yield Object.entries(doc.objects).map(([objectId, object]) => {
           return {
@@ -4332,10 +5358,12 @@ var createDocumentsIterator = (automergeHost) => (
           if (visited.has(urlString)) {
             continue;
           }
-          const linkHandle = await automergeHost.loadDoc(Context4.default(void 0, {
-            F: __dxlog_file12,
-            L: 248
-          }), urlString);
+          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;
           }
@@ -4343,7 +5371,7 @@ var createDocumentsIterator = (automergeHost) => (
       }
       visited.add(handle.documentId);
     }
-    for (const handle of Object.values(automergeHost.repo.handles)) {
+    for (const handle of Object.values(automergeHost.handles)) {
       if (visited.has(handle.documentId)) {
         continue;
       }
@@ -4355,22 +5383,127 @@ var createDocumentsIterator = (automergeHost) => (
   }
 );
 
+// src/db-host/queue-data-source.ts
+import * as Effect3 from "effect/Effect";
+import { RuntimeProvider as RuntimeProvider2 } from "@dxos/effect";
+import { FeedCursor } from "@dxos/feed";
+import { failedInvariant } from "@dxos/invariant";
+import { log as log12 } from "@dxos/log";
+var __dxlog_file15 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/queue-data-source.ts";
+var QueueDataSource = class {
+  sourceName = "queue";
+  _feedStore;
+  _runtime;
+  _getSpaceIds;
+  constructor(options) {
+    this._feedStore = options.feedStore;
+    this._runtime = options.runtime;
+    this._getSpaceIds = options.getSpaceIds;
+  }
+  getChangedObjects(cursors, opts) {
+    return Effect3.gen(this, function* () {
+      const objects = [];
+      const updatedCursors = [];
+      const existingSpaceIds = new Set(cursors.map((c) => c.spaceId).filter(Boolean));
+      const allSpaceIds = this._getSpaceIds();
+      const augmentedCursors = [
+        ...cursors
+      ];
+      for (const spaceId of allSpaceIds) {
+        if (!existingSpaceIds.has(spaceId)) {
+          augmentedCursors.push({
+            spaceId,
+            resourceId: null,
+            cursor: ""
+          });
+        }
+      }
+      let remainingLimit = opts?.limit ?? Infinity;
+      for (const cursor of augmentedCursors) {
+        if (remainingLimit <= 0) {
+          updatedCursors.push(cursor);
+          continue;
+        }
+        if (!cursor.spaceId) {
+          updatedCursors.push(cursor);
+          continue;
+        }
+        const currentCursor = typeof cursor.cursor === "string" && cursor.cursor !== "" ? FeedCursor.make(cursor.cursor) : void 0;
+        try {
+          const result = yield* this._feedStore.query({
+            spaceId: cursor.spaceId,
+            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);
+              objects.push({
+                spaceId: cursor.spaceId,
+                queueId: block.feedId ?? failedInvariant(),
+                documentId: null,
+                recordId: null,
+                data
+              });
+            } catch (err) {
+              log12.warn("Failed to parse block data for indexing", {
+                spaceId: cursor.spaceId,
+                err
+              }, {
+                F: __dxlog_file15,
+                L: 114,
+                S: this,
+                C: (f, a) => f(...a)
+              });
+            }
+          }
+          remainingLimit -= result.blocks.length;
+          updatedCursors.push({
+            spaceId: cursor.spaceId,
+            resourceId: null,
+            cursor: result.nextCursor
+          });
+        } catch (error) {
+          log12.error("Error querying queue for indexing", {
+            spaceId: cursor.spaceId,
+            error
+          }, {
+            F: __dxlog_file15,
+            L: 125,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+        }
+      }
+      return {
+        objects,
+        cursors: updatedCursors
+      };
+    }).pipe(RuntimeProvider2.provide(this._runtime), Effect3.withSpan("QueueDataSource.getChangedObjects"), Effect3.orDie);
+  }
+};
+
 // src/db-host/space-state-manager.ts
 import { interpretAsDocumentId as interpretAsDocumentId3 } from "@automerge/automerge-repo";
 import isEqual from "lodash.isequal";
-import { Event as Event3, UpdateScheduler as UpdateScheduler3 } from "@dxos/async";
-import { Context as Context5, LifecycleState as LifecycleState4, Resource as Resource8 } from "@dxos/context";
-import { invariant as invariant12 } from "@dxos/invariant";
+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";
 
 // src/db-host/database-root.ts
 import { interpretAsDocumentId as interpretAsDocumentId2 } from "@automerge/automerge-repo";
-import { DatabaseDirectory as DatabaseDirectory5, SpaceDocVersion as SpaceDocVersion2 } from "@dxos/echo-protocol";
-import { invariant as invariant11 } from "@dxos/invariant";
+import { DatabaseDirectory as DatabaseDirectory6, SpaceDocVersion as SpaceDocVersion3 } from "@dxos/echo-protocol";
+import { invariant as invariant12 } from "@dxos/invariant";
 
 // src/db-host/automerge-metrics.ts
 import * as A5 from "@automerge/automerge";
-import { log as log11 } from "@dxos/log";
-var __dxlog_file13 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/automerge-metrics.ts";
+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 start = Date.now();
@@ -4381,10 +5514,10 @@ var measureDocMetrics = (doc) => {
   const mutationCount = A5.getAllChanges(doc).length;
   const getAllChangesEnd = Date.now();
   if (getAllChangesEnd - getAllChangesStart > 300) {
-    log11.warn("getAllChanges took too long", {
+    log13.warn("getAllChanges took too long", {
       elapsed: getAllChangesEnd - getAllChangesStart
     }, {
-      F: __dxlog_file13,
+      F: __dxlog_file16,
       L: 31,
       S: void 0,
       C: (f, a) => f(...a)
@@ -4398,7 +5531,7 @@ var measureDocMetrics = (doc) => {
 };
 
 // src/db-host/database-root.ts
-var __dxlog_file14 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/database-root.ts";
+var __dxlog_file17 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/database-root.ts";
 var DatabaseRoot = class {
   _rootHandle;
   static mapLinks(doc, mapping) {
@@ -4437,14 +5570,14 @@ var DatabaseRoot = class {
     if (!doc) {
       return null;
     }
-    return doc.version ?? SpaceDocVersion2.LEGACY;
+    return doc.version ?? SpaceDocVersion3.LEGACY;
   }
   getSpaceKey() {
     const doc = this.doc();
     if (!doc) {
       return null;
     }
-    return DatabaseDirectory5.getSpaceKey(doc);
+    return DatabaseDirectory6.getSpaceKey(doc);
   }
   getInlineObjectCount() {
     const doc = this.doc();
@@ -4462,8 +5595,8 @@ var DatabaseRoot = class {
   }
   getAllLinkedDocuments() {
     const doc = this.doc();
-    invariant11(doc, void 0, {
-      F: __dxlog_file14,
+    invariant12(doc, void 0, {
+      F: __dxlog_file17,
       L: 88,
       S: this,
       A: [
@@ -4483,13 +5616,13 @@ var DatabaseRoot = class {
 };
 
 // src/db-host/space-state-manager.ts
-var __dxlog_file15 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/space-state-manager.ts";
+var __dxlog_file18 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/db-host/space-state-manager.ts";
 var SpaceStateManager = class extends Resource8 {
   _roots = /* @__PURE__ */ new Map();
   _rootBySpace = /* @__PURE__ */ new Map();
   _perRootContext = /* @__PURE__ */ new Map();
   _lastSpaceDocumentList = /* @__PURE__ */ new Map();
-  spaceDocumentListUpdated = new Event3();
+  spaceDocumentListUpdated = new Event4();
   async _close(ctx) {
     for (const [_, rootCtx] of this._perRootContext) {
       await rootCtx.dispose();
@@ -4499,6 +5632,9 @@ var SpaceStateManager = class extends Resource8 {
   get roots() {
     return this._roots;
   }
+  get spaceIds() {
+    return Array.from(this._rootBySpace.keys());
+  }
   getRootByDocumentId(documentId) {
     return this._roots.get(documentId);
   }
@@ -4506,9 +5642,9 @@ var SpaceStateManager = class extends Resource8 {
     return this._rootBySpace.get(spaceId);
   }
   getRootBySpaceId(spaceId) {
-    invariant12(this._lifecycleState === LifecycleState4.OPEN, void 0, {
-      F: __dxlog_file15,
-      L: 44,
+    invariant13(this._lifecycleState === LifecycleState4.OPEN, void 0, {
+      F: __dxlog_file18,
+      L: 48,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -4538,9 +5674,9 @@ var SpaceStateManager = class extends Resource8 {
       this._perRootContext.delete(prevRootId);
     }
     this._rootBySpace.set(spaceId, root.handle.documentId);
-    const ctx = new Context5(void 0, {
-      F: __dxlog_file15,
-      L: 72
+    const ctx = new Context7(void 0, {
+      F: __dxlog_file18,
+      L: 76
     });
     this._perRootContext.set(root.handle.documentId, ctx);
     await root.handle.whenReady();
@@ -4576,11 +5712,24 @@ var SpaceDocumentListUpdatedEvent = class {
   }
 };
 
+// src/db-host/stub.ts
+var QueueServiceStub = class {
+  queryQueue(request) {
+    throw new Error("Not available.");
+  }
+  insertIntoQueue(request) {
+    throw new Error("Not available.");
+  }
+  deleteFromQueue(request) {
+    throw new Error("Not available.");
+  }
+};
+
 // src/db-host/echo-host.ts
-var __dxlog_file16 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/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(dmaretskyi): Disabled by default since embedding generation is expensive.
-  fullText: false,
+  // TODO(mykola): Enable by default when SQLite indexer is stable.
+  sqlIndex: false,
   vector: false
 };
 var EchoHost = class extends Resource9 {
@@ -4591,9 +5740,18 @@ var EchoHost = class extends Resource9 {
   _dataService;
   _spaceStateManager = new SpaceStateManager();
   _echoDataMonitor;
-  constructor({ kv, indexing = {}, peerIdProvider, getSpaceKeyByRootDocumentId }) {
+  _automergeDataSource;
+  _indexer2;
+  _indexConfig;
+  _runtime;
+  _feedStore;
+  _queueDataSource;
+  _updateIndexes;
+  _queuesService;
+  _indexesUpToDate = false;
+  constructor({ kv, localQueues, indexing = {}, peerIdProvider, getSpaceKeyByRootDocumentId, runtime, assignQueuePositions = false }) {
     super();
-    const indexingConfig = {
+    this._indexConfig = {
       ...DEFAULT_INDEXING_CONFIG,
       ...indexing
     };
@@ -4608,6 +5766,22 @@ var EchoHost = class extends Resource9 {
       peerIdProvider,
       getSpaceKeyByRootDocumentId
     });
+    this._runtime = runtime;
+    this._automergeDataSource = new AutomergeDataSource(this._automergeHost);
+    if (localQueues) {
+      this._feedStore = new FeedStore({
+        assignPositions: assignQueuePositions,
+        localActorId: crypto.randomUUID()
+      });
+      this._queueDataSource = new QueueDataSource({
+        feedStore: this._feedStore,
+        runtime: this._runtime,
+        getSpaceIds: () => this._spaceStateManager.spaceIds
+      });
+      this._queuesService = new LocalQueueServiceImpl(runtime, this._feedStore);
+    } else {
+      this._queuesService = new QueueServiceStub();
+    }
     this._indexer = new Indexer({
       db: kv,
       indexStore: new IndexStore({
@@ -4627,21 +5801,19 @@ var EchoHost = class extends Resource9 {
         {
           kind: IndexKind.Kind.GRAPH
         },
-        ...indexingConfig.fullText ? [
-          {
-            kind: IndexKind.Kind.FULL_TEXT
-          }
-        ] : [],
-        ...indexingConfig.vector ? [
+        ...this._indexConfig.vector ? [
           {
             kind: IndexKind.Kind.VECTOR
           }
         ] : []
       ]
     });
+    this._indexer2 = new IndexEngine();
     this._queryService = new QueryServiceImpl({
       automergeHost: this._automergeHost,
       indexer: this._indexer,
+      indexer2: this._indexConfig.sqlIndex ? this._indexer2 : void 0,
+      runtime: this._indexConfig.sqlIndex ? this._runtime : void 0,
       spaceStateManager: this._spaceStateManager
     });
     this._dataService = new DataServiceImpl({
@@ -4649,6 +5821,11 @@ var EchoHost = class extends Resource9 {
       spaceStateManager: this._spaceStateManager,
       updateIndexes: async () => {
         await this._indexer.updateIndexes();
+        if (this._indexConfig.sqlIndex) {
+          do {
+            await this._updateIndexes.runBlocking();
+          } while (!this._indexesUpToDate);
+        }
       }
     });
     trace5.diagnostic({
@@ -4695,20 +5872,36 @@ var EchoHost = class extends Resource9 {
   get dataService() {
     return this._dataService;
   }
-  /**
-  * @deprecated To be abstracted away.
-  */
-  get automergeRepo() {
-    return this._automergeHost.repo;
+  get queuesService() {
+    return this._queuesService;
   }
   get roots() {
     return this._spaceStateManager.roots;
   }
+  /**
+  * New index-core indexer for text and other queries.
+  */
+  get indexer2() {
+    return this._indexer2;
+  }
   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.sqlIndex) {
+          this._updateIndexes.schedule();
+        }
+      });
+    }
+    if (this._indexConfig.sqlIndex) {
+      await RuntimeProvider3.runPromise(this._runtime)(this._indexer2.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));
@@ -4717,7 +5910,13 @@ var EchoHost = class extends Resource9 {
     });
     this._automergeHost.documentsSaved.on(this._ctx, () => {
       this._queryService.invalidateQueries();
+      if (this._indexConfig.sqlIndex) {
+        this._updateIndexes.schedule();
+      }
     });
+    if (this._indexConfig.sqlIndex) {
+      this._updateIndexes.schedule();
+    }
   }
   async _close(ctx) {
     await this._queryService.close(ctx);
@@ -4749,16 +5948,16 @@ var EchoHost = class extends Resource9 {
   /**
   * Create new persisted document.
   */
-  createDoc(initialValue, opts) {
+  async createDoc(initialValue, opts) {
     return this._automergeHost.createDoc(initialValue, opts);
   }
   /**
   * Create new space root.
   */
   async createSpaceRoot(spaceKey) {
-    invariant13(this._lifecycleState === LifecycleState5.OPEN, void 0, {
-      F: __dxlog_file16,
-      L: 254,
+    invariant14(this._lifecycleState === LifecycleState5.OPEN, void 0, {
+      F: __dxlog_file19,
+      L: 342,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -4766,8 +5965,8 @@ var EchoHost = class extends Resource9 {
       ]
     });
     const spaceId = await createIdFromSpaceKey2(spaceKey);
-    const automergeRoot = this._automergeHost.createDoc({
-      version: SpaceDocVersion3.CURRENT,
+    const automergeRoot = await this._automergeHost.createDoc({
+      version: SpaceDocVersion4.CURRENT,
       access: {
         spaceKey: spaceKey.toHex()
       },
@@ -4784,21 +5983,26 @@ var EchoHost = class extends Resource9 {
   }
   // TODO(dmaretskyi): Change to document id.
   async openSpaceRoot(spaceId, automergeUrl) {
-    invariant13(this._lifecycleState === LifecycleState5.OPEN, void 0, {
-      F: __dxlog_file16,
-      L: 273,
+    invariant14(this._lifecycleState === LifecycleState5.OPEN, void 0, {
+      F: __dxlog_file19,
+      L: 361,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
         ""
       ]
     });
-    const handle = await this._automergeHost.repo.find(automergeUrl, FIND_PARAMS);
+    const handle = await this._automergeHost.loadDoc(Context8.default(void 0, {
+      F: __dxlog_file19,
+      L: 362
+    }), automergeUrl, {
+      fetchFromNetwork: true
+    });
     await handle.whenReady();
     return this._spaceStateManager.assignRootToSpace(spaceId, handle);
   }
   // TODO(dmaretskyi): Change to document id.
-  async closeSpaceRoot(automergeUrl) {
+  async closeSpaceRoot(_automergeUrl) {
     todo();
   }
   /**
@@ -4813,16 +6017,102 @@ var EchoHost = class extends Resource9 {
   async removeReplicator(replicator) {
     await this._automergeHost.removeReplicator(replicator);
   }
+  /**
+  * Run collection sync for the given space.
+  * Does not wait for the sync to complete.
+  */
+  async runCollectionSync(spaceId) {
+    const root = this._spaceStateManager.getRootBySpaceId(spaceId);
+    if (!root) {
+      throw new Error(`Space not found: ${spaceId}`);
+    }
+    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, {
+        spaceId: null,
+        limit: 50
+      }).pipe(RuntimeProvider3.runPromise(this._runtime));
+      totalUpdated += updated;
+      totalDone &&= done;
+      performance.measure("Index Automerge", {
+        start: "indexer2.update.automerge:start",
+        detail: {
+          devtools: {
+            dataType: "track-entry",
+            track: "Indexing",
+            trackGroup: "ECHO",
+            color: "tertiary-dark",
+            properties: [
+              [
+                "count",
+                updated
+              ]
+            ]
+          }
+        }
+      });
+    }
+    if (this._queueDataSource) {
+      performance.mark("indexer2.update.queue:start");
+      const { updated, done } = await this._indexer2.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",
+        detail: {
+          devtools: {
+            dataType: "track-entry",
+            track: "Indexing",
+            trackGroup: "ECHO",
+            color: "tertiary-dark",
+            properties: [
+              [
+                "count",
+                updated
+              ]
+            ]
+          }
+        }
+      });
+    }
+    log14.verbose("indexer2 update completed", {
+      updated: totalUpdated,
+      done: totalDone
+    }, {
+      F: __dxlog_file19,
+      L: 452,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    await sleep(1);
+    if (!totalDone) {
+      this._indexesUpToDate = false;
+      this._updateIndexes.schedule();
+    } else {
+      this._indexesUpToDate = true;
+    }
+  };
 };
 
 // src/edge/echo-edge-replicator.ts
 import * as Automerge from "@automerge/automerge";
 import { cbor as cbor2 } from "@automerge/automerge-repo";
 import { Mutex, scheduleMicroTask as scheduleMicroTask2, scheduleTask as scheduleTask2 } from "@dxos/async";
-import { Context as Context6, Resource as Resource11 } from "@dxos/context";
+import { Context as Context9, Resource as Resource11 } from "@dxos/context";
 import { randomUUID } from "@dxos/crypto";
-import { invariant as invariant14 } from "@dxos/invariant";
-import { log as log13 } from "@dxos/log";
+import { invariant as invariant15 } from "@dxos/invariant";
+import { log as log16 } from "@dxos/log";
 import { DocumentCodec, EdgeService } from "@dxos/protocols";
 import { buf } from "@dxos/protocols/buf";
 import { MessageSchema as RouterMessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
@@ -4831,8 +6121,8 @@ import { bufferToArray as bufferToArray2, setDeep } from "@dxos/util";
 // src/edge/inflight-request-limiter.ts
 import { Trigger as Trigger2 } from "@dxos/async";
 import { Resource as Resource10 } from "@dxos/context";
-import { log as log12 } from "@dxos/log";
-var __dxlog_file17 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/edge/inflight-request-limiter.ts";
+import { log as log15 } from "@dxos/log";
+var __dxlog_file20 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/edge/inflight-request-limiter.ts";
 var InflightRequestLimiter = class extends Resource10 {
   _config;
   /**
@@ -4867,8 +6157,8 @@ var InflightRequestLimiter = class extends Resource10 {
     if (this._inflightRequestBalance === this._config.maxInflightRequests) {
       this._requestBarrier.reset();
       this._resetBalanceTimeout = setTimeout(() => {
-        log12.warn("Request balance has not changed during specified timeout, resetting request limiter.", void 0, {
-          F: __dxlog_file17,
+        log15.warn("Request balance has not changed during specified timeout, resetting request limiter.", void 0, {
+          F: __dxlog_file20,
           L: 52,
           S: this,
           C: (f, a) => f(...a)
@@ -4956,7 +6246,7 @@ function _ts_dispose_resources(env) {
     return next();
   })(env);
 }
-var __dxlog_file18 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/edge/echo-edge-replicator.ts";
+var __dxlog_file21 = "/__w/dxos/dxos/packages/core/echo/echo-pipeline/src/edge/echo-edge-replicator.ts";
 var INITIAL_RESTART_DELAY = 500;
 var RESTART_DELAY_JITTER = 250;
 var MAX_RESTART_DELAY = 5e3;
@@ -4975,19 +6265,19 @@ var EchoEdgeReplicator = class {
     this._sharePolicyEnabled = !disableSharePolicy;
   }
   async connect(context) {
-    log13("connecting...", {
+    log16("connecting...", {
       peerId: context.peerId,
       connectedSpaces: this._connectedSpaces.size
     }, {
-      F: __dxlog_file18,
-      L: 73,
+      F: __dxlog_file21,
+      L: 74,
       S: this,
       C: (f, a) => f(...a)
     });
     this._context = context;
-    this._ctx = Context6.default(void 0, {
-      F: __dxlog_file18,
-      L: 75
+    this._ctx = Context9.default(void 0, {
+      F: __dxlog_file21,
+      L: 76
     });
     this._ctx.onDispose(this._edgeConnection.onReconnected(() => {
       this._ctx && scheduleMicroTask2(this._ctx, () => this._handleReconnect());
@@ -5047,6 +6337,14 @@ var EchoEdgeReplicator = class {
       hasError: false
     };
     try {
+      log16("connectToSpace", {
+        spaceId
+      }, {
+        F: __dxlog_file21,
+        L: 111,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       const _guard = _ts_add_disposable_resource(env, await this._mutex.acquire(), false);
       if (this._connectedSpaces.has(spaceId)) {
         return;
@@ -5084,18 +6382,18 @@ var EchoEdgeReplicator = class {
     }
   }
   async _openConnection(spaceId, reconnects = 0) {
-    invariant14(this._context, void 0, {
-      F: __dxlog_file18,
-      L: 136,
+    invariant15(this._context, void 0, {
+      F: __dxlog_file21,
+      L: 138,
       S: this,
       A: [
         "this._context",
         ""
       ]
     });
-    invariant14(!this._connections.has(spaceId), void 0, {
-      F: __dxlog_file18,
-      L: 137,
+    invariant15(!this._connections.has(spaceId), void 0, {
+      F: __dxlog_file21,
+      L: 139,
       S: this,
       A: [
         "!this._connections.has(spaceId)",
@@ -5110,22 +6408,22 @@ var EchoEdgeReplicator = class {
       context: this._context,
       sharedPolicyEnabled: this._sharePolicyEnabled,
       onRemoteConnected: async () => {
-        log13.trace("dxos.echo.edge.replicator.onRemoteConnected", {
+        log16.trace("dxos.echo.edge.replicator.onRemoteConnected", {
           spaceId
         }, {
-          F: __dxlog_file18,
-          L: 148,
+          F: __dxlog_file21,
+          L: 150,
           S: this,
           C: (f, a) => f(...a)
         });
         this._context?.onConnectionOpen(connection);
       },
       onRemoteDisconnected: async () => {
-        log13.trace("dxos.echo.edge.replicator.onRemoteDisconnected", {
+        log16.trace("dxos.echo.edge.replicator.onRemoteDisconnected", {
           spaceId
         }, {
-          F: __dxlog_file18,
-          L: 152,
+          F: __dxlog_file21,
+          L: 154,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5136,13 +6434,13 @@ var EchoEdgeReplicator = class {
           return;
         }
         const restartDelay = Math.min(MAX_RESTART_DELAY, INITIAL_RESTART_DELAY * reconnects) + Math.random() * RESTART_DELAY_JITTER;
-        log13("connection restart scheduled", {
+        log16("connection restart scheduled", {
           spaceId,
           reconnects,
           restartDelay
         }, {
-          F: __dxlog_file18,
-          L: 163,
+          F: __dxlog_file21,
+          L: 165,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5164,13 +6462,13 @@ var EchoEdgeReplicator = class {
             if (ctx?.disposed) {
               return;
             }
-            log13.trace("dxos.echo.edge.replicator.restart", {
+            log16.trace("dxos.echo.edge.replicator.restart", {
               spaceId,
               reconnects,
               restartDelay
             }, {
-              F: __dxlog_file18,
-              L: 180,
+              F: __dxlog_file21,
+              L: 182,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5235,9 +6533,9 @@ var EdgeReplicatorConnection = class extends Resource11 {
     });
   }
   async _open(ctx) {
-    log13("opening...", void 0, {
-      F: __dxlog_file18,
-      L: 273,
+    log16("opening...", void 0, {
+      F: __dxlog_file21,
+      L: 275,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5250,9 +6548,9 @@ var EdgeReplicatorConnection = class extends Resource11 {
       // NOTE: This will fire immediately if the connection is already open.
       this._edgeConnection.onReconnected(async () => {
         if (firstReconnect) {
-          log13.verbose("first reconnect skipped", void 0, {
-            F: __dxlog_file18,
-            L: 288,
+          log16.verbose("first reconnect skipped", void 0, {
+            F: __dxlog_file21,
+            L: 290,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5265,9 +6563,9 @@ var EdgeReplicatorConnection = class extends Resource11 {
     await this._onRemoteConnected();
   }
   async _close() {
-    log13("closing...", void 0, {
-      F: __dxlog_file18,
-      L: 301,
+    log16("closing...", void 0, {
+      F: __dxlog_file21,
+      L: 303,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5276,9 +6574,9 @@ var EdgeReplicatorConnection = class extends Resource11 {
     await this._onRemoteDisconnected();
   }
   get peerId() {
-    invariant14(this._remotePeerId, "Not connected", {
-      F: __dxlog_file18,
-      L: 310,
+    invariant15(this._remotePeerId, "Not connected", {
+      F: __dxlog_file21,
+      L: 312,
       S: this,
       A: [
         "this._remotePeerId",
@@ -5297,13 +6595,13 @@ var EdgeReplicatorConnection = class extends Resource11 {
         documentId: params.documentId,
         peerId: this._remotePeerId
       });
-      log13.verbose("document not found locally for share policy check", {
+      log16.verbose("document not found locally for share policy check", {
         documentId: params.documentId,
         acceptDocument: remoteDocumentExists,
         remoteId: this._remotePeerId
       }, {
-        F: __dxlog_file18,
-        L: 325,
+        F: __dxlog_file21,
+        L: 327,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5323,12 +6621,12 @@ var EdgeReplicatorConnection = class extends Resource11 {
       return;
     }
     const payload = cbor2.decode(message.payload.value);
-    log13.verbose("received", {
+    log16.verbose("received", {
       ...getMessageInfo(payload),
       remoteId: this._remotePeerId
     }, {
-      F: __dxlog_file18,
-      L: 354,
+      F: __dxlog_file21,
+      L: 356,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5360,6 +6658,14 @@ var EdgeReplicatorConnection = class extends Resource11 {
   }
   _processMessage(message) {
     if (isErrorMessage(message)) {
+      log16.verbose("stream error", {
+        error: message.message
+      }, {
+        F: __dxlog_file21,
+        L: 392,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       this._onRestartRequested();
       return;
     }
@@ -5376,12 +6682,12 @@ var EdgeReplicatorConnection = class extends Resource11 {
       "metadata",
       "dxos_connectionId"
     ], this._connectionId);
-    log13.verbose("sending...", {
+    log16.verbose("sending...", {
       ...getMessageInfo(message),
       remoteId: this._remotePeerId
     }, {
-      F: __dxlog_file18,
-      L: 407,
+      F: __dxlog_file21,
+      L: 410,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5398,11 +6704,11 @@ var EdgeReplicatorConnection = class extends Resource11 {
         }
       }));
     } catch (err) {
-      log13.error("failed to send message", {
+      log16.error("failed to send message", {
         err
       }, {
-        F: __dxlog_file18,
-        L: 426,
+        F: __dxlog_file21,
+        L: 429,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5418,6 +6724,7 @@ var getMessageInfo = (msg) => {
   return {
     type: msg.type,
     documentId: "documentId" in msg ? msg.documentId : void 0,
+    collectionId: "collectionId" in msg ? msg.collectionId : void 0,
     have,
     heads,
     need,
@@ -5427,16 +6734,20 @@ var getMessageInfo = (msg) => {
 };
 
 // src/util.ts
-import { ObjectStructure as ObjectStructure2, decodeReference } from "@dxos/echo-protocol";
+import { EncodedReference, 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 && decodeReference(objType).objectId === typename) {
-      return [
-        id,
-        obj
-      ];
+    if (objType) {
+      const typeDXN = EncodedReference.toDXN(objType);
+      const typeDXNInfo = typeDXN.asTypeDXN();
+      if (typeDXNInfo?.type === typename) {
+        return [
+          id,
+          obj
+        ];
+      }
     }
   }
   return void 0;
@@ -5444,6 +6755,7 @@ var findInlineObjectOfType = (spaceDoc, typename) => {
 export {
   AuthExtension,
   AuthStatus,
+  AutomergeDataSource,
   AutomergeHost,
   CredentialRetrieverExtension,
   CredentialServerExtension,
@@ -5484,6 +6796,7 @@ export {
   findInlineObjectOfType,
   getSpaceIdFromCollectionId,
   hasInvitationExpired,
+  headsCodec,
   mapFeedIndexesToTimeframe,
   mapTimeframeToFeedIndexes,
   startAfter,