@dxos/client-services 0.3.11-main.dd122a6 → 0.3.11-main.df1e30a

package/dist/lib/node/{chunk-6VE2OLVY.cjs → chunk-LTQYCVFH.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_6VE2OLVY_exports = {};
-__export(chunk_6VE2OLVY_exports, {
+var chunk_LTQYCVFH_exports = {};
+__export(chunk_LTQYCVFH_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -60,7 +60,7 @@ __export(chunk_6VE2OLVY_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_6VE2OLVY_exports);
+module.exports = __toCommonJS(chunk_LTQYCVFH_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -108,6 +108,7 @@ var import_credentials6 = require("@dxos/credentials");
 var import_debug2 = require("@dxos/debug");
 var import_invariant3 = require("@dxos/invariant");
 var import_invariant4 = require("@dxos/invariant");
+var import_protocols3 = require("@dxos/protocols");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
 var import_async7 = require("@dxos/async");
 var import_client_protocol2 = require("@dxos/client-protocol");
@@ -117,7 +118,7 @@ var import_invariant5 = require("@dxos/invariant");
 var import_keys5 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
 var import_network_manager = require("@dxos/network-manager");
-var import_protocols3 = require("@dxos/protocols");
+var import_protocols4 = require("@dxos/protocols");
 var import_services2 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_async8 = require("@dxos/async");
@@ -125,7 +126,7 @@ var import_context5 = require("@dxos/context");
 var import_invariant6 = require("@dxos/invariant");
 var import_keys6 = require("@dxos/keys");
 var import_log5 = require("@dxos/log");
-var import_protocols4 = require("@dxos/protocols");
+var import_protocols5 = require("@dxos/protocols");
 var import_services3 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations2 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_teleport = require("@dxos/teleport");
@@ -138,6 +139,7 @@ var import_credentials8 = require("@dxos/credentials");
 var import_feed_store3 = require("@dxos/feed-store");
 var import_invariant8 = require("@dxos/invariant");
 var import_log7 = require("@dxos/log");
+var import_protocols6 = require("@dxos/protocols");
 var import_services5 = require("@dxos/protocols/proto/dxos/client/services");
 var import_codec_protobuf9 = require("@dxos/codec-protobuf");
 var import_debug3 = require("@dxos/debug");
@@ -149,16 +151,17 @@ 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_protocols5 = require("@dxos/protocols");
+var import_protocols7 = require("@dxos/protocols");
 var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async10 = require("@dxos/async");
 var import_client_protocol3 = require("@dxos/client-protocol");
 var import_context6 = require("@dxos/context");
 var import_debug4 = 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_protocols6 = require("@dxos/protocols");
+var import_protocols8 = require("@dxos/protocols");
 var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe2 = require("@dxos/timeframe");
@@ -167,19 +170,19 @@ 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");
+var import_invariant11 = require("@dxos/invariant");
 var import_keys8 = require("@dxos/keys");
 var import_log10 = require("@dxos/log");
-var import_protocols7 = require("@dxos/protocols");
+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_context8 = require("@dxos/context");
 var import_credentials12 = require("@dxos/credentials");
-var import_invariant11 = require("@dxos/invariant");
+var import_invariant12 = require("@dxos/invariant");
 var import_keys9 = require("@dxos/keys");
 var import_log11 = require("@dxos/log");
-var import_protocols8 = require("@dxos/protocols");
+var import_protocols10 = 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");
@@ -190,9 +193,9 @@ var import_timeframe3 = require("@dxos/timeframe");
 var import_async13 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_debug6 = require("@dxos/debug");
-var import_invariant12 = require("@dxos/invariant");
+var import_invariant13 = require("@dxos/invariant");
 var import_log12 = require("@dxos/log");
-var import_protocols9 = require("@dxos/protocols");
+var import_protocols11 = 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");
@@ -200,20 +203,20 @@ 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");
-var import_invariant13 = require("@dxos/invariant");
+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_protocols10 = require("@dxos/protocols");
+var import_protocols12 = require("@dxos/protocols");
 var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_tracing5 = require("@dxos/tracing");
 var import_util7 = require("@dxos/util");
-var import_invariant14 = require("@dxos/invariant");
+var import_invariant15 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
 var import_log14 = require("@dxos/log");
 var import_client_protocol4 = require("@dxos/client-protocol");
-var import_protocols11 = require("@dxos/protocols");
+var import_protocols13 = 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");
@@ -223,13 +226,13 @@ var import_context10 = 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_invariant15 = require("@dxos/invariant");
+var import_invariant16 = require("@dxos/invariant");
 var import_keys11 = require("@dxos/keys");
 var import_log15 = 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_protocols12 = require("@dxos/protocols");
+var import_protocols14 = require("@dxos/protocols");
 var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
 var import_text_model = require("@dxos/text-model");
 var import_tracing6 = require("@dxos/tracing");
@@ -675,7 +678,7 @@ function _ts_decorate(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
-var Identity = class Identity2 {
+var Identity = class {
   constructor({ space, signer, identityKey, deviceKey }) {
     this.stateUpdate = new import_async5.Event();
     this.space = space;
@@ -843,7 +846,7 @@ function _ts_decorate2(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-manager.ts";
-var IdentityManager = class IdentityManager2 {
+var IdentityManager = class {
   // TODO(burdon): IdentityManagerParams.
   // TODO(dmaretskyi): Perhaps this should take/generate the peerKey outside of an initialized identity.
   constructor(_metadataStore, _keyring, _feedStore, _spaceManager) {
@@ -1174,7 +1177,7 @@ var IdentityManager = class IdentityManager2 {
         genesisFeedKey: spaceRecord.genesisFeedKey
       },
       swarmIdentity,
-      onNetworkConnection: () => {
+      onAuthorizedConnection: () => {
       },
       onAuthFailure: () => {
         import_log3.log.warn("auth failure", void 0, {
@@ -1197,6 +1200,7 @@ IdentityManager = _ts_decorate2([
   import_tracing2.trace.resource()
 ], IdentityManager);
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-service.ts";
+var CREATE_PROFILE_WITH_AUTOMERGE_DEFAULT = true;
 var IdentityServiceImpl = class {
   constructor(_createIdentity, _identityManager, _keyring, _onProfileUpdate) {
     this._createIdentity = _createIdentity;
@@ -1205,7 +1209,7 @@ var IdentityServiceImpl = class {
     this._onProfileUpdate = _onProfileUpdate;
   }
   async createIdentity(request) {
-    await this._createIdentity(request);
+    await this._createIdentity(request.profile ?? {}, request.useAutomerge ?? CREATE_PROFILE_WITH_AUTOMERGE_DEFAULT);
     return this._getIdentity();
   }
   async recoverIdentity(request) {
@@ -1233,7 +1237,7 @@ var IdentityServiceImpl = class {
   async updateProfile(profile) {
     (0, import_invariant3.invariant)(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file4,
-      L: 60,
+      L: 63,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -1247,7 +1251,7 @@ var IdentityServiceImpl = class {
   async signPresentation({ presentation, nonce }) {
     (0, import_invariant3.invariant)(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file4,
-      L: 67,
+      L: 70,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -1281,7 +1285,7 @@ var DeviceInvitationProtocol = class {
   async admit(request) {
     (0, import_invariant4.invariant)(request.device, void 0, {
       F: __dxlog_file5,
-      L: 35,
+      L: 36,
       S: this,
       A: [
         "request.device",
@@ -1299,6 +1303,15 @@ var DeviceInvitationProtocol = class {
       }
     };
   }
+  checkInvitation(invitation) {
+    try {
+      const identity = this._getIdentity();
+      if (identity) {
+        return new import_protocols3.AlreadyJoinedError("Currently only one identity per client is supported.");
+      }
+    } catch {
+    }
+  }
   createIntroduction() {
     return {};
   }
@@ -1317,7 +1330,7 @@ var DeviceInvitationProtocol = class {
   async accept(response, request) {
     (0, import_invariant4.invariant)(response.device, void 0, {
       F: __dxlog_file5,
-      L: 68,
+      L: 80,
       S: this,
       A: [
         "response.device",
@@ -1327,7 +1340,7 @@ var DeviceInvitationProtocol = class {
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
     (0, import_invariant4.invariant)(request.device, void 0, {
       F: __dxlog_file5,
-      L: 71,
+      L: 83,
       S: this,
       A: [
         "request.device",
@@ -1356,10 +1369,10 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
   constructor(_callbacks) {
     super({
       requested: {
-        InvitationHostService: import_protocols4.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_protocols5.schema.getService("dxos.halo.invitations.InvitationHostService")
       },
       exposed: {
-        InvitationHostService: import_protocols4.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_protocols5.schema.getService("dxos.halo.invitations.InvitationHostService")
       }
     });
     this._callbacks = _callbacks;
@@ -1392,7 +1405,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         introduce: async (request) => {
           const { profile, invitationId } = request;
           const traceId = import_keys6.PublicKey.random().toHex();
-          import_log5.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols4.trace.begin({
+          import_log5.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols5.trace.begin({
             id: traceId
           }), {
             F: __dxlog_file6,
@@ -1429,7 +1442,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             ...this.invitation,
             state: import_services3.Invitation.State.READY_FOR_AUTHENTICATION
           });
-          import_log5.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols4.trace.end({
+          import_log5.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols5.trace.end({
             id: traceId
           }), {
             F: __dxlog_file6,
@@ -1443,7 +1456,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         },
         authenticate: async ({ authCode: code }) => {
           const traceId = import_keys6.PublicKey.random().toHex();
-          import_log5.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols4.trace.begin({
+          import_log5.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols5.trace.begin({
             id: traceId
           }), {
             F: __dxlog_file6,
@@ -1506,7 +1519,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
               break;
             }
           }
-          import_log5.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols4.trace.end({
+          import_log5.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols5.trace.end({
             id: traceId,
             data: {
               status
@@ -1523,7 +1536,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         },
         admit: async (request) => {
           const traceId = import_keys6.PublicKey.random().toHex();
-          import_log5.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols4.trace.begin({
+          import_log5.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols5.trace.begin({
             id: traceId
           }), {
             F: __dxlog_file6,
@@ -1545,7 +1558,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
               throw new Error("Not authenticated");
             }
             const response = await this._callbacks.admit(request);
-            import_log5.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols4.trace.end({
+            import_log5.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols5.trace.end({
               id: traceId
             }), {
               F: __dxlog_file6,
@@ -1572,7 +1585,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         timeout: OPTIONS_TIMEOUT
       }));
       if (this._remoteOptions?.role !== import_invitations2.Options.Role.GUEST) {
-        throw new import_protocols4.InvalidInvitationExtensionRoleError(void 0, {
+        throw new import_protocols5.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations2.Options.Role.GUEST,
           remoteOptions: this._remoteOptions
         });
@@ -1590,10 +1603,10 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
   constructor(_callbacks) {
     super({
       requested: {
-        InvitationHostService: import_protocols4.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_protocols5.schema.getService("dxos.halo.invitations.InvitationHostService")
       },
       exposed: {
-        InvitationHostService: import_protocols4.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_protocols5.schema.getService("dxos.halo.invitations.InvitationHostService")
       }
     });
     this._callbacks = _callbacks;
@@ -1650,7 +1663,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
         C: (f, a) => f(...a)
       });
       if (this._remoteOptions?.role !== import_invitations2.Options.Role.HOST) {
-        throw new import_protocols4.InvalidInvitationExtensionRoleError(void 0, {
+        throw new import_protocols5.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations2.Options.Role.HOST,
           remoteOptions: this._remoteOptions
         });
@@ -1763,7 +1776,7 @@ var InvitationsHandler = class {
           (0, import_async7.scheduleTask)(ctx, async () => {
             const traceId = import_keys5.PublicKey.random().toHex();
             try {
-              import_log4.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols3.trace.begin({
+              import_log4.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols4.trace.begin({
                 id: traceId
               }), {
                 F: __dxlog_file7,
@@ -1799,7 +1812,7 @@ var InvitationsHandler = class {
                 ...invitation,
                 state: import_services2.Invitation.State.SUCCESS
               });
-              import_log4.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols3.trace.end({
+              import_log4.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols4.trace.end({
                 id: traceId
               }), {
                 F: __dxlog_file7,
@@ -1830,7 +1843,7 @@ var InvitationsHandler = class {
                 });
                 stream.error(err);
               }
-              import_log4.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols3.trace.error({
+              import_log4.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols4.trace.error({
                 id: traceId,
                 error: err
               }), {
@@ -1848,7 +1861,7 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
-          if (err instanceof import_protocols3.InvalidInvitationExtensionRoleError) {
+          if (err instanceof import_protocols4.InvalidInvitationExtensionRoleError) {
             return;
           }
           if (err instanceof import_async7.TimeoutError) {
@@ -1996,7 +2009,7 @@ var InvitationsHandler = class {
           (0, import_async7.scheduleTask)(ctx, async () => {
             const traceId = import_keys5.PublicKey.random().toHex();
             try {
-              import_log4.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols3.trace.begin({
+              import_log4.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols4.trace.begin({
                 id: traceId
               }), {
                 F: __dxlog_file7,
@@ -2083,16 +2096,12 @@ var InvitationsHandler = class {
                     }
                   }
                 }
-              } else {
-                setState({
-                  state: import_services2.Invitation.State.READY_FOR_AUTHENTICATION
-                });
               }
               (0, import_log4.log)("request admission", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 312,
+                L: 309,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2104,19 +2113,20 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 323,
+                L: 320,
                 S: this,
                 C: (f, a) => f(...a)
               });
               setState({
                 ...result,
+                target: invitation.target,
                 state: import_services2.Invitation.State.SUCCESS
               });
-              import_log4.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols3.trace.end({
+              import_log4.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols4.trace.end({
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 325,
+                L: 322,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2126,7 +2136,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 328,
+                  L: 325,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2136,18 +2146,18 @@ var InvitationsHandler = class {
               } else {
                 (0, import_log4.log)("auth failed", err, {
                   F: __dxlog_file7,
-                  L: 331,
+                  L: 328,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 stream.error(err);
               }
-              import_log4.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols3.trace.error({
+              import_log4.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols4.trace.error({
                 id: traceId,
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 334,
+                L: 331,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2157,7 +2167,7 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
-          if (err instanceof import_protocols3.InvalidInvitationExtensionRoleError) {
+          if (err instanceof import_protocols4.InvalidInvitationExtensionRoleError) {
             return;
           }
           if (err instanceof import_async7.TimeoutError) {
@@ -2165,7 +2175,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 345,
+              L: 342,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2175,7 +2185,7 @@ var InvitationsHandler = class {
           } else {
             (0, import_log4.log)("auth failed", err, {
               F: __dxlog_file7,
-              L: 348,
+              L: 345,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2186,29 +2196,34 @@ var InvitationsHandler = class {
       return extension;
     };
     (0, import_async7.scheduleTask)(ctx, async () => {
-      (0, import_invariant5.invariant)(invitation.swarmKey, void 0, {
-        F: __dxlog_file7,
-        L: 358,
-        S: this,
-        A: [
-          "invitation.swarmKey",
-          ""
-        ]
-      });
-      const topic = invitation.swarmKey;
-      const swarmConnection = await this._networkManager.joinSwarm({
-        topic,
-        peerId: import_keys5.PublicKey.random(),
-        protocolProvider: (0, import_network_manager.createTeleportProtocolFactory)(async (teleport) => {
-          teleport.addExtension("dxos.halo.invitations", createExtension());
-        }),
-        topology: new import_network_manager.StarTopology(topic),
-        label: "invitation guest"
-      });
-      ctx.onDispose(() => swarmConnection.close());
-      setState({
-        state: import_services2.Invitation.State.CONNECTING
-      });
+      const error = protocol.checkInvitation(invitation);
+      if (error) {
+        stream.error(error);
+      } else {
+        (0, import_invariant5.invariant)(invitation.swarmKey, void 0, {
+          F: __dxlog_file7,
+          L: 359,
+          S: this,
+          A: [
+            "invitation.swarmKey",
+            ""
+          ]
+        });
+        const topic = invitation.swarmKey;
+        const swarmConnection = await this._networkManager.joinSwarm({
+          topic,
+          peerId: import_keys5.PublicKey.random(),
+          protocolProvider: (0, import_network_manager.createTeleportProtocolFactory)(async (teleport) => {
+            teleport.addExtension("dxos.halo.invitations", createExtension());
+          }),
+          topology: new import_network_manager.StarTopology(topic),
+          label: "invitation guest"
+        });
+        ctx.onDispose(() => swarmConnection.close());
+        setState({
+          state: import_services2.Invitation.State.CONNECTING
+        });
+      }
     });
     const observable = new import_client_protocol2.AuthenticatingInvitation({
       initialInvitation: invitation,
@@ -2424,7 +2439,7 @@ var SpaceInvitationProtocol = class {
   async admit(request, guestProfile) {
     (0, import_invariant8.invariant)(this._spaceKey, void 0, {
       F: __dxlog_file9,
-      L: 46,
+      L: 47,
       S: this,
       A: [
         "this._spaceKey",
@@ -2434,7 +2449,7 @@ var SpaceInvitationProtocol = class {
     const space = await this._spaceManager.spaces.get(this._spaceKey);
     (0, import_invariant8.invariant)(space, void 0, {
       F: __dxlog_file9,
-      L: 48,
+      L: 49,
       S: this,
       A: [
         "space",
@@ -2443,7 +2458,7 @@ var SpaceInvitationProtocol = class {
     });
     (0, import_invariant8.invariant)(request.space, void 0, {
       F: __dxlog_file9,
-      L: 50,
+      L: 51,
       S: this,
       A: [
         "request.space",
@@ -2456,14 +2471,14 @@ var SpaceInvitationProtocol = class {
       guest: deviceKey
     }, {
       F: __dxlog_file9,
-      L: 53,
+      L: 54,
       S: this,
       C: (f, a) => f(...a)
     });
     const credentials = await (0, import_credentials8.createAdmissionCredentials)(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, guestProfile);
     (0, import_invariant8.invariant)(credentials[0].credential, void 0, {
       F: __dxlog_file9,
-      L: 64,
+      L: 65,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2473,7 +2488,7 @@ var SpaceInvitationProtocol = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     (0, import_invariant8.invariant)((0, import_credentials8.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file9,
-      L: 66,
+      L: 67,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2489,6 +2504,11 @@ var SpaceInvitationProtocol = class {
       }
     };
   }
+  checkInvitation(invitation) {
+    if (invitation.spaceKey && this._spaceManager.spaces.has(invitation.spaceKey)) {
+      return new import_protocols6.AlreadyJoinedError("Already joined space.");
+    }
+  }
   createIntroduction() {
     return {
       profile: this._signingContext.getProfile()
@@ -2509,7 +2529,7 @@ var SpaceInvitationProtocol = class {
   async accept(response) {
     (0, import_invariant8.invariant)(response.space, void 0, {
       F: __dxlog_file9,
-      L: 101,
+      L: 108,
       S: this,
       A: [
         "response.space",
@@ -2520,7 +2540,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: 104,
+      L: 111,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2529,13 +2549,16 @@ var SpaceInvitationProtocol = class {
     });
     (0, import_invariant8.invariant)(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
       F: __dxlog_file9,
-      L: 105,
+      L: 112,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
         ""
       ]
     });
+    if (this._spaceManager.spaces.has(assertion.spaceKey)) {
+      throw new import_protocols6.AlreadyJoinedError("Already joined space.");
+    }
     await this._spaceManager.acceptSpace({
       spaceKey: assertion.spaceKey,
       genesisFeedKey: assertion.genesisFeedKey,
@@ -2558,7 +2581,7 @@ function _ts_decorate3(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var ClientRpcServer = class ClientRpcServer2 {
+var ClientRpcServer = class {
   constructor(params) {
     this._handlerCache = /* @__PURE__ */ new Map();
     this._callMetrics = new import_tracing3.MapCounter();
@@ -2649,7 +2672,7 @@ var getPlatform = () => {
     };
   }
 };
-var DXOS_VERSION = "0.3.11-main.dd122a6";
+var DXOS_VERSION = "0.3.11-main.df1e30a";
 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) => {
@@ -2659,14 +2682,14 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
     client: {
       version: DXOS_VERSION,
       storage: {
-        version: import_protocols5.STORAGE_VERSION
+        version: import_protocols7.STORAGE_VERSION
       }
     }
   };
   {
     (0, import_invariant9.invariant)(clientServices.LoggingService, "SystemService is not available.", {
       F: __dxlog_file10,
-      L: 92,
+      L: 93,
       S: void 0,
       A: [
         "clientServices.LoggingService",
@@ -2677,6 +2700,21 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
       timeout: DEFAULT_TIMEOUT
     }).catch(() => void 0);
   }
+  if (typeof navigator !== "undefined" && navigator.storage) {
+    const map = /* @__PURE__ */ new Map();
+    const dir = await navigator.storage.getDirectory();
+    for await (const filename of dir?.keys()) {
+      const idx = filename.indexOf("-", filename.indexOf("-") + 1);
+      if (idx === -1) {
+        continue;
+      }
+      map.set(filename.slice(0, idx), (map.get(filename.slice(0, idx)) ?? 0) + 1);
+    }
+    diagnostics.storage = Array.from(map.entries()).sort((a, b) => b[1] - a[1]).map(([file, count]) => ({
+      file,
+      count
+    }));
+  }
   const identity = serviceContext.identityManager.identity;
   if (identity) {
     diagnostics.identity = {
@@ -2717,7 +2755,7 @@ var getProperties = (space) => {
   } catch (err) {
     import_log8.log.warn(err.message, void 0, {
       F: __dxlog_file10,
-      L: 160,
+      L: 178,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2772,7 +2810,8 @@ var getSpaceStats = async (space) => {
   return stats;
 };
 var AutomergeSpaceState = class {
-  constructor() {
+  constructor(_onNewRoot) {
+    this._onNewRoot = _onNewRoot;
     this.rootUrl = void 0;
     this.lastEpoch = void 0;
   }
@@ -2783,6 +2822,7 @@ var AutomergeSpaceState = class {
     this.lastEpoch = credential;
     if (credential.subject.assertion.automergeRoot) {
       this.rootUrl = credential.subject.assertion.automergeRoot;
+      this._onNewRoot(this.rootUrl);
     }
   }
 };
@@ -2819,7 +2859,7 @@ var NotarizationPlugin = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant10.invariant)(credentials.every((credential) => credential.id), "Credentials must have an id", {
+    (0, import_invariant11.invariant)(credentials.every((credential) => credential.id), "Credentials must have an id", {
       F: __dxlog_file11,
       L: 91,
       S: this,
@@ -2944,7 +2984,7 @@ var NotarizationPlugin = class {
     this._processCredentialsTriggers.delete(credential.id);
   }
   setWriter(writer) {
-    (0, import_invariant10.invariant)(!this._writer, "Writer already set.", {
+    (0, import_invariant11.invariant)(!this._writer, "Writer already set.", {
       F: __dxlog_file11,
       L: 181,
       S: this,
@@ -2969,7 +3009,7 @@ var NotarizationPlugin = class {
       throw new Error(WRITER_NOT_SET_ERROR_CODE);
     }
     for (const credential of request.credentials ?? []) {
-      (0, import_invariant10.invariant)(credential.id, "Credential must have an id", {
+      (0, import_invariant11.invariant)(credential.id, "Credential must have an id", {
         F: __dxlog_file11,
         L: 200,
         S: this,
@@ -3018,10 +3058,10 @@ var NotarizationTeleportExtension = class extends import_teleport2.RpcExtension
   constructor(_params) {
     super({
       requested: {
-        NotarizationService: import_protocols7.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_protocols9.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       },
       exposed: {
-        NotarizationService: import_protocols7.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_protocols9.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       }
     });
     this._params = _params;
@@ -3056,12 +3096,12 @@ function _ts_decorate4(decorators, target, key, desc) {
 }
 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 DataSpace2 {
+var DataSpace = class {
   constructor(params) {
     this._ctx = new import_context6.Context();
     this._notarizationPlugin = new NotarizationPlugin();
     this._cache = void 0;
-    this._automergeSpaceState = new AutomergeSpaceState();
+    this._automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
     this._state = import_services7.SpaceState.CLOSED;
     this.error = void 0;
     this.stateUpdate = new import_async10.Event();
@@ -3087,7 +3127,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 137,
+      L: 138,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3134,7 +3174,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 189,
+      L: 190,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3152,7 +3192,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 203,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3181,10 +3221,10 @@ var DataSpace = class DataSpace2 {
         this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
       } catch (err) {
-        if (err instanceof import_protocols6.CancelledError) {
+        if (err instanceof import_protocols8.CancelledError) {
           (0, import_log9.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 236,
+            L: 237,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3192,7 +3232,7 @@ var DataSpace = class DataSpace2 {
         }
         import_log9.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 240,
+          L: 241,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3201,7 +3241,7 @@ var DataSpace = class DataSpace2 {
           state: import_services7.SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 242,
+          L: 243,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3214,14 +3254,14 @@ var DataSpace = class DataSpace2 {
   }
   async initializeDataPipeline() {
     if (this._state !== import_services7.SpaceState.CONTROL_ONLY) {
-      throw new import_protocols6.SystemError("Invalid operation");
+      throw new import_protocols8.SystemError("Invalid operation");
     }
     this._state = import_services7.SpaceState.INITIALIZING;
     (0, import_log9.log)("new state", {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 258,
+      L: 259,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3232,7 +3272,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: 272,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3243,7 +3283,7 @@ var DataSpace = class DataSpace2 {
     this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     (0, import_log9.log)("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 281,
+      L: 282,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3253,7 +3293,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 285,
+      L: 286,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3269,7 +3309,7 @@ var DataSpace = class DataSpace2 {
     await this._createWritableFeeds();
     (0, import_log9.log)("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 301,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3326,6 +3366,40 @@ var DataSpace = class DataSpace2 {
       await this._metadataStore.setWritableFeedKeys(this.key, this.inner.controlFeedKey, this.inner.dataFeedKey);
     }
   }
+  _onNewAutomergeRoot(rootUrl) {
+    import_log9.log.info("loading automerge root doc for space", {
+      space: this.key,
+      rootUrl
+    }, {
+      F: __dxlog_file12,
+      L: 368,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const handle = this._automergeHost.repo.find(rootUrl);
+    queueMicrotask(async () => {
+      try {
+        await handle.whenReady();
+        const doc = handle.docSync() ?? (0, import_invariant10.failedInvariant)();
+        if (!doc.experimental_spaceKey) {
+          handle.change((doc2) => {
+            doc2.experimental_spaceKey = this.key.toHex();
+          });
+        }
+      } catch (err) {
+        import_log9.log.warn("error loading automerge root doc", {
+          space: this.key,
+          rootUrl,
+          err
+        }, {
+          F: __dxlog_file12,
+          L: 381,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+    });
+  }
   // TODO(dmaretskyi): Use profile from signing context.
   async updateOwnProfile(profile) {
     const credential = await this._signingContext.credentialSigner.createCredential({
@@ -3409,7 +3483,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 450,
+      L: 470,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3521,7 +3595,7 @@ function _ts_decorate5(decorators, target, key, desc) {
 var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
 var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
-var DataSpaceManager = class DataSpaceManager2 {
+var DataSpaceManager = class {
   constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _feedStore, _automergeHost) {
     this._spaceManager = _spaceManager;
     this._metadataStore = _metadataStore;
@@ -3547,7 +3621,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols8.trace.begin({
+    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols10.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
@@ -3593,7 +3667,7 @@ var DataSpaceManager = class DataSpaceManager2 {
         space.initializeDataPipelineAsync();
       }
     }
-    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols8.trace.end({
+    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols10.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
@@ -3619,7 +3693,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   * Creates a new space writing the genesis credentials to the control feed.
   */
   async createSpace() {
-    (0, import_invariant11.invariant)(this._isOpen, "Not open.", {
+    (0, import_invariant12.invariant)(this._isOpen, "Not open.", {
       F: __dxlog_file13,
       L: 130,
       S: this,
@@ -3648,12 +3722,15 @@ var DataSpaceManager = class DataSpaceManager2 {
     });
     const space = await this._constructSpace(metadata);
     const automergeRoot = this._automergeHost.repo.create();
+    automergeRoot.change((doc) => {
+      doc.experimental_spaceKey = spaceKey.toHex();
+    });
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRoot.url);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    (0, import_invariant11.invariant)((0, import_credentials12.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+    (0, import_invariant12.invariant)((0, import_credentials12.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file13,
-      L: 151,
+      L: 154,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3671,22 +3748,22 @@ var DataSpaceManager = class DataSpaceManager2 {
       opts
     }, {
       F: __dxlog_file13,
-      L: 163,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant11.invariant)(this._isOpen, "Not open.", {
+    (0, import_invariant12.invariant)(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 164,
+      L: 167,
       S: this,
       A: [
         "this._isOpen",
         "'Not open.'"
       ]
     });
-    (0, import_invariant11.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
+    (0, import_invariant12.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file13,
-      L: 165,
+      L: 168,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -3721,7 +3798,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       metadata
     }, {
       F: __dxlog_file13,
-      L: 198,
+      L: 201,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3748,17 +3825,18 @@ var DataSpaceManager = class DataSpaceManager2 {
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: (0, import_util6.deferFunction)(() => dataSpace.authVerifier.verifier)
       },
-      onNetworkConnection: (session) => {
+      onAuthorizedConnection: (session) => {
         session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
           remotePeerId: session.remotePeerId
         }));
         session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
+        this._automergeHost.authorizeDevice(space.key, session.remotePeerId);
         session.addExtension("dxos.mesh.teleport.automerge", this._automergeHost.createExtension());
       },
       onAuthFailure: () => {
         import_log11.log.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 234,
+          L: 238,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3782,7 +3860,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 252,
+            L: 256,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3794,7 +3872,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 259,
+            L: 263,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3807,7 +3885,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 265,
+            L: 269,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3855,7 +3933,7 @@ var SpacesServiceImpl = class {
   }
   async createSpace() {
     if (!this._identityManager.identity) {
-      throw new Error("This device has no HALO identity available. See https://docs.dxos.org/guide/halo");
+      throw new Error("This device has no HALO identity available. See https://docs.dxos.org/guide/platform/halo");
     }
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = await dataSpaceManager.createSpace();
@@ -3863,7 +3941,7 @@ var SpacesServiceImpl = class {
   }
   async updateSpace({ spaceKey, state }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
     if (state) {
       switch (state) {
         case import_services9.SpaceState.ACTIVE:
@@ -3873,7 +3951,7 @@ var SpacesServiceImpl = class {
           await space.deactivate();
           break;
         default:
-          throw new import_protocols9.ApiError("Invalid space state");
+          throw new import_protocols11.ApiError("Invalid space state");
       }
     }
   }
@@ -3928,14 +4006,14 @@ var SpacesServiceImpl = class {
   }
   async postMessage({ spaceKey, channel, message }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
     await space.postMessage(getChannelId(channel), message);
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
       (0, import_async13.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
+        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
           next(message);
         });
@@ -3945,7 +4023,7 @@ var SpacesServiceImpl = class {
   }
   queryCredentials({ spaceKey, noTail }) {
     return new import_codec_protobuf11.Stream(({ ctx, next, close }) => {
-      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
+      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
       const processor = {
         processCredential: async (credential) => {
           next(credential);
@@ -3961,7 +4039,7 @@ var SpacesServiceImpl = class {
     });
   }
   async writeCredentials({ spaceKey, credentials }) {
-    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
+    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
     for (const credential of credentials ?? []) {
       if (credential.proof) {
         await space.controlPipeline.writer.write({
@@ -3970,7 +4048,7 @@ var SpacesServiceImpl = class {
           }
         });
       } else {
-        (0, import_invariant12.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
+        (0, import_invariant13.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file14,
           L: 168,
           S: this,
@@ -3979,7 +4057,7 @@ var SpacesServiceImpl = class {
             "'Id on unsigned credentials is not allowed'"
           ]
         });
-        (0, import_invariant12.invariant)(this._identityManager.identity, "Identity is not available", {
+        (0, import_invariant13.invariant)(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file14,
           L: 169,
           S: this,
@@ -3989,7 +4067,7 @@ var SpacesServiceImpl = class {
           ]
         });
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
-        (0, import_invariant12.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
+        (0, import_invariant13.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file14,
           L: 171,
           S: this,
@@ -4012,14 +4090,14 @@ var SpacesServiceImpl = class {
   }
   async createEpoch({ spaceKey }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
     await space.createEpoch();
   }
   _serializeSpace(space) {
     return {
       spaceKey: space.key,
       state: space.state,
-      error: space.error ? (0, import_protocols9.encodeError)(space.error) : void 0,
+      error: space.error ? (0, import_protocols11.encodeError)(space.error) : void 0,
       pipeline: {
         currentEpoch: space.dataPipeline.currentEpoch,
         appliedEpoch: space.dataPipeline.appliedEpoch,
@@ -4068,7 +4146,7 @@ function _ts_decorate6(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
-var ServiceContext = class ServiceContext2 {
+var ServiceContext = class {
   constructor(storage, networkManager, signalManager, modelFactory) {
     this.storage = storage;
     this.networkManager = networkManager;
@@ -4113,7 +4191,7 @@ var ServiceContext = class ServiceContext2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols10.trace.begin({
+    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols12.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file15,
@@ -4129,7 +4207,7 @@ var ServiceContext = class ServiceContext2 {
     if (this.identityManager.identity) {
       await this._initialize(ctx);
     }
-    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols10.trace.end({
+    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols12.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file15,
@@ -4177,7 +4255,7 @@ var ServiceContext = class ServiceContext2 {
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    (0, import_invariant13.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
+    (0, import_invariant14.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
       L: 173,
       S: this,
@@ -4203,8 +4281,8 @@ var ServiceContext = class ServiceContext2 {
   }
   async _checkStorageVersion() {
     await this.metadataStore.load();
-    if (this.metadataStore.version !== import_protocols10.STORAGE_VERSION) {
-      throw new import_protocols10.InvalidStorageVersionError(import_protocols10.STORAGE_VERSION, this.metadataStore.version);
+    if (this.metadataStore.version !== import_protocols12.STORAGE_VERSION) {
+      throw new import_protocols12.InvalidStorageVersionError(import_protocols12.STORAGE_VERSION, this.metadataStore.version);
     }
   }
   // Called when identity is created.
@@ -4232,7 +4310,7 @@ var ServiceContext = class ServiceContext2 {
     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", {
+      (0, import_invariant14.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
         L: 228,
         S: this,
@@ -4371,7 +4449,7 @@ var Lock = class {
   }
   async release() {
     await this._onRelease?.();
-    (0, import_invariant14.invariant)(this._fileHandle, "Lock is not acquired", {
+    (0, import_invariant15.invariant)(this._fileHandle, "Lock is not acquired", {
       F: __dxlog_file16,
       L: 42,
       S: this,
@@ -4391,16 +4469,16 @@ var StorageDriver = import_config.Runtime.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
   const { persistent = false, keyStore, dataStore, dataRoot = (0, import_util8.isNode)() ? import_client_protocol4.DX_DATA : "dxos/storage" } = config ?? {};
   if (persistent && dataStore === StorageDriver.RAM) {
-    throw new import_protocols11.InvalidConfigError("RAM storage cannot be used in persistent mode.");
+    throw new import_protocols13.InvalidConfigError("RAM storage cannot be used in persistent mode.");
   }
   if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
-    throw new import_protocols11.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
+    throw new import_protocols13.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
   }
   if (persistent && keyStore === StorageDriver.RAM) {
-    throw new import_protocols11.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
+    throw new import_protocols13.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
   }
   if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
-    throw new import_protocols11.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+    throw new import_protocols13.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
   }
   return {
     storage: (0, import_random_access_storage.createStorage)({
@@ -4682,7 +4760,7 @@ var createGenesisMutationFromTypedObject = (obj) => {
     }
   };
 };
-var ClientServicesHost = class ClientServicesHost2 {
+var ClientServicesHost = class {
   constructor({
     config,
     modelFactory = createDefaultModelFactory(),
@@ -4766,7 +4844,7 @@ var ClientServicesHost = class ClientServicesHost2 {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    (0, import_invariant15.invariant)(!this._open, "service host is open", {
+    (0, import_invariant16.invariant)(!this._open, "service host is open", {
       F: __dxlog_file17,
       L: 201,
       S: this,
@@ -4782,7 +4860,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       C: (f, a) => f(...a)
     });
     if (config) {
-      (0, import_invariant15.invariant)(!this._config, "config already set", {
+      (0, import_invariant16.invariant)(!this._config, "config already set", {
         F: __dxlog_file17,
         L: 205,
         S: this,
@@ -4800,7 +4878,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       iceServers: this._config?.get("runtime.services.ice")
     }), signalManager = new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
-    (0, import_invariant15.invariant)(!this._networkManager, "network manager already set", {
+    (0, import_invariant16.invariant)(!this._networkManager, "network manager already set", {
       F: __dxlog_file17,
       L: 221,
       S: this,
@@ -4826,7 +4904,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       return;
     }
     const traceId = import_keys11.PublicKey.random().toHex();
-    import_log15.log.trace("dxos.client-services.host.open", import_protocols12.trace.begin({
+    import_log15.log.trace("dxos.client-services.host.open", import_protocols14.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file17,
@@ -4834,7 +4912,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant15.invariant)(this._config, "config not set", {
+    (0, import_invariant16.invariant)(this._config, "config not set", {
       F: __dxlog_file17,
       L: 241,
       S: this,
@@ -4843,7 +4921,7 @@ var ClientServicesHost = class ClientServicesHost2 {
         "'config not set'"
       ]
     });
-    (0, import_invariant15.invariant)(this._storage, "storage not set", {
+    (0, import_invariant16.invariant)(this._storage, "storage not set", {
       F: __dxlog_file17,
       L: 242,
       S: this,
@@ -4852,7 +4930,7 @@ var ClientServicesHost = class ClientServicesHost2 {
         "'storage not set'"
       ]
     });
-    (0, import_invariant15.invariant)(this._signalManager, "signal manager not set", {
+    (0, import_invariant16.invariant)(this._signalManager, "signal manager not set", {
       F: __dxlog_file17,
       L: 243,
       S: this,
@@ -4861,7 +4939,7 @@ var ClientServicesHost = class ClientServicesHost2 {
         "'signal manager not set'"
       ]
     });
-    (0, import_invariant15.invariant)(this._networkManager, "network manager not set", {
+    (0, import_invariant16.invariant)(this._networkManager, "network manager not set", {
       F: __dxlog_file17,
       L: 244,
       S: this,
@@ -4884,7 +4962,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._signalManager, this._modelFactory);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
-      IdentityService: new IdentityServiceImpl((params) => this._createIdentity(params), this._serviceContext.identityManager, this._serviceContext.keyring, (profile) => this._serviceContext.broadcastProfileUpdate(profile)),
+      IdentityService: new IdentityServiceImpl((params, useAutomerge) => this._createIdentity(params, useAutomerge), this._serviceContext.identityManager, this._serviceContext.keyring, (profile) => this._serviceContext.broadcastProfileUpdate(profile)),
       InvitationsService: new InvitationsServiceImpl(this._serviceContext.invitations, (invitation) => this._serviceContext.getInvitationHandler(invitation)),
       DevicesService: new DevicesServiceImpl(this._serviceContext.identityManager),
       SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, this._serviceContext.dataServiceSubscriptions, async () => {
@@ -4925,7 +5003,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log15.log.trace("dxos.client-services.host.open", import_protocols12.trace.end({
+    import_log15.log.trace("dxos.client-services.host.open", import_protocols14.trace.end({
       id: traceId
     }), {
       F: __dxlog_file17,
@@ -4966,7 +5044,7 @@ var ClientServicesHost = class ClientServicesHost2 {
   }
   async reset() {
     const traceId = import_keys11.PublicKey.random().toHex();
-    import_log15.log.trace("dxos.sdk.client-services-host.reset", import_protocols12.trace.begin({
+    import_log15.log.trace("dxos.sdk.client-services-host.reset", import_protocols14.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file17,
@@ -4988,7 +5066,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log15.log.trace("dxos.sdk.client-services-host.reset", import_protocols12.trace.end({
+    import_log15.log.trace("dxos.sdk.client-services-host.reset", import_protocols14.trace.end({
       id: traceId
     }), {
       F: __dxlog_file17,
@@ -4998,25 +5076,44 @@ var ClientServicesHost = class ClientServicesHost2 {
     });
     await this._callbacks?.onReset?.();
   }
-  async _createIdentity(params) {
+  async _createIdentity(params, useAutomerge) {
     const identity = await this._serviceContext.createIdentity(params);
     await this._serviceContext.initialized.wait();
     const space = await this._serviceContext.dataSpaceManager.createSpace();
     const obj = new import_client_protocol5.Properties(void 0, {
-      automerge: false
+      automerge: useAutomerge
     });
     obj[import_client_protocol5.defaultKey] = identity.identityKey.toHex();
-    await this._serviceRegistry.services.DataService.write({
-      spaceKey: space.key,
-      batch: {
-        objects: [
-          createGenesisMutationFromTypedObject(obj)
+    if (!useAutomerge) {
+      await this._serviceRegistry.services.DataService.write({
+        spaceKey: space.key,
+        batch: {
+          objects: [
+            createGenesisMutationFromTypedObject(obj)
+          ]
+        }
+      });
+      await this._serviceRegistry.services.DataService.flush({
+        spaceKey: space.key
+      });
+    } else {
+      const automergeIndex = space.automergeSpaceState.rootUrl;
+      (0, import_invariant16.invariant)(automergeIndex, void 0, {
+        F: __dxlog_file17,
+        L: 375,
+        S: this,
+        A: [
+          "automergeIndex",
+          ""
         ]
-      }
-    });
-    await this._serviceRegistry.services.DataService.flush({
-      spaceKey: space.key
-    });
+      });
+      const document = await this._serviceContext.automergeHost.repo.find(automergeIndex);
+      await document.whenReady();
+      document.change((doc) => {
+        doc.objects ??= {};
+        doc.objects[obj[import_echo_schema.base]._id] = (0, import_echo_schema.getRawDoc)(obj).handle.docSync();
+      });
+    }
     return identity;
   }
 };
@@ -5071,4 +5168,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-6VE2OLVY.cjs.map
+//# sourceMappingURL=chunk-LTQYCVFH.cjs.map