@dxos/client-services 0.3.9-main.ee9a520 → 0.3.9-main.ef334cd

package/dist/lib/node/{chunk-TVYC6AI7.cjs → chunk-RD2EVVPQ.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_TVYC6AI7_exports = {};
-__export(chunk_TVYC6AI7_exports, {
+var chunk_RD2EVVPQ_exports = {};
+__export(chunk_RD2EVVPQ_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -60,7 +60,7 @@ __export(chunk_TVYC6AI7_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_TVYC6AI7_exports);
+module.exports = __toCommonJS(chunk_RD2EVVPQ_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -164,6 +164,7 @@ var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials"
 var import_timeframe2 = require("@dxos/timeframe");
 var import_tracing4 = require("@dxos/tracing");
 var import_util4 = require("@dxos/util");
+var import_credentials11 = require("@dxos/credentials");
 var import_async11 = require("@dxos/async");
 var import_context7 = require("@dxos/context");
 var import_invariant10 = require("@dxos/invariant");
@@ -174,7 +175,7 @@ var import_teleport2 = require("@dxos/teleport");
 var import_util5 = require("@dxos/util");
 var import_async12 = require("@dxos/async");
 var import_context8 = require("@dxos/context");
-var import_credentials11 = require("@dxos/credentials");
+var import_credentials12 = require("@dxos/credentials");
 var import_invariant11 = require("@dxos/invariant");
 var import_keys9 = require("@dxos/keys");
 var import_log11 = require("@dxos/log");
@@ -182,9 +183,9 @@ var import_protocols8 = require("@dxos/protocols");
 var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
 var import_util6 = require("@dxos/util");
-var import_credentials12 = require("@dxos/credentials");
+var import_credentials13 = require("@dxos/credentials");
 var import_debug5 = require("@dxos/debug");
-var import_credentials13 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_credentials14 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe3 = require("@dxos/timeframe");
 var import_async13 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
@@ -195,7 +196,7 @@ var import_protocols9 = require("@dxos/protocols");
 var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async14 = require("@dxos/async");
 var import_context9 = require("@dxos/context");
-var import_credentials14 = require("@dxos/credentials");
+var import_credentials15 = require("@dxos/credentials");
 var import_debug7 = require("@dxos/debug");
 var import_echo_pipeline2 = require("@dxos/echo-pipeline");
 var import_feed_store4 = require("@dxos/feed-store");
@@ -2648,7 +2649,7 @@ var getPlatform = () => {
     };
   }
 };
-var DXOS_VERSION = "0.3.9-main.ee9a520";
+var DXOS_VERSION = "0.3.9-main.ef334cd";
 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) => {
@@ -2770,6 +2771,21 @@ var getSpaceStats = async (space) => {
   }
   return stats;
 };
+var AutomergeSpaceState = class {
+  constructor() {
+    this.rootUrl = void 0;
+    this.lastEpoch = void 0;
+  }
+  async processCredential(credential) {
+    if (!(0, import_credentials11.checkCredentialType)(credential, "dxos.halo.credentials.Epoch")) {
+      return;
+    }
+    this.lastEpoch = credential;
+    if (credential.subject.assertion.automergeRoot) {
+      this.rootUrl = credential.subject.assertion.automergeRoot;
+    }
+  }
+};
 var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
 var DEFAULT_RETRY_TIMEOUT = 1e3;
 var DEFAULT_SUCCESS_DELAY = 1e3;
@@ -3044,6 +3060,9 @@ var DataSpace = class DataSpace2 {
   constructor(params) {
     this._ctx = new import_context6.Context();
     this._notarizationPlugin = new NotarizationPlugin();
+    this._cache = void 0;
+    this._automergeHost = void 0;
+    this._automergeSpaceState = new AutomergeSpaceState();
     this._state = import_services7.SpaceState.CLOSED;
     this.error = void 0;
     this.stateUpdate = new import_async10.Event();
@@ -3068,7 +3087,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 118,
+      L: 138,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3098,6 +3117,9 @@ var DataSpace = class DataSpace2 {
   get cache() {
     return this._cache;
   }
+  get automergeSpaceState() {
+    return this._automergeSpaceState;
+  }
   async open() {
     await this._open();
   }
@@ -3105,13 +3127,14 @@ var DataSpace = class DataSpace2 {
     await this._gossip.open();
     await this._notarizationPlugin.open();
     await this._inner.spaceState.addCredentialProcessor(this._notarizationPlugin);
+    await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
     await this._inner.open(new import_context6.Context());
     this._state = import_services7.SpaceState.CONTROL_ONLY;
     (0, import_log9.log)("new state", {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 165,
+      L: 190,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3129,7 +3152,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 179,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3137,6 +3160,7 @@ var DataSpace = class DataSpace2 {
     this._ctx = new import_context6.Context();
     await this.authVerifier.close();
     await this._inner.close();
+    await this._inner.spaceState.removeCredentialProcessor(this._automergeSpaceState);
     await this._inner.spaceState.removeCredentialProcessor(this._notarizationPlugin);
     await this._notarizationPlugin.close();
     await this._presence.destroy();
@@ -3160,7 +3184,7 @@ var DataSpace = class DataSpace2 {
         if (err instanceof import_protocols6.CancelledError) {
           (0, import_log9.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 211,
+            L: 237,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3168,7 +3192,7 @@ var DataSpace = class DataSpace2 {
         }
         import_log9.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 215,
+          L: 241,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3177,7 +3201,7 @@ var DataSpace = class DataSpace2 {
           state: import_services7.SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 217,
+          L: 243,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3197,7 +3221,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 233,
+      L: 259,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3208,7 +3232,7 @@ var DataSpace = class DataSpace2 {
     await (0, import_context6.cancelWithContext)(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
     (0, import_log9.log)("waiting for data pipeline to reach target timeframe", void 0, {
       F: __dxlog_file12,
-      L: 247,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3219,7 +3243,7 @@ var DataSpace = class DataSpace2 {
     this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     (0, import_log9.log)("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 256,
+      L: 282,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3229,7 +3253,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 260,
+      L: 286,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3245,7 +3269,7 @@ var DataSpace = class DataSpace2 {
     await this._createWritableFeeds();
     (0, import_log9.log)("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 276,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3317,8 +3341,28 @@ var DataSpace = class DataSpace2 {
       }
     });
   }
-  async createEpoch() {
-    const epoch = await this.dataPipeline.createEpoch();
+  async createEpoch(options) {
+    let epoch;
+    switch (options?.migration) {
+      case void 0:
+      case import_services7.CreateEpochRequest.Migration.NONE:
+        {
+          epoch = await this.dataPipeline.createEpoch();
+        }
+        break;
+      case import_services7.CreateEpochRequest.Migration.INIT_AUTOMERGE: {
+        const document = this._automergeHost?.repo.create();
+        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: document?.url
+        };
+      }
+    }
+    if (!epoch) {
+      return;
+    }
     const receipt = await this.inner.controlPipeline.writer.write({
       credential: {
         credential: await this._signingContext.credentialSigner.createCredential({
@@ -3365,7 +3409,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 404,
+      L: 451,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3402,7 +3446,7 @@ DataSpace = _ts_decorate4([
 ], DataSpace);
 var spaceGenesis = async (keyring, signingContext, space) => {
   const credentials = [
-    await (0, import_credentials12.createCredential)({
+    await (0, import_credentials13.createCredential)({
       signer: keyring,
       issuer: space.key,
       subject: space.key,
@@ -3411,14 +3455,14 @@ var spaceGenesis = async (keyring, signingContext, space) => {
         spaceKey: space.key
       }
     }),
-    await (0, import_credentials12.createCredential)({
+    await (0, import_credentials13.createCredential)({
       signer: keyring,
       issuer: space.key,
       subject: signingContext.identityKey,
       assertion: {
         "@type": "dxos.halo.credentials.SpaceMember",
         spaceKey: space.key,
-        role: import_credentials13.SpaceMember.Role.ADMIN,
+        role: import_credentials14.SpaceMember.Role.ADMIN,
         profile: signingContext.getProfile(),
         genesisFeedKey: space.controlFeedKey ?? (0, import_debug5.failUndefined)()
       }
@@ -3430,7 +3474,7 @@ var spaceGenesis = async (keyring, signingContext, space) => {
         spaceKey: space.key,
         identityKey: signingContext.identityKey,
         deviceKey: signingContext.deviceKey,
-        designation: import_credentials13.AdmittedFeed.Designation.CONTROL
+        designation: import_credentials14.AdmittedFeed.Designation.CONTROL
       }
     }),
     await signingContext.credentialSigner.createCredential({
@@ -3440,7 +3484,7 @@ var spaceGenesis = async (keyring, signingContext, space) => {
         spaceKey: space.key,
         identityKey: signingContext.identityKey,
         deviceKey: signingContext.deviceKey,
-        designation: import_credentials13.AdmittedFeed.Designation.DATA
+        designation: import_credentials14.AdmittedFeed.Designation.DATA
       }
     }),
     await signingContext.credentialSigner.createCredential({
@@ -3477,13 +3521,14 @@ 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 DataSpaceManager2 {
-  constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _feedStore) {
+  constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _feedStore, _automergeHost) {
     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_context8.Context();
     this.updated = new import_async12.Event();
     this._spaces = new import_util6.ComplexMap(import_keys9.PublicKey.hash);
@@ -3497,7 +3542,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   async open() {
     (0, import_log11.log)("open", void 0, {
       F: __dxlog_file13,
-      L: 83,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3505,7 +3550,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 84,
+      L: 93,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3513,7 +3558,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file13,
-      L: 85,
+      L: 94,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3523,7 +3568,7 @@ var DataSpaceManager = class DataSpaceManager2 {
           spaceMetadata
         }, {
           F: __dxlog_file13,
-          L: 89,
+          L: 98,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3534,7 +3579,7 @@ var DataSpaceManager = class DataSpaceManager2 {
           err
         }, {
           F: __dxlog_file13,
-          L: 92,
+          L: 101,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3551,7 +3596,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 105,
+      L: 114,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3559,7 +3604,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   async close() {
     (0, import_log11.log)("close", void 0, {
       F: __dxlog_file13,
-      L: 110,
+      L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3575,7 +3620,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   async createSpace() {
     (0, import_invariant11.invariant)(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 123,
+      L: 132,
       S: this,
       A: [
         "this._isOpen",
@@ -3596,7 +3641,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       spaceKey
     }, {
       F: __dxlog_file13,
-      L: 135,
+      L: 144,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3604,9 +3649,9 @@ var DataSpaceManager = class DataSpaceManager2 {
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    (0, import_invariant11.invariant)((0, import_credentials11.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+    (0, import_invariant11.invariant)((0, import_credentials12.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file13,
-      L: 142,
+      L: 151,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3624,13 +3669,13 @@ var DataSpaceManager = class DataSpaceManager2 {
       opts
     }, {
       F: __dxlog_file13,
-      L: 154,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant11.invariant)(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 155,
+      L: 164,
       S: this,
       A: [
         "this._isOpen",
@@ -3639,7 +3684,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     });
     (0, import_invariant11.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file13,
-      L: 156,
+      L: 165,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -3674,7 +3719,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       metadata
     }, {
       F: __dxlog_file13,
-      L: 189,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3710,7 +3755,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       onAuthFailure: () => {
         import_log11.log.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 224,
+          L: 233,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3734,7 +3779,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 242,
+            L: 251,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3746,7 +3791,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 249,
+            L: 258,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3759,14 +3804,15 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 255,
+            L: 264,
             S: this,
             C: (f, a) => f(...a)
           });
           await this._dataServiceSubscriptions.unregisterSpace(space.key);
         }
       },
-      cache: metadata.cache
+      cache: metadata.cache,
+      automergeHost: this._automergeHost
     });
     if (metadata.state !== import_services8.SpaceState.INACTIVE) {
       await dataSpace.open();
@@ -4052,6 +4098,7 @@ var ServiceContext = class ServiceContext2 {
       snapshotStore: this.snapshotStore
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
+    this.automergeHost = new import_echo_pipeline2.AutomergeHost(storage.createDirectory("automerge"));
     this.invitations = new InvitationsHandler(this.networkManager);
     this._handlerFactories.set(import_services10.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug7.failUndefined)(), this._acceptIdentity.bind(this)));
   }
@@ -4059,7 +4106,7 @@ var ServiceContext = class ServiceContext2 {
     await this._checkStorageVersion();
     (0, import_log13.log)("opening...", void 0, {
       F: __dxlog_file15,
-      L: 129,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4067,7 +4114,7 @@ var ServiceContext = class ServiceContext2 {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 130,
+      L: 134,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4083,13 +4130,13 @@ var ServiceContext = class ServiceContext2 {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 140,
+      L: 144,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log13.log)("opened", void 0, {
       F: __dxlog_file15,
-      L: 141,
+      L: 145,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4097,7 +4144,7 @@ var ServiceContext = class ServiceContext2 {
   async close() {
     (0, import_log13.log)("closing...", void 0, {
       F: __dxlog_file15,
-      L: 145,
+      L: 149,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4114,7 +4161,7 @@ var ServiceContext = class ServiceContext2 {
     await this.metadataStore.close();
     (0, import_log13.log)("closed", void 0, {
       F: __dxlog_file15,
-      L: 157,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4128,7 +4175,7 @@ var ServiceContext = class ServiceContext2 {
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant13.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 168,
+      L: 172,
       S: this,
       A: [
         "factory",
@@ -4160,7 +4207,7 @@ var ServiceContext = class ServiceContext2 {
   async _initialize(ctx) {
     (0, import_log13.log)("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 199,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4178,12 +4225,12 @@ var ServiceContext = class ServiceContext2 {
         });
       }
     };
-    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore);
+    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore, this.automergeHost);
     await this.dataSpaceManager.open();
     this._handlerFactories.set(import_services10.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant13.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 222,
+        L: 227,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4195,7 +4242,7 @@ var ServiceContext = class ServiceContext2 {
     this.initialized.wake();
     this._deviceSpaceSync = {
       processCredential: async (credential) => {
-        const assertion = (0, import_credentials14.getCredentialAssertion)(credential);
+        const assertion = (0, import_credentials15.getCredentialAssertion)(credential);
         if (assertion["@type"] !== "dxos.halo.credentials.SpaceMember") {
           return;
         }
@@ -4207,7 +4254,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 238,
+            L: 243,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4218,7 +4265,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 242,
+            L: 247,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4229,7 +4276,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 247,
+            L: 252,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4240,7 +4287,7 @@ var ServiceContext = class ServiceContext2 {
         } catch (err) {
           import_log13.log.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 253,
+            L: 258,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4840,7 +4887,7 @@ var ClientServicesHost = class ClientServicesHost2 {
         await this._serviceContext.initialized.wait();
         return this._serviceContext.dataSpaceManager;
       }),
-      DataService: new import_echo_pipeline3.DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
+      DataService: new import_echo_pipeline3.DataServiceImpl(this._serviceContext.dataServiceSubscriptions, this._serviceContext.automergeHost),
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
       LoggingService: this._loggingService,
       TracingService: this._tracingService,
@@ -4870,7 +4917,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 317,
+      L: 320,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4878,7 +4925,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 318,
+      L: 321,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4892,7 +4939,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 329,
+      L: 332,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4908,7 +4955,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 336,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4919,13 +4966,13 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 341,
+      L: 344,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log15.log)("resetting...", void 0, {
       F: __dxlog_file17,
-      L: 343,
+      L: 346,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4933,7 +4980,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     await this._storage.reset();
     (0, import_log15.log)("reset", void 0, {
       F: __dxlog_file17,
-      L: 346,
+      L: 349,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4941,7 +4988,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 347,
+      L: 350,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5018,4 +5065,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-TVYC6AI7.cjs.map
+//# sourceMappingURL=chunk-RD2EVVPQ.cjs.map