@dxos/client-services 0.5.1-main.16a1d7d → 0.5.1-next.2ad6c47

package/dist/lib/browser/{chunk-XEGUH2J7.mjs → chunk-CMVTOS5E.mjs}

@@ -3277,7 +3277,7 @@ var DataSpace = class {
     this._metadataStore = params.metadataStore;
     this._signingContext = params.signingContext;
     this._callbacks = params.callbacks ?? {};
-    this._echoHost = params.echoHost;
+    this._automergeHost = params.automergeHost;
     this.authVerifier = new TrustedKeySetAuthVerifier({
       trustedKeysProvider: () => new ComplexSet3(PublicKey9.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
       update: this._inner.stateUpdate,
@@ -3289,7 +3289,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file11,
-      L: 135,
+      L: 140,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3339,7 +3339,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file11,
-      L: 193,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3357,7 +3357,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file11,
-      L: 207,
+      L: 212,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3389,7 +3389,7 @@ var DataSpace = class {
         if (err instanceof CancelledError || err instanceof ContextDisposedError) {
           log9("data pipeline initialization cancelled", err, {
             F: __dxlog_file11,
-            L: 240,
+            L: 245,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3397,7 +3397,7 @@ var DataSpace = class {
         }
         log9.error("Error initializing data pipeline", err, {
           F: __dxlog_file11,
-          L: 244,
+          L: 249,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3406,7 +3406,7 @@ var DataSpace = class {
           state: SpaceState[this._state]
         }, {
           F: __dxlog_file11,
-          L: 246,
+          L: 251,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3426,7 +3426,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file11,
-      L: 262,
+      L: 267,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3436,7 +3436,7 @@ var DataSpace = class {
     await cancelWithContext2(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
     log9("data pipeline ready", void 0, {
       F: __dxlog_file11,
-      L: 274,
+      L: 279,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3446,7 +3446,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file11,
-      L: 278,
+      L: 283,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3462,7 +3462,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log9("writable feeds created", void 0, {
       F: __dxlog_file11,
-      L: 294,
+      L: 299,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3525,12 +3525,12 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file11,
-      L: 360,
+      L: 365,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._echoHost.replicateDocument(rootUrl);
-    const handle = this._echoHost.automergeRepo.find(rootUrl);
+    this._automergeHost._requestedDocs.add(rootUrl);
+    const handle = this._automergeHost.repo.find(rootUrl);
     queueMicrotask(async () => {
       try {
         await warnAfterTimeout(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
@@ -3557,7 +3557,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file11,
-          L: 383,
+          L: 388,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3595,7 +3595,7 @@ var DataSpace = class {
         break;
       case CreateEpochRequest.Migration.INIT_AUTOMERGE:
         {
-          const document = this._echoHost.automergeRepo.create();
+          const document = this._automergeHost.repo.create();
           epoch = {
             previousId: this._automergeSpaceState.lastEpoch?.id,
             number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
@@ -3607,12 +3607,12 @@ var DataSpace = class {
       case CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY:
         {
           const currentRootUrl = this._automergeSpaceState.rootUrl;
-          const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl);
+          const rootHandle = this._automergeHost.repo.find(currentRootUrl);
           await cancelWithContext2(this._ctx, asyncTimeout(rootHandle.whenReady(), 1e4));
-          const newRoot = this._echoHost.automergeRepo.create(rootHandle.docSync());
+          const newRoot = this._automergeHost.repo.create(rootHandle.docSync());
           invariant10(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
             F: __dxlog_file11,
-            L: 433,
+            L: 438,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
@@ -3631,19 +3631,19 @@ var DataSpace = class {
         {
           log9.info("Fragmenting", void 0, {
             F: __dxlog_file11,
-            L: 445,
+            L: 450,
             S: this,
             C: (f, a) => f(...a)
           });
           const currentRootUrl = this._automergeSpaceState.rootUrl;
-          const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl);
+          const rootHandle = this._automergeHost.repo.find(currentRootUrl);
           await cancelWithContext2(this._ctx, asyncTimeout(rootHandle.whenReady(), 1e4));
           const objects = Object.entries(rootHandle.docSync().objects);
           const properties = objects.find(([_, value]) => value.system.type?.itemId === TYPE_PROPERTIES);
           const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
           invariant10(properties, "Properties not found", {
             F: __dxlog_file11,
-            L: 455,
+            L: 460,
             S: this,
             A: [
               "properties",
@@ -3656,17 +3656,17 @@ var DataSpace = class {
               properties
             ])
           };
-          const newRoot = this._echoHost.automergeRepo.create(newSpaceDoc);
+          const newRoot = this._automergeHost.repo.create(newSpaceDoc);
           invariant10(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
             F: __dxlog_file11,
-            L: 460,
+            L: 465,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
               ""
             ]
           });
-          const docLoader = new AutomergeDocumentLoaderImpl(this.key, this._echoHost.automergeRepo);
+          const docLoader = new AutomergeDocumentLoaderImpl(this.key, this._automergeHost.repo);
           await docLoader.loadSpaceRootDocHandle(this._ctx, {
             rootUrl: newRoot.url
           });
@@ -3728,7 +3728,7 @@ var DataSpace = class {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file11,
-      L: 526,
+      L: 531,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3878,13 +3878,13 @@ var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var DataSpaceManager = class {
-  constructor(_spaceManager, _metadataStore, _keyring, _signingContext, _feedStore, _echoHost, _invitationsManager, params) {
+  constructor(_spaceManager, _metadataStore, _keyring, _signingContext, _feedStore, _automergeHost, _invitationsManager, params) {
     this._spaceManager = _spaceManager;
     this._metadataStore = _metadataStore;
     this._keyring = _keyring;
     this._signingContext = _signingContext;
     this._feedStore = _feedStore;
-    this._echoHost = _echoHost;
+    this._automergeHost = _automergeHost;
     this._invitationsManager = _invitationsManager;
     this._ctx = new Context9();
     this.updated = new Event7();
@@ -3902,7 +3902,7 @@ var DataSpaceManager = class {
   async open() {
     log10("open", void 0, {
       F: __dxlog_file12,
-      L: 102,
+      L: 101,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3910,7 +3910,7 @@ var DataSpaceManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 103,
+      L: 102,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3918,7 +3918,7 @@ var DataSpaceManager = class {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file12,
-      L: 104,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3928,7 +3928,7 @@ var DataSpaceManager = class {
           spaceMetadata
         }, {
           F: __dxlog_file12,
-          L: 108,
+          L: 107,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3939,7 +3939,7 @@ var DataSpaceManager = class {
           err
         }, {
           F: __dxlog_file12,
-          L: 111,
+          L: 110,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3956,7 +3956,7 @@ var DataSpaceManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 124,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3964,7 +3964,7 @@ var DataSpaceManager = class {
   async close() {
     log10("close", void 0, {
       F: __dxlog_file12,
-      L: 129,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3980,7 +3980,7 @@ var DataSpaceManager = class {
   async createSpace() {
     invariant11(this._isOpen, "Not open.", {
       F: __dxlog_file12,
-      L: 142,
+      L: 141,
       S: this,
       A: [
         "this._isOpen",
@@ -4001,18 +4001,23 @@ var DataSpaceManager = class {
       spaceKey
     }, {
       F: __dxlog_file12,
-      L: 154,
+      L: 153,
       S: this,
       C: (f, a) => f(...a)
     });
-    const automergeRootUrl = await this._echoHost.createSpaceRoot(spaceKey);
+    const automergeRoot = this._automergeHost.repo.create();
+    automergeRoot.change((doc) => {
+      doc.access = {
+        spaceKey: spaceKey.toHex()
+      };
+    });
     const space = await this._constructSpace(metadata);
-    const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRootUrl);
+    const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRoot.url);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
     invariant11(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file12,
-      L: 163,
+      L: 166,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -4030,13 +4035,13 @@ var DataSpaceManager = class {
       opts
     }, {
       F: __dxlog_file12,
-      L: 175,
+      L: 178,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant11(this._isOpen, "Not open.", {
       F: __dxlog_file12,
-      L: 176,
+      L: 179,
       S: this,
       A: [
         "this._isOpen",
@@ -4045,7 +4050,7 @@ var DataSpaceManager = class {
     });
     invariant11(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file12,
-      L: 177,
+      L: 180,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -4080,7 +4085,7 @@ var DataSpaceManager = class {
       metadata
     }, {
       F: __dxlog_file12,
-      L: 210,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4112,13 +4117,13 @@ var DataSpaceManager = class {
           remotePeerId: session.remotePeerId
         }));
         session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
-        this._echoHost.authorizeDevice(space.key, session.remotePeerId);
-        session.addExtension("dxos.mesh.teleport.automerge", this._echoHost.createReplicationExtension());
+        this._automergeHost.authorizeDevice(space.key, session.remotePeerId);
+        session.addExtension("dxos.mesh.teleport.automerge", this._automergeHost.createExtension());
       },
       onAuthFailure: () => {
         log10.warn("auth failure", void 0, {
           F: __dxlog_file12,
-          L: 247,
+          L: 250,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4138,7 +4143,6 @@ var DataSpaceManager = class {
       presence,
       keyring: this._keyring,
       feedStore: this._feedStore,
-      echoHost: this._echoHost,
       signingContext: this._signingContext,
       callbacks: {
         beforeReady: async () => {
@@ -4146,7 +4150,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file12,
-            L: 269,
+            L: 271,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4157,7 +4161,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file12,
-            L: 272,
+            L: 274,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4173,13 +4177,14 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file12,
-            L: 279,
+            L: 281,
             S: this,
             C: (f, a) => f(...a)
           });
         }
       },
-      cache: metadata.cache
+      cache: metadata.cache,
+      automergeHost: this._automergeHost
     });
     if (metadata.state !== SpaceState2.INACTIVE) {
       await dataSpace.open();
@@ -4464,9 +4469,9 @@ import { Trigger as Trigger5 } from "@dxos/async";
 import { Context as Context10, Resource } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
-import { EchoHost } from "@dxos/echo-db";
-import { MetadataStore, SnapshotStore, SpaceManager, valueEncoding } from "@dxos/echo-pipeline";
+import { AutomergeHost, MetadataStore, SnapshotStore, SpaceManager, valueEncoding } from "@dxos/echo-pipeline";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
+import { IndexMetadataStore, IndexStore, Indexer, createStorageCallbacks } from "@dxos/indexing";
 import { invariant as invariant13 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
 import { PublicKey as PublicKey11 } from "@dxos/keys";
@@ -4476,6 +4481,37 @@ import { Invitation as Invitation7 } from "@dxos/protocols/proto/dxos/client/ser
 import { BlobStore } from "@dxos/teleport-extension-object-sync";
 import { trace as Trace2 } from "@dxos/tracing";
 import { safeInstanceof } from "@dxos/util";
+
+// packages/sdk/client-services/src/packlets/indexing/util.ts
+import { getHeads } from "@dxos/automerge/automerge";
+import { idCodec } from "@dxos/protocols";
+var createSelectedDocumentsIterator = (automergeHost) => (
+  /**
+  * Get object data blobs from Automerge Repo by ids.
+  * @param ids
+  */
+  // TODO(mykola): Unload automerge handles after usage.
+  async function* loadDocuments(ids) {
+    for (const id of ids) {
+      const { documentId, objectId } = idCodec.decode(id);
+      const handle = automergeHost.repo.handles[documentId] ?? automergeHost.repo.find(documentId);
+      if (!handle.isReady()) {
+        await handle.whenReady();
+      }
+      const doc = handle.docSync();
+      const hash = getHeads(doc).join("");
+      yield doc.objects?.[objectId] ? [
+        {
+          id,
+          object: doc.objects[objectId],
+          currentHash: hash
+        }
+      ] : [];
+    }
+  }
+);
+
+// packages/sdk/client-services/src/packlets/services/service-context.ts
 function _ts_decorate6(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -4520,9 +4556,24 @@ var ServiceContext = class extends Resource {
       snapshotStore: this.snapshotStore
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams);
-    this.echoHost = new EchoHost({
-      kv: this.level,
-      storage: this.storage
+    this.indexMetadata = new IndexMetadataStore({
+      db: level.sublevel("index-metadata")
+    });
+    this.automergeHost = new AutomergeHost({
+      directory: storage.createDirectory("automerge"),
+      db: level.sublevel("automerge"),
+      storageCallbacks: createStorageCallbacks({
+        host: () => this.automergeHost,
+        metadata: this.indexMetadata
+      })
+    });
+    this.indexer = new Indexer({
+      db: this.level,
+      indexStore: new IndexStore({
+        db: level.sublevel("index-storage")
+      }),
+      metadataStore: this.indexMetadata,
+      loadDocuments: createSelectedDocumentsIterator(this.automergeHost)
     });
     this.invitations = new InvitationsHandler(this.networkManager);
     this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
@@ -4532,7 +4583,7 @@ var ServiceContext = class extends Resource {
     await this._checkStorageVersion();
     log12("opening...", void 0, {
       F: __dxlog_file14,
-      L: 151,
+      L: 164,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4540,13 +4591,13 @@ var ServiceContext = class extends Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file14,
-      L: 152,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
     await this.signalManager.open();
     await this.networkManager.open();
-    await this.echoHost.open(ctx);
+    await this.automergeHost.open();
     await this.metadataStore.load();
     await this.spaceManager.open();
     await this.identityManager.open(ctx);
@@ -4558,7 +4609,7 @@ var ServiceContext = class extends Resource {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file14,
-      L: 165,
+      L: 178,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4566,38 +4617,39 @@ var ServiceContext = class extends Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file14,
-      L: 167,
+      L: 180,
       S: this,
       C: (f, a) => f(...a)
     });
     log12("opened", void 0, {
       F: __dxlog_file14,
-      L: 168,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async _close(ctx) {
+  async _close() {
     log12("closing...", void 0, {
       F: __dxlog_file14,
-      L: 172,
+      L: 185,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._deviceSpaceSync && this.identityManager.identity) {
       await this.identityManager.identity.space.spaceState.removeCredentialProcessor(this._deviceSpaceSync);
     }
+    await this.automergeHost.close();
     await this.dataSpaceManager?.close();
     await this.identityManager.close();
     await this.spaceManager.close();
     await this.feedStore.close();
-    await this.metadataStore.close();
-    await this.echoHost.close(ctx);
     await this.networkManager.close();
     await this.signalManager.close();
+    await this.metadataStore.close();
+    await this.indexer.destroy();
     log12("closed", void 0, {
       F: __dxlog_file14,
-      L: 184,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4611,7 +4663,7 @@ var ServiceContext = class extends Resource {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant13(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file14,
-      L: 195,
+      L: 209,
       S: this,
       A: [
         "factory",
@@ -4643,7 +4695,7 @@ var ServiceContext = class extends Resource {
   async _initialize(ctx) {
     log12("initializing spaces...", void 0, {
       F: __dxlog_file14,
-      L: 226,
+      L: 240,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4661,12 +4713,12 @@ var ServiceContext = class extends Resource {
         });
       }
     };
-    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, signingContext, this.feedStore, this.echoHost, this.invitationsManager, this._runtimeParams);
+    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, signingContext, this.feedStore, this.automergeHost, this.invitationsManager, this._runtimeParams);
     await this.dataSpaceManager.open();
     this._handlerFactories.set(Invitation7.Kind.SPACE, (invitation) => {
       invariant13(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file14,
-        L: 251,
+        L: 265,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4690,7 +4742,7 @@ var ServiceContext = class extends Resource {
             details: assertion
           }, {
             F: __dxlog_file14,
-            L: 267,
+            L: 281,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4701,7 +4753,7 @@ var ServiceContext = class extends Resource {
             details: assertion
           }, {
             F: __dxlog_file14,
-            L: 271,
+            L: 285,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4712,7 +4764,7 @@ var ServiceContext = class extends Resource {
             details: assertion
           }, {
             F: __dxlog_file14,
-            L: 276,
+            L: 290,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4723,7 +4775,7 @@ var ServiceContext = class extends Resource {
         } catch (err) {
           log12.catch(err, void 0, {
             F: __dxlog_file14,
-            L: 282,
+            L: 296,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4777,7 +4829,7 @@ import { SpaceMember as SpaceMember4 } from "@dxos/protocols/proto/dxos/client/s
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.5.1-main.16a1d7d";
+var DXOS_VERSION = "0.5.1-next.2ad6c47";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -5021,8 +5073,9 @@ import { jsonKeyReplacer as jsonKeyReplacer2, nonNullable } from "@dxos/util";
 import { Event as Event9, synchronized as synchronized3 } from "@dxos/async";
 import { clientServiceBundle, defaultKey, Properties } from "@dxos/client-protocol";
 import { Context as Context11 } from "@dxos/context";
-import { encodeReference } from "@dxos/echo-pipeline";
+import { DataServiceImpl, encodeReference } from "@dxos/echo-pipeline";
 import { getTypeReference } from "@dxos/echo-schema";
+import { QueryServiceImpl } from "@dxos/indexing";
 import { invariant as invariant16 } from "@dxos/invariant";
 import { PublicKey as PublicKey14 } from "@dxos/keys";
 import { log as log16 } from "@dxos/log";
@@ -5629,7 +5682,7 @@ var ClientServicesHost = class {
   initialize({ config, ...options }) {
     invariant16(!this._open, "service host is open", {
       F: __dxlog_file19,
-      L: 190,
+      L: 198,
       S: this,
       A: [
         "!this._open",
@@ -5638,14 +5691,14 @@ var ClientServicesHost = class {
     });
     log16("initializing...", void 0, {
       F: __dxlog_file19,
-      L: 191,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       invariant16(!this._config, "config already set", {
         F: __dxlog_file19,
-        L: 194,
+        L: 202,
         S: this,
         A: [
           "!this._config",
@@ -5660,7 +5713,7 @@ var ClientServicesHost = class {
     if (!options.signalManager) {
       log16.warn("running signaling without telemetry metadata.", void 0, {
         F: __dxlog_file19,
-        L: 202,
+        L: 210,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5671,7 +5724,7 @@ var ClientServicesHost = class {
     this._signalManager = signalManager;
     invariant16(!this._networkManager, "network manager already set", {
       F: __dxlog_file19,
-      L: 213,
+      L: 221,
       S: this,
       A: [
         "!this._networkManager",
@@ -5685,7 +5738,7 @@ var ClientServicesHost = class {
     });
     log16("initialized", void 0, {
       F: __dxlog_file19,
-      L: 220,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5699,13 +5752,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file19,
-      L: 231,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant16(this._config, "config not set", {
       F: __dxlog_file19,
-      L: 233,
+      L: 241,
       S: this,
       A: [
         "this._config",
@@ -5714,7 +5767,7 @@ var ClientServicesHost = class {
     });
     invariant16(this._storage, "storage not set", {
       F: __dxlog_file19,
-      L: 234,
+      L: 242,
       S: this,
       A: [
         "this._storage",
@@ -5723,7 +5776,7 @@ var ClientServicesHost = class {
     });
     invariant16(this._signalManager, "signal manager not set", {
       F: __dxlog_file19,
-      L: 235,
+      L: 243,
       S: this,
       A: [
         "this._signalManager",
@@ -5732,7 +5785,7 @@ var ClientServicesHost = class {
     });
     invariant16(this._networkManager, "network manager not set", {
       F: __dxlog_file19,
-      L: 236,
+      L: 244,
       S: this,
       A: [
         "this._networkManager",
@@ -5744,7 +5797,7 @@ var ClientServicesHost = class {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file19,
-      L: 239,
+      L: 247,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5755,6 +5808,11 @@ var ClientServicesHost = class {
     await this._resourceLock?.acquire();
     await this._loggingService.open();
     this._serviceContext = new ServiceContext(this._storage, this._level, this._networkManager, this._signalManager, this._runtimeParams);
+    this._queryService = new QueryServiceImpl({
+      indexer: this._serviceContext.indexer,
+      automergeHost: this._serviceContext.automergeHost
+    });
+    await this._queryService.open(ctx);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
       IdentityService: new IdentityServiceImpl((params) => this._createIdentity(params), this._serviceContext.identityManager, this._serviceContext.keyring, (profile) => this._serviceContext.broadcastProfileUpdate(profile)),
@@ -5764,8 +5822,8 @@ var ClientServicesHost = class {
         await this._serviceContext.initialized.wait();
         return this._serviceContext.dataSpaceManager;
       }),
-      DataService: this._serviceContext.echoHost.dataService,
-      QueryService: this._serviceContext.echoHost.queryService,
+      DataService: new DataServiceImpl(this._serviceContext.automergeHost),
+      QueryService: this._queryService,
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
       LoggingService: this._loggingService,
       TracingService: this._tracingService,
@@ -5796,7 +5854,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file19,
-      L: 315,
+      L: 330,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5804,7 +5862,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file19,
-      L: 316,
+      L: 331,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5818,7 +5876,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file19,
-      L: 327,
+      L: 342,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5828,6 +5886,7 @@ var ClientServicesHost = class {
       SystemService: this._systemService
     });
     await this._loggingService.close();
+    await this._queryService.close();
     await this._serviceContext.close();
     await this._level?.close();
     this._open = false;
@@ -5836,7 +5895,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file19,
-      L: 336,
+      L: 352,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5847,13 +5906,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file19,
-      L: 341,
+      L: 357,
       S: this,
       C: (f, a) => f(...a)
     });
     log16("resetting...", void 0, {
       F: __dxlog_file19,
-      L: 343,
+      L: 359,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5861,7 +5920,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     log16("reset", void 0, {
       F: __dxlog_file19,
-      L: 346,
+      L: 362,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5869,7 +5928,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file19,
-      L: 347,
+      L: 363,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5882,14 +5941,14 @@ var ClientServicesHost = class {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant16(automergeIndex, void 0, {
       F: __dxlog_file19,
-      L: 359,
+      L: 375,
       S: this,
       A: [
         "automergeIndex",
         ""
       ]
     });
-    const document = await this._serviceContext.echoHost.automergeRepo.find(automergeIndex);
+    const document = await this._serviceContext.automergeHost.repo.find(automergeIndex);
     await document.whenReady();
     const properties = {
       system: {
@@ -5909,7 +5968,7 @@ var ClientServicesHost = class {
         propertiesId
       ], properties);
     });
-    await this._serviceContext.echoHost.flush();
+    await this._serviceContext.automergeHost.repo.flush();
     return identity;
   }
 };
@@ -6009,4 +6068,4 @@ export {
   ClientServicesHost,
   ClientServicesProviderResource
 };
-//# sourceMappingURL=chunk-XEGUH2J7.mjs.map
+//# sourceMappingURL=chunk-CMVTOS5E.mjs.map