@dxos/client-services 0.4.6-main.aeca3cc → 0.4.6-main.c12c15b

package/dist/lib/node/{chunk-PZGADVCE.cjs → chunk-WB7KSXSI.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_PZGADVCE_exports = {};
-__export(chunk_PZGADVCE_exports, {
+var chunk_WB7KSXSI_exports = {};
+__export(chunk_WB7KSXSI_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -60,7 +60,7 @@ __export(chunk_PZGADVCE_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_PZGADVCE_exports);
+module.exports = __toCommonJS(chunk_WB7KSXSI_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -83,7 +83,6 @@ var import_protocols = require("@dxos/protocols");
 var import_async5 = require("@dxos/async");
 var import_client_protocol = require("@dxos/client-protocol");
 var import_credentials2 = require("@dxos/credentials");
-var import_debug = require("@dxos/debug");
 var import_feed_store2 = require("@dxos/feed-store");
 var import_invariant = require("@dxos/invariant");
 var import_keys3 = require("@dxos/keys");
@@ -106,7 +105,7 @@ var import_tracing2 = require("@dxos/tracing");
 var import_util3 = require("@dxos/util");
 var import_codec_protobuf7 = require("@dxos/codec-protobuf");
 var import_credentials6 = require("@dxos/credentials");
-var import_debug2 = require("@dxos/debug");
+var import_debug = require("@dxos/debug");
 var import_invariant3 = require("@dxos/invariant");
 var import_invariant4 = require("@dxos/invariant");
 var import_protocols3 = require("@dxos/protocols");
@@ -143,7 +142,7 @@ var import_log7 = require("@dxos/log");
 var import_protocols6 = require("@dxos/protocols");
 var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
 var import_codec_protobuf9 = require("@dxos/codec-protobuf");
-var import_debug3 = require("@dxos/debug");
+var import_debug2 = require("@dxos/debug");
 var import_rpc = require("@dxos/rpc");
 var import_tracing3 = require("@dxos/tracing");
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
@@ -159,7 +158,7 @@ var import_services8 = 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_debug3 = require("@dxos/debug");
 var import_echo_pipeline = require("@dxos/echo-pipeline");
 var import_invariant10 = require("@dxos/invariant");
 var import_keys7 = require("@dxos/keys");
@@ -190,12 +189,12 @@ var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
 var import_util6 = require("@dxos/util");
 var import_credentials13 = require("@dxos/credentials");
-var import_debug5 = require("@dxos/debug");
+var import_debug4 = require("@dxos/debug");
 var import_credentials14 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe3 = require("@dxos/timeframe");
 var import_async13 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
-var import_debug6 = require("@dxos/debug");
+var import_debug5 = require("@dxos/debug");
 var import_invariant13 = require("@dxos/invariant");
 var import_log12 = require("@dxos/log");
 var import_protocols11 = require("@dxos/protocols");
@@ -203,7 +202,7 @@ var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async14 = require("@dxos/async");
 var import_context9 = require("@dxos/context");
 var import_credentials15 = require("@dxos/credentials");
-var import_debug7 = require("@dxos/debug");
+var import_debug6 = require("@dxos/debug");
 var import_echo_pipeline2 = require("@dxos/echo-pipeline");
 var import_feed_store4 = require("@dxos/feed-store");
 var import_invariant14 = require("@dxos/invariant");
@@ -693,7 +692,7 @@ var Identity = class {
       deviceKey
     }, {
       F: __dxlog_file2,
-      L: 64,
+      L: 63,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -751,13 +750,6 @@ var Identity = class {
   get deviceCredentialChain() {
     return this._deviceStateMachine.deviceCredentialChain;
   }
-  getAdmissionCredentials() {
-    return {
-      deviceKey: this.deviceKey,
-      controlFeedKey: this.space.controlFeedKey ?? (0, import_debug.failUndefined)(),
-      dataFeedKey: this.space.dataFeedKey ?? (0, import_debug.failUndefined)()
-    };
-  }
   /**
   * Issues credentials as identity.
   * Requires identity to be ready.
@@ -765,7 +757,7 @@ var Identity = class {
   getIdentityCredentialSigner() {
     (0, import_invariant.invariant)(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
       F: __dxlog_file2,
-      L: 145,
+      L: 136,
       S: this,
       A: [
         "this._deviceStateMachine.deviceCredentialChain",
@@ -789,7 +781,7 @@ var Identity = class {
       dataFeedKey
     }, {
       F: __dxlog_file2,
-      L: 161,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -869,7 +861,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 80,
+      L: 84,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -878,7 +870,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file3,
-      L: 83,
+      L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -891,7 +883,7 @@ var IdentityManager = class {
         displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file3,
-        L: 88,
+        L: 92,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -901,7 +893,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 94,
+      L: 99,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -909,10 +901,10 @@ var IdentityManager = class {
   async close() {
     await this._identity?.close(new import_context3.Context());
   }
-  async createIdentity({ displayName } = {}) {
+  async createIdentity({ displayName, deviceProfile } = {}) {
     (0, import_invariant2.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file3,
-      L: 102,
+      L: 108,
       S: this,
       A: [
         "!this._identity",
@@ -921,7 +913,7 @@ var IdentityManager = class {
     });
     (0, import_log3.log)("creating identity...", void 0, {
       F: __dxlog_file3,
-      L: 103,
+      L: 109,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -942,7 +934,7 @@ var IdentityManager = class {
       const generator = new import_credentials4.CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       (0, import_invariant2.invariant)(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
         F: __dxlog_file3,
-        L: 122,
+        L: 128,
         S: this,
         A: [
           "identityRecord.haloSpace.genesisFeedKey",
@@ -951,7 +943,7 @@ var IdentityManager = class {
       });
       (0, import_invariant2.invariant)(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
         F: __dxlog_file3,
-        L: 123,
+        L: 129,
         S: this,
         A: [
           "identityRecord.haloSpace.dataFeedKey",
@@ -971,11 +963,8 @@ var IdentityManager = class {
       }
       credentials.push(await generator.createDeviceAuthorization(identityRecord.deviceKey));
       credentials.push(await generator.createDeviceProfile({
-        platform: import_platform.default.name,
-        platformVersion: import_platform.default.version,
-        architecture: typeof import_platform.default.os?.architecture === "number" ? String(import_platform.default.os.architecture) : void 0,
-        os: import_platform.default.os?.family,
-        osVersion: import_platform.default.os?.version
+        ...this.createDefaultDeviceProfile(),
+        ...deviceProfile
       }));
       for (const credential of credentials) {
         await identity.controlPipeline.writer.write({
@@ -993,37 +982,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();
     (0, import_log3.log)("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 ((0, import_util3.isNode)()) {
+      type = import_credentials5.DeviceType.AGENT;
+    } else {
+      if (import_platform.default.name?.startsWith("iOS") || import_platform.default.name?.startsWith("Android")) {
+        type = import_credentials5.DeviceType.MOBILE;
+      } else if (globalThis.__args) {
+        type = import_credentials5.DeviceType.NATIVE;
+      } else {
+        type = import_credentials5.DeviceType.BROWSER;
+      }
+    }
+    return {
+      type,
+      platform: import_platform.default.name,
+      platformVersion: import_platform.default.version,
+      architecture: typeof import_platform.default.os?.architecture === "number" ? String(import_platform.default.os.architecture) : void 0,
+      os: import_platform.default.os?.family,
+      osVersion: import_platform.default.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) {
     (0, import_log3.log)("accepting identity", {
       params
     }, {
       F: __dxlog_file3,
-      L: 182,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant2.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file3,
-      L: 183,
+      L: 216,
       S: this,
       A: [
         "!this._identity",
@@ -1051,17 +1064,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();
     (0, import_log3.log)("accepted identity", {
       identityKey: identity.identityKey,
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file3,
-      L: 208,
+      L: 245,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1073,7 +1090,7 @@ var IdentityManager = class {
   async updateProfile(profile) {
     (0, import_invariant2.invariant)(this._identity, "Identity not initialized.", {
       F: __dxlog_file3,
-      L: 216,
+      L: 253,
       S: this,
       A: [
         "this._identity",
@@ -1104,14 +1121,14 @@ var IdentityManager = class {
   async updateDeviceProfile(profile) {
     (0, import_invariant2.invariant)(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",
@@ -1139,7 +1156,7 @@ var IdentityManager = class {
   async _constructIdentity(identityRecord) {
     (0, import_invariant2.invariant)(!this._identity, void 0, {
       F: __dxlog_file3,
-      L: 254,
+      L: 291,
       S: this,
       A: [
         "!this._identity",
@@ -1150,13 +1167,13 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file3,
-      L: 255,
+      L: 292,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant2.invariant)(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file3,
-      L: 258,
+      L: 295,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -1168,7 +1185,7 @@ var IdentityManager = class {
     });
     (0, import_invariant2.invariant)(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file3,
-      L: 262,
+      L: 299,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -1188,7 +1205,7 @@ var IdentityManager = class {
       },
       identityKey: identityRecord.identityKey
     });
-    space.setControlFeed(controlFeed);
+    await space.setControlFeed(controlFeed);
     space.setDataFeed(dataFeed);
     const identity = new Identity({
       space,
@@ -1200,13 +1217,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 }) {
@@ -1221,7 +1239,7 @@ var IdentityManager = class {
       onAuthFailure: () => {
         import_log3.log.warn("auth failure", void 0, {
           F: __dxlog_file3,
-          L: 305,
+          L: 343,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1247,11 +1265,14 @@ 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) {
-    return (0, import_debug2.todo)();
+    return (0, import_debug.todo)();
   }
   queryIdentity() {
     return new import_codec_protobuf7.Stream(({ next }) => {
@@ -1323,7 +1344,7 @@ var DeviceInvitationProtocol = class {
   async admit(request) {
     (0, import_invariant4.invariant)(request.device, void 0, {
       F: __dxlog_file5,
-      L: 36,
+      L: 37,
       S: this,
       A: [
         "request.device",
@@ -1353,7 +1374,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();
@@ -1361,14 +1382,15 @@ var DeviceInvitationProtocol = class {
       device: {
         deviceKey,
         controlFeedKey,
-        dataFeedKey
+        dataFeedKey,
+        profile: deviceProfile
       }
     };
   }
   async accept(response, request) {
     (0, import_invariant4.invariant)(response.device, void 0, {
       F: __dxlog_file5,
-      L: 80,
+      L: 82,
       S: this,
       A: [
         "response.device",
@@ -1378,14 +1400,14 @@ var DeviceInvitationProtocol = class {
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
     (0, import_invariant4.invariant)(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,
@@ -1393,7 +1415,8 @@ var DeviceInvitationProtocol = class {
       haloGenesisFeedKey: genesisFeedKey,
       controlFeedKey,
       dataFeedKey,
-      controlTimeframe
+      controlTimeframe,
+      deviceProfile: profile
     });
     return {
       identityKey
@@ -1741,7 +1764,7 @@ var InvitationsHandler = class {
     const authCode = options?.authCode ?? (authMethod === import_services3.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials7.generatePasscode)(import_client_protocol2.AUTHENTICATION_CODE_LENGTH) : void 0);
     (0, import_invariant5.invariant)(protocol, void 0, {
       F: __dxlog_file7,
-      L: 80,
+      L: 81,
       S: this,
       A: [
         "protocol",
@@ -1770,7 +1793,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 102,
+        L: 103,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1795,7 +1818,7 @@ var InvitationsHandler = class {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             (0, import_invariant5.invariant)(deviceKey, void 0, {
               F: __dxlog_file7,
-              L: 123,
+              L: 124,
               S: this,
               A: [
                 "deviceKey",
@@ -1818,7 +1841,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 141,
+                L: 142,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1826,7 +1849,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 142,
+                L: 143,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1842,7 +1865,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 145,
+                L: 146,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1854,7 +1877,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 147,
+                L: 148,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1864,7 +1887,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 150,
+                  L: 151,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1875,7 +1898,7 @@ var InvitationsHandler = class {
               } else {
                 import_log4.log.error("failed", err, {
                   F: __dxlog_file7,
-                  L: 153,
+                  L: 154,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1886,7 +1909,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 156,
+                L: 157,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1907,7 +1930,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 171,
+              L: 172,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1918,7 +1941,7 @@ var InvitationsHandler = class {
           } else {
             import_log4.log.error("failed", err, {
               F: __dxlog_file7,
-              L: 174,
+              L: 175,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1959,17 +1982,28 @@ var InvitationsHandler = class {
     });
     return observable;
   }
-  acceptInvitation(protocol, invitation) {
+  acceptInvitation(protocol, invitation, deviceProfile) {
     const { timeout = import_client_protocol2.INVITATION_TIMEOUT } = invitation;
     (0, import_invariant5.invariant)(protocol, void 0, {
       F: __dxlog_file7,
-      L: 215,
+      L: 220,
       S: this,
       A: [
         "protocol",
         ""
       ]
     });
+    if (deviceProfile) {
+      (0, import_invariant5.invariant)(invitation.kind === import_services3.Invitation.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 import_async7.Trigger();
     let admitted = false;
     let currentState;
@@ -1977,7 +2011,7 @@ var InvitationsHandler = class {
     const setState = (newData) => {
       (0, import_invariant5.invariant)(newData.state !== void 0, void 0, {
         F: __dxlog_file7,
-        L: 226,
+        L: 235,
         S: this,
         A: [
           "newData.state !== undefined",
@@ -1997,7 +2031,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             F: __dxlog_file7,
-            L: 234,
+            L: 243,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2007,7 +2041,7 @@ var InvitationsHandler = class {
         } else {
           import_log4.log.warn("auth failed", err, {
             F: __dxlog_file7,
-            L: 237,
+            L: 246,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2021,7 +2055,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 245,
+        L: 254,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2036,7 +2070,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               F: __dxlog_file7,
-              L: 255,
+              L: 264,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2051,7 +2085,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 264,
+                L: 273,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2063,7 +2097,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 272,
+                L: 281,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2074,7 +2108,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 276,
+                L: 285,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2084,7 +2118,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file7,
-                L: 280,
+                L: 289,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2093,7 +2127,7 @@ var InvitationsHandler = class {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
                   (0, import_log4.log)("guest waiting for authentication code...", void 0, {
                     F: __dxlog_file7,
-                    L: 286,
+                    L: 295,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -2105,7 +2139,7 @@ var InvitationsHandler = class {
                   });
                   (0, import_log4.log)("sending authentication request", void 0, {
                     F: __dxlog_file7,
-                    L: 290,
+                    L: 299,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -2126,7 +2160,7 @@ var InvitationsHandler = class {
                         attempt
                       }, {
                         F: __dxlog_file7,
-                        L: 301,
+                        L: 310,
                         S: this,
                         C: (f, a) => f(...a)
                       });
@@ -2139,11 +2173,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);
@@ -2151,7 +2185,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 320,
+                L: 329,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2164,7 +2198,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 322,
+                L: 331,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2174,7 +2208,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 325,
+                  L: 334,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2184,7 +2218,7 @@ var InvitationsHandler = class {
               } else {
                 (0, import_log4.log)("auth failed", err, {
                   F: __dxlog_file7,
-                  L: 328,
+                  L: 337,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2195,7 +2229,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 331,
+                L: 340,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2213,7 +2247,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 342,
+              L: 351,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2223,7 +2257,7 @@ var InvitationsHandler = class {
           } else {
             (0, import_log4.log)("auth failed", err, {
               F: __dxlog_file7,
-              L: 345,
+              L: 354,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2240,7 +2274,7 @@ var InvitationsHandler = class {
       } else {
         (0, import_invariant5.invariant)(invitation.swarmKey, void 0, {
           F: __dxlog_file7,
-          L: 359,
+          L: 368,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -2320,14 +2354,25 @@ var InvitationsServiceImpl = class {
       });
     });
   }
-  acceptInvitation(options) {
+  acceptInvitation({ invitation: options, deviceProfile }) {
     let invitation;
+    if (deviceProfile) {
+      (0, import_invariant7.invariant)(options.kind === import_services5.Invitation.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());
     }
@@ -2348,13 +2393,13 @@ var InvitationsServiceImpl = class {
   async authenticate({ invitationId, authCode }) {
     (0, import_log6.log)("authenticating...", void 0, {
       F: __dxlog_file8,
-      L: 108,
+      L: 114,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant7.invariant)(invitationId, void 0, {
       F: __dxlog_file8,
-      L: 109,
+      L: 115,
       S: this,
       A: [
         "invitationId",
@@ -2367,7 +2412,7 @@ var InvitationsServiceImpl = class {
         invitationId
       }, {
         F: __dxlog_file8,
-        L: 112,
+        L: 118,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2378,13 +2423,13 @@ var InvitationsServiceImpl = class {
   async cancelInvitation({ invitationId }) {
     (0, import_log6.log)("deleting...", void 0, {
       F: __dxlog_file8,
-      L: 119,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant7.invariant)(invitationId, void 0, {
       F: __dxlog_file8,
-      L: 120,
+      L: 126,
       S: this,
       A: [
         "invitationId",
@@ -2665,7 +2710,7 @@ var ClientRpcServer = class {
   }
   _getServiceHandler(serviceName) {
     if (!this._handlerCache.has(serviceName)) {
-      const [key, descriptor] = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName) ?? (0, import_debug3.raise)(new Error(`Service not available: ${serviceName}`));
+      const [key, descriptor] = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName) ?? (0, import_debug2.raise)(new Error(`Service not available: ${serviceName}`));
       const service = this._serviceRegistry.services[key];
       if (!service) {
         throw new Error(`Service not available: ${serviceName}`);
@@ -2711,7 +2756,7 @@ var getPlatform = () => {
     };
   }
 };
-var DXOS_VERSION = "0.4.6-main.aeca3cc";
+var DXOS_VERSION = "0.4.6-main.c12c15b";
 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) => {
@@ -3374,7 +3419,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: {
@@ -3391,7 +3436,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: {
@@ -3426,16 +3471,18 @@ var DataSpace = class {
     const handle = this._automergeHost.repo.find(rootUrl);
     queueMicrotask(async () => {
       try {
-        await (0, import_debug4.warnAfterTimeout)(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
+        await (0, import_debug3.warnAfterTimeout)(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
           await (0, import_context6.cancelWithContext)(this._ctx, handle.whenReady());
         });
         if (this._ctx.disposed) {
           return;
         }
         const doc = handle.docSync() ?? (0, import_invariant10.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) {
@@ -3578,7 +3625,7 @@ _ts_decorate4([
   })
 ], DataSpace.prototype, "_initializeAndReadControlPipeline", null);
 _ts_decorate4([
-  (0, import_debug4.timed)(1e4)
+  (0, import_debug3.timed)(1e4)
 ], DataSpace.prototype, "_createWritableFeeds", null);
 _ts_decorate4([
   import_async10.synchronized
@@ -3610,11 +3657,11 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
         spaceKey: space.key,
         role: import_credentials14.SpaceMember.Role.ADMIN,
         profile: signingContext.getProfile(),
-        genesisFeedKey: space.controlFeedKey ?? (0, import_debug5.failUndefined)()
+        genesisFeedKey: space.controlFeedKey ?? (0, import_debug4.failUndefined)()
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: space.controlFeedKey ?? (0, import_debug5.failUndefined)(),
+      subject: space.controlFeedKey ?? (0, import_debug4.failUndefined)(),
       assertion: {
         "@type": "dxos.halo.credentials.AdmittedFeed",
         spaceKey: space.key,
@@ -3624,7 +3671,7 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: space.dataFeedKey ?? (0, import_debug5.failUndefined)(),
+      subject: space.dataFeedKey ?? (0, import_debug4.failUndefined)(),
       assertion: {
         "@type": "dxos.halo.credentials.AdmittedFeed",
         spaceKey: space.key,
@@ -3634,7 +3681,7 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: space.key ?? (0, import_debug5.failUndefined)(),
+      subject: space.key ?? (0, import_debug4.failUndefined)(),
       assertion: {
         "@type": "dxos.halo.credentials.Epoch",
         number: 0,
@@ -3794,7 +3841,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);
@@ -3915,8 +3964,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 === import_services10.SpaceState.INACTIVE ? import_services10.SpaceState.INACTIVE : import_services10.SpaceState.CLOSED,
@@ -4013,7 +4062,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_protocols11.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
     if (state) {
       switch (state) {
         case import_services11.SpaceState.ACTIVE:
@@ -4078,14 +4127,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_protocols11.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.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_protocols11.SpaceNotFoundError(spaceKey));
+        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
           next(message);
         });
@@ -4095,7 +4144,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_protocols11.SpaceNotFoundError(spaceKey));
+      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
       const processor = {
         processCredential: async (credential) => {
           next(credential);
@@ -4111,7 +4160,7 @@ var SpacesServiceImpl = class {
     });
   }
   async writeCredentials({ spaceKey, credentials }) {
-    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
+    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
     for (const credential of credentials ?? []) {
       if (credential.proof) {
         await space.controlPipeline.writer.write({
@@ -4162,7 +4211,7 @@ var SpacesServiceImpl = class {
   }
   async createEpoch({ spaceKey }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
     await space.createEpoch();
   }
   _serializeSpace(space) {
@@ -4253,7 +4302,7 @@ var ServiceContext = class {
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
     this.automergeHost = new import_echo_pipeline2.AutomergeHost(storage.createDirectory("automerge"));
     this.invitations = new InvitationsHandler(this.networkManager);
-    this._handlerFactories.set(import_services12.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug7.failUndefined)(), this._acceptIdentity.bind(this)));
+    this._handlerFactories.set(import_services12.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug6.failUndefined)(), this._acceptIdentity.bind(this)));
   }
   async open(ctx) {
     await this._checkStorageVersion();
@@ -4365,7 +4414,7 @@ var ServiceContext = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    const identity = this.identityManager.identity ?? (0, import_debug7.failUndefined)();
+    const identity = this.identityManager.identity ?? (0, import_debug6.failUndefined)();
     const signingContext = {
       credentialSigner: identity.getIdentityCredentialSigner(),
       identityKey: identity.identityKey,
@@ -5218,4 +5267,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-PZGADVCE.cjs.map
+//# sourceMappingURL=chunk-WB7KSXSI.cjs.map