@dxos/client-services 0.4.6-main.9c97a50 → 0.4.6-main.b69a2b5

package/dist/lib/browser/{chunk-7JCJI2VR.mjs → chunk-KFMLOQZY.mjs}

@@ -464,7 +464,6 @@ var TrustedKeySetAuthVerifier = class {
 import { Event } from "@dxos/async";
 import { AUTH_TIMEOUT, LOAD_CONTROL_FEEDS_TIMEOUT } from "@dxos/client-protocol";
 import { DeviceStateMachine, createCredentialSignerWithKey, createCredentialSignerWithChain, ProfileStateMachine } from "@dxos/credentials";
-import { failUndefined } from "@dxos/debug";
 import { writeMessages } from "@dxos/feed-store";
 import { invariant } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
@@ -494,7 +493,7 @@ var Identity = class {
       deviceKey
     }, {
       F: __dxlog_file2,
-      L: 64,
+      L: 63,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -552,13 +551,6 @@ var Identity = class {
   get deviceCredentialChain() {
     return this._deviceStateMachine.deviceCredentialChain;
   }
-  getAdmissionCredentials() {
-    return {
-      deviceKey: this.deviceKey,
-      controlFeedKey: this.space.controlFeedKey ?? failUndefined(),
-      dataFeedKey: this.space.dataFeedKey ?? failUndefined()
-    };
-  }
   /**
   * Issues credentials as identity.
   * Requires identity to be ready.
@@ -566,7 +558,7 @@ var Identity = class {
   getIdentityCredentialSigner() {
     invariant(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
       F: __dxlog_file2,
-      L: 145,
+      L: 136,
       S: this,
       A: [
         "this._deviceStateMachine.deviceCredentialChain",
@@ -590,7 +582,7 @@ var Identity = class {
       dataFeedKey
     }, {
       F: __dxlog_file2,
-      L: 161,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -651,10 +643,10 @@ import { PublicKey as PublicKey4 } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 import { trace as trace2 } from "@dxos/protocols";
 import { DeviceKind } from "@dxos/protocols/proto/dxos/client/services";
-import { AdmittedFeed as AdmittedFeed2 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { AdmittedFeed as AdmittedFeed2, DeviceType } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe } from "@dxos/timeframe";
 import { trace as Trace } from "@dxos/tracing";
-import { deferFunction } from "@dxos/util";
+import { isNode, deferFunction } from "@dxos/util";
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -685,7 +677,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 80,
+      L: 84,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -694,7 +686,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file3,
-      L: 83,
+      L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -707,7 +699,7 @@ var IdentityManager = class {
         displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file3,
-        L: 88,
+        L: 92,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -717,7 +709,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 94,
+      L: 99,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -725,10 +717,10 @@ var IdentityManager = class {
   async close() {
     await this._identity?.close(new Context3());
   }
-  async createIdentity({ displayName } = {}) {
+  async createIdentity({ displayName, deviceProfile } = {}) {
     invariant2(!this._identity, "Identity already exists.", {
       F: __dxlog_file3,
-      L: 102,
+      L: 108,
       S: this,
       A: [
         "!this._identity",
@@ -737,7 +729,7 @@ var IdentityManager = class {
     });
     log3("creating identity...", void 0, {
       F: __dxlog_file3,
-      L: 103,
+      L: 109,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -758,7 +750,7 @@ var IdentityManager = class {
       const generator = new CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       invariant2(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
         F: __dxlog_file3,
-        L: 122,
+        L: 128,
         S: this,
         A: [
           "identityRecord.haloSpace.genesisFeedKey",
@@ -767,7 +759,7 @@ var IdentityManager = class {
       });
       invariant2(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
         F: __dxlog_file3,
-        L: 123,
+        L: 129,
         S: this,
         A: [
           "identityRecord.haloSpace.dataFeedKey",
@@ -787,11 +779,8 @@ var IdentityManager = class {
       }
       credentials.push(await generator.createDeviceAuthorization(identityRecord.deviceKey));
       credentials.push(await generator.createDeviceProfile({
-        platform: platform.name,
-        platformVersion: platform.version,
-        architecture: typeof platform.os?.architecture === "number" ? String(platform.os.architecture) : void 0,
-        os: platform.os?.family,
-        osVersion: platform.os?.version
+        ...this.createDefaultDeviceProfile(),
+        ...deviceProfile
       }));
       for (const credential of credentials) {
         await identity.controlPipeline.writer.write({
@@ -809,37 +798,61 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file3,
-      L: 168,
+      L: 171,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdate.emit();
     log3("created identity", {
       identityKey: identity.identityKey,
-      deviceKey: identity.deviceKey
+      deviceKey: identity.deviceKey,
+      profile: identity.profileDocument
     }, {
       F: __dxlog_file3,
-      L: 174,
+      L: 177,
       S: this,
       C: (f, a) => f(...a)
     });
     return identity;
   }
+  // TODO(nf): receive platform info rather than generating it here.
+  createDefaultDeviceProfile() {
+    let type;
+    if (isNode()) {
+      type = DeviceType.AGENT;
+    } else {
+      if (platform.name?.startsWith("iOS") || platform.name?.startsWith("Android")) {
+        type = DeviceType.MOBILE;
+      } else if (globalThis.__args) {
+        type = DeviceType.NATIVE;
+      } else {
+        type = DeviceType.BROWSER;
+      }
+    }
+    return {
+      type,
+      platform: platform.name,
+      platformVersion: platform.version,
+      architecture: typeof platform.os?.architecture === "number" ? String(platform.os.architecture) : void 0,
+      os: platform.os?.family,
+      osVersion: platform.os?.version
+    };
+  }
   /**
-  * Accept an existing identity. Expects it's device key to be authorized (now or later).
+  * Accept an existing identity. Expects its device key to be authorized (now or later).
   */
   async acceptIdentity(params) {
     log3("accepting identity", {
       params
     }, {
       F: __dxlog_file3,
-      L: 182,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._identity, "Identity already exists.", {
       F: __dxlog_file3,
-      L: 183,
+      L: 216,
       S: this,
       A: [
         "!this._identity",
@@ -867,17 +880,21 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file3,
-      L: 202,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
+    await this.updateDeviceProfile({
+      ...this.createDefaultDeviceProfile(),
+      ...params.deviceProfile
+    });
     this.stateUpdate.emit();
     log3("accepted identity", {
       identityKey: identity.identityKey,
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file3,
-      L: 208,
+      L: 245,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -889,7 +906,7 @@ var IdentityManager = class {
   async updateProfile(profile) {
     invariant2(this._identity, "Identity not initialized.", {
       F: __dxlog_file3,
-      L: 216,
+      L: 253,
       S: this,
       A: [
         "this._identity",
@@ -920,14 +937,14 @@ var IdentityManager = class {
   async updateDeviceProfile(profile) {
     invariant2(this._identity, "Identity not initialized.", {
       F: __dxlog_file3,
-      L: 233,
+      L: 270,
       S: this,
       A: [
         "this._identity",
         "'Identity not initialized.'"
       ]
     });
-    const credential = await this._identity.getIdentityCredentialSigner().createCredential({
+    const credential = await this._identity.getDeviceCredentialSigner().createCredential({
       subject: this._identity.deviceKey,
       assertion: {
         "@type": "dxos.halo.credentials.DeviceProfile",
@@ -955,7 +972,7 @@ var IdentityManager = class {
   async _constructIdentity(identityRecord) {
     invariant2(!this._identity, void 0, {
       F: __dxlog_file3,
-      L: 254,
+      L: 291,
       S: this,
       A: [
         "!this._identity",
@@ -966,13 +983,13 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file3,
-      L: 255,
+      L: 292,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file3,
-      L: 258,
+      L: 295,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -984,7 +1001,7 @@ var IdentityManager = class {
     });
     invariant2(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file3,
-      L: 262,
+      L: 299,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -1004,7 +1021,7 @@ var IdentityManager = class {
       },
       identityKey: identityRecord.identityKey
     });
-    space.setControlFeed(controlFeed);
+    await space.setControlFeed(controlFeed);
     space.setDataFeed(dataFeed);
     const identity = new Identity({
       space,
@@ -1016,13 +1033,14 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file3,
-      L: 286,
+      L: 323,
       S: this,
       C: (f, a) => f(...a)
     });
     if (identityRecord.haloSpace.controlTimeframe) {
       identity.controlPipeline.state.setTargetTimeframe(identityRecord.haloSpace.controlTimeframe);
     }
+    identity.stateUpdate.on(() => this.stateUpdate.emit());
     return identity;
   }
   async _constructSpace({ spaceRecord, swarmIdentity, identityKey }) {
@@ -1037,7 +1055,7 @@ var IdentityManager = class {
       onAuthFailure: () => {
         log3.warn("auth failure", void 0, {
           F: __dxlog_file3,
-          L: 305,
+          L: 343,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1069,7 +1087,10 @@ var IdentityServiceImpl = class {
     this._onProfileUpdate = _onProfileUpdate;
   }
   async createIdentity(request) {
-    await this._createIdentity(request.profile ?? {});
+    await this._createIdentity({
+      displayName: request.profile?.displayName,
+      deviceProfile: request.deviceProfile
+    });
     return this._getIdentity();
   }
   async recoverIdentity(request) {
@@ -1150,7 +1171,7 @@ var DeviceInvitationProtocol = class {
   async admit(request) {
     invariant4(request.device, void 0, {
       F: __dxlog_file5,
-      L: 36,
+      L: 37,
       S: this,
       A: [
         "request.device",
@@ -1180,7 +1201,7 @@ var DeviceInvitationProtocol = class {
   createIntroduction() {
     return {};
   }
-  async createAdmissionRequest() {
+  async createAdmissionRequest(deviceProfile) {
     const deviceKey = await this._keyring.createKey();
     const controlFeedKey = await this._keyring.createKey();
     const dataFeedKey = await this._keyring.createKey();
@@ -1188,14 +1209,15 @@ var DeviceInvitationProtocol = class {
       device: {
         deviceKey,
         controlFeedKey,
-        dataFeedKey
+        dataFeedKey,
+        profile: deviceProfile
       }
     };
   }
   async accept(response, request) {
     invariant4(response.device, void 0, {
       F: __dxlog_file5,
-      L: 80,
+      L: 82,
       S: this,
       A: [
         "response.device",
@@ -1205,14 +1227,14 @@ var DeviceInvitationProtocol = class {
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
     invariant4(request.device, void 0, {
       F: __dxlog_file5,
-      L: 83,
+      L: 85,
       S: this,
       A: [
         "request.device",
         ""
       ]
     });
-    const { deviceKey, controlFeedKey, dataFeedKey } = request.device;
+    const { deviceKey, controlFeedKey, dataFeedKey, profile } = request.device;
     await this._acceptIdentity({
       identityKey,
       deviceKey,
@@ -1220,7 +1242,8 @@ var DeviceInvitationProtocol = class {
       haloGenesisFeedKey: genesisFeedKey,
       controlFeedKey,
       dataFeedKey,
-      controlTimeframe
+      controlTimeframe,
+      deviceProfile: profile
     });
     return {
       identityKey
@@ -1594,7 +1617,7 @@ var InvitationsHandler = class {
     const authCode = options?.authCode ?? (authMethod === Invitation3.AuthMethod.SHARED_SECRET ? generatePasscode(AUTHENTICATION_CODE_LENGTH) : void 0);
     invariant6(protocol, void 0, {
       F: __dxlog_file7,
-      L: 80,
+      L: 81,
       S: this,
       A: [
         "protocol",
@@ -1623,7 +1646,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 102,
+        L: 103,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1648,7 +1671,7 @@ var InvitationsHandler = class {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             invariant6(deviceKey, void 0, {
               F: __dxlog_file7,
-              L: 123,
+              L: 124,
               S: this,
               A: [
                 "deviceKey",
@@ -1671,7 +1694,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 141,
+                L: 142,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1679,7 +1702,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 142,
+                L: 143,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1695,7 +1718,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 145,
+                L: 146,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1707,7 +1730,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 147,
+                L: 148,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1717,7 +1740,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 150,
+                  L: 151,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1728,7 +1751,7 @@ var InvitationsHandler = class {
               } else {
                 log5.error("failed", err, {
                   F: __dxlog_file7,
-                  L: 153,
+                  L: 154,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1739,7 +1762,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 156,
+                L: 157,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1760,7 +1783,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 171,
+              L: 172,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1771,7 +1794,7 @@ var InvitationsHandler = class {
           } else {
             log5.error("failed", err, {
               F: __dxlog_file7,
-              L: 174,
+              L: 175,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1812,17 +1835,28 @@ var InvitationsHandler = class {
     });
     return observable;
   }
-  acceptInvitation(protocol, invitation) {
+  acceptInvitation(protocol, invitation, deviceProfile) {
     const { timeout = INVITATION_TIMEOUT } = invitation;
     invariant6(protocol, void 0, {
       F: __dxlog_file7,
-      L: 215,
+      L: 220,
       S: this,
       A: [
         "protocol",
         ""
       ]
     });
+    if (deviceProfile) {
+      invariant6(invitation.kind === Invitation3.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
+        F: __dxlog_file7,
+        L: 224,
+        S: this,
+        A: [
+          "invitation.kind === Invitation.Kind.DEVICE",
+          "'deviceProfile provided for non-device invitation'"
+        ]
+      });
+    }
     const authenticated = new Trigger3();
     let admitted = false;
     let currentState;
@@ -1830,7 +1864,7 @@ var InvitationsHandler = class {
     const setState = (newData) => {
       invariant6(newData.state !== void 0, void 0, {
         F: __dxlog_file7,
-        L: 226,
+        L: 235,
         S: this,
         A: [
           "newData.state !== undefined",
@@ -1850,7 +1884,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             F: __dxlog_file7,
-            L: 234,
+            L: 243,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1860,7 +1894,7 @@ var InvitationsHandler = class {
         } else {
           log5.warn("auth failed", err, {
             F: __dxlog_file7,
-            L: 237,
+            L: 246,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1874,7 +1908,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 245,
+        L: 254,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1889,7 +1923,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               F: __dxlog_file7,
-              L: 255,
+              L: 264,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1904,7 +1938,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 264,
+                L: 273,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1916,7 +1950,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 272,
+                L: 281,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1927,7 +1961,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 276,
+                L: 285,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1937,7 +1971,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file7,
-                L: 280,
+                L: 289,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1946,7 +1980,7 @@ var InvitationsHandler = class {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
                   log5("guest waiting for authentication code...", void 0, {
                     F: __dxlog_file7,
-                    L: 286,
+                    L: 295,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -1958,7 +1992,7 @@ var InvitationsHandler = class {
                   });
                   log5("sending authentication request", void 0, {
                     F: __dxlog_file7,
-                    L: 290,
+                    L: 299,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -1979,7 +2013,7 @@ var InvitationsHandler = class {
                         attempt
                       }, {
                         F: __dxlog_file7,
-                        L: 301,
+                        L: 310,
                         S: this,
                         C: (f, a) => f(...a)
                       });
@@ -1992,11 +2026,11 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 309,
+                L: 318,
                 S: this,
                 C: (f, a) => f(...a)
               });
-              const admissionRequest = await protocol.createAdmissionRequest();
+              const admissionRequest = await protocol.createAdmissionRequest(deviceProfile);
               const admissionResponse = await extension.rpc.InvitationHostService.admit(admissionRequest);
               admitted = true;
               const result = await protocol.accept(admissionResponse, admissionRequest);
@@ -2004,7 +2038,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 320,
+                L: 329,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2017,7 +2051,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 322,
+                L: 331,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2027,7 +2061,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 325,
+                  L: 334,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2037,7 +2071,7 @@ var InvitationsHandler = class {
               } else {
                 log5("auth failed", err, {
                   F: __dxlog_file7,
-                  L: 328,
+                  L: 337,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2048,7 +2082,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 331,
+                L: 340,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2066,7 +2100,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 342,
+              L: 351,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2076,7 +2110,7 @@ var InvitationsHandler = class {
           } else {
             log5("auth failed", err, {
               F: __dxlog_file7,
-              L: 345,
+              L: 354,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2093,7 +2127,7 @@ var InvitationsHandler = class {
       } else {
         invariant6(invitation.swarmKey, void 0, {
           F: __dxlog_file7,
-          L: 359,
+          L: 368,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -2180,14 +2214,25 @@ var InvitationsServiceImpl = class {
       });
     });
   }
-  acceptInvitation(options) {
+  acceptInvitation({ invitation: options, deviceProfile }) {
     let invitation;
+    if (deviceProfile) {
+      invariant7(options.kind === Invitation4.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
+        F: __dxlog_file8,
+        L: 81,
+        S: this,
+        A: [
+          "options.kind === Invitation.Kind.DEVICE",
+          "'deviceProfile provided for non-device invitation'"
+        ]
+      });
+    }
     const existingInvitation = this._acceptInvitations.get(options.invitationId);
     if (existingInvitation) {
       invitation = existingInvitation;
     } else {
       const handler = this._getHandler(options);
-      invitation = this._invitationsHandler.acceptInvitation(handler, options);
+      invitation = this._invitationsHandler.acceptInvitation(handler, options, deviceProfile);
       this._acceptInvitations.set(invitation.get().invitationId, invitation);
       this._invitationAccepted.emit(invitation.get());
     }
@@ -2208,13 +2253,13 @@ var InvitationsServiceImpl = class {
   async authenticate({ invitationId, authCode }) {
     log6("authenticating...", void 0, {
       F: __dxlog_file8,
-      L: 108,
+      L: 114,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant7(invitationId, void 0, {
       F: __dxlog_file8,
-      L: 109,
+      L: 115,
       S: this,
       A: [
         "invitationId",
@@ -2227,7 +2272,7 @@ var InvitationsServiceImpl = class {
         invitationId
       }, {
         F: __dxlog_file8,
-        L: 112,
+        L: 118,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2238,13 +2283,13 @@ var InvitationsServiceImpl = class {
   async cancelInvitation({ invitationId }) {
     log6("deleting...", void 0, {
       F: __dxlog_file8,
-      L: 119,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant7(invitationId, void 0, {
       F: __dxlog_file8,
-      L: 120,
+      L: 126,
       S: this,
       A: [
         "invitationId",
@@ -2601,7 +2646,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.4.6-main.9c97a50";
+var DXOS_VERSION = "0.4.6-main.b69a2b5";
 
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
@@ -3301,7 +3346,7 @@ var DataSpace = class {
       const controlFeed = await this._feedStore.openFeed(await this._keyring.createKey(), {
         writable: true
       });
-      this.inner.setControlFeed(controlFeed);
+      await this.inner.setControlFeed(controlFeed);
       credentials.push(await this._signingContext.credentialSigner.createCredential({
         subject: controlFeed.key,
         assertion: {
@@ -3318,7 +3363,7 @@ var DataSpace = class {
         writable: true,
         sparse: true
       });
-      this.inner.setDataFeed(dataFeed);
+      await this.inner.setDataFeed(dataFeed);
       credentials.push(await this._signingContext.credentialSigner.createCredential({
         subject: dataFeed.key,
         assertion: {
@@ -3360,9 +3405,11 @@ var DataSpace = class {
           return;
         }
         const doc = handle.docSync() ?? failedInvariant();
-        if (!doc.experimental_spaceKey) {
+        if (!doc.access?.spaceKey) {
           handle.change((doc2) => {
-            doc2.experimental_spaceKey = this.key.toHex();
+            doc2.access = {
+              spaceKey: this.key.toHex()
+            };
           });
         }
       } catch (err) {
@@ -3532,7 +3579,7 @@ import { ComplexMap as ComplexMap3, deferFunction as deferFunction2, forEachAsyn
 
 // packages/sdk/client-services/src/packlets/spaces/genesis.ts
 import { createCredential } from "@dxos/credentials";
-import { failUndefined as failUndefined2 } from "@dxos/debug";
+import { failUndefined } from "@dxos/debug";
 import { AdmittedFeed as AdmittedFeed4, SpaceMember as SpaceMember2 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe3 } from "@dxos/timeframe";
 var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
@@ -3555,11 +3602,11 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
         spaceKey: space.key,
         role: SpaceMember2.Role.ADMIN,
         profile: signingContext.getProfile(),
-        genesisFeedKey: space.controlFeedKey ?? failUndefined2()
+        genesisFeedKey: space.controlFeedKey ?? failUndefined()
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: space.controlFeedKey ?? failUndefined2(),
+      subject: space.controlFeedKey ?? failUndefined(),
       assertion: {
         "@type": "dxos.halo.credentials.AdmittedFeed",
         spaceKey: space.key,
@@ -3569,7 +3616,7 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: space.dataFeedKey ?? failUndefined2(),
+      subject: space.dataFeedKey ?? failUndefined(),
       assertion: {
         "@type": "dxos.halo.credentials.AdmittedFeed",
         spaceKey: space.key,
@@ -3579,7 +3626,7 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: space.key ?? failUndefined2(),
+      subject: space.key ?? failUndefined(),
       assertion: {
         "@type": "dxos.halo.credentials.Epoch",
         number: 0,
@@ -3741,7 +3788,9 @@ var DataSpaceManager = class {
     });
     const automergeRoot = this._automergeHost.repo.create();
     automergeRoot.change((doc) => {
-      doc.experimental_spaceKey = spaceKey.toHex();
+      doc.access = {
+        spaceKey: spaceKey.toHex()
+      };
     });
     const space = await this._constructSpace(metadata);
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRoot.url);
@@ -3862,8 +3911,8 @@ var DataSpaceManager = class {
       },
       memberKey: this._signingContext.identityKey
     });
-    controlFeed && space.setControlFeed(controlFeed);
-    dataFeed && space.setDataFeed(dataFeed);
+    controlFeed && await space.setControlFeed(controlFeed);
+    dataFeed && await space.setDataFeed(dataFeed);
     const dataSpace = new DataSpace({
       inner: space,
       initialState: metadata.state === SpaceState2.INACTIVE ? SpaceState2.INACTIVE : SpaceState2.CLOSED,
@@ -4168,7 +4217,7 @@ var getChannelId = (channel) => `user-channel/${channel}`;
 import { Trigger as Trigger5 } from "@dxos/async";
 import { Context as Context9 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
-import { failUndefined as failUndefined3 } from "@dxos/debug";
+import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { valueEncoding, MetadataStore, SpaceManager, DataServiceSubscriptions, SnapshotStore, AutomergeHost } from "@dxos/echo-pipeline";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
 import { invariant as invariant13 } from "@dxos/invariant";
@@ -4226,7 +4275,7 @@ var ServiceContext = class {
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
     this.automergeHost = new AutomergeHost(storage.createDirectory("automerge"));
     this.invitations = new InvitationsHandler(this.networkManager);
-    this._handlerFactories.set(Invitation6.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined3(), this._acceptIdentity.bind(this)));
+    this._handlerFactories.set(Invitation6.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined2(), this._acceptIdentity.bind(this)));
   }
   async open(ctx) {
     await this._checkStorageVersion();
@@ -4338,7 +4387,7 @@ var ServiceContext = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    const identity = this.identityManager.identity ?? failUndefined3();
+    const identity = this.identityManager.identity ?? failUndefined2();
     const signingContext = {
       credentialSigner: identity.getIdentityCredentialSigner(),
       identityKey: identity.identityKey,
@@ -4588,10 +4637,10 @@ import { DX_DATA } from "@dxos/client-protocol";
 import { InvalidConfigError } from "@dxos/protocols";
 import { Runtime } from "@dxos/protocols/proto/dxos/config";
 import { createStorage, StorageType } from "@dxos/random-access-storage";
-import { isNode } from "@dxos/util";
+import { isNode as isNode2 } from "@dxos/util";
 var StorageDriver = Runtime.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
-  const { persistent = false, keyStore, dataStore, dataRoot = isNode() ? DX_DATA : "dxos/storage" } = config ?? {};
+  const { persistent = false, keyStore, dataStore, dataRoot = isNode2() ? DX_DATA : "dxos/storage" } = config ?? {};
   if (persistent && dataStore === StorageDriver.RAM) {
     throw new InvalidConfigError("RAM storage cannot be used in persistent mode.");
   }
@@ -5313,4 +5362,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-7JCJI2VR.mjs.map
+//# sourceMappingURL=chunk-KFMLOQZY.mjs.map