@dxos/client-services 0.4.8-next.fff1521 → 0.4.9-main.1057b49

package/dist/lib/node/{chunk-K2PCGWBW.cjs → chunk-VWAYL2FO.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_K2PCGWBW_exports = {};
-__export(chunk_K2PCGWBW_exports, {
+var chunk_VWAYL2FO_exports = {};
+__export(chunk_VWAYL2FO_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -47,7 +47,6 @@ __export(chunk_K2PCGWBW_exports, {
   SpacesServiceImpl: () => SpacesServiceImpl,
   TrustedKeySetAuthVerifier: () => TrustedKeySetAuthVerifier,
   createAuthProvider: () => createAuthProvider,
-  createDefaultModelFactory: () => createDefaultModelFactory,
   createDiagnostics: () => createDiagnostics,
   createStorageObjects: () => createStorageObjects,
   getNetworkPeers: () => getNetworkPeers,
@@ -61,7 +60,7 @@ __export(chunk_K2PCGWBW_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_K2PCGWBW_exports);
+module.exports = __toCommonJS(chunk_VWAYL2FO_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -150,10 +149,7 @@ var import_rpc = require("@dxos/rpc");
 var import_tracing3 = require("@dxos/tracing");
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
 var import_credentials9 = require("@dxos/credentials");
-var import_document_model = require("@dxos/document-model");
-var import_echo_db = require("@dxos/echo-db");
 var import_invariant9 = require("@dxos/invariant");
-var import_log8 = require("@dxos/log");
 var import_protocols7 = require("@dxos/protocols");
 var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing4 = require("@dxos/tracing");
@@ -165,28 +161,29 @@ var import_debug3 = require("@dxos/debug");
 var import_echo_pipeline = require("@dxos/echo-pipeline");
 var import_invariant10 = require("@dxos/invariant");
 var import_keys7 = require("@dxos/keys");
-var import_log9 = require("@dxos/log");
+var import_log8 = require("@dxos/log");
 var import_protocols8 = require("@dxos/protocols");
 var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe2 = require("@dxos/timeframe");
 var import_tracing5 = require("@dxos/tracing");
 var import_util4 = require("@dxos/util");
-var import_credentials11 = require("@dxos/credentials");
 var import_async11 = require("@dxos/async");
+var import_credentials11 = require("@dxos/credentials");
+var import_async12 = require("@dxos/async");
 var import_context8 = require("@dxos/context");
 var import_invariant11 = require("@dxos/invariant");
 var import_keys8 = require("@dxos/keys");
-var import_log10 = require("@dxos/log");
+var import_log9 = require("@dxos/log");
 var import_protocols9 = require("@dxos/protocols");
 var import_teleport2 = require("@dxos/teleport");
 var import_util5 = require("@dxos/util");
-var import_async12 = require("@dxos/async");
+var import_async13 = require("@dxos/async");
 var import_context9 = require("@dxos/context");
 var import_credentials12 = require("@dxos/credentials");
 var import_invariant12 = require("@dxos/invariant");
 var import_keys9 = require("@dxos/keys");
-var import_log11 = require("@dxos/log");
+var import_log10 = require("@dxos/log");
 var import_protocols10 = require("@dxos/protocols");
 var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_gossip2 = require("@dxos/teleport-extension-gossip");
@@ -195,14 +192,14 @@ var import_credentials13 = require("@dxos/credentials");
 var import_debug4 = require("@dxos/debug");
 var import_credentials14 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe3 = require("@dxos/timeframe");
-var import_async13 = require("@dxos/async");
+var import_async14 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_debug5 = require("@dxos/debug");
 var import_invariant13 = require("@dxos/invariant");
-var import_log12 = require("@dxos/log");
+var import_log11 = require("@dxos/log");
 var import_protocols11 = require("@dxos/protocols");
 var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
-var import_async14 = require("@dxos/async");
+var import_async15 = require("@dxos/async");
 var import_context10 = require("@dxos/context");
 var import_credentials15 = require("@dxos/credentials");
 var import_debug6 = require("@dxos/debug");
@@ -212,7 +209,7 @@ var import_indexing = require("@dxos/indexing");
 var import_invariant14 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
 var import_keys10 = require("@dxos/keys");
-var import_log13 = require("@dxos/log");
+var import_log12 = require("@dxos/log");
 var import_protocols12 = require("@dxos/protocols");
 var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
@@ -223,39 +220,36 @@ var import_debug7 = require("@dxos/debug");
 var import_protocols13 = require("@dxos/protocols");
 var import_invariant15 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
-var import_log14 = require("@dxos/log");
+var import_log13 = require("@dxos/log");
 var import_client_protocol4 = require("@dxos/client-protocol");
 var import_protocols14 = require("@dxos/protocols");
 var import_config = require("@dxos/protocols/proto/dxos/config");
 var import_random_access_storage = require("@dxos/random-access-storage");
 var import_util8 = require("@dxos/util");
-var import_async15 = require("@dxos/async");
+var import_async16 = require("@dxos/async");
 var import_client_protocol5 = require("@dxos/client-protocol");
 var import_context11 = require("@dxos/context");
-var import_document_model2 = require("@dxos/document-model");
 var import_echo_pipeline3 = require("@dxos/echo-pipeline");
 var import_echo_schema = require("@dxos/echo-schema");
 var import_indexing2 = require("@dxos/indexing");
 var import_invariant16 = require("@dxos/invariant");
 var import_keys11 = require("@dxos/keys");
-var import_log15 = require("@dxos/log");
+var import_log14 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
-var import_model_factory = require("@dxos/model-factory");
 var import_network_manager2 = require("@dxos/network-manager");
 var import_protocols15 = require("@dxos/protocols");
 var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
-var import_text_model = require("@dxos/text-model");
 var import_tracing7 = require("@dxos/tracing");
 var import_util9 = require("@dxos/util");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
-var import_async16 = require("@dxos/async");
+var import_async17 = require("@dxos/async");
 var import_codec_protobuf12 = require("@dxos/codec-protobuf");
 var import_invariant17 = require("@dxos/invariant");
 var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
-var import_async17 = require("@dxos/async");
+var import_async18 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
 var import_keys12 = require("@dxos/keys");
-var import_log16 = require("@dxos/log");
+var import_log15 = require("@dxos/log");
 var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util10 = require("@dxos/util");
 var import_codec_protobuf14 = require("@dxos/codec-protobuf");
@@ -732,6 +726,7 @@ var Identity = class {
     await this.space.open(ctx);
   }
   async close(ctx) {
+    await this._presence?.destroy();
     await this.authVerifier.close();
     await this.space.spaceState.removeCredentialProcessor(this._profileStateMachine);
     await this.space.spaceState.removeCredentialProcessor(this._deviceStateMachine);
@@ -771,7 +766,7 @@ var Identity = class {
   getIdentityCredentialSigner() {
     (0, import_invariant.invariant)(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
       F: __dxlog_file2,
-      L: 144,
+      L: 145,
       S: this,
       A: [
         "this._deviceStateMachine.deviceCredentialChain",
@@ -795,7 +790,7 @@ var Identity = class {
       dataFeedKey
     }, {
       F: __dxlog_file2,
-      L: 160,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2716,8 +2711,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
       }
     };
   }
@@ -2746,7 +2740,7 @@ var SpaceInvitationProtocol = class {
   async accept(response) {
     (0, import_invariant8.invariant)(response.space, void 0, {
       F: __dxlog_file9,
-      L: 108,
+      L: 107,
       S: this,
       A: [
         "response.space",
@@ -2757,7 +2751,7 @@ var SpaceInvitationProtocol = class {
     const assertion = (0, import_credentials8.getCredentialAssertion)(credential);
     (0, import_invariant8.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file9,
-      L: 111,
+      L: 110,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2766,7 +2760,7 @@ var SpaceInvitationProtocol = class {
     });
     (0, import_invariant8.invariant)(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)",
@@ -2890,7 +2884,7 @@ var getPlatform = () => {
     };
   }
 };
-var DXOS_VERSION = "0.4.8-next.fff1521";
+var DXOS_VERSION = "0.4.9-main.1057b49";
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
 var DEFAULT_TIMEOUT = 1e3;
 var createDiagnostics = async (clientServices, serviceContext, config) => {
@@ -2908,7 +2902,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
   {
     (0, import_invariant9.invariant)(clientServices.LoggingService, "SystemService is not available.", {
       F: __dxlog_file10,
-      L: 111,
+      L: 108,
       S: void 0,
       A: [
         "clientServices.LoggingService",
@@ -2965,22 +2959,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 === import_document_model.DocumentModel.meta.type && item.state?.type?.itemId === import_echo_db.TYPE_PROPERTIES);
-    const state = propertiesItem?.state;
-    properties = state?.data;
-  } catch (err) {
-    import_log8.log.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,
@@ -3000,28 +2978,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();
@@ -3033,6 +2997,7 @@ var AutomergeSpaceState = class {
     this._onNewRoot = _onNewRoot;
     this.rootUrl = void 0;
     this.lastEpoch = void 0;
+    this.onNewEpoch = new import_async11.Event();
     this._isProcessingRootDocs = false;
   }
   async processCredential(credential) {
@@ -3046,6 +3011,7 @@ var AutomergeSpaceState = class {
         this._onNewRoot(this.rootUrl);
       }
     }
+    this.onNewEpoch.emit(credential);
   }
   startProcessingRootDocs() {
     if (this._isProcessingRootDocs) {
@@ -3056,6 +3022,9 @@ var AutomergeSpaceState = class {
     }
     this._isProcessingRootDocs = true;
   }
+  async ensureEpochInitialized() {
+    await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
+  }
 };
 var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
 var DEFAULT_RETRY_TIMEOUT = 1e3;
@@ -3065,7 +3034,7 @@ var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var NotarizationPlugin = class {
   constructor() {
     this._ctx = new import_context8.Context();
-    this._extensionOpened = new import_async11.Event();
+    this._extensionOpened = new import_async12.Event();
     this._extensions = /* @__PURE__ */ new Set();
     this._processedCredentials = new import_util5.ComplexSet(import_keys8.PublicKey.hash);
     this._processCredentialsTriggers = new import_util5.ComplexMap(import_keys8.PublicKey.hash);
@@ -3082,7 +3051,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 }) {
-    (0, import_log10.log)("notarize", {
+    (0, import_log9.log)("notarize", {
       credentials
     }, {
       F: __dxlog_file11,
@@ -3099,10 +3068,10 @@ var NotarizationPlugin = class {
         "'Credentials must have an id'"
       ]
     });
-    const errors = new import_async11.Trigger();
+    const errors = new import_async12.Trigger();
     const ctx = this._ctx.derive({
       onError: (err) => {
-        import_log10.log.warn("Notarization error", {
+        import_log9.log.warn("Notarization error", {
           err
         }, {
           F: __dxlog_file11,
@@ -3116,8 +3085,8 @@ var NotarizationPlugin = class {
     });
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
-      (0, import_async11.scheduleTask)(ctx, () => {
-        import_log10.log.warn("Notarization timeout", {
+      (0, import_async12.scheduleTask)(ctx, () => {
+        import_log9.log.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
@@ -3127,12 +3096,12 @@ var NotarizationPlugin = class {
           C: (f, a) => f(...a)
         });
         void ctx.dispose();
-        errors.throw(new import_async11.TimeoutError(timeout, "Notarization timed out"));
+        errors.throw(new import_async12.TimeoutError(timeout, "Notarization timed out"));
       }, timeout);
     }
     const allNotarized = Promise.all(credentials.map((credential) => this._waitUntilProcessed(credential.id)));
     const peersTried = /* @__PURE__ */ new Set();
-    const notarizeTask = new import_async11.DeferredTask(ctx, async () => {
+    const notarizeTask = new import_async12.DeferredTask(ctx, async () => {
       try {
         if (this._extensions.size === 0) {
           return;
@@ -3141,7 +3110,7 @@ var NotarizationPlugin = class {
           ...this._extensions
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
-          import_log10.log.info("Exhausted all peers to notarize with", {
+          import_log9.log.info("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
             F: __dxlog_file11,
@@ -3150,11 +3119,11 @@ var NotarizationPlugin = class {
             C: (f, a) => f(...a)
           });
           peersTried.clear();
-          (0, import_async11.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
+          (0, import_async12.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
           return;
         }
         peersTried.add(peer);
-        (0, import_log10.log)("try notarizing", {
+        (0, import_log9.log)("try notarizing", {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
@@ -3166,16 +3135,16 @@ var NotarizationPlugin = class {
         await peer.rpc.NotarizationService.notarize({
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
-        (0, import_log10.log)("success", void 0, {
+        (0, import_log9.log)("success", void 0, {
           F: __dxlog_file11,
           L: 147,
           S: this,
           C: (f, a) => f(...a)
         });
-        await (0, import_async11.sleep)(successDelay);
+        await (0, import_async12.sleep)(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
-          import_log10.log.info("error notarizing (recoverable)", err, {
+          import_log9.log.info("error notarizing (recoverable)", err, {
             F: __dxlog_file11,
             L: 151,
             S: this,
@@ -3193,7 +3162,7 @@ var NotarizationPlugin = class {
         allNotarized,
         errors.wait()
       ]);
-      (0, import_log10.log)("done", void 0, {
+      (0, import_log9.log)("done", void 0, {
         F: __dxlog_file11,
         L: 162,
         S: this,
@@ -3230,7 +3199,7 @@ var NotarizationPlugin = class {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await (0, import_util5.entry)(this._processCredentialsTriggers, id).orInsert(new import_async11.Trigger()).value.wait();
+    await (0, import_util5.entry)(this._processCredentialsTriggers, id).orInsert(new import_async12.Trigger()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -3258,7 +3227,7 @@ var NotarizationPlugin = class {
   createExtension() {
     const extension = new NotarizationTeleportExtension({
       onOpen: async () => {
-        (0, import_log10.log)("extension opened", {
+        (0, import_log9.log)("extension opened", {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file11,
@@ -3270,7 +3239,7 @@ var NotarizationPlugin = class {
         this._extensionOpened.emit();
       },
       onClose: async () => {
-        (0, import_log10.log)("extension closed", {
+        (0, import_log9.log)("extension closed", {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file11,
@@ -3326,7 +3295,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 import_context7.Context();
@@ -3354,11 +3322,11 @@ var DataSpace = class {
     });
     this._cache = params.cache;
     this._state = params.initialState;
-    (0, import_log9.log)("new state", {
+    (0, import_log8.log)("new state", {
       state: import_services9.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 141,
+      L: 132,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3376,9 +3344,6 @@ var DataSpace = class {
   get inner() {
     return this._inner;
   }
-  get dataPipeline() {
-    return this._inner.dataPipeline;
-  }
   get presence() {
     return this._presence;
   }
@@ -3407,11 +3372,11 @@ var DataSpace = class {
     await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
     await this._inner.open(new import_context7.Context());
     this._state = import_services9.SpaceState.CONTROL_ONLY;
-    (0, import_log9.log)("new state", {
+    (0, import_log8.log)("new state", {
       state: import_services9.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 203,
+      L: 190,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3425,11 +3390,11 @@ var DataSpace = class {
   async _close() {
     await this._callbacks.beforeClose?.();
     this._state = import_services9.SpaceState.CLOSED;
-    (0, import_log9.log)("new state", {
+    (0, import_log8.log)("new state", {
       state: import_services9.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 217,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3459,26 +3424,26 @@ var DataSpace = class {
         await this.initializeDataPipeline();
       } catch (err) {
         if (err instanceof import_protocols8.CancelledError || err instanceof import_context7.ContextDisposedError) {
-          (0, import_log9.log)("data pipeline initialization cancelled", err, {
+          (0, import_log8.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 250,
+            L: 237,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
-        import_log9.log.error("Error initializing data pipeline", err, {
+        import_log8.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 254,
+          L: 241,
           S: this,
           C: (f, a) => f(...a)
         });
         this._state = import_services9.SpaceState.ERROR;
-        (0, import_log9.log)("new state", {
+        (0, import_log8.log)("new state", {
           state: import_services9.SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 256,
+          L: 243,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3494,44 +3459,31 @@ var DataSpace = class {
       throw new import_protocols8.SystemError("Invalid operation");
     }
     this._state = import_services9.SpaceState.INITIALIZING;
-    (0, import_log9.log)("new state", {
+    (0, import_log8.log)("new state", {
       state: import_services9.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 272,
+      L: 259,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._initializeAndReadControlPipeline();
     await (0, import_async10.sleep)(1);
     this._automergeSpaceState.startProcessingRootDocs();
-    await this._inner.initializeDataPipeline();
-    this.metrics.dataPipelineOpen = /* @__PURE__ */ new Date();
-    await (0, import_context7.cancelWithContext)(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
-    (0, import_log9.log)("waiting for data pipeline to reach target timeframe", void 0, {
+    await (0, import_context7.cancelWithContext)(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
+    (0, import_log8.log)("data pipeline ready", 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();
-    (0, import_log9.log)("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 = import_services9.SpaceState.READY;
-    (0, import_log9.log)("new state", {
+    (0, import_log8.log)("new state", {
       state: import_services9.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 300,
+      L: 275,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3545,9 +3497,9 @@ var DataSpace = class {
     });
     this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
-    (0, import_log9.log)("writable feeds created", void 0, {
+    (0, import_log8.log)("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 316,
+      L: 291,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3605,12 +3557,12 @@ var DataSpace = class {
     }
   }
   _onNewAutomergeRoot(rootUrl) {
-    (0, import_log9.log)("loading automerge root doc for space", {
+    (0, import_log8.log)("loading automerge root doc for space", {
       space: this.key,
       rootUrl
     }, {
       F: __dxlog_file12,
-      L: 382,
+      L: 357,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3636,13 +3588,13 @@ var DataSpace = class {
         if (err instanceof import_context7.ContextDisposedError) {
           return;
         }
-        import_log9.log.warn("error loading automerge root doc", {
+        import_log8.log.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)
         });
@@ -3670,7 +3622,12 @@ var DataSpace = class {
       case void 0:
       case import_services9.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 import_timeframe2.Timeframe(),
+            automergeRoot: this._automergeSpaceState.lastEpoch?.subject.assertion?.automergeRoot
+          };
         }
         break;
       case import_services9.CreateEpochRequest.Migration.INIT_AUTOMERGE:
@@ -3692,7 +3649,7 @@ var DataSpace = class {
           const newRoot = this._automergeHost.repo.create(rootHandle.docSync());
           (0, import_invariant10.invariant)(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",
@@ -3728,15 +3685,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 !== import_services9.SpaceState.INACTIVE) {
@@ -3753,11 +3701,11 @@ var DataSpace = class {
     await this._metadataStore.setSpaceState(this.key, import_services9.SpaceState.INACTIVE);
     await this._close();
     this._state = import_services9.SpaceState.INACTIVE;
-    (0, import_log9.log)("new state", {
+    (0, import_log8.log)("new state", {
       state: import_services9.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 514,
+      L: 482,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3887,16 +3835,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 import_context9.Context();
-    this.updated = new import_async12.Event();
+    this.updated = new import_async13.Event();
     this._spaces = new import_util6.ComplexMap(import_keys9.PublicKey.hash);
     this._isOpen = false;
     this._instanceId = import_keys9.PublicKey.random().toHex();
@@ -3909,46 +3856,46 @@ var DataSpaceManager = class {
     return this._spaces;
   }
   async open() {
-    (0, import_log11.log)("open", void 0, {
+    (0, import_log10.log)("open", void 0, {
       F: __dxlog_file13,
-      L: 105,
+      L: 98,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols10.trace.begin({
+    import_log10.log.trace("dxos.echo.data-space-manager.open", import_protocols10.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 106,
+      L: 99,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log11.log)("metadata loaded", {
+    (0, import_log10.log)("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file13,
-      L: 107,
+      L: 100,
       S: this,
       C: (f, a) => f(...a)
     });
     await (0, import_util6.forEachAsync)(this._metadataStore.spaces, async (spaceMetadata) => {
       try {
-        (0, import_log11.log)("load space", {
+        (0, import_log10.log)("load space", {
           spaceMetadata
         }, {
           F: __dxlog_file13,
-          L: 111,
+          L: 104,
           S: this,
           C: (f, a) => f(...a)
         });
         await this._constructSpace(spaceMetadata);
       } catch (err) {
-        import_log11.log.error("Error loading space", {
+        import_log10.log.error("Error loading space", {
           spaceMetadata,
           err
         }, {
           F: __dxlog_file13,
-          L: 114,
+          L: 107,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3961,19 +3908,19 @@ var DataSpaceManager = class {
         space.initializeDataPipelineAsync();
       }
     }
-    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols10.trace.end({
+    import_log10.log.trace("dxos.echo.data-space-manager.open", import_protocols10.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 127,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    (0, import_log11.log)("close", void 0, {
+    (0, import_log10.log)("close", void 0, {
       F: __dxlog_file13,
-      L: 132,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3989,7 +3936,7 @@ var DataSpaceManager = class {
   async createSpace() {
     (0, import_invariant12.invariant)(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 145,
+      L: 138,
       S: this,
       A: [
         "this._isOpen",
@@ -4006,11 +3953,11 @@ var DataSpaceManager = class {
       dataFeedKey,
       state: import_services10.SpaceState.ACTIVE
     };
-    (0, import_log11.log)("creating space...", {
+    (0, import_log10.log)("creating space...", {
       spaceKey
     }, {
       F: __dxlog_file13,
-      L: 157,
+      L: 150,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4026,7 +3973,7 @@ var DataSpaceManager = class {
     const memberCredential = credentials[1];
     (0, import_invariant12.invariant)((0, import_credentials12.getCredentialAssertion)(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'",
@@ -4040,17 +3987,17 @@ var DataSpaceManager = class {
   }
   // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
-    (0, import_log11.log)("accept space", {
+    (0, import_log10.log)("accept space", {
       opts
     }, {
       F: __dxlog_file13,
-      L: 182,
+      L: 175,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant12.invariant)(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 183,
+      L: 176,
       S: this,
       A: [
         "this._isOpen",
@@ -4059,7 +4006,7 @@ var DataSpaceManager = class {
     });
     (0, import_invariant12.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file13,
-      L: 184,
+      L: 177,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -4090,11 +4037,11 @@ var DataSpaceManager = class {
     }));
   }
   async _constructSpace(metadata) {
-    (0, import_log11.log)("construct space", {
+    (0, import_log10.log)("construct space", {
       metadata
     }, {
       F: __dxlog_file13,
-      L: 217,
+      L: 210,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4130,9 +4077,9 @@ var DataSpaceManager = class {
         session.addExtension("dxos.mesh.teleport.automerge", this._automergeHost.createExtension());
       },
       onAuthFailure: () => {
-        import_log11.log.warn("auth failure", void 0, {
+        import_log10.log.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 254,
+          L: 247,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4152,23 +4099,22 @@ var DataSpaceManager = class {
       signingContext: this._signingContext,
       callbacks: {
         beforeReady: async () => {
-          (0, import_log11.log)("before space ready", {
+          (0, import_log10.log)("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 () => {
-          (0, import_log11.log)("after space ready", {
+          (0, import_log10.log)("after space ready", {
             space: space.key,
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 279,
+            L: 268,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4177,15 +4123,14 @@ var DataSpaceManager = class {
           }
         },
         beforeClose: async () => {
-          (0, import_log11.log)("before space close", {
+          (0, import_log10.log)("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,
@@ -4197,34 +4142,30 @@ 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;
   }
 };
 _ts_decorate5([
-  import_async12.synchronized
+  import_async13.synchronized
 ], DataSpaceManager.prototype, "open", null);
 _ts_decorate5([
-  import_async12.synchronized
+  import_async13.synchronized
 ], DataSpaceManager.prototype, "close", null);
 _ts_decorate5([
-  import_async12.synchronized
+  import_async13.synchronized
 ], DataSpaceManager.prototype, "createSpace", null);
 _ts_decorate5([
-  import_async12.synchronized
+  import_async13.synchronized
 ], DataSpaceManager.prototype, "acceptSpace", null);
 DataSpaceManager = _ts_decorate5([
-  (0, import_async12.trackLeaks)("open", "close")
+  (0, import_async13.trackLeaks)("open", "close")
 ], DataSpaceManager);
 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() {
@@ -4253,14 +4194,14 @@ var SpacesServiceImpl = class {
   }
   querySpaces() {
     return new import_codec_protobuf11.Stream(({ next, ctx }) => {
-      const scheduler = new import_async13.UpdateScheduler(ctx, async () => {
+      const scheduler = new import_async14.UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
-        (0, import_log12.log)("update", {
+        (0, import_log11.log)("update", {
           spaces
         }, {
           F: __dxlog_file14,
-          L: 78,
+          L: 77,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4270,20 +4211,17 @@ var SpacesServiceImpl = class {
       }, {
         maxFrequency: process.env.NODE_ENV === "test" ? void 0 : 2
       });
-      (0, import_async13.scheduleTask)(ctx, async () => {
+      (0, import_async14.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const subscriptions = new import_async13.EventSubscriptions();
+        const subscriptions = new import_async14.EventSubscriptions();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeSpaces = () => {
           subscriptions.clear();
           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, () => {
@@ -4307,7 +4245,7 @@ var SpacesServiceImpl = class {
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
-      (0, import_async13.scheduleTask)(ctx, async () => {
+      (0, import_async14.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
@@ -4326,7 +4264,7 @@ var SpacesServiceImpl = class {
         }
       };
       ctx.onDispose(() => space.spaceState.removeCredentialProcessor(processor));
-      (0, import_async13.scheduleTask)(ctx, async () => {
+      (0, import_async14.scheduleTask)(ctx, async () => {
         await space.spaceState.addCredentialProcessor(processor);
         if (noTail) {
           close();
@@ -4346,7 +4284,7 @@ var SpacesServiceImpl = class {
       } else {
         (0, import_invariant13.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file14,
-          L: 168,
+          L: 164,
           S: this,
           A: [
             "!credential.id",
@@ -4355,7 +4293,7 @@ var SpacesServiceImpl = class {
         });
         (0, import_invariant13.invariant)(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file14,
-          L: 169,
+          L: 165,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -4365,7 +4303,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         (0, import_invariant13.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file14,
-          L: 171,
+          L: 167,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -4397,17 +4335,17 @@ var SpacesServiceImpl = class {
       state: space.state,
       error: space.error ? (0, import_protocols11.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));
@@ -4443,12 +4381,12 @@ var createLoadDocuments = (automergeHost) => (
       const handle = automergeHost.repo.find(documentId);
       await (0, import_debug7.warnAfterTimeout)(5e3, "to long to load doc", () => handle.whenReady());
       const doc = handle.docSync();
-      const heads = (0, import_automerge.getHeads)(doc);
+      const hash = (0, import_automerge.getHeads)(doc).join("");
       yield [
         {
           id,
           object: doc.objects[objectId],
-          currentHash: heads.at(-1)
+          currentHash: hash
         }
       ];
     }
@@ -4517,14 +4455,12 @@ function _ts_decorate6(decorators, target, key, desc) {
 }
 var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class {
-  constructor(storage, networkManager, signalManager, modelFactory, _runtimeParams) {
+  constructor(storage, networkManager, signalManager, _runtimeParams) {
     this.storage = storage;
     this.networkManager = networkManager;
     this.signalManager = signalManager;
-    this.modelFactory = modelFactory;
     this._runtimeParams = _runtimeParams;
-    this.initialized = new import_async14.Trigger();
-    this.dataServiceSubscriptions = new import_echo_pipeline2.DataServiceSubscriptions();
+    this.initialized = new import_async15.Trigger();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = import_keys10.PublicKey.random().toHex();
     this.metadataStore = new import_echo_pipeline2.MetadataStore(storage.createDirectory("metadata"));
@@ -4546,7 +4482,6 @@ var ServiceContext = class {
       networkManager: this.networkManager,
       blobStore: this.blobStore,
       metadataStore: this.metadataStore,
-      modelFactory: this.modelFactory,
       snapshotStore: this.snapshotStore
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams);
@@ -4570,17 +4505,17 @@ var ServiceContext = class {
   }
   async open(ctx) {
     await this._checkStorageVersion();
-    (0, import_log13.log)("opening...", void 0, {
+    (0, import_log12.log)("opening...", void 0, {
       F: __dxlog_file15,
-      L: 162,
+      L: 151,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols12.trace.begin({
+    import_log12.log.trace("dxos.sdk.service-context.open", import_protocols12.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 163,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4592,25 +4527,25 @@ var ServiceContext = class {
     if (this.identityManager.identity) {
       await this._initialize(ctx);
     }
-    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols12.trace.end({
+    import_log12.log.trace("dxos.sdk.service-context.open", import_protocols12.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 173,
+      L: 162,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log13.log)("opened", void 0, {
+    (0, import_log12.log)("opened", void 0, {
       F: __dxlog_file15,
-      L: 174,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    (0, import_log13.log)("closing...", void 0, {
+    (0, import_log12.log)("closing...", void 0, {
       F: __dxlog_file15,
-      L: 178,
+      L: 167,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4624,12 +4559,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();
-    (0, import_log13.log)("closed", void 0, {
+    (0, import_log12.log)("closed", void 0, {
       F: __dxlog_file15,
-      L: 192,
+      L: 180,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4643,7 +4577,7 @@ var ServiceContext = class {
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant14.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 203,
+      L: 191,
       S: this,
       A: [
         "factory",
@@ -4673,9 +4607,9 @@ var ServiceContext = class {
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    (0, import_log13.log)("initializing spaces...", void 0, {
+    (0, import_log12.log)("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 234,
+      L: 222,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4693,12 +4627,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(import_services12.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant14.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 259,
+        L: 246,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4718,33 +4652,33 @@ var ServiceContext = class {
           return;
         }
         if (!this.dataSpaceManager) {
-          (0, import_log13.log)("dataSpaceManager not initialized yet, ignoring space admission", {
+          (0, import_log12.log)("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 275,
+            L: 262,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          (0, import_log13.log)("space already exists, ignoring space admission", {
+          (0, import_log12.log)("space already exists, ignoring space admission", {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 279,
+            L: 266,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         try {
-          (0, import_log13.log)("accepting space recorded in halo", {
+          (0, import_log12.log)("accepting space recorded in halo", {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 284,
+            L: 271,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4753,9 +4687,9 @@ var ServiceContext = class {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          import_log13.log.catch(err, void 0, {
+          import_log12.log.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 290,
+            L: 277,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4818,7 +4752,7 @@ var Lock = class {
     return this._lockPath;
   }
   async acquire() {
-    (0, import_log14.log)("acquiring lock...", void 0, {
+    (0, import_log13.log)("acquiring lock...", void 0, {
       F: __dxlog_file16,
       L: 32,
       S: this,
@@ -4826,7 +4760,7 @@ var Lock = class {
     });
     this._fileHandle = await import_lock_file.LockFile.acquire(this._lockPath);
     await this._onAcquire?.();
-    (0, import_log14.log)("acquired lock", void 0, {
+    (0, import_log13.log)("acquired lock", void 0, {
       F: __dxlog_file16,
       L: 37,
       S: this,
@@ -4848,7 +4782,7 @@ var Lock = class {
   }
 };
 _ts_decorate7([
-  import_log14.logInfo
+  import_log13.logInfo
 ], Lock.prototype, "lockKey", null);
 var isLocked = (lockPath) => import_lock_file.LockFile.isLocked(lockPath);
 var StorageDriver = import_config.Runtime.Client.Storage.StorageDriver;
@@ -4952,7 +4886,7 @@ var DevicesServiceImpl = class {
           presenceSubscribed = true;
         }
       };
-      const subscriptions = new import_async16.EventSubscriptions();
+      const subscriptions = new import_async17.EventSubscriptions();
       if (this._identityManager.identity) {
         subscribeIdentity();
         subscribePresence();
@@ -4971,7 +4905,7 @@ var DevicesServiceImpl = class {
 };
 var LoggingServiceImpl = class {
   constructor() {
-    this._logs = new import_async17.Event();
+    this._logs = new import_async18.Event();
     this._started = Date.now();
     this._sessionId = import_keys12.PublicKey.random().toHex();
     this._logProcessor = (_config, entry2) => {
@@ -4979,11 +4913,11 @@ var LoggingServiceImpl = class {
     };
   }
   async open() {
-    import_log16.log.runtimeConfig.processors.push(this._logProcessor);
+    import_log15.log.runtimeConfig.processors.push(this._logProcessor);
   }
   async close() {
-    const index = import_log16.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
-    import_log16.log.runtimeConfig.processors.splice(index, 1);
+    const index = import_log15.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    import_log15.log.runtimeConfig.processors.splice(index, 1);
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
@@ -5044,7 +4978,7 @@ var LoggingServiceImpl = class {
         }
         const record = {
           ...entry2,
-          context: (0, import_util10.jsonify)((0, import_log16.getContextFromEntry)(entry2)),
+          context: (0, import_util10.jsonify)((0, import_log15.getContextFromEntry)(entry2)),
           timestamp: /* @__PURE__ */ new Date(),
           meta: {
             // TODO(dmaretskyi): Fix proto.
@@ -5178,13 +5112,9 @@ function _ts_decorate8(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
-var createDefaultModelFactory = () => {
-  return new import_model_factory.ModelFactory().registerModel(import_document_model2.DocumentModel).registerModel(import_text_model.TextModel);
-};
 var ClientServicesHost = class {
   constructor({
     config,
-    modelFactory = createDefaultModelFactory(),
     transportFactory,
     signalManager,
     storage,
@@ -5194,11 +5124,10 @@ var ClientServicesHost = class {
     runtimeParams
   } = {}) {
     this._tracingService = import_tracing7.TRACE_PROCESSOR.createTraceSender();
-    this._statusUpdate = new import_async15.Event();
+    this._statusUpdate = new import_async16.Event();
     this._opening = false;
     this._open = false;
     this._storage = storage;
-    this._modelFactory = modelFactory;
     this._callbacks = callbacks;
     this._runtimeParams = runtimeParams;
     if (config) {
@@ -5269,23 +5198,23 @@ var ClientServicesHost = class {
   initialize({ config, ...options }) {
     (0, import_invariant16.invariant)(!this._open, "service host is open", {
       F: __dxlog_file18,
-      L: 191,
+      L: 179,
       S: this,
       A: [
         "!this._open",
         "'service host is open'"
       ]
     });
-    (0, import_log15.log)("initializing...", void 0, {
+    (0, import_log14.log)("initializing...", void 0, {
       F: __dxlog_file18,
-      L: 192,
+      L: 180,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       (0, import_invariant16.invariant)(!this._config, "config already set", {
         F: __dxlog_file18,
-        L: 195,
+        L: 183,
         S: this,
         A: [
           "!this._config",
@@ -5303,7 +5232,7 @@ var ClientServicesHost = class {
     this._signalManager = signalManager;
     (0, import_invariant16.invariant)(!this._networkManager, "network manager already set", {
       F: __dxlog_file18,
-      L: 211,
+      L: 199,
       S: this,
       A: [
         "!this._networkManager",
@@ -5315,9 +5244,9 @@ var ClientServicesHost = class {
       transportFactory,
       signalManager
     });
-    (0, import_log15.log)("initialized", void 0, {
+    (0, import_log14.log)("initialized", void 0, {
       F: __dxlog_file18,
-      L: 218,
+      L: 206,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5327,17 +5256,17 @@ var ClientServicesHost = class {
       return;
     }
     const traceId = import_keys11.PublicKey.random().toHex();
-    import_log15.log.trace("dxos.client-services.host.open", import_protocols15.trace.begin({
+    import_log14.log.trace("dxos.client-services.host.open", import_protocols15.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 229,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant16.invariant)(this._config, "config not set", {
       F: __dxlog_file18,
-      L: 231,
+      L: 219,
       S: this,
       A: [
         "this._config",
@@ -5346,7 +5275,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant16.invariant)(this._storage, "storage not set", {
       F: __dxlog_file18,
-      L: 232,
+      L: 220,
       S: this,
       A: [
         "this._storage",
@@ -5355,7 +5284,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant16.invariant)(this._signalManager, "signal manager not set", {
       F: __dxlog_file18,
-      L: 233,
+      L: 221,
       S: this,
       A: [
         "this._signalManager",
@@ -5364,7 +5293,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant16.invariant)(this._networkManager, "network manager not set", {
       F: __dxlog_file18,
-      L: 234,
+      L: 222,
       S: this,
       A: [
         "this._networkManager",
@@ -5372,27 +5301,27 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    (0, import_log15.log)("opening...", {
+    (0, import_log14.log)("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file18,
-      L: 237,
+      L: 225,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._resourceLock?.acquire();
     await this._loggingService.open();
-    this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._signalManager, this._modelFactory, this._runtimeParams);
+    this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._signalManager, this._runtimeParams);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
       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 import_echo_pipeline3.DataServiceImpl(this._serviceContext.dataServiceSubscriptions, this._serviceContext.automergeHost),
+      DataService: new import_echo_pipeline3.DataServiceImpl(this._serviceContext.automergeHost),
       IndexService: new import_indexing2.IndexServiceImpl({
         indexer: this._serviceContext.indexer,
         automergeHost: this._serviceContext.automergeHost
@@ -5410,7 +5339,7 @@ var ClientServicesHost = class {
     await this._serviceContext.open(ctx);
     (0, import_invariant16.invariant)(this.serviceRegistry.services.InvitationsService, void 0, {
       F: __dxlog_file18,
-      L: 303,
+      L: 286,
       S: this,
       A: [
         "this.serviceRegistry.services.InvitationsService",
@@ -5418,11 +5347,11 @@ var ClientServicesHost = class {
       ]
     });
     const loadedInvitations = await this.serviceRegistry.services.InvitationsService.loadPersistentInvitations();
-    (0, import_log15.log)("loaded persistent invitations", {
+    (0, import_log14.log)("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file18,
-      L: 306,
+      L: 289,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5440,19 +5369,19 @@ var ClientServicesHost = class {
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log15.log)("opened", {
+    (0, import_log14.log)("opened", {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 323,
+      L: 306,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log15.log.trace("dxos.client-services.host.open", import_protocols15.trace.end({
+    import_log14.log.trace("dxos.client-services.host.open", import_protocols15.trace.end({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 324,
+      L: 307,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5462,11 +5391,11 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log15.log)("closing...", {
+    (0, import_log14.log)("closing...", {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 335,
+      L: 318,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5478,44 +5407,44 @@ var ClientServicesHost = class {
     await this._serviceContext.close();
     this._open = false;
     this._statusUpdate.emit();
-    (0, import_log15.log)("closed", {
+    (0, import_log14.log)("closed", {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 342,
+      L: 325,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
     const traceId = import_keys11.PublicKey.random().toHex();
-    import_log15.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.begin({
+    import_log14.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 347,
+      L: 330,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log15.log)("resetting...", void 0, {
+    (0, import_log14.log)("resetting...", void 0, {
       F: __dxlog_file18,
-      L: 349,
+      L: 332,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
-    (0, import_log15.log)("reset", void 0, {
+    (0, import_log14.log)("reset", void 0, {
       F: __dxlog_file18,
-      L: 352,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log15.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.end({
+    import_log14.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.end({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 353,
+      L: 336,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5530,7 +5459,7 @@ var ClientServicesHost = class {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     (0, import_invariant16.invariant)(automergeIndex, void 0, {
       F: __dxlog_file18,
-      L: 368,
+      L: 351,
       S: this,
       A: [
         "automergeIndex",
@@ -5555,11 +5484,11 @@ _ts_decorate8([
   import_tracing7.trace.info()
 ], ClientServicesHost.prototype, "_open", void 0);
 _ts_decorate8([
-  import_async15.synchronized,
+  import_async16.synchronized,
   import_tracing7.trace.span()
 ], ClientServicesHost.prototype, "open", null);
 _ts_decorate8([
-  import_async15.synchronized,
+  import_async16.synchronized,
   import_tracing7.trace.span()
 ], ClientServicesHost.prototype, "close", null);
 ClientServicesHost = _ts_decorate8([
@@ -5586,7 +5515,6 @@ ClientServicesHost = _ts_decorate8([
   SpacesServiceImpl,
   TrustedKeySetAuthVerifier,
   createAuthProvider,
-  createDefaultModelFactory,
   createDiagnostics,
   createStorageObjects,
   getNetworkPeers,
@@ -5600,4 +5528,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-K2PCGWBW.cjs.map
+//# sourceMappingURL=chunk-VWAYL2FO.cjs.map