@dxos/client-services 0.4.9-main.4fd47cd → 0.4.9-main.7750cb2

package/dist/lib/browser/{chunk-MLGJV5VA.mjs → chunk-D6LYSGMU.mjs}

@@ -2577,8 +2577,7 @@ var SpaceInvitationProtocol = class {
     return {
       space: {
         credential: spaceMemberCredential,
-        controlTimeframe: space.inner.controlPipeline.state.timeframe,
-        dataTimeframe: space.dataPipeline.pipelineState?.timeframe
+        controlTimeframe: space.inner.controlPipeline.state.timeframe
       }
     };
   }
@@ -2607,7 +2606,7 @@ var SpaceInvitationProtocol = class {
   async accept(response) {
     invariant8(response.space, void 0, {
       F: __dxlog_file9,
-      L: 108,
+      L: 107,
       S: this,
       A: [
         "response.space",
@@ -2618,7 +2617,7 @@ var SpaceInvitationProtocol = class {
     const assertion = getCredentialAssertion(credential);
     invariant8(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file9,
-      L: 111,
+      L: 110,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2627,7 +2626,7 @@ var SpaceInvitationProtocol = class {
     });
     invariant8(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
       F: __dxlog_file9,
-      L: 112,
+      L: 111,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
@@ -2734,10 +2733,7 @@ ClientRpcServer = _ts_decorate3([
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 import { getFirstStreamValue } from "@dxos/codec-protobuf";
 import { credentialTypeFilter } from "@dxos/credentials";
-import { DocumentModel } from "@dxos/document-model";
-import { TYPE_PROPERTIES } from "@dxos/echo-db";
 import { invariant as invariant9 } from "@dxos/invariant";
-import { log as log8 } from "@dxos/log";
 import { STORAGE_VERSION } from "@dxos/protocols";
 import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
@@ -2773,7 +2769,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.4.9-main.4fd47cd";
+var DXOS_VERSION = "0.4.9-main.7750cb2";
 
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
@@ -2793,7 +2789,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
   {
     invariant9(clientServices.LoggingService, "SystemService is not available.", {
       F: __dxlog_file10,
-      L: 111,
+      L: 108,
       S: void 0,
       A: [
         "clientServices.LoggingService",
@@ -2850,22 +2846,6 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
   diagnostics.config = config.values;
   return diagnostics;
 };
-var getProperties = (space) => {
-  let properties = {};
-  try {
-    const propertiesItem = space.dataPipeline.itemManager.items.find((item) => item.modelMeta?.type === DocumentModel.meta.type && item.state?.type?.itemId === TYPE_PROPERTIES);
-    const state = propertiesItem?.state;
-    properties = state?.data;
-  } catch (err) {
-    log8.warn(err.message, void 0, {
-      F: __dxlog_file10,
-      L: 196,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-  }
-  return properties;
-};
 var getSpaceStats = async (space) => {
   const stats = {
     key: space.key,
@@ -2885,28 +2865,14 @@ var getSpaceStats = async (space) => {
     })),
     pipeline: {
       // TODO(burdon): Pick properties from credentials if needed.
-      // currentEpoch: space.dataPipeline.currentEpoch,
-      // appliedEpoch: space.dataPipeline.appliedEpoch,
+      currentEpoch: space.automergeSpaceState.lastEpoch,
+      appliedEpoch: space.automergeSpaceState.lastEpoch,
       controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
       currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
       targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
-      totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe,
-      // TODO(burdon): Empty?
-      dataFeeds: space.dataPipeline.pipelineState?.feeds.map((feed) => feed.key) ?? [],
-      startDataTimeframe: space.dataPipeline.pipelineState?.startTimeframe,
-      currentDataTimeframe: space.dataPipeline.pipelineState?.timeframe,
-      targetDataTimeframe: space.dataPipeline.pipelineState?.targetTimeframe,
-      totalDataTimeframe: space.dataPipeline.pipelineState?.endTimeframe
+      totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe
     }
   };
-  if (space.dataPipeline.itemManager) {
-    Object.assign(stats, {
-      properties: getProperties(space),
-      db: {
-        objects: space.dataPipeline.itemManager.entities.size
-      }
-    });
-  }
   if (stats.metrics) {
     const { open, ready } = stats.metrics;
     stats.metrics.startupTime = open && ready && ready.getTime() - open.getTime();
@@ -2915,14 +2881,14 @@ var getSpaceStats = async (space) => {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-import { Event as Event5, asyncTimeout, scheduleTask as scheduleTask5, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
+import { Event as Event6, asyncTimeout, scheduleTask as scheduleTask5, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
 import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
 import { cancelWithContext as cancelWithContext2, Context as Context8, ContextDisposedError } from "@dxos/context";
 import { timed, warnAfterTimeout } from "@dxos/debug";
 import { createMappedFeedWriter } from "@dxos/echo-pipeline";
 import { failedInvariant, invariant as invariant11 } from "@dxos/invariant";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
-import { log as log10 } from "@dxos/log";
+import { log as log9 } from "@dxos/log";
 import { CancelledError, SystemError } from "@dxos/protocols";
 import { SpaceState, CreateEpochRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
@@ -2931,12 +2897,14 @@ import { trace as trace6 } from "@dxos/tracing";
 import { ComplexSet as ComplexSet3 } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/automerge-space-state.ts
+import { Event as Event4 } from "@dxos/async";
 import { checkCredentialType } from "@dxos/credentials";
 var AutomergeSpaceState = class {
   constructor(_onNewRoot) {
     this._onNewRoot = _onNewRoot;
     this.rootUrl = void 0;
     this.lastEpoch = void 0;
+    this.onNewEpoch = new Event4();
     this._isProcessingRootDocs = false;
   }
   async processCredential(credential) {
@@ -2950,6 +2918,7 @@ var AutomergeSpaceState = class {
         this._onNewRoot(this.rootUrl);
       }
     }
+    this.onNewEpoch.emit(credential);
   }
   startProcessingRootDocs() {
     if (this._isProcessingRootDocs) {
@@ -2960,14 +2929,17 @@ var AutomergeSpaceState = class {
     }
     this._isProcessingRootDocs = true;
   }
+  async ensureEpochInitialized() {
+    await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
+  }
 };
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
-import { DeferredTask, Event as Event4, scheduleTask as scheduleTask4, sleep, TimeoutError as TimeoutError2, Trigger as Trigger4 } from "@dxos/async";
+import { DeferredTask, Event as Event5, scheduleTask as scheduleTask4, sleep, TimeoutError as TimeoutError2, Trigger as Trigger4 } from "@dxos/async";
 import { Context as Context7, rejectOnDispose } from "@dxos/context";
 import { invariant as invariant10 } from "@dxos/invariant";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
-import { log as log9 } from "@dxos/log";
+import { log as log8 } from "@dxos/log";
 import { schema as schema3 } from "@dxos/protocols";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
 import { ComplexMap as ComplexMap2, ComplexSet as ComplexSet2, entry } from "@dxos/util";
@@ -2979,7 +2951,7 @@ var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var NotarizationPlugin = class {
   constructor() {
     this._ctx = new Context7();
-    this._extensionOpened = new Event4();
+    this._extensionOpened = new Event5();
     this._extensions = /* @__PURE__ */ new Set();
     this._processedCredentials = new ComplexSet2(PublicKey7.hash);
     this._processCredentialsTriggers = new ComplexMap2(PublicKey7.hash);
@@ -2996,7 +2968,7 @@ var NotarizationPlugin = class {
   * Request credentials to be notarized.
   */
   async notarize({ ctx: opCtx, credentials, timeout = DEFAULT_NOTARIZE_TIMEOUT, retryTimeout = DEFAULT_RETRY_TIMEOUT, successDelay = DEFAULT_SUCCESS_DELAY }) {
-    log9("notarize", {
+    log8("notarize", {
       credentials
     }, {
       F: __dxlog_file11,
@@ -3016,7 +2988,7 @@ var NotarizationPlugin = class {
     const errors = new Trigger4();
     const ctx = this._ctx.derive({
       onError: (err) => {
-        log9.warn("Notarization error", {
+        log8.warn("Notarization error", {
           err
         }, {
           F: __dxlog_file11,
@@ -3031,7 +3003,7 @@ var NotarizationPlugin = class {
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
       scheduleTask4(ctx, () => {
-        log9.warn("Notarization timeout", {
+        log8.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
@@ -3055,7 +3027,7 @@ var NotarizationPlugin = class {
           ...this._extensions
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
-          log9.info("Exhausted all peers to notarize with", {
+          log8.info("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
             F: __dxlog_file11,
@@ -3068,7 +3040,7 @@ var NotarizationPlugin = class {
           return;
         }
         peersTried.add(peer);
-        log9("try notarizing", {
+        log8("try notarizing", {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
@@ -3080,7 +3052,7 @@ var NotarizationPlugin = class {
         await peer.rpc.NotarizationService.notarize({
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
-        log9("success", void 0, {
+        log8("success", void 0, {
           F: __dxlog_file11,
           L: 147,
           S: this,
@@ -3089,7 +3061,7 @@ var NotarizationPlugin = class {
         await sleep(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
-          log9.info("error notarizing (recoverable)", err, {
+          log8.info("error notarizing (recoverable)", err, {
             F: __dxlog_file11,
             L: 151,
             S: this,
@@ -3107,7 +3079,7 @@ var NotarizationPlugin = class {
         allNotarized,
         errors.wait()
       ]);
-      log9("done", void 0, {
+      log8("done", void 0, {
         F: __dxlog_file11,
         L: 162,
         S: this,
@@ -3172,7 +3144,7 @@ var NotarizationPlugin = class {
   createExtension() {
     const extension = new NotarizationTeleportExtension({
       onOpen: async () => {
-        log9("extension opened", {
+        log8("extension opened", {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file11,
@@ -3184,7 +3156,7 @@ var NotarizationPlugin = class {
         this._extensionOpened.emit();
       },
       onClose: async () => {
-        log9("extension closed", {
+        log8("extension closed", {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file11,
@@ -3242,7 +3214,6 @@ function _ts_decorate4(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
-var ENABLE_FEED_PURGE = false;
 var DataSpace = class {
   constructor(params) {
     this._ctx = new Context8();
@@ -3255,7 +3226,7 @@ var DataSpace = class {
     * Error for _state === SpaceState.ERROR.
     */
     this.error = void 0;
-    this.stateUpdate = new Event5();
+    this.stateUpdate = new Event6();
     this.metrics = {};
     this._inner = params.inner;
     this._inner.stateUpdate.on(this._ctx, () => this.stateUpdate.emit());
@@ -3274,11 +3245,11 @@ var DataSpace = class {
     });
     this._cache = params.cache;
     this._state = params.initialState;
-    log10("new state", {
+    log9("new state", {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 141,
+      L: 132,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3296,9 +3267,6 @@ var DataSpace = class {
   get inner() {
     return this._inner;
   }
-  get dataPipeline() {
-    return this._inner.dataPipeline;
-  }
   get presence() {
     return this._presence;
   }
@@ -3327,11 +3295,11 @@ var DataSpace = class {
     await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
     await this._inner.open(new Context8());
     this._state = SpaceState.CONTROL_ONLY;
-    log10("new state", {
+    log9("new state", {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 203,
+      L: 190,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3345,11 +3313,11 @@ var DataSpace = class {
   async _close() {
     await this._callbacks.beforeClose?.();
     this._state = SpaceState.CLOSED;
-    log10("new state", {
+    log9("new state", {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 217,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3379,26 +3347,26 @@ var DataSpace = class {
         await this.initializeDataPipeline();
       } catch (err) {
         if (err instanceof CancelledError || err instanceof ContextDisposedError) {
-          log10("data pipeline initialization cancelled", err, {
+          log9("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 250,
+            L: 237,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
-        log10.error("Error initializing data pipeline", err, {
+        log9.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 254,
+          L: 241,
           S: this,
           C: (f, a) => f(...a)
         });
         this._state = SpaceState.ERROR;
-        log10("new state", {
+        log9("new state", {
           state: SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 256,
+          L: 243,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3414,44 +3382,31 @@ var DataSpace = class {
       throw new SystemError("Invalid operation");
     }
     this._state = SpaceState.INITIALIZING;
-    log10("new state", {
+    log9("new state", {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 272,
+      L: 259,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._initializeAndReadControlPipeline();
     await sleep2(1);
     this._automergeSpaceState.startProcessingRootDocs();
-    await this._inner.initializeDataPipeline();
-    this.metrics.dataPipelineOpen = /* @__PURE__ */ new Date();
-    await cancelWithContext2(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
-    log10("waiting for data pipeline to reach target timeframe", void 0, {
-      F: __dxlog_file12,
-      L: 288,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    await this._inner.dataPipeline.pipelineState.waitUntilReachedTargetTimeframe({
-      ctx: this._ctx,
-      breakOnStall: false
-    });
-    this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
-    log10("data pipeline ready", void 0, {
+    await cancelWithContext2(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
+    log9("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 296,
+      L: 271,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._callbacks.beforeReady?.();
     this._state = SpaceState.READY;
-    log10("new state", {
+    log9("new state", {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 300,
+      L: 275,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3465,9 +3420,9 @@ var DataSpace = class {
     });
     this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
-    log10("writable feeds created", void 0, {
+    log9("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 316,
+      L: 291,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3525,12 +3480,12 @@ var DataSpace = class {
     }
   }
   _onNewAutomergeRoot(rootUrl) {
-    log10("loading automerge root doc for space", {
+    log9("loading automerge root doc for space", {
       space: this.key,
       rootUrl
     }, {
       F: __dxlog_file12,
-      L: 382,
+      L: 357,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3556,13 +3511,13 @@ var DataSpace = class {
         if (err instanceof ContextDisposedError) {
           return;
         }
-        log10.warn("error loading automerge root doc", {
+        log9.warn("error loading automerge root doc", {
           space: this.key,
           rootUrl,
           err
         }, {
           F: __dxlog_file12,
-          L: 405,
+          L: 380,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3590,7 +3545,12 @@ var DataSpace = class {
       case void 0:
       case CreateEpochRequest.Migration.NONE:
         {
-          epoch = await this.dataPipeline.createEpoch();
+          epoch = {
+            previousId: this._automergeSpaceState.lastEpoch?.id,
+            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
+            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe2(),
+            automergeRoot: this._automergeSpaceState.lastEpoch?.subject.assertion?.automergeRoot
+          };
         }
         break;
       case CreateEpochRequest.Migration.INIT_AUTOMERGE:
@@ -3612,7 +3572,7 @@ var DataSpace = class {
           const newRoot = this._automergeHost.repo.create(rootHandle.docSync());
           invariant11(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
             F: __dxlog_file12,
-            L: 450,
+            L: 430,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
@@ -3648,15 +3608,6 @@ var DataSpace = class {
         receipt.seq
       ]
     ]));
-    if (ENABLE_FEED_PURGE) {
-      for (const feed of this.inner.dataPipeline.pipelineState?.feeds ?? []) {
-        const indexBeforeEpoch = epoch.timeframe.get(feed.key);
-        if (indexBeforeEpoch === void 0) {
-          continue;
-        }
-        await feed.safeClear(0, indexBeforeEpoch + 1);
-      }
-    }
   }
   async activate() {
     if (this._state !== SpaceState.INACTIVE) {
@@ -3673,11 +3624,11 @@ var DataSpace = class {
     await this._metadataStore.setSpaceState(this.key, SpaceState.INACTIVE);
     await this._close();
     this._state = SpaceState.INACTIVE;
-    log10("new state", {
+    log9("new state", {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 514,
+      L: 482,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3731,12 +3682,12 @@ DataSpace = _ts_decorate4([
 ], DataSpace);
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
-import { Event as Event6, synchronized as synchronized2, trackLeaks as trackLeaks2 } from "@dxos/async";
-import { cancelWithContext as cancelWithContext3, Context as Context9 } from "@dxos/context";
+import { Event as Event7, synchronized as synchronized2, trackLeaks as trackLeaks2 } from "@dxos/async";
+import { Context as Context9, cancelWithContext as cancelWithContext3 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
 import { invariant as invariant12 } from "@dxos/invariant";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
-import { log as log11 } from "@dxos/log";
+import { log as log10 } from "@dxos/log";
 import { trace as trace7 } from "@dxos/protocols";
 import { SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
 import { Gossip as Gossip2, Presence as Presence2 } from "@dxos/teleport-extension-gossip";
@@ -3827,16 +3778,15 @@ var __dxlog_file13 = "/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, _dataServiceSubscriptions, _keyring, _signingContext, _feedStore, _automergeHost, params) {
+  constructor(_spaceManager, _metadataStore, _keyring, _signingContext, _feedStore, _automergeHost, params) {
     this._spaceManager = _spaceManager;
     this._metadataStore = _metadataStore;
-    this._dataServiceSubscriptions = _dataServiceSubscriptions;
     this._keyring = _keyring;
     this._signingContext = _signingContext;
     this._feedStore = _feedStore;
     this._automergeHost = _automergeHost;
     this._ctx = new Context9();
-    this.updated = new Event6();
+    this.updated = new Event7();
     this._spaces = new ComplexMap3(PublicKey9.hash);
     this._isOpen = false;
     this._instanceId = PublicKey9.random().toHex();
@@ -3849,46 +3799,46 @@ var DataSpaceManager = class {
     return this._spaces;
   }
   async open() {
-    log11("open", void 0, {
+    log10("open", void 0, {
       F: __dxlog_file13,
-      L: 105,
+      L: 98,
       S: this,
       C: (f, a) => f(...a)
     });
-    log11.trace("dxos.echo.data-space-manager.open", trace7.begin({
+    log10.trace("dxos.echo.data-space-manager.open", trace7.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 106,
+      L: 99,
       S: this,
       C: (f, a) => f(...a)
     });
-    log11("metadata loaded", {
+    log10("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file13,
-      L: 107,
+      L: 100,
       S: this,
       C: (f, a) => f(...a)
     });
     await forEachAsync(this._metadataStore.spaces, async (spaceMetadata) => {
       try {
-        log11("load space", {
+        log10("load space", {
           spaceMetadata
         }, {
           F: __dxlog_file13,
-          L: 111,
+          L: 104,
           S: this,
           C: (f, a) => f(...a)
         });
         await this._constructSpace(spaceMetadata);
       } catch (err) {
-        log11.error("Error loading space", {
+        log10.error("Error loading space", {
           spaceMetadata,
           err
         }, {
           F: __dxlog_file13,
-          L: 114,
+          L: 107,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3901,19 +3851,19 @@ var DataSpaceManager = class {
         space.initializeDataPipelineAsync();
       }
     }
-    log11.trace("dxos.echo.data-space-manager.open", trace7.end({
+    log10.trace("dxos.echo.data-space-manager.open", trace7.end({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 127,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    log11("close", void 0, {
+    log10("close", void 0, {
       F: __dxlog_file13,
-      L: 132,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3929,7 +3879,7 @@ var DataSpaceManager = class {
   async createSpace() {
     invariant12(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 145,
+      L: 138,
       S: this,
       A: [
         "this._isOpen",
@@ -3946,11 +3896,11 @@ var DataSpaceManager = class {
       dataFeedKey,
       state: SpaceState2.ACTIVE
     };
-    log11("creating space...", {
+    log10("creating space...", {
       spaceKey
     }, {
       F: __dxlog_file13,
-      L: 157,
+      L: 150,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3966,7 +3916,7 @@ var DataSpaceManager = class {
     const memberCredential = credentials[1];
     invariant12(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file13,
-      L: 170,
+      L: 163,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3980,17 +3930,17 @@ var DataSpaceManager = class {
   }
   // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
-    log11("accept space", {
+    log10("accept space", {
       opts
     }, {
       F: __dxlog_file13,
-      L: 182,
+      L: 175,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant12(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 183,
+      L: 176,
       S: this,
       A: [
         "this._isOpen",
@@ -3999,7 +3949,7 @@ var DataSpaceManager = class {
     });
     invariant12(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file13,
-      L: 184,
+      L: 177,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -4030,11 +3980,11 @@ var DataSpaceManager = class {
     }));
   }
   async _constructSpace(metadata) {
-    log11("construct space", {
+    log10("construct space", {
       metadata
     }, {
       F: __dxlog_file13,
-      L: 217,
+      L: 210,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4070,9 +4020,9 @@ var DataSpaceManager = class {
         session.addExtension("dxos.mesh.teleport.automerge", this._automergeHost.createExtension());
       },
       onAuthFailure: () => {
-        log11.warn("auth failure", void 0, {
+        log10.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 254,
+          L: 247,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4092,23 +4042,22 @@ var DataSpaceManager = class {
       signingContext: this._signingContext,
       callbacks: {
         beforeReady: async () => {
-          log11("before space ready", {
+          log10("before space ready", {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 272,
+            L: 265,
             S: this,
             C: (f, a) => f(...a)
           });
-          await this._dataServiceSubscriptions.registerSpace(space.key, dataSpace.dataPipeline.databaseHost.createDataServiceHost());
         },
         afterReady: async () => {
-          log11("after space ready", {
+          log10("after space ready", {
             space: space.key,
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 279,
+            L: 268,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4117,15 +4066,14 @@ var DataSpaceManager = class {
           }
         },
         beforeClose: async () => {
-          log11("before space close", {
+          log10("before space close", {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 285,
+            L: 274,
             S: this,
             C: (f, a) => f(...a)
           });
-          await this._dataServiceSubscriptions.unregisterSpace(space.key);
         }
       },
       cache: metadata.cache,
@@ -4137,9 +4085,6 @@ var DataSpaceManager = class {
     if (metadata.controlTimeframe) {
       dataSpace.inner.controlPipeline.state.setTargetTimeframe(metadata.controlTimeframe);
     }
-    if (metadata.dataTimeframe) {
-      dataSpace.dataPipeline.setTargetTimeframe(metadata.dataTimeframe);
-    }
     this._spaces.set(metadata.key, dataSpace);
     return dataSpace;
   }
@@ -4165,15 +4110,14 @@ import { EventSubscriptions as EventSubscriptions2, UpdateScheduler, scheduleTas
 import { Stream as Stream10 } from "@dxos/codec-protobuf";
 import { raise as raise2 } from "@dxos/debug";
 import { invariant as invariant13 } from "@dxos/invariant";
-import { log as log12 } from "@dxos/log";
+import { log as log11 } from "@dxos/log";
 import { ApiError, SpaceNotFoundError, encodeError } from "@dxos/protocols";
 import { SpaceMember as SpaceMember3, SpaceState as SpaceState3 } from "@dxos/protocols/proto/dxos/client/services";
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
-  constructor(_identityManager, _spaceManager, _dataServiceSubscriptions, _getDataSpaceManager) {
+  constructor(_identityManager, _spaceManager, _getDataSpaceManager) {
     this._identityManager = _identityManager;
     this._spaceManager = _spaceManager;
-    this._dataServiceSubscriptions = _dataServiceSubscriptions;
     this._getDataSpaceManager = _getDataSpaceManager;
   }
   async createSpace() {
@@ -4205,11 +4149,11 @@ var SpacesServiceImpl = class {
       const scheduler = new UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
-        log12("update", {
+        log11("update", {
           spaces
         }, {
           F: __dxlog_file14,
-          L: 78,
+          L: 77,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4228,11 +4172,8 @@ var SpacesServiceImpl = class {
           for (const space of dataSpaceManager.spaces.values()) {
             subscriptions.add(space.stateUpdate.on(ctx, () => scheduler.forceTrigger()));
             subscriptions.add(space.presence.updated.on(ctx, () => scheduler.trigger()));
-            subscriptions.add(space.dataPipeline.onNewEpoch.on(ctx, () => scheduler.trigger()));
+            subscriptions.add(space.automergeSpaceState.onNewEpoch.on(ctx, () => scheduler.trigger()));
             subscriptions.add(space.inner.controlPipeline.state.timeframeUpdate.on(ctx, () => scheduler.trigger()));
-            if (space.dataPipeline.pipelineState) {
-              subscriptions.add(space.dataPipeline.pipelineState.timeframeUpdate.on(ctx, () => scheduler.trigger()));
-            }
           }
         };
         dataSpaceManager.updated.on(ctx, () => {
@@ -4295,7 +4236,7 @@ var SpacesServiceImpl = class {
       } else {
         invariant13(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file14,
-          L: 168,
+          L: 164,
           S: this,
           A: [
             "!credential.id",
@@ -4304,7 +4245,7 @@ var SpacesServiceImpl = class {
         });
         invariant13(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file14,
-          L: 169,
+          L: 165,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -4314,7 +4255,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         invariant13(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file14,
-          L: 171,
+          L: 167,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -4346,17 +4287,17 @@ var SpacesServiceImpl = class {
       state: space.state,
       error: space.error ? encodeError(space.error) : void 0,
       pipeline: {
-        currentEpoch: space.dataPipeline.currentEpoch,
-        appliedEpoch: space.dataPipeline.appliedEpoch,
+        currentEpoch: space.automergeSpaceState.lastEpoch,
+        appliedEpoch: space.automergeSpaceState.lastEpoch,
         controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
         currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
         targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
         totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe,
-        dataFeeds: space.dataPipeline.pipelineState?.feeds.map((feed) => feed.key) ?? [],
-        startDataTimeframe: space.dataPipeline.pipelineState?.startTimeframe,
-        currentDataTimeframe: space.dataPipeline.pipelineState?.timeframe,
-        targetDataTimeframe: space.dataPipeline.pipelineState?.targetTimeframe,
-        totalDataTimeframe: space.dataPipeline.pipelineState?.endTimeframe
+        dataFeeds: void 0,
+        startDataTimeframe: void 0,
+        currentDataTimeframe: void 0,
+        targetDataTimeframe: void 0,
+        totalDataTimeframe: void 0
       },
       members: Array.from(space.inner.spaceState.members.values()).map((member) => {
         const peers = space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key));
@@ -4386,13 +4327,13 @@ import { Trigger as Trigger5 } from "@dxos/async";
 import { Context as Context10 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
-import { valueEncoding, MetadataStore, SpaceManager, DataServiceSubscriptions, SnapshotStore, AutomergeHost } 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 } from "@dxos/indexing";
 import { invariant as invariant14 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
 import { PublicKey as PublicKey10 } from "@dxos/keys";
-import { log as log13 } from "@dxos/log";
+import { log as log12 } from "@dxos/log";
 import { InvalidStorageVersionError, STORAGE_VERSION as STORAGE_VERSION2, trace as trace8 } from "@dxos/protocols";
 import { Invitation as Invitation6 } from "@dxos/protocols/proto/dxos/client/services";
 import { BlobStore } from "@dxos/teleport-extension-object-sync";
@@ -4415,12 +4356,12 @@ var createLoadDocuments = (automergeHost) => (
       const handle = automergeHost.repo.find(documentId);
       await warnAfterTimeout2(5e3, "to long to load doc", () => handle.whenReady());
       const doc = handle.docSync();
-      const heads = getHeads(doc);
+      const hash = getHeads(doc).join("");
       yield [
         {
           id,
           object: doc.objects[objectId],
-          currentHash: heads.at(-1)
+          currentHash: hash
         }
       ];
     }
@@ -4498,7 +4439,6 @@ var ServiceContext = class {
     this.modelFactory = modelFactory;
     this._runtimeParams = _runtimeParams;
     this.initialized = new Trigger5();
-    this.dataServiceSubscriptions = new DataServiceSubscriptions();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = PublicKey10.random().toHex();
     this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
@@ -4544,17 +4484,17 @@ var ServiceContext = class {
   }
   async open(ctx) {
     await this._checkStorageVersion();
-    log13("opening...", void 0, {
+    log12("opening...", void 0, {
       F: __dxlog_file15,
-      L: 162,
+      L: 154,
       S: this,
       C: (f, a) => f(...a)
     });
-    log13.trace("dxos.sdk.service-context.open", trace8.begin({
+    log12.trace("dxos.sdk.service-context.open", trace8.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 163,
+      L: 155,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4566,25 +4506,25 @@ var ServiceContext = class {
     if (this.identityManager.identity) {
       await this._initialize(ctx);
     }
-    log13.trace("dxos.sdk.service-context.open", trace8.end({
+    log12.trace("dxos.sdk.service-context.open", trace8.end({
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 173,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
-    log13("opened", void 0, {
+    log12("opened", void 0, {
       F: __dxlog_file15,
-      L: 174,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    log13("closing...", void 0, {
+    log12("closing...", void 0, {
       F: __dxlog_file15,
-      L: 178,
+      L: 170,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4598,12 +4538,11 @@ var ServiceContext = class {
     await this.feedStore.close();
     await this.networkManager.close();
     await this.signalManager.close();
-    this.dataServiceSubscriptions.clear();
     await this.metadataStore.close();
     await this.indexer.destroy();
-    log13("closed", void 0, {
+    log12("closed", void 0, {
       F: __dxlog_file15,
-      L: 192,
+      L: 183,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4617,7 +4556,7 @@ var ServiceContext = class {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant14(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 203,
+      L: 194,
       S: this,
       A: [
         "factory",
@@ -4647,9 +4586,9 @@ var ServiceContext = class {
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    log13("initializing spaces...", void 0, {
+    log12("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 234,
+      L: 225,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4667,12 +4606,12 @@ var ServiceContext = class {
         });
       }
     };
-    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore, this.automergeHost, this._runtimeParams);
+    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, signingContext, this.feedStore, this.automergeHost, this._runtimeParams);
     await this.dataSpaceManager.open();
     this._handlerFactories.set(Invitation6.Kind.SPACE, (invitation) => {
       invariant14(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 259,
+        L: 249,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4692,33 +4631,33 @@ var ServiceContext = class {
           return;
         }
         if (!this.dataSpaceManager) {
-          log13("dataSpaceManager not initialized yet, ignoring space admission", {
+          log12("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 275,
+            L: 265,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          log13("space already exists, ignoring space admission", {
+          log12("space already exists, ignoring space admission", {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 279,
+            L: 269,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         try {
-          log13("accepting space recorded in halo", {
+          log12("accepting space recorded in halo", {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 284,
+            L: 274,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4727,9 +4666,9 @@ var ServiceContext = class {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          log13.catch(err, void 0, {
+          log12.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 290,
+            L: 280,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4777,7 +4716,7 @@ var ServiceRegistry = class {
 // packages/sdk/client-services/src/packlets/locks/browser.ts
 import { asyncTimeout as asyncTimeout2, Trigger as Trigger6 } from "@dxos/async";
 import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
-import { log as log14, logInfo } from "@dxos/log";
+import { log as log13, logInfo } from "@dxos/log";
 function _ts_decorate7(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")
@@ -4810,28 +4749,28 @@ var Lock = class {
       message: "acquiring"
     });
     try {
-      log14("aquiring lock...", void 0, {
+      log13("aquiring lock...", void 0, {
         F: __dxlog_file16,
         L: 42,
         S: this,
         C: (f, a) => f(...a)
       });
       await asyncTimeout2(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
-      log14("acquired lock", void 0, {
+      log13("acquired lock", void 0, {
         F: __dxlog_file16,
         L: 44,
         S: this,
         C: (f, a) => f(...a)
       });
     } catch {
-      log14("stealing lock...", void 0, {
+      log13("stealing lock...", void 0, {
         F: __dxlog_file16,
         L: 46,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._requestLock(true);
-      log14("stolen lock", void 0, {
+      log13("stolen lock", void 0, {
         F: __dxlog_file16,
         L: 48,
         S: this,
@@ -4848,7 +4787,7 @@ var Lock = class {
     }
   }
   async _requestLock(steal = false) {
-    log14("requesting lock...", {
+    log13("requesting lock...", {
       steal
     }, {
       F: __dxlog_file16,
@@ -4864,14 +4803,14 @@ var Lock = class {
       acquired.wake();
       this._releaseTrigger = new Trigger6();
       await this._releaseTrigger.wait();
-      log14("releasing lock...", void 0, {
+      log13("releasing lock...", void 0, {
         F: __dxlog_file16,
         L: 72,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._onRelease?.();
-      log14("released lock", void 0, {
+      log13("released lock", void 0, {
         F: __dxlog_file16,
         L: 74,
         S: this,
@@ -4881,7 +4820,7 @@ var Lock = class {
       await this._onRelease?.();
     });
     await acquired.wait();
-    log14("recieved lock", {
+    log13("recieved lock", {
       steal
     }, {
       F: __dxlog_file16,
@@ -4948,16 +4887,16 @@ var toStorageType = (type) => {
 };
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
-import { Event as Event8, synchronized as synchronized3 } from "@dxos/async";
+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 { DocumentModel as DocumentModel2 } from "@dxos/document-model";
+import { DocumentModel } from "@dxos/document-model";
 import { DataServiceImpl } from "@dxos/echo-pipeline";
 import { getRawDoc, getAutomergeObjectCore } from "@dxos/echo-schema";
 import { IndexServiceImpl } from "@dxos/indexing";
 import { invariant as invariant16 } from "@dxos/invariant";
 import { PublicKey as PublicKey12 } from "@dxos/keys";
-import { log as log16 } from "@dxos/log";
+import { log as log15 } from "@dxos/log";
 import { WebsocketSignalManager } from "@dxos/messaging";
 import { ModelFactory } from "@dxos/model-factory";
 import { createSimplePeerTransportFactory, NetworkManager } from "@dxos/network-manager";
@@ -5051,15 +4990,15 @@ var DevicesServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
-import { Event as Event7 } from "@dxos/async";
+import { Event as Event8 } from "@dxos/async";
 import { Stream as Stream12 } from "@dxos/codec-protobuf";
 import { PublicKey as PublicKey11 } from "@dxos/keys";
-import { getContextFromEntry, log as log15 } from "@dxos/log";
+import { getContextFromEntry, log as log14 } from "@dxos/log";
 import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { getDebugName, jsonify, numericalValues, tracer } from "@dxos/util";
 var LoggingServiceImpl = class {
   constructor() {
-    this._logs = new Event7();
+    this._logs = new Event8();
     this._started = Date.now();
     this._sessionId = PublicKey11.random().toHex();
     this._logProcessor = (_config, entry2) => {
@@ -5067,11 +5006,11 @@ var LoggingServiceImpl = class {
     };
   }
   async open() {
-    log15.runtimeConfig.processors.push(this._logProcessor);
+    log14.runtimeConfig.processors.push(this._logProcessor);
   }
   async close() {
-    const index = log15.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
-    log15.runtimeConfig.processors.splice(index, 1);
+    const index = log14.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    log14.runtimeConfig.processors.splice(index, 1);
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
@@ -5277,7 +5216,7 @@ function _ts_decorate8(decorators, target, key, desc) {
 }
 var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var createDefaultModelFactory = () => {
-  return new ModelFactory().registerModel(DocumentModel2).registerModel(TextModel);
+  return new ModelFactory().registerModel(DocumentModel).registerModel(TextModel);
 };
 var ClientServicesHost = class {
   constructor({
@@ -5292,7 +5231,7 @@ var ClientServicesHost = class {
     runtimeParams
   } = {}) {
     this._tracingService = TRACE_PROCESSOR2.createTraceSender();
-    this._statusUpdate = new Event8();
+    this._statusUpdate = new Event9();
     this._opening = false;
     this._open = false;
     this._storage = storage;
@@ -5374,7 +5313,7 @@ var ClientServicesHost = class {
         "'service host is open'"
       ]
     });
-    log16("initializing...", void 0, {
+    log15("initializing...", void 0, {
       F: __dxlog_file18,
       L: 192,
       S: this,
@@ -5413,7 +5352,7 @@ var ClientServicesHost = class {
       transportFactory,
       signalManager
     });
-    log16("initialized", void 0, {
+    log15("initialized", void 0, {
       F: __dxlog_file18,
       L: 218,
       S: this,
@@ -5425,7 +5364,7 @@ var ClientServicesHost = class {
       return;
     }
     const traceId = PublicKey12.random().toHex();
-    log16.trace("dxos.client-services.host.open", trace9.begin({
+    log15.trace("dxos.client-services.host.open", trace9.begin({
       id: traceId
     }), {
       F: __dxlog_file18,
@@ -5470,7 +5409,7 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    log16("opening...", {
+    log15("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file18,
@@ -5486,11 +5425,11 @@ var ClientServicesHost = class {
       IdentityService: new IdentityServiceImpl((params) => this._createIdentity(params), this._serviceContext.identityManager, this._serviceContext.keyring, (profile) => this._serviceContext.broadcastProfileUpdate(profile)),
       InvitationsService: new InvitationsServiceImpl(this._serviceContext.invitations, (invitation) => this._serviceContext.getInvitationHandler(invitation), this._serviceContext.metadataStore),
       DevicesService: new DevicesServiceImpl(this._serviceContext.identityManager),
-      SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, this._serviceContext.dataServiceSubscriptions, async () => {
+      SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, async () => {
         await this._serviceContext.initialized.wait();
         return this._serviceContext.dataSpaceManager;
       }),
-      DataService: new DataServiceImpl(this._serviceContext.dataServiceSubscriptions, this._serviceContext.automergeHost),
+      DataService: new DataServiceImpl(this._serviceContext.automergeHost),
       IndexService: new IndexServiceImpl({
         indexer: this._serviceContext.indexer,
         automergeHost: this._serviceContext.automergeHost
@@ -5508,7 +5447,7 @@ var ClientServicesHost = class {
     await this._serviceContext.open(ctx);
     invariant16(this.serviceRegistry.services.InvitationsService, void 0, {
       F: __dxlog_file18,
-      L: 303,
+      L: 299,
       S: this,
       A: [
         "this.serviceRegistry.services.InvitationsService",
@@ -5516,11 +5455,11 @@ var ClientServicesHost = class {
       ]
     });
     const loadedInvitations = await this.serviceRegistry.services.InvitationsService.loadPersistentInvitations();
-    log16("loaded persistent invitations", {
+    log15("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file18,
-      L: 306,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5538,19 +5477,19 @@ var ClientServicesHost = class {
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    log16("opened", {
+    log15("opened", {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 323,
+      L: 319,
       S: this,
       C: (f, a) => f(...a)
     });
-    log16.trace("dxos.client-services.host.open", trace9.end({
+    log15.trace("dxos.client-services.host.open", trace9.end({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 324,
+      L: 320,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5560,11 +5499,11 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    log16("closing...", {
+    log15("closing...", {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 335,
+      L: 331,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5576,44 +5515,44 @@ var ClientServicesHost = class {
     await this._serviceContext.close();
     this._open = false;
     this._statusUpdate.emit();
-    log16("closed", {
+    log15("closed", {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 342,
+      L: 338,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
     const traceId = PublicKey12.random().toHex();
-    log16.trace("dxos.sdk.client-services-host.reset", trace9.begin({
+    log15.trace("dxos.sdk.client-services-host.reset", trace9.begin({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 347,
+      L: 343,
       S: this,
       C: (f, a) => f(...a)
     });
-    log16("resetting...", void 0, {
+    log15("resetting...", void 0, {
       F: __dxlog_file18,
-      L: 349,
+      L: 345,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
-    log16("reset", void 0, {
+    log15("reset", void 0, {
       F: __dxlog_file18,
-      L: 352,
+      L: 348,
       S: this,
       C: (f, a) => f(...a)
     });
-    log16.trace("dxos.sdk.client-services-host.reset", trace9.end({
+    log15.trace("dxos.sdk.client-services-host.reset", trace9.end({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 353,
+      L: 349,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5628,7 +5567,7 @@ var ClientServicesHost = class {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant16(automergeIndex, void 0, {
       F: __dxlog_file18,
-      L: 368,
+      L: 364,
       S: this,
       A: [
         "automergeIndex",
@@ -5699,4 +5638,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-MLGJV5VA.mjs.map
+//# sourceMappingURL=chunk-D6LYSGMU.mjs.map