@dxos/client-services 0.6.12-staging.e11e696 → 0.6.13-main.09887cd

package/dist/lib/browser/{chunk-67FEJJ6J.mjs → chunk-XOKN3TE7.mjs}

@@ -404,7 +404,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.6.12-staging.e11e696";
+var DXOS_VERSION = "0.6.13-main.09887cd";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -2020,6 +2020,7 @@ import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log8 } from "@dxos/log";
 import { AlreadyJoinedError, trace as Trace } from "@dxos/protocols";
 import { Invitation, SpaceState } from "@dxos/protocols/proto/dxos/client/services";
+import { EdgeReplicationSetting } from "@dxos/protocols/proto/dxos/echo/metadata";
 import { SpaceMember as SpaceMember3 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Gossip, Presence } from "@dxos/teleport-extension-gossip";
 import { trace } from "@dxos/tracing";
@@ -2445,12 +2446,36 @@ var DataSpaceManager = class extends Resource4 {
       }
     });
   }
+  async setSpaceEdgeReplicationSetting(spaceKey, setting) {
+    const space = this._spaces.get(spaceKey);
+    invariant5(space, "Space not found.", {
+      F: __dxlog_file10,
+      L: 399,
+      S: this,
+      A: [
+        "space",
+        "'Space not found.'"
+      ]
+    });
+    await this._metadataStore.setSpaceEdgeReplicationSetting(spaceKey, setting);
+    if (space.isOpen) {
+      switch (setting) {
+        case EdgeReplicationSetting.DISABLED:
+          await this._echoEdgeReplicator?.disconnectFromSpace(space.id);
+          break;
+        case EdgeReplicationSetting.ENABLED:
+          await this._echoEdgeReplicator?.connectToSpace(space.id);
+          break;
+      }
+    }
+    space.stateUpdate.emit();
+  }
   async _constructSpace(metadata) {
     log8("construct space", {
       metadata
     }, {
       F: __dxlog_file10,
-      L: 398,
+      L: 418,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2494,7 +2519,7 @@ var DataSpaceManager = class extends Resource4 {
             err
           }, {
             F: __dxlog_file10,
-            L: 440,
+            L: 460,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2504,7 +2529,7 @@ var DataSpaceManager = class extends Resource4 {
       onAuthFailure: () => {
         log8.warn("auth failure", void 0, {
           F: __dxlog_file10,
-          L: 445,
+          L: 465,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2537,7 +2562,7 @@ var DataSpaceManager = class extends Resource4 {
             space: space.key
           }, {
             F: __dxlog_file10,
-            L: 472,
+            L: 492,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2548,7 +2573,7 @@ var DataSpaceManager = class extends Resource4 {
             open: this._lifecycleState === LifecycleState.OPEN
           }, {
             F: __dxlog_file10,
-            L: 475,
+            L: 495,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2567,7 +2592,7 @@ var DataSpaceManager = class extends Resource4 {
             space: space.key
           }, {
             F: __dxlog_file10,
-            L: 483,
+            L: 503,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2579,10 +2604,25 @@ var DataSpaceManager = class extends Resource4 {
       edgeFeatures: this._edgeFeatures
     });
     dataSpace.postOpen.append(async () => {
-      await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
+      const setting = dataSpace.getEdgeReplicationSetting();
+      if (setting === EdgeReplicationSetting.ENABLED) {
+        await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
+      } else if (this._echoEdgeReplicator) {
+        log8("not connecting EchoEdgeReplicator because of EdgeReplicationSetting", {
+          spaceId: dataSpace.id
+        }, {
+          F: __dxlog_file10,
+          L: 516,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
     });
     dataSpace.preClose.append(async () => {
-      await this._echoEdgeReplicator?.disconnectFromSpace(dataSpace.id);
+      const setting = dataSpace.getEdgeReplicationSetting();
+      if (setting === EdgeReplicationSetting.ENABLED) {
+        await this._echoEdgeReplicator?.disconnectFromSpace(dataSpace.id);
+      }
     });
     presence.newPeer.on((peerState) => {
       if (dataSpace.state === SpaceState.SPACE_READY) {
@@ -2602,7 +2642,7 @@ var DataSpaceManager = class extends Resource4 {
         space: space.key
       }, {
         F: __dxlog_file10,
-        L: 515,
+        L: 543,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2635,7 +2675,7 @@ var DataSpaceManager = class extends Resource4 {
       closedSessions
     }, {
       F: __dxlog_file10,
-      L: 541,
+      L: 569,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2650,7 +2690,7 @@ var DataSpaceManager = class extends Resource4 {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file10,
-          L: 555,
+          L: 583,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2735,7 +2775,7 @@ var SpacesServiceImpl = class {
     await this._updateMetrics();
     return this._serializeSpace(space);
   }
-  async updateSpace({ spaceKey, state }) {
+  async updateSpace({ spaceKey, state, edgeReplication }) {
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.spaces.get(spaceKey) ?? raise(new SpaceNotFoundError(spaceKey));
     if (state) {
@@ -2750,6 +2790,9 @@ var SpacesServiceImpl = class {
           throw new ApiError("Invalid space state");
       }
     }
+    if (edgeReplication !== void 0) {
+      await dataSpaceManager.setSpaceEdgeReplicationSetting(spaceKey, edgeReplication);
+    }
   }
   async updateMemberRole(request) {
     const identity = this._requireIdentity();
@@ -2766,7 +2809,7 @@ var SpacesServiceImpl = class {
     const credentials = await createAdmissionCredentials2(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
     invariant6(credentials[0].credential, void 0, {
       F: __dxlog_file11,
-      L: 102,
+      L: 106,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2776,7 +2819,7 @@ var SpacesServiceImpl = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant6(getCredentialAssertion3(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file11,
-      L: 104,
+      L: 108,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2794,7 +2837,7 @@ var SpacesServiceImpl = class {
           ids: spaces.map((space) => space.id)
         }), {
           F: __dxlog_file11,
-          L: 115,
+          L: 119,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2886,7 +2929,7 @@ var SpacesServiceImpl = class {
       } else {
         invariant6(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file11,
-          L: 213,
+          L: 217,
           S: this,
           A: [
             "!credential.id",
@@ -2895,7 +2938,7 @@ var SpacesServiceImpl = class {
         });
         invariant6(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file11,
-          L: 214,
+          L: 218,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -2905,7 +2948,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         invariant6(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file11,
-          L: 216,
+          L: 220,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -2955,7 +2998,7 @@ var SpacesServiceImpl = class {
     const assertion = getCredentialAssertion3(credential);
     invariant6(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file11,
-      L: 250,
+      L: 254,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2965,7 +3008,7 @@ var SpacesServiceImpl = class {
     const myIdentity = this._identityManager.identity;
     invariant6(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
       F: __dxlog_file11,
-      L: 252,
+      L: 256,
       S: this,
       A: [
         "myIdentity && credential.subject.id.equals(myIdentity.identityKey)",
@@ -3027,7 +3070,8 @@ var SpacesServiceImpl = class {
       }),
       creator: space.inner.spaceState.creator?.key,
       cache: space.cache,
-      metrics: space.metrics
+      metrics: space.metrics,
+      edgeReplication: space.getEdgeReplicationSetting()
     };
   }
   _requireIdentity() {
@@ -3074,7 +3118,7 @@ var Identity = class {
       deviceKey: params.deviceKey
     }, {
       F: __dxlog_file12,
-      L: 78,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3115,10 +3159,13 @@ var Identity = class {
     await this.space.spaceState.addCredentialProcessor(this._deviceStateMachine);
     await this.space.spaceState.addCredentialProcessor(this._profileStateMachine);
     await this.space.spaceState.addCredentialProcessor(this._defaultSpaceStateMachine);
+    await this.space.open(ctx);
+  }
+  async joinNetwork() {
     if (this._edgeFeedReplicator) {
       this.space.protocol.feedAdded.append(this._onFeedAdded);
     }
-    await this.space.open(ctx);
+    await this.space.startProtocol();
     await this._edgeFeedReplicator?.open();
   }
   async close(ctx) {
@@ -3170,7 +3217,7 @@ var Identity = class {
   getIdentityCredentialSigner() {
     invariant7(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
       F: __dxlog_file12,
-      L: 189,
+      L: 191,
       S: this,
       A: [
         "this._deviceStateMachine.deviceCredentialChain",
@@ -3214,20 +3261,21 @@ var Identity = class {
       dataFeedKey
     }, {
       F: __dxlog_file12,
-      L: 214,
+      L: 216,
       S: this,
       C: (f, a) => f(...a)
     });
     const signer = this.getIdentityCredentialSigner();
+    const deviceCredential = await signer.createCredential({
+      subject: deviceKey,
+      assertion: {
+        "@type": "dxos.halo.credentials.AuthorizedDevice",
+        identityKey: this.identityKey,
+        deviceKey
+      }
+    });
     await writeMessages3(this.controlPipeline.writer, [
-      await signer.createCredential({
-        subject: deviceKey,
-        assertion: {
-          "@type": "dxos.halo.credentials.AuthorizedDevice",
-          identityKey: this.identityKey,
-          deviceKey
-        }
-      }),
+      deviceCredential,
       await signer.createCredential({
         subject: controlFeedKey,
         assertion: {
@@ -3253,6 +3301,7 @@ var Identity = class {
         credential
       }
     })));
+    return deviceCredential;
   }
 };
 _ts_decorate4([
@@ -3301,7 +3350,6 @@ var IdentityManager = class {
     this._edgeFeatures = params.edgeFeatures;
     this._devicePresenceAnnounceInterval = params.devicePresenceAnnounceInterval ?? DEVICE_PRESENCE_ANNOUNCE_INTERVAL;
     this._devicePresenceOfflineTimeout = params.devicePresenceOfflineTimeout ?? DEVICE_PRESENCE_OFFLINE_TIMEOUT;
-    this._callbacks = params.callbacks;
   }
   get identity() {
     return this._identity;
@@ -3312,7 +3360,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file13,
-      L: 121,
+      L: 116,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3321,7 +3369,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file13,
-      L: 124,
+      L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3334,7 +3382,7 @@ var IdentityManager = class {
         displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file13,
-        L: 129,
+        L: 124,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3344,7 +3392,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file13,
-      L: 136,
+      L: 131,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3352,13 +3400,13 @@ var IdentityManager = class {
   async close() {
     await this._identity?.close(new Context4(void 0, {
       F: __dxlog_file13,
-      L: 140
+      L: 135
     }));
   }
   async createIdentity({ displayName, deviceProfile } = {}) {
     invariant8(!this._identity, "Identity already exists.", {
       F: __dxlog_file13,
-      L: 145,
+      L: 140,
       S: this,
       A: [
         "!this._identity",
@@ -3367,7 +3415,7 @@ var IdentityManager = class {
     });
     log11("creating identity...", void 0, {
       F: __dxlog_file13,
-      L: 146,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3385,13 +3433,13 @@ var IdentityManager = class {
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new Context4(void 0, {
       F: __dxlog_file13,
-      L: 161
+      L: 156
     }));
     {
       const generator = new CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       invariant8(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
         F: __dxlog_file13,
-        L: 165,
+        L: 160,
         S: this,
         A: [
           "identityRecord.haloSpace.genesisFeedKey",
@@ -3400,7 +3448,7 @@ var IdentityManager = class {
       });
       invariant8(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
         F: __dxlog_file13,
-        L: 166,
+        L: 161,
         S: this,
         A: [
           "identityRecord.haloSpace.dataFeedKey",
@@ -3439,7 +3487,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file13,
-      L: 208,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3450,7 +3498,7 @@ var IdentityManager = class {
       profile: identity.profileDocument
     }, {
       F: __dxlog_file13,
-      L: 214,
+      L: 205,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3480,20 +3528,20 @@ var IdentityManager = class {
     };
   }
   /**
-  * Accept an existing identity. Expects its device key to be authorized (now or later).
+  * Prepare an identity object as the first step of acceptIdentity flow.
   */
-  async acceptIdentity(params) {
+  async prepareIdentity(params) {
     log11("accepting identity", {
       params
     }, {
       F: __dxlog_file13,
-      L: 252,
+      L: 244,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant8(!this._identity, "Identity already exists.", {
       F: __dxlog_file13,
-      L: 253,
+      L: 245,
       S: this,
       A: [
         "!this._identity",
@@ -3514,23 +3562,32 @@ var IdentityManager = class {
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new Context4(void 0, {
       F: __dxlog_file13,
-      L: 268
+      L: 259
     }));
+    return {
+      identity,
+      identityRecord
+    };
+  }
+  /**
+  * Accept an existing identity. Expects its device key to be authorized (now or later).
+  */
+  async acceptIdentity(identity, identityRecord, profile) {
     this._identity = identity;
-    await this._metadataStore.setIdentityRecord(identityRecord);
     await this._identity.ready();
+    await this._metadataStore.setIdentityRecord(identityRecord);
     log11.trace("dxos.halo.identity", {
-      identityKey: identityRecord.identityKey,
+      identityKey: this._identity.identityKey,
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file13,
-      L: 272,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
     await this.updateDeviceProfile({
       ...this.createDefaultDeviceProfile(),
-      ...params.deviceProfile
+      ...profile
     });
     this.stateUpdate.emit();
     log11("accepted identity", {
@@ -3538,11 +3595,10 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file13,
-      L: 282,
+      L: 284,
       S: this,
       C: (f, a) => f(...a)
     });
-    return identity;
   }
   /**
   * Update the profile document of an existing identity.
@@ -3550,7 +3606,7 @@ var IdentityManager = class {
   async updateProfile(profile) {
     invariant8(this._identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 290,
+      L: 291,
       S: this,
       A: [
         "this._identity",
@@ -3581,7 +3637,7 @@ var IdentityManager = class {
   async updateDeviceProfile(profile) {
     invariant8(this._identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 307,
+      L: 308,
       S: this,
       A: [
         "this._identity",
@@ -3617,7 +3673,7 @@ var IdentityManager = class {
   async _constructIdentity(identityRecord) {
     invariant8(!this._identity, void 0, {
       F: __dxlog_file13,
-      L: 333,
+      L: 334,
       S: this,
       A: [
         "!this._identity",
@@ -3628,7 +3684,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file13,
-      L: 334,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3643,7 +3699,7 @@ var IdentityManager = class {
     });
     invariant8(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file13,
-      L: 347,
+      L: 348,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -3655,7 +3711,7 @@ var IdentityManager = class {
     });
     invariant8(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file13,
-      L: 351,
+      L: 352,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -3692,11 +3748,10 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file13,
-      L: 380,
+      L: 381,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._callbacks?.onIdentityConstruction?.(identity);
     if (identityRecord.haloSpace.controlTimeframe) {
       identity.controlPipeline.state.setTargetTimeframe(identityRecord.haloSpace.controlTimeframe);
     }
@@ -4082,13 +4137,14 @@ var DataSpace = class {
       F: __dxlog_file15,
       L: 244
     }));
+    await this._inner.startProtocol();
     await this._edgeFeedReplicator?.open();
     this._state = SpaceState4.SPACE_CONTROL_ONLY;
     log13("new state", {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 249,
+      L: 250,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4108,14 +4164,14 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 268,
+      L: 269,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
     this._ctx = new Context5(void 0, {
       F: __dxlog_file15,
-      L: 270
+      L: 271
     });
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.remove(this._onFeedAdded);
@@ -4148,7 +4204,7 @@ var DataSpace = class {
         if (err instanceof CancelledError || err instanceof ContextDisposedError) {
           log13("data pipeline initialization cancelled", err, {
             F: __dxlog_file15,
-            L: 308,
+            L: 309,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4156,7 +4212,7 @@ var DataSpace = class {
         }
         log13.error("Error initializing data pipeline", err, {
           F: __dxlog_file15,
-          L: 312,
+          L: 313,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4165,7 +4221,7 @@ var DataSpace = class {
           state: SpaceState4[this._state]
         }, {
           F: __dxlog_file15,
-          L: 314,
+          L: 315,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4185,13 +4241,13 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 330,
+      L: 331,
       S: this,
       C: (f, a) => f(...a)
     });
     log13("initializing control pipeline", void 0, {
       F: __dxlog_file15,
-      L: 332,
+      L: 333,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4200,21 +4256,21 @@ var DataSpace = class {
     const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState4.SPACE_READY);
     log13("initializing automerge root", void 0, {
       F: __dxlog_file15,
-      L: 340,
+      L: 341,
       S: this,
       C: (f, a) => f(...a)
     });
     this._automergeSpaceState.startProcessingRootDocs();
     log13("waiting for space to be ready", void 0, {
       F: __dxlog_file15,
-      L: 344,
+      L: 345,
       S: this,
       C: (f, a) => f(...a)
     });
     await ready;
     log13("space is ready", void 0, {
       F: __dxlog_file15,
-      L: 346,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4226,7 +4282,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 353,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4243,7 +4299,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log13("writable feeds created", void 0, {
       F: __dxlog_file15,
-      L: 370,
+      L: 371,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4297,7 +4353,7 @@ var DataSpace = class {
           count: credentials.length
         }, {
           F: __dxlog_file15,
-          L: 428,
+          L: 429,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4308,14 +4364,14 @@ var DataSpace = class {
         });
         log13("credentials notarized", void 0, {
           F: __dxlog_file15,
-          L: 432,
+          L: 433,
           S: this,
           C: (f, a) => f(...a)
         });
       } catch (err) {
         log13.error("error notarizing credentials for feed admission", err, {
           F: __dxlog_file15,
-          L: 434,
+          L: 435,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4330,7 +4386,7 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file15,
-      L: 444,
+      L: 445,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4382,7 +4438,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file15,
-          L: 487,
+          L: 488,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4472,12 +4528,15 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 569,
+      L: 570,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdate.emit();
   }
+  getEdgeReplicationSetting() {
+    return this._metadataStore.getSpaceEdgeReplicationSetting(this.key);
+  }
 };
 _ts_decorate6([
   trace5.info()
@@ -4529,6 +4588,7 @@ DataSpace = _ts_decorate6([
 ], DataSpace);
 
 // packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts
+import { getCredentialAssertion as getCredentialAssertion4 } from "@dxos/credentials";
 import { invariant as invariant10 } from "@dxos/invariant";
 import { AlreadyJoinedError as AlreadyJoinedError2 } from "@dxos/protocols";
 import { Invitation as Invitation2 } from "@dxos/protocols/proto/dxos/client/services";
@@ -4559,7 +4619,7 @@ var DeviceInvitationProtocol = class {
   async admit(_, request) {
     invariant10(request.device, void 0, {
       F: __dxlog_file16,
-      L: 50,
+      L: 51,
       S: this,
       A: [
         "request.device",
@@ -4567,13 +4627,23 @@ var DeviceInvitationProtocol = class {
       ]
     });
     const identity = this._getIdentity();
-    await identity.admitDevice(request.device);
+    const credential = await identity.admitDevice(request.device);
+    invariant10(getCredentialAssertion4(credential)["@type"] === "dxos.halo.credentials.AuthorizedDevice", void 0, {
+      F: __dxlog_file16,
+      L: 54,
+      S: this,
+      A: [
+        "getCredentialAssertion(credential)['@type'] === 'dxos.halo.credentials.AuthorizedDevice'",
+        ""
+      ]
+    });
     return {
       device: {
         identityKey: identity.identityKey,
         haloSpaceKey: identity.haloSpaceKey,
         genesisFeedKey: identity.haloGenesisFeedKey,
-        controlTimeframe: identity.controlPipeline.state.timeframe
+        controlTimeframe: identity.controlPipeline.state.timeframe,
+        credential
       }
     };
   }
@@ -4605,7 +4675,7 @@ var DeviceInvitationProtocol = class {
   async accept(response, request) {
     invariant10(response.device, void 0, {
       F: __dxlog_file16,
-      L: 95,
+      L: 98,
       S: this,
       A: [
         "response.device",
@@ -4615,7 +4685,7 @@ var DeviceInvitationProtocol = class {
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
     invariant10(request.device, void 0, {
       F: __dxlog_file16,
-      L: 98,
+      L: 101,
       S: this,
       A: [
         "request.device",
@@ -4631,7 +4701,8 @@ var DeviceInvitationProtocol = class {
       controlFeedKey,
       dataFeedKey,
       controlTimeframe,
-      deviceProfile: profile
+      deviceProfile: profile,
+      authorizedDeviceCredential: response.device.credential
     });
     return {
       identityKey
@@ -4640,30 +4711,30 @@ var DeviceInvitationProtocol = class {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
-import { Mutex as Mutex3, scheduleTask as scheduleTask6, TimeoutError as TimeoutError2 } from "@dxos/async";
+import { scheduleTask as scheduleTask7, TimeoutError as TimeoutError2 } from "@dxos/async";
 import { INVITATION_TIMEOUT } from "@dxos/client-protocol";
 import { ContextDisposedError as ContextDisposedError3 } from "@dxos/context";
 import { createKeyPair, sign } from "@dxos/crypto";
-import { invariant as invariant14 } from "@dxos/invariant";
+import { invariant as invariant15 } from "@dxos/invariant";
 import { PublicKey as PublicKey11 } from "@dxos/keys";
-import { log as log17 } from "@dxos/log";
+import { log as log19 } from "@dxos/log";
 import { createTeleportProtocolFactory } from "@dxos/network-manager";
 import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError3, trace as trace7 } from "@dxos/protocols";
-import { Invitation as Invitation5 } from "@dxos/protocols/proto/dxos/client/services";
+import { Invitation as Invitation7 } from "@dxos/protocols/proto/dxos/client/services";
 import { AuthenticationResponse as AuthenticationResponse2 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { InvitationOptions as InvitationOptions4 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { trace as _trace } from "@dxos/tracing";
 import { ComplexSet as ComplexSet5 } from "@dxos/util";
 
-// packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts
-import { Trigger as Trigger5 } from "@dxos/async";
-import { cancelWithContext as cancelWithContext4, Context as Context6 } from "@dxos/context";
+// packages/sdk/client-services/src/packlets/invitations/edge-invitation-handler.ts
+import { scheduleMicroTask as scheduleMicroTask3, scheduleTask as scheduleTask5 } from "@dxos/async";
+import { ed25519Signature } from "@dxos/crypto";
 import { invariant as invariant11 } from "@dxos/invariant";
+import { SpaceId as SpaceId2 } from "@dxos/keys";
 import { log as log14 } from "@dxos/log";
-import { InvalidInvitationExtensionRoleError } from "@dxos/protocols";
+import { EdgeAuthChallengeError, EdgeCallFailedError as EdgeCallFailedError2 } from "@dxos/protocols";
 import { schema as schema3 } from "@dxos/protocols/proto";
-import { InvitationOptions } from "@dxos/protocols/proto/dxos/halo/invitations";
-import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
+import { Invitation as Invitation4 } from "@dxos/protocols/proto/dxos/client/services";
 
 // packages/sdk/client-services/src/packlets/invitations/utils.ts
 import { cancelWithContext as cancelWithContext3, ContextDisposedError as ContextDisposedError2 } from "@dxos/context";
@@ -4684,24 +4755,184 @@ var tryAcquireBeforeContextDisposed = async (ctx, mutex) => {
   })());
 };
 
+// packages/sdk/client-services/src/packlets/invitations/edge-invitation-handler.ts
+var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/edge-invitation-handler.ts";
+var DEFAULT_REQUEST_RETRY_INTERVAL_MS = 3e3;
+var DEFAULT_REQUEST_RETRY_JITTER_MS = 500;
+var EdgeInvitationHandler = class {
+  constructor(config, _client, _callbacks) {
+    this._client = _client;
+    this._callbacks = _callbacks;
+    this._retryInterval = config?.retryInterval ?? DEFAULT_REQUEST_RETRY_INTERVAL_MS;
+    this._retryJitter = config?.retryJitter ?? DEFAULT_REQUEST_RETRY_JITTER_MS;
+  }
+  handle(ctx, guardedState, protocol, deviceProfile) {
+    if (!this._client) {
+      log14("edge disabled", void 0, {
+        F: __dxlog_file17,
+        L: 65,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    const invitation = guardedState.current;
+    const spaceId = invitation.spaceId;
+    const canBeHandledByEdge = invitation.authMethod !== Invitation4.AuthMethod.SHARED_SECRET && invitation.type === Invitation4.Type.DELEGATED && invitation.kind === Invitation4.Kind.SPACE && spaceId != null && SpaceId2.isValid(spaceId);
+    if (!canBeHandledByEdge) {
+      log14("invitation could not be handled by edge", {
+        invitation
+      }, {
+        F: __dxlog_file17,
+        L: 79,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    ctx.onDispose(() => {
+      this._flowLock?.release();
+      this._flowLock = void 0;
+    });
+    const tryHandleInvitation = async () => {
+      const admissionRequest = await protocol.createAdmissionRequest(deviceProfile);
+      if (admissionRequest.space) {
+        try {
+          await this._handleSpaceInvitationFlow(ctx, guardedState, admissionRequest.space, spaceId);
+        } catch (error) {
+          if (error instanceof EdgeCallFailedError2) {
+            log14.info("join space with edge unsuccessful", {
+              reason: error.message,
+              retryable: error.isRetryable,
+              after: error.retryAfterMs ?? this._calculateNextRetryMs()
+            }, {
+              F: __dxlog_file17,
+              L: 95,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            if (error.isRetryable) {
+              scheduleTask5(ctx, tryHandleInvitation, error.retryAfterMs ?? this._calculateNextRetryMs());
+            }
+          } else {
+            log14.info("failed to handle invitation with edge", {
+              error
+            }, {
+              F: __dxlog_file17,
+              L: 104,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            scheduleTask5(ctx, tryHandleInvitation, this._calculateNextRetryMs());
+          }
+        }
+      }
+    };
+    scheduleMicroTask3(ctx, tryHandleInvitation);
+  }
+  async _handleSpaceInvitationFlow(ctx, guardedState, admissionRequest, spaceId) {
+    try {
+      log14("edge invitation flow", void 0, {
+        F: __dxlog_file17,
+        L: 120,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._flowLock = await tryAcquireBeforeContextDisposed(ctx, guardedState.mutex);
+      log14("edge invitation flow acquired the lock", void 0, {
+        F: __dxlog_file17,
+        L: 122,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      guardedState.set(this, Invitation4.State.CONNECTING);
+      const response = await this._joinSpaceByInvitation(guardedState, spaceId, {
+        identityKey: admissionRequest.identityKey.toHex(),
+        invitationId: guardedState.current.invitationId
+      });
+      const admissionResponse = await this._mapToAdmissionResponse(response);
+      await this._callbacks.onInvitationSuccess(admissionResponse, {
+        space: admissionRequest
+      });
+    } catch (error) {
+      guardedState.set(this, Invitation4.State.ERROR);
+      throw error;
+    } finally {
+      this._flowLock?.release();
+      this._flowLock = void 0;
+    }
+  }
+  async _mapToAdmissionResponse(edgeResponse) {
+    const credentialBytes = Buffer.from(edgeResponse.spaceMemberCredential, "base64");
+    const codec = schema3.getCodecForType("dxos.halo.credentials.Credential");
+    return {
+      space: {
+        credential: codec.decode(credentialBytes)
+      }
+    };
+  }
+  async _joinSpaceByInvitation(guardedState, spaceId, request) {
+    invariant11(this._client, void 0, {
+      F: __dxlog_file17,
+      L: 157,
+      S: this,
+      A: [
+        "this._client",
+        ""
+      ]
+    });
+    try {
+      return await this._client.joinSpaceByInvitation(spaceId, request);
+    } catch (error) {
+      if (error instanceof EdgeAuthChallengeError) {
+        guardedState.set(this, Invitation4.State.AUTHENTICATING);
+        const publicKey = guardedState.current.guestKeypair?.publicKey;
+        const privateKey = guardedState.current.guestKeypair?.privateKey;
+        if (!privateKey || !publicKey) {
+          throw error;
+        }
+        const signature = await ed25519Signature(privateKey, Buffer.from(error.challenge, "base64"));
+        request.signature = Buffer.from(signature).toString("base64");
+        return this._client.joinSpaceByInvitation(spaceId, request);
+      } else {
+        throw error;
+      }
+    }
+  }
+  hasFlowLock() {
+    return this._flowLock != null;
+  }
+  _calculateNextRetryMs() {
+    return this._retryInterval + Math.random() * this._retryJitter;
+  }
+};
+
 // packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts
-var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts";
+import { Trigger as Trigger5 } from "@dxos/async";
+import { cancelWithContext as cancelWithContext4, Context as Context6 } from "@dxos/context";
+import { invariant as invariant12 } from "@dxos/invariant";
+import { log as log15 } from "@dxos/log";
+import { InvalidInvitationExtensionRoleError } from "@dxos/protocols";
+import { schema as schema4 } from "@dxos/protocols/proto";
+import { InvitationOptions } from "@dxos/protocols/proto/dxos/halo/invitations";
+import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
+var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts";
 var OPTIONS_TIMEOUT = 1e4;
 var InvitationGuestExtension = class extends RpcExtension2 {
   constructor(_invitationFlowMutex, _callbacks) {
     super({
       requested: {
-        InvitationHostService: schema3.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: schema4.getService("dxos.halo.invitations.InvitationHostService")
       },
       exposed: {
-        InvitationHostService: schema3.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: schema4.getService("dxos.halo.invitations.InvitationHostService")
       }
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
     this._ctx = new Context6(void 0, {
-      F: __dxlog_file17,
-      L: 34
+      F: __dxlog_file18,
+      L: 38
     });
     this._remoteOptionsTrigger = new Trigger5();
     this._invitationFlowLock = null;
@@ -4713,9 +4944,9 @@ var InvitationGuestExtension = class extends RpcExtension2 {
     return {
       InvitationHostService: {
         options: async (options) => {
-          invariant11(!this._remoteOptions, "Remote options already set.", {
-            F: __dxlog_file17,
-            L: 64,
+          invariant12(!this._remoteOptions, "Remote options already set.", {
+            F: __dxlog_file18,
+            L: 68,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -4740,34 +4971,34 @@ var InvitationGuestExtension = class extends RpcExtension2 {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      log14("guest acquire lock", void 0, {
-        F: __dxlog_file17,
-        L: 85,
+      log15("guest acquire lock", void 0, {
+        F: __dxlog_file18,
+        L: 89,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      log14("guest lock acquired", void 0, {
-        F: __dxlog_file17,
-        L: 87,
+      log15("guest lock acquired", void 0, {
+        F: __dxlog_file18,
+        L: 91,
         S: this,
         C: (f, a) => f(...a)
       });
       await cancelWithContext4(this._ctx, this.rpc.InvitationHostService.options({
         role: InvitationOptions.Role.GUEST
       }));
-      log14("options sent", void 0, {
-        F: __dxlog_file17,
-        L: 92,
+      log15("options sent", void 0, {
+        F: __dxlog_file18,
+        L: 96,
         S: this,
         C: (f, a) => f(...a)
       });
       await cancelWithContext4(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT
       }));
-      log14("options received", void 0, {
-        F: __dxlog_file17,
-        L: 94,
+      log15("options received", void 0, {
+        F: __dxlog_file18,
+        L: 98,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4799,9 +5030,9 @@ var InvitationGuestExtension = class extends RpcExtension2 {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock.release();
       this._invitationFlowLock = null;
-      log14("invitation flow lock released", void 0, {
-        F: __dxlog_file17,
-        L: 127,
+      log15("invitation flow lock released", void 0, {
+        F: __dxlog_file18,
+        L: 131,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4810,35 +5041,35 @@ var InvitationGuestExtension = class extends RpcExtension2 {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts
-import { Trigger as Trigger6, scheduleTask as scheduleTask5 } from "@dxos/async";
+import { Trigger as Trigger6, scheduleTask as scheduleTask6 } from "@dxos/async";
 import { cancelWithContext as cancelWithContext5, Context as Context7 } from "@dxos/context";
 import { randomBytes, verify } from "@dxos/crypto";
-import { invariant as invariant12, InvariantViolation } from "@dxos/invariant";
+import { invariant as invariant13, InvariantViolation } from "@dxos/invariant";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
-import { log as log15 } from "@dxos/log";
+import { log as log16 } from "@dxos/log";
 import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError2, trace as trace6 } from "@dxos/protocols";
-import { schema as schema4 } from "@dxos/protocols/proto";
-import { Invitation as Invitation4 } from "@dxos/protocols/proto/dxos/client/services";
+import { schema as schema5 } from "@dxos/protocols/proto";
+import { Invitation as Invitation5 } from "@dxos/protocols/proto/dxos/client/services";
 import { AuthenticationResponse, InvitationOptions as InvitationOptions2 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension as RpcExtension3 } from "@dxos/teleport";
-var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
+var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
 var OPTIONS_TIMEOUT2 = 1e4;
 var MAX_OTP_ATTEMPTS = 3;
 var InvitationHostExtension = class extends RpcExtension3 {
   constructor(_invitationFlowMutex, _callbacks) {
     super({
       requested: {
-        InvitationHostService: schema4.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: schema5.getService("dxos.halo.invitations.InvitationHostService")
       },
       exposed: {
-        InvitationHostService: schema4.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: schema5.getService("dxos.halo.invitations.InvitationHostService")
       }
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
     this._ctx = new Context7(void 0, {
-      F: __dxlog_file18,
-      L: 53
+      F: __dxlog_file19,
+      L: 57
     });
     this._remoteOptionsTrigger = new Trigger6();
     this._challenge = void 0;
@@ -4857,9 +5088,9 @@ var InvitationHostExtension = class extends RpcExtension3 {
       // Perhaps in the future we will have more complex logic here.
       InvitationHostService: {
         options: async (options) => {
-          invariant12(!this._remoteOptions, "Remote options already set.", {
-            F: __dxlog_file18,
-            L: 102,
+          invariant13(!this._remoteOptions, "Remote options already set.", {
+            F: __dxlog_file19,
+            L: 106,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -4872,48 +5103,48 @@ var InvitationHostExtension = class extends RpcExtension3 {
         introduce: async (request) => {
           const { profile, invitationId } = request;
           const traceId = PublicKey9.random().toHex();
-          log15.trace("dxos.sdk.invitation-handler.host.introduce", trace6.begin({
+          log16.trace("dxos.sdk.invitation-handler.host.introduce", trace6.begin({
             id: traceId
           }), {
-            F: __dxlog_file18,
-            L: 110,
+            F: __dxlog_file19,
+            L: 114,
             S: this,
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
-          this._assertInvitationState(Invitation4.State.CONNECTED);
+          this._assertInvitationState(Invitation5.State.CONNECTED);
           if (invitationId !== invitation?.invitationId) {
-            log15.warn("incorrect invitationId", {
+            log16.warn("incorrect invitationId", {
               expected: invitation.invitationId,
               actual: invitationId
             }, {
-              F: __dxlog_file18,
-              L: 115,
+              F: __dxlog_file19,
+              L: 119,
               S: this,
               C: (f, a) => f(...a)
             });
             this._callbacks.onError(new Error("Incorrect invitationId."));
-            scheduleTask5(this._ctx, () => this.close());
+            scheduleTask6(this._ctx, () => this.close());
             return {
-              authMethod: Invitation4.AuthMethod.NONE
+              authMethod: Invitation5.AuthMethod.NONE
             };
           }
-          log15("guest introduced themselves", {
+          log16("guest introduced themselves", {
             guestProfile: profile
           }, {
-            F: __dxlog_file18,
-            L: 124,
+            F: __dxlog_file19,
+            L: 128,
             S: this,
             C: (f, a) => f(...a)
           });
           this.guestProfile = profile;
-          this._callbacks.onStateUpdate(Invitation4.State.READY_FOR_AUTHENTICATION);
-          this._challenge = invitation.authMethod === Invitation4.AuthMethod.KNOWN_PUBLIC_KEY ? randomBytes(32) : void 0;
-          log15.trace("dxos.sdk.invitation-handler.host.introduce", trace6.end({
+          this._callbacks.onStateUpdate(Invitation5.State.READY_FOR_AUTHENTICATION);
+          this._challenge = invitation.authMethod === Invitation5.AuthMethod.KNOWN_PUBLIC_KEY ? randomBytes(32) : void 0;
+          log16.trace("dxos.sdk.invitation-handler.host.introduce", trace6.end({
             id: traceId
           }), {
-            F: __dxlog_file18,
-            L: 130,
+            F: __dxlog_file19,
+            L: 134,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4924,34 +5155,34 @@ var InvitationHostExtension = class extends RpcExtension3 {
         },
         authenticate: async ({ authCode: code, signedChallenge }) => {
           const traceId = PublicKey9.random().toHex();
-          log15.trace("dxos.sdk.invitation-handler.host.authenticate", trace6.begin({
+          log16.trace("dxos.sdk.invitation-handler.host.authenticate", trace6.begin({
             id: traceId
           }), {
-            F: __dxlog_file18,
-            L: 139,
+            F: __dxlog_file19,
+            L: 143,
             S: this,
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
-          log15("received authentication request", {
+          log16("received authentication request", {
             authCode: code
           }, {
-            F: __dxlog_file18,
-            L: 142,
+            F: __dxlog_file19,
+            L: 146,
             S: this,
             C: (f, a) => f(...a)
           });
           let status = AuthenticationResponse.Status.OK;
           this._assertInvitationState([
-            Invitation4.State.AUTHENTICATING,
-            Invitation4.State.READY_FOR_AUTHENTICATION
+            Invitation5.State.AUTHENTICATING,
+            Invitation5.State.READY_FOR_AUTHENTICATION
           ]);
-          this._callbacks.onStateUpdate(Invitation4.State.AUTHENTICATING);
+          this._callbacks.onStateUpdate(Invitation5.State.AUTHENTICATING);
           switch (invitation.authMethod) {
-            case Invitation4.AuthMethod.NONE: {
-              log15("authentication not required", void 0, {
-                F: __dxlog_file18,
-                L: 150,
+            case Invitation5.AuthMethod.NONE: {
+              log16("authentication not required", void 0, {
+                F: __dxlog_file19,
+                L: 154,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -4959,7 +5190,7 @@ var InvitationHostExtension = class extends RpcExtension3 {
                 status: AuthenticationResponse.Status.OK
               };
             }
-            case Invitation4.AuthMethod.SHARED_SECRET: {
+            case Invitation5.AuthMethod.SHARED_SECRET: {
               if (invitation.authCode) {
                 if (this.authenticationRetry++ > MAX_OTP_ATTEMPTS) {
                   status = AuthenticationResponse.Status.INVALID_OPT_ATTEMPTS;
@@ -4971,7 +5202,7 @@ var InvitationHostExtension = class extends RpcExtension3 {
               }
               break;
             }
-            case Invitation4.AuthMethod.KNOWN_PUBLIC_KEY: {
+            case Invitation5.AuthMethod.KNOWN_PUBLIC_KEY: {
               if (!invitation.guestKeypair) {
                 status = AuthenticationResponse.Status.INTERNAL_ERROR;
                 break;
@@ -4985,11 +5216,11 @@ var InvitationHostExtension = class extends RpcExtension3 {
               break;
             }
             default: {
-              log15.error("invalid authentication method", {
+              log16.error("invalid authentication method", {
                 authMethod: invitation.authMethod
               }, {
-                F: __dxlog_file18,
-                L: 188,
+                F: __dxlog_file19,
+                L: 192,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5002,19 +5233,19 @@ var InvitationHostExtension = class extends RpcExtension3 {
             AuthenticationResponse.Status.INVALID_OTP
           ].includes(status)) {
             this._callbacks.onError(new Error(`Authentication failed, with status=${status}`));
-            scheduleTask5(this._ctx, () => this.close());
+            scheduleTask6(this._ctx, () => this.close());
             return {
               status
             };
           }
-          log15.trace("dxos.sdk.invitation-handler.host.authenticate", trace6.end({
+          log16.trace("dxos.sdk.invitation-handler.host.authenticate", trace6.end({
             id: traceId,
             data: {
               status
             }
           }), {
-            F: __dxlog_file18,
-            L: 200,
+            F: __dxlog_file19,
+            L: 204,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5024,28 +5255,28 @@ var InvitationHostExtension = class extends RpcExtension3 {
         },
         admit: async (request) => {
           const traceId = PublicKey9.random().toHex();
-          log15.trace("dxos.sdk.invitation-handler.host.admit", trace6.begin({
+          log16.trace("dxos.sdk.invitation-handler.host.admit", trace6.begin({
             id: traceId
           }), {
-            F: __dxlog_file18,
-            L: 206,
+            F: __dxlog_file19,
+            L: 210,
             S: this,
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
           try {
             if (isAuthenticationRequired(invitation)) {
-              this._assertInvitationState(Invitation4.State.AUTHENTICATING);
+              this._assertInvitationState(Invitation5.State.AUTHENTICATING);
               if (!this.authenticationPassed) {
                 throw new Error("Not authenticated");
               }
             }
             const response = await this._callbacks.admit(request);
-            log15.trace("dxos.sdk.invitation-handler.host.admit", trace6.end({
+            log16.trace("dxos.sdk.invitation-handler.host.admit", trace6.end({
               id: traceId
             }), {
-              F: __dxlog_file18,
-              L: 220,
+              F: __dxlog_file19,
+              L: 224,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5061,36 +5292,36 @@ var InvitationHostExtension = class extends RpcExtension3 {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      log15("host acquire lock", void 0, {
-        F: __dxlog_file18,
-        L: 235,
+      log16("host acquire lock", void 0, {
+        F: __dxlog_file19,
+        L: 239,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      log15("host lock acquired", void 0, {
-        F: __dxlog_file18,
-        L: 237,
+      log16("host lock acquired", void 0, {
+        F: __dxlog_file19,
+        L: 241,
         S: this,
         C: (f, a) => f(...a)
       });
       const lastState = this._requireActiveInvitation().state;
-      this._callbacks.onStateUpdate(Invitation4.State.CONNECTING);
+      this._callbacks.onStateUpdate(Invitation5.State.CONNECTING);
       await this.rpc.InvitationHostService.options({
         role: InvitationOptions2.Role.HOST
       });
-      log15("options sent", void 0, {
-        F: __dxlog_file18,
-        L: 241,
+      log16("options sent", void 0, {
+        F: __dxlog_file19,
+        L: 245,
         S: this,
         C: (f, a) => f(...a)
       });
       await cancelWithContext5(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT2
       }));
-      log15("options received", void 0, {
-        F: __dxlog_file18,
-        L: 243,
+      log16("options received", void 0, {
+        F: __dxlog_file19,
+        L: 247,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5102,7 +5333,7 @@ var InvitationHostExtension = class extends RpcExtension3 {
           remotePeerId: context.remotePeerId
         });
       }
-      this._callbacks.onStateUpdate(Invitation4.State.CONNECTED);
+      this._callbacks.onStateUpdate(Invitation5.State.CONNECTED);
       this._callbacks.onOpen(this._ctx, context);
     } catch (err) {
       if (this._invitationFlowLock != null) {
@@ -5116,7 +5347,7 @@ var InvitationHostExtension = class extends RpcExtension3 {
   _requireActiveInvitation() {
     const invitation = this._callbacks.activeInvitation;
     if (invitation == null) {
-      scheduleTask5(this._ctx, () => this.close());
+      scheduleTask6(this._ctx, () => this.close());
       throw new Error("Active invitation not found");
     }
     return invitation;
@@ -5127,7 +5358,7 @@ var InvitationHostExtension = class extends RpcExtension3 {
       stateOrMany
     ];
     if (!validStates.includes(invitation.state)) {
-      scheduleTask5(this._ctx, () => this.close());
+      scheduleTask6(this._ctx, () => this.close());
       throw new InvariantViolation(`Expected ${stateToString(invitation.state)} to be one of [${validStates.map(stateToString).join(", ")}]`);
     }
   }
@@ -5142,55 +5373,150 @@ var InvitationHostExtension = class extends RpcExtension3 {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock?.release();
       this._invitationFlowLock = null;
-      log15("invitation flow lock released", void 0, {
-        F: __dxlog_file18,
-        L: 298,
+      log16("invitation flow lock released", void 0, {
+        F: __dxlog_file19,
+        L: 302,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
 };
-var isAuthenticationRequired = (invitation) => invitation.authMethod !== Invitation4.AuthMethod.NONE;
+var isAuthenticationRequired = (invitation) => invitation.authMethod !== Invitation5.AuthMethod.NONE;
 
-// packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts
-import { invariant as invariant13 } from "@dxos/invariant";
-import { PublicKey as PublicKey10 } from "@dxos/keys";
-import { log as log16 } from "@dxos/log";
-import { InvitationOptions as InvitationOptions3 } from "@dxos/protocols/proto/dxos/halo/invitations";
-import { ComplexSet as ComplexSet4 } from "@dxos/util";
-var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
-var InvitationTopology = class {
-  constructor(_role) {
-    this._role = _role;
-    this._seenPeers = new ComplexSet4(PublicKey10.hash);
-  }
-  init(controller) {
-    invariant13(!this._controller, "Already initialized.", {
-      F: __dxlog_file19,
-      L: 42,
-      S: this,
-      A: [
-        "!this._controller",
-        "'Already initialized.'"
-      ]
-    });
-    this._controller = controller;
-  }
-  update() {
-    invariant13(this._controller, "Not initialized.", {
-      F: __dxlog_file19,
-      L: 47,
-      S: this,
-      A: [
-        "this._controller",
-        "'Not initialized.'"
-      ]
-    });
-    const { ownPeerId, candidates, connected, allPeers } = this._controller.getState();
-    if (this._role === InvitationOptions3.Role.GUEST) {
-      return;
-    }
+// packages/sdk/client-services/src/packlets/invitations/invitation-state.ts
+import { Mutex as Mutex3 } from "@dxos/async";
+import { log as log17 } from "@dxos/log";
+import { Invitation as Invitation6 } from "@dxos/protocols/proto/dxos/client/services";
+var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-state.ts";
+var createGuardedInvitationState = (ctx, invitation, stream) => {
+  const mutex = new Mutex3();
+  let lastActiveLockHolder = null;
+  let currentInvitation = {
+    ...invitation
+  };
+  const isStateChangeAllowed = (lockHolder) => {
+    if (ctx.disposed || lockHolder !== null && mutex.isLocked() && !lockHolder.hasFlowLock()) {
+      return false;
+    }
+    return lockHolder == null || lastActiveLockHolder !== lockHolder || isNonTerminalState(currentInvitation.state);
+  };
+  return {
+    mutex,
+    get current() {
+      return currentInvitation;
+    },
+    // disposing context prevents any further state updates
+    complete: (newState) => {
+      currentInvitation = {
+        ...currentInvitation,
+        ...newState
+      };
+      stream.next(currentInvitation);
+      return ctx.dispose();
+    },
+    set: (lockHolder, newState) => {
+      if (isStateChangeAllowed(lockHolder)) {
+        logStateUpdate(currentInvitation, lockHolder, newState);
+        currentInvitation = {
+          ...currentInvitation,
+          state: newState
+        };
+        stream.next(currentInvitation);
+        lastActiveLockHolder = lockHolder;
+        return true;
+      }
+      return false;
+    },
+    error: (lockHolder, error) => {
+      if (isStateChangeAllowed(lockHolder)) {
+        logStateUpdate(currentInvitation, lockHolder, Invitation6.State.ERROR);
+        currentInvitation = {
+          ...currentInvitation,
+          state: Invitation6.State.ERROR
+        };
+        stream.next(currentInvitation);
+        stream.error(error);
+        lastActiveLockHolder = lockHolder;
+        return true;
+      }
+      return false;
+    }
+  };
+};
+var logStateUpdate = (invitation, actor, newState) => {
+  if (isNonTerminalState(newState)) {
+    log17("invitation state update", {
+      actor: actor?.constructor.name,
+      newState: stateToString(newState),
+      oldState: stateToString(invitation.state)
+    }, {
+      F: __dxlog_file20,
+      L: 89,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  } else {
+    log17.info("invitation state update", {
+      actor: actor?.constructor.name,
+      newState: stateToString(newState),
+      oldState: stateToString(invitation.state)
+    }, {
+      F: __dxlog_file20,
+      L: 95,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  }
+};
+var isNonTerminalState = (currentState) => {
+  return ![
+    Invitation6.State.SUCCESS,
+    Invitation6.State.ERROR,
+    Invitation6.State.CANCELLED,
+    Invitation6.State.TIMEOUT,
+    Invitation6.State.EXPIRED
+  ].includes(currentState);
+};
+
+// packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts
+import { invariant as invariant14 } from "@dxos/invariant";
+import { PublicKey as PublicKey10 } from "@dxos/keys";
+import { log as log18 } from "@dxos/log";
+import { InvitationOptions as InvitationOptions3 } from "@dxos/protocols/proto/dxos/halo/invitations";
+import { ComplexSet as ComplexSet4 } from "@dxos/util";
+var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
+var InvitationTopology = class {
+  constructor(_role) {
+    this._role = _role;
+    this._seenPeers = new ComplexSet4(PublicKey10.hash);
+  }
+  init(controller) {
+    invariant14(!this._controller, "Already initialized.", {
+      F: __dxlog_file21,
+      L: 42,
+      S: this,
+      A: [
+        "!this._controller",
+        "'Already initialized.'"
+      ]
+    });
+    this._controller = controller;
+  }
+  update() {
+    invariant14(this._controller, "Not initialized.", {
+      F: __dxlog_file21,
+      L: 47,
+      S: this,
+      A: [
+        "this._controller",
+        "'Not initialized.'"
+      ]
+    });
+    const { ownPeerId, candidates, connected, allPeers } = this._controller.getState();
+    if (this._role === InvitationOptions3.Role.GUEST) {
+      return;
+    }
     if (connected.length > 0) {
       connected.forEach((c) => this._seenPeers.add(c));
       return;
@@ -5198,11 +5524,11 @@ var InvitationTopology = class {
     const firstUnknownPeer = candidates.find((peerId) => !this._seenPeers.has(peerId));
     this._seenPeers = new ComplexSet4(PublicKey10.hash, allPeers.filter((peerId) => this._seenPeers.has(peerId)));
     if (firstUnknownPeer != null) {
-      log16("invitation connect", {
+      log18("invitation connect", {
         ownPeerId,
         remotePeerId: firstUnknownPeer
       }, {
-        F: __dxlog_file19,
+        F: __dxlog_file21,
         L: 69,
         S: this,
         C: (f, a) => f(...a)
@@ -5212,8 +5538,8 @@ var InvitationTopology = class {
     }
   }
   async onOffer(peer) {
-    invariant13(this._controller, "Not initialized.", {
-      F: __dxlog_file19,
+    invariant14(this._controller, "Not initialized.", {
+      F: __dxlog_file21,
       L: 76,
       S: this,
       A: [
@@ -5232,20 +5558,21 @@ var InvitationTopology = class {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
-var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
+var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
 var metrics = _trace.metrics;
 var MAX_DELEGATED_INVITATION_HOST_TRIES = 3;
 var InvitationsHandler = class {
   /**
   * @internal
   */
-  constructor(_networkManager, _defaultTeleportParams) {
+  constructor(_networkManager, _edgeClient, _connectionParams) {
     this._networkManager = _networkManager;
-    this._defaultTeleportParams = _defaultTeleportParams;
+    this._edgeClient = _edgeClient;
+    this._connectionParams = _connectionParams;
   }
   handleInvitationFlow(ctx, stream, protocol, invitation) {
     metrics.increment("dxos.invitation.created");
-    const guardedState = this._createGuardedState(ctx, invitation, stream);
+    const guardedState = createGuardedInvitationState(ctx, invitation, stream);
     const createExtension = () => {
       const extension = new InvitationHostExtension(guardedState.mutex, {
         get activeInvitation() {
@@ -5258,9 +5585,9 @@ var InvitationsHandler = class {
         admit: async (admissionRequest) => {
           try {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
-            invariant14(deviceKey, void 0, {
-              F: __dxlog_file20,
-              L: 94,
+            invariant15(deviceKey, void 0, {
+              F: __dxlog_file22,
+              L: 100,
               S: this,
               A: [
                 "deviceKey",
@@ -5282,44 +5609,44 @@ var InvitationsHandler = class {
               guardedState.error(extension, new ContextDisposedError3());
             }
           });
-          scheduleTask6(connectionCtx, async () => {
+          scheduleTask7(connectionCtx, async () => {
             const traceId = PublicKey11.random().toHex();
             try {
-              log17.trace("dxos.sdk.invitations-handler.host.onOpen", trace7.begin({
+              log19.trace("dxos.sdk.invitations-handler.host.onOpen", trace7.begin({
                 id: traceId
               }), {
-                F: __dxlog_file20,
-                L: 119,
+                F: __dxlog_file22,
+                L: 125,
                 S: this,
                 C: (f, a) => f(...a)
               });
-              log17("connected", {
+              log19("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file20,
-                L: 120,
+                F: __dxlog_file22,
+                L: 126,
                 S: this,
                 C: (f, a) => f(...a)
               });
               const deviceKey = await extension.completedTrigger.wait({
                 timeout: invitation.timeout
               });
-              log17("admitted guest", {
+              log19("admitted guest", {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file20,
-                L: 122,
+                F: __dxlog_file22,
+                L: 128,
                 S: this,
                 C: (f, a) => f(...a)
               });
-              guardedState.set(extension, Invitation5.State.SUCCESS);
+              guardedState.set(extension, Invitation7.State.SUCCESS);
               metrics.increment("dxos.invitation.success");
-              log17.trace("dxos.sdk.invitations-handler.host.onOpen", trace7.end({
+              log19.trace("dxos.sdk.invitations-handler.host.onOpen", trace7.end({
                 id: traceId
               }), {
-                F: __dxlog_file20,
-                L: 125,
+                F: __dxlog_file22,
+                L: 131,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5329,13 +5656,13 @@ var InvitationsHandler = class {
               }
             } catch (err) {
               if (err instanceof TimeoutError2) {
-                if (guardedState.set(extension, Invitation5.State.TIMEOUT)) {
+                if (guardedState.set(extension, Invitation7.State.TIMEOUT)) {
                   metrics.increment("dxos.invitation.timeout");
-                  log17("timeout", {
+                  log19("timeout", {
                     ...protocol.toJSON()
                   }, {
-                    F: __dxlog_file20,
-                    L: 135,
+                    F: __dxlog_file22,
+                    L: 141,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -5343,20 +5670,20 @@ var InvitationsHandler = class {
               } else {
                 if (guardedState.error(extension, err)) {
                   metrics.increment("dxos.invitation.failed");
-                  log17.error("failed", err, {
-                    F: __dxlog_file20,
-                    L: 140,
+                  log19.error("failed", err, {
+                    F: __dxlog_file22,
+                    L: 146,
                     S: this,
                     C: (f, a) => f(...a)
                   });
                 }
               }
-              log17.trace("dxos.sdk.invitations-handler.host.onOpen", trace7.error({
+              log19.trace("dxos.sdk.invitations-handler.host.onOpen", trace7.error({
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file20,
-                L: 143,
+                F: __dxlog_file22,
+                L: 149,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5366,24 +5693,24 @@ var InvitationsHandler = class {
         },
         onError: (err) => {
           if (err instanceof InvalidInvitationExtensionRoleError3) {
-            log17("invalid role", {
+            log19("invalid role", {
               ...err.context
             }, {
-              F: __dxlog_file20,
-              L: 151,
+              F: __dxlog_file22,
+              L: 157,
               S: this,
               C: (f, a) => f(...a)
             });
             return;
           }
           if (err instanceof TimeoutError2) {
-            if (guardedState.set(extension, Invitation5.State.TIMEOUT)) {
+            if (guardedState.set(extension, Invitation7.State.TIMEOUT)) {
               metrics.increment("dxos.invitation.timeout");
-              log17("timeout", {
+              log19("timeout", {
                 err
               }, {
-                F: __dxlog_file20,
-                L: 157,
+                F: __dxlog_file22,
+                L: 163,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5391,9 +5718,9 @@ var InvitationsHandler = class {
           } else {
             if (guardedState.error(extension, err)) {
               metrics.increment("dxos.invitation.failed");
-              log17.error("failed", err, {
-                F: __dxlog_file20,
-                L: 162,
+              log19.error("failed", err, {
+                F: __dxlog_file22,
+                L: 168,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5405,33 +5732,33 @@ var InvitationsHandler = class {
     };
     if (invitation.lifetime && invitation.created) {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
-        log17.warn("invitation has already expired", void 0, {
-          F: __dxlog_file20,
-          L: 173,
+        log19.warn("invitation has already expired", void 0, {
+          F: __dxlog_file22,
+          L: 179,
           S: this,
           C: (f, a) => f(...a)
         });
       } else {
-        scheduleTask6(ctx, async () => {
+        scheduleTask7(ctx, async () => {
           await swarmConnection.close();
-          guardedState.set(null, Invitation5.State.EXPIRED);
+          guardedState.set(null, Invitation7.State.EXPIRED);
           metrics.increment("dxos.invitation.expired");
           await ctx.dispose();
         }, invitation.created.getTime() + invitation.lifetime * 1e3 - Date.now());
       }
     }
     let swarmConnection;
-    scheduleTask6(ctx, async () => {
+    scheduleTask7(ctx, async () => {
       swarmConnection = await this._joinSwarm(ctx, invitation, InvitationOptions4.Role.HOST, createExtension);
-      guardedState.set(null, Invitation5.State.CONNECTING);
+      guardedState.set(null, Invitation7.State.CONNECTING);
     });
   }
   acceptInvitation(ctx, stream, protocol, invitation, otpEnteredTrigger, deviceProfile) {
     const { timeout = INVITATION_TIMEOUT } = invitation;
     if (deviceProfile) {
-      invariant14(invitation.kind === Invitation5.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
-        F: __dxlog_file20,
-        L: 207,
+      invariant15(invitation.kind === Invitation7.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
+        F: __dxlog_file22,
+        L: 213,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -5440,23 +5767,23 @@ var InvitationsHandler = class {
       });
     }
     const triedPeersIds = new ComplexSet5(PublicKey11.hash);
-    const guardedState = this._createGuardedState(ctx, invitation, stream);
+    const guardedState = createGuardedInvitationState(ctx, invitation, stream);
     const shouldCancelInvitationFlow = (extension) => {
       const isLockedByAnotherConnection = guardedState.mutex.isLocked() && !extension.hasFlowLock();
-      log17("should cancel invitation flow", {
+      log19("should cancel invitation flow", {
         isLockedByAnotherConnection,
-        invitationType: Invitation5.Type.DELEGATED,
+        invitationType: Invitation7.Type.DELEGATED,
         triedPeers: triedPeersIds.size
       }, {
-        F: __dxlog_file20,
-        L: 215,
+        F: __dxlog_file22,
+        L: 221,
         S: this,
         C: (f, a) => f(...a)
       });
       if (isLockedByAnotherConnection) {
         return false;
       }
-      return invitation.type !== Invitation5.Type.DELEGATED || triedPeersIds.size >= MAX_DELEGATED_INVITATION_HOST_TRIES;
+      return invitation.type !== Invitation7.Type.DELEGATED || triedPeersIds.size >= MAX_DELEGATED_INVITATION_HOST_TRIES;
     };
     let admitted = false;
     const createExtension = () => {
@@ -5471,12 +5798,12 @@ var InvitationsHandler = class {
             return;
           }
           connectionCtx.onDispose(async () => {
-            log17("extension disposed", {
+            log19("extension disposed", {
               admitted,
               currentState: guardedState.current.state
             }, {
-              F: __dxlog_file20,
-              L: 243,
+              F: __dxlog_file22,
+              L: 249,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5487,35 +5814,35 @@ var InvitationsHandler = class {
               }
             }
           });
-          scheduleTask6(connectionCtx, async () => {
+          scheduleTask7(connectionCtx, async () => {
             const traceId = PublicKey11.random().toHex();
             try {
-              log17.trace("dxos.sdk.invitations-handler.guest.onOpen", trace7.begin({
+              log19.trace("dxos.sdk.invitations-handler.guest.onOpen", trace7.begin({
                 id: traceId
               }), {
-                F: __dxlog_file20,
-                L: 255,
+                F: __dxlog_file22,
+                L: 261,
                 S: this,
                 C: (f, a) => f(...a)
               });
-              scheduleTask6(connectionCtx, () => {
-                guardedState.set(extension, Invitation5.State.TIMEOUT);
+              scheduleTask7(connectionCtx, () => {
+                guardedState.set(extension, Invitation7.State.TIMEOUT);
                 extensionCtx.close();
               }, timeout);
-              log17("connected", {
+              log19("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file20,
-                L: 266,
+                F: __dxlog_file22,
+                L: 272,
                 S: this,
                 C: (f, a) => f(...a)
               });
-              guardedState.set(extension, Invitation5.State.CONNECTED);
-              log17("introduce", {
+              guardedState.set(extension, Invitation7.State.CONNECTED);
+              log19("introduce", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file20,
-                L: 270,
+                F: __dxlog_file22,
+                L: 276,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5523,33 +5850,33 @@ var InvitationsHandler = class {
                 invitationId: invitation.invitationId,
                 ...protocol.createIntroduction()
               });
-              log17("introduce response", {
+              log19("introduce response", {
                 ...protocol.toJSON(),
                 response: introductionResponse
               }, {
-                F: __dxlog_file20,
-                L: 275,
+                F: __dxlog_file22,
+                L: 281,
                 S: this,
                 C: (f, a) => f(...a)
               });
               invitation.authMethod = introductionResponse.authMethod;
               if (isAuthenticationRequired(invitation)) {
                 switch (invitation.authMethod) {
-                  case Invitation5.AuthMethod.SHARED_SECRET:
+                  case Invitation7.AuthMethod.SHARED_SECRET:
                     await this._handleGuestOtpAuth(extension, (state) => guardedState.set(extension, state), otpEnteredTrigger, {
                       timeout
                     });
                     break;
-                  case Invitation5.AuthMethod.KNOWN_PUBLIC_KEY:
+                  case Invitation7.AuthMethod.KNOWN_PUBLIC_KEY:
                     await this._handleGuestKpkAuth(extension, (state) => guardedState.set(extension, state), invitation, introductionResponse);
                     break;
                 }
               }
-              log17("request admission", {
+              log19("request admission", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file20,
-                L: 301,
+                F: __dxlog_file22,
+                L: 307,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5557,54 +5884,54 @@ var InvitationsHandler = class {
               const admissionResponse = await extension.rpc.InvitationHostService.admit(admissionRequest);
               admitted = true;
               const result = await protocol.accept(admissionResponse, admissionRequest);
-              log17("admitted by host", {
+              log19("admitted by host", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file20,
-                L: 312,
+                F: __dxlog_file22,
+                L: 318,
                 S: this,
                 C: (f, a) => f(...a)
               });
-              await guardedState.complete({
+              guardedState.complete({
                 ...guardedState.current,
                 ...result,
-                state: Invitation5.State.SUCCESS
+                state: Invitation7.State.SUCCESS
               });
-              log17.trace("dxos.sdk.invitations-handler.guest.onOpen", trace7.end({
+              log19.trace("dxos.sdk.invitations-handler.guest.onOpen", trace7.end({
                 id: traceId
               }), {
-                F: __dxlog_file20,
-                L: 318,
+                F: __dxlog_file22,
+                L: 324,
                 S: this,
                 C: (f, a) => f(...a)
               });
             } catch (err) {
               if (err instanceof TimeoutError2) {
-                log17("timeout", {
+                log19("timeout", {
                   ...protocol.toJSON()
                 }, {
-                  F: __dxlog_file20,
-                  L: 321,
+                  F: __dxlog_file22,
+                  L: 327,
                   S: this,
                   C: (f, a) => f(...a)
                 });
-                guardedState.set(extension, Invitation5.State.TIMEOUT);
+                guardedState.set(extension, Invitation7.State.TIMEOUT);
               } else {
-                log17("auth failed", err, {
-                  F: __dxlog_file20,
-                  L: 324,
+                log19("auth failed", err, {
+                  F: __dxlog_file22,
+                  L: 330,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 guardedState.error(extension, err);
               }
               extensionCtx.close(err);
-              log17.trace("dxos.sdk.invitations-handler.guest.onOpen", trace7.error({
+              log19.trace("dxos.sdk.invitations-handler.guest.onOpen", trace7.error({
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file20,
-                L: 328,
+                F: __dxlog_file22,
+                L: 334,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5616,19 +5943,19 @@ var InvitationsHandler = class {
             return;
           }
           if (err instanceof TimeoutError2) {
-            log17("timeout", {
+            log19("timeout", {
               ...protocol.toJSON()
             }, {
-              F: __dxlog_file20,
-              L: 337,
+              F: __dxlog_file22,
+              L: 343,
               S: this,
               C: (f, a) => f(...a)
             });
-            guardedState.set(extension, Invitation5.State.TIMEOUT);
+            guardedState.set(extension, Invitation7.State.TIMEOUT);
           } else {
-            log17("auth failed", err, {
-              F: __dxlog_file20,
-              L: 340,
+            log19("auth failed", err, {
+              F: __dxlog_file22,
+              L: 346,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5638,15 +5965,34 @@ var InvitationsHandler = class {
       });
       return extension;
     };
-    scheduleTask6(ctx, async () => {
+    const edgeInvitationHandler = new EdgeInvitationHandler(this._connectionParams?.edgeInvitations, this._edgeClient, {
+      onInvitationSuccess: async (admissionResponse, admissionRequest) => {
+        const result = await protocol.accept(admissionResponse, admissionRequest);
+        log19("admitted by edge", {
+          ...protocol.toJSON()
+        }, {
+          F: __dxlog_file22,
+          L: 358,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        guardedState.complete({
+          ...guardedState.current,
+          ...result,
+          state: Invitation7.State.SUCCESS
+        });
+      }
+    });
+    edgeInvitationHandler.handle(ctx, guardedState, protocol, deviceProfile);
+    scheduleTask7(ctx, async () => {
       const error = protocol.checkInvitation(invitation);
       if (error) {
         stream.error(error);
         await ctx.dispose();
       } else {
-        invariant14(invitation.swarmKey, void 0, {
-          F: __dxlog_file20,
-          L: 355,
+        invariant15(invitation.swarmKey, void 0, {
+          F: __dxlog_file22,
+          L: 370,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -5655,14 +6001,14 @@ var InvitationsHandler = class {
         });
         const timeoutInactive = () => {
           if (guardedState.mutex.isLocked()) {
-            scheduleTask6(ctx, timeoutInactive, timeout);
+            scheduleTask7(ctx, timeoutInactive, timeout);
           } else {
-            guardedState.set(null, Invitation5.State.TIMEOUT);
+            guardedState.set(null, Invitation7.State.TIMEOUT);
           }
         };
-        scheduleTask6(ctx, timeoutInactive, timeout);
+        scheduleTask7(ctx, timeoutInactive, timeout);
         await this._joinSwarm(ctx, invitation, InvitationOptions4.Role.GUEST, createExtension);
-        guardedState.set(null, Invitation5.State.CONNECTING);
+        guardedState.set(null, Invitation7.State.CONNECTING);
       }
     });
   }
@@ -5670,7 +6016,7 @@ var InvitationsHandler = class {
     let label;
     if (role === InvitationOptions4.Role.GUEST) {
       label = "invitation guest";
-    } else if (invitation.kind === Invitation5.Kind.DEVICE) {
+    } else if (invitation.kind === Invitation7.Kind.DEVICE) {
       label = "invitation host for device";
     } else {
       label = `invitation host for space ${invitation.spaceKey?.truncate()}`;
@@ -5679,123 +6025,30 @@ var InvitationsHandler = class {
       topic: invitation.swarmKey,
       protocolProvider: createTeleportProtocolFactory(async (teleport) => {
         teleport.addExtension("dxos.halo.invitations", extensionFactory());
-      }, this._defaultTeleportParams),
+      }, this._connectionParams?.teleport),
       topology: new InvitationTopology(role),
       label
     });
     ctx.onDispose(() => swarmConnection.close());
     return swarmConnection;
   }
-  /**
-  * A utility object for serializing invitation state changes by multiple concurrent
-  * invitation flow connections.
-  */
-  _createGuardedState(ctx, invitation, stream) {
-    const mutex = new Mutex3();
-    let lastActiveExtension = null;
-    let currentInvitation = {
-      ...invitation
-    };
-    const isStateChangeAllowed = (extension) => {
-      if (ctx.disposed || extension !== null && mutex.isLocked() && !extension.hasFlowLock()) {
-        return false;
-      }
-      return extension == null || lastActiveExtension !== extension || this._isNotTerminal(currentInvitation.state);
-    };
-    return {
-      mutex,
-      get current() {
-        return currentInvitation;
-      },
-      // disposing context prevents any further state updates
-      complete: (newState) => {
-        currentInvitation = {
-          ...currentInvitation,
-          ...newState
-        };
-        stream.next(currentInvitation);
-        return ctx.dispose();
-      },
-      set: (extension, newState) => {
-        if (isStateChangeAllowed(extension)) {
-          this._logStateUpdate(currentInvitation, extension, newState);
-          currentInvitation = {
-            ...currentInvitation,
-            state: newState
-          };
-          stream.next(currentInvitation);
-          lastActiveExtension = extension;
-          return true;
-        }
-        return false;
-      },
-      error: (extension, error) => {
-        if (isStateChangeAllowed(extension)) {
-          this._logStateUpdate(currentInvitation, extension, Invitation5.State.ERROR);
-          currentInvitation = {
-            ...currentInvitation,
-            state: Invitation5.State.ERROR
-          };
-          stream.next(currentInvitation);
-          stream.error(error);
-          lastActiveExtension = extension;
-          return true;
-        }
-        return false;
-      }
-    };
-  }
-  _logStateUpdate(invitation, actor, newState) {
-    if (this._isNotTerminal(newState)) {
-      log17("invitation state update", {
-        actor: actor?.constructor.name,
-        newState: stateToString(newState),
-        oldState: stateToString(invitation.state)
-      }, {
-        F: __dxlog_file20,
-        L: 460,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    } else {
-      log17("invitation state update", {
-        actor: actor?.constructor.name,
-        newState: stateToString(newState),
-        oldState: stateToString(invitation.state)
-      }, {
-        F: __dxlog_file20,
-        L: 466,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-  _isNotTerminal(currentState) {
-    return ![
-      Invitation5.State.SUCCESS,
-      Invitation5.State.ERROR,
-      Invitation5.State.CANCELLED,
-      Invitation5.State.TIMEOUT,
-      Invitation5.State.EXPIRED
-    ].includes(currentState);
-  }
   async _handleGuestOtpAuth(extension, setState, authenticated, options) {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
-      log17("guest waiting for authentication code...", void 0, {
-        F: __dxlog_file20,
-        L: 491,
+      log19("guest waiting for authentication code...", void 0, {
+        F: __dxlog_file22,
+        L: 422,
         S: this,
         C: (f, a) => f(...a)
       });
-      setState(Invitation5.State.READY_FOR_AUTHENTICATION);
+      setState(Invitation7.State.READY_FOR_AUTHENTICATION);
       const authCode = await authenticated.wait(options);
-      log17("sending authentication request", void 0, {
-        F: __dxlog_file20,
-        L: 495,
+      log19("sending authentication request", void 0, {
+        F: __dxlog_file22,
+        L: 426,
         S: this,
         C: (f, a) => f(...a)
       });
-      setState(Invitation5.State.AUTHENTICATING);
+      setState(Invitation7.State.AUTHENTICATING);
       const response = await extension.rpc.InvitationHostService.authenticate({
         authCode
       });
@@ -5806,11 +6059,11 @@ var InvitationsHandler = class {
         if (attempt === MAX_OTP_ATTEMPTS) {
           throw new Error(`Maximum retry attempts: ${MAX_OTP_ATTEMPTS}`);
         } else {
-          log17("retrying invalid code", {
+          log19("retrying invalid code", {
             attempt
           }, {
-            F: __dxlog_file20,
-            L: 506,
+            F: __dxlog_file22,
+            L: 437,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5826,13 +6079,13 @@ var InvitationsHandler = class {
     if (introductionResponse.challenge == null) {
       throw new Error("challenge missing in the introduction");
     }
-    log17("sending authentication request", void 0, {
-      F: __dxlog_file20,
-      L: 525,
+    log19("sending authentication request", void 0, {
+      F: __dxlog_file22,
+      L: 456,
       S: this,
       C: (f, a) => f(...a)
     });
-    setState(Invitation5.State.AUTHENTICATING);
+    setState(Invitation7.State.AUTHENTICATING);
     const signature = sign(Buffer.from(introductionResponse.challenge), invitation.guestKeypair.privateKey);
     const response = await extension.rpc.InvitationHostService.authenticate({
       signedChallenge: signature
@@ -5948,14 +6201,14 @@ var InvitationsServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts
-import { createCancelDelegatedSpaceInvitationCredential, createDelegatedSpaceInvitationCredential, getCredentialAssertion as getCredentialAssertion4 } from "@dxos/credentials";
+import { createCancelDelegatedSpaceInvitationCredential, createDelegatedSpaceInvitationCredential, getCredentialAssertion as getCredentialAssertion5 } from "@dxos/credentials";
 import { writeMessages as writeMessages4 } from "@dxos/feed-store";
-import { invariant as invariant15 } from "@dxos/invariant";
-import { log as log18 } from "@dxos/log";
+import { invariant as invariant16 } from "@dxos/invariant";
+import { log as log20 } from "@dxos/log";
 import { AlreadyJoinedError as AlreadyJoinedError3, AuthorizationError as AuthorizationError2, InvalidInvitationError, SpaceNotFoundError as SpaceNotFoundError2 } from "@dxos/protocols";
-import { Invitation as Invitation6 } from "@dxos/protocols/proto/dxos/client/services";
+import { Invitation as Invitation8 } from "@dxos/protocols/proto/dxos/client/services";
 import { SpaceMember as SpaceMember6 } from "@dxos/protocols/proto/dxos/halo/credentials";
-var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
+var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
 var SpaceInvitationProtocol = class {
   constructor(_spaceManager, _signingContext, _keyring, _spaceKey) {
     this._spaceManager = _spaceManager;
@@ -5983,27 +6236,47 @@ var SpaceInvitationProtocol = class {
     return void 0;
   }
   getInvitationContext() {
+    invariant16(this._spaceKey, void 0, {
+      F: __dxlog_file23,
+      L: 63,
+      S: this,
+      A: [
+        "this._spaceKey",
+        ""
+      ]
+    });
+    const space = this._spaceManager.spaces.get(this._spaceKey);
+    invariant16(space, void 0, {
+      F: __dxlog_file23,
+      L: 65,
+      S: this,
+      A: [
+        "space",
+        ""
+      ]
+    });
     return {
-      kind: Invitation6.Kind.SPACE,
-      spaceKey: this._spaceKey
+      kind: Invitation8.Kind.SPACE,
+      spaceKey: this._spaceKey,
+      spaceId: space.id
     };
   }
   async admit(invitation, request, guestProfile) {
-    invariant15(this._spaceKey && request.space, void 0, {
-      F: __dxlog_file21,
-      L: 74,
+    invariant16(this._spaceKey && request.space, void 0, {
+      F: __dxlog_file23,
+      L: 78,
       S: this,
       A: [
         "this._spaceKey && request.space",
         ""
       ]
     });
-    log18("writing guest credentials", {
+    log20("writing guest credentials", {
       host: this._signingContext.deviceKey,
       guest: request.space.deviceKey
     }, {
-      F: __dxlog_file21,
-      L: 75,
+      F: __dxlog_file23,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6023,9 +6296,9 @@ var SpaceInvitationProtocol = class {
     };
   }
   async delegate(invitation) {
-    invariant15(this._spaceKey, void 0, {
-      F: __dxlog_file21,
-      L: 95,
+    invariant16(this._spaceKey, void 0, {
+      F: __dxlog_file23,
+      L: 99,
       S: this,
       A: [
         "this._spaceKey",
@@ -6033,19 +6306,19 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const space = this._spaceManager.spaces.get(this._spaceKey);
-    invariant15(space, void 0, {
-      F: __dxlog_file21,
-      L: 97,
+    invariant16(space, void 0, {
+      F: __dxlog_file23,
+      L: 101,
       S: this,
       A: [
         "space",
         ""
       ]
     });
-    if (invitation.authMethod === Invitation6.AuthMethod.KNOWN_PUBLIC_KEY) {
-      invariant15(invitation.guestKeypair?.publicKey, void 0, {
-        F: __dxlog_file21,
-        L: 99,
+    if (invitation.authMethod === Invitation8.AuthMethod.KNOWN_PUBLIC_KEY) {
+      invariant16(invitation.guestKeypair?.publicKey, void 0, {
+        F: __dxlog_file23,
+        L: 103,
         S: this,
         A: [
           "invitation.guestKeypair?.publicKey",
@@ -6053,12 +6326,12 @@ var SpaceInvitationProtocol = class {
         ]
       });
     }
-    log18("writing delegate space invitation", {
+    log20("writing delegate space invitation", {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
-      F: __dxlog_file21,
-      L: 102,
+      F: __dxlog_file23,
+      L: 106,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6069,11 +6342,11 @@ var SpaceInvitationProtocol = class {
       role: invitation.role ?? SpaceMember6.Role.ADMIN,
       expiresOn: invitation.lifetime ? new Date((invitation.created?.getTime() ?? Date.now()) + invitation.lifetime) : void 0,
       multiUse: invitation.multiUse ?? false,
-      guestKey: invitation.authMethod === Invitation6.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
+      guestKey: invitation.authMethod === Invitation8.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
     });
-    invariant15(credential.credential, void 0, {
-      F: __dxlog_file21,
-      L: 122,
+    invariant16(credential.credential, void 0, {
+      F: __dxlog_file23,
+      L: 126,
       S: this,
       A: [
         "credential.credential",
@@ -6086,18 +6359,18 @@ var SpaceInvitationProtocol = class {
     return credential.credential.credential.id;
   }
   async cancelDelegation(invitation) {
-    invariant15(this._spaceKey, void 0, {
-      F: __dxlog_file21,
-      L: 128,
+    invariant16(this._spaceKey, void 0, {
+      F: __dxlog_file23,
+      L: 132,
       S: this,
       A: [
         "this._spaceKey",
         ""
       ]
     });
-    invariant15(invitation.type === Invitation6.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
-      F: __dxlog_file21,
-      L: 129,
+    invariant16(invitation.type === Invitation8.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
+      F: __dxlog_file23,
+      L: 133,
       S: this,
       A: [
         "invitation.type === Invitation.Type.DELEGATED && invitation.delegationCredentialId",
@@ -6105,28 +6378,28 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const space = this._spaceManager.spaces.get(this._spaceKey);
-    invariant15(space, void 0, {
-      F: __dxlog_file21,
-      L: 131,
+    invariant16(space, void 0, {
+      F: __dxlog_file23,
+      L: 135,
       S: this,
       A: [
         "space",
         ""
       ]
     });
-    log18("cancelling delegated space invitation", {
+    log20("cancelling delegated space invitation", {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
-      F: __dxlog_file21,
-      L: 133,
+      F: __dxlog_file23,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
     const credential = await createCancelDelegatedSpaceInvitationCredential(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
-    invariant15(credential.credential, void 0, {
-      F: __dxlog_file21,
-      L: 140,
+    invariant16(credential.credential, void 0, {
+      F: __dxlog_file23,
+      L: 144,
       S: this,
       A: [
         "credential.credential",
@@ -6163,9 +6436,9 @@ var SpaceInvitationProtocol = class {
     };
   }
   async accept(response) {
-    invariant15(response.space, void 0, {
-      F: __dxlog_file21,
-      L: 175,
+    invariant16(response.space, void 0, {
+      F: __dxlog_file23,
+      L: 179,
       S: this,
       A: [
         "response.space",
@@ -6173,19 +6446,19 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const { credential, controlTimeframe, dataTimeframe } = response.space;
-    const assertion = getCredentialAssertion4(credential);
-    invariant15(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
-      F: __dxlog_file21,
-      L: 178,
+    const assertion = getCredentialAssertion5(credential);
+    invariant16(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
+      F: __dxlog_file23,
+      L: 182,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
         "'Invalid credential'"
       ]
     });
-    invariant15(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
-      F: __dxlog_file21,
-      L: 179,
+    invariant16(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
+      F: __dxlog_file23,
+      L: 183,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
@@ -6214,12 +6487,12 @@ import { AuthenticatingInvitation, AUTHENTICATION_CODE_LENGTH, CancellableInvita
 import { Context as Context8 } from "@dxos/context";
 import { generatePasscode } from "@dxos/credentials";
 import { hasInvitationExpired } from "@dxos/echo-pipeline";
-import { invariant as invariant16 } from "@dxos/invariant";
+import { invariant as invariant17 } from "@dxos/invariant";
 import { PublicKey as PublicKey12 } from "@dxos/keys";
-import { log as log19 } from "@dxos/log";
-import { Invitation as Invitation7 } from "@dxos/protocols/proto/dxos/client/services";
+import { log as log21 } from "@dxos/log";
+import { Invitation as Invitation9 } from "@dxos/protocols/proto/dxos/client/services";
 import { SpaceMember as SpaceMember7 } from "@dxos/protocols/proto/dxos/halo/credentials";
-var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
+var __dxlog_file24 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
 var InvitationsManager = class {
   constructor(_invitationsHandler, _getHandler, _metadataStore) {
     this._invitationsHandler = _invitationsHandler;
@@ -6261,8 +6534,8 @@ var InvitationsManager = class {
     try {
       await this._persistIfRequired(handler, stream, invitation);
     } catch (err) {
-      log19.catch(err, void 0, {
-        F: __dxlog_file22,
+      log21.catch(err, void 0, {
+        F: __dxlog_file24,
         L: 82,
         S: this,
         C: (f, a) => f(...a)
@@ -6284,8 +6557,8 @@ var InvitationsManager = class {
       const persistentInvitations = this._metadataStore.getInvitations();
       const freshInvitations = persistentInvitations.filter((invitation) => !hasInvitationExpired(invitation));
       const loadTasks = freshInvitations.map((persistentInvitation) => {
-        invariant16(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
-          F: __dxlog_file22,
+        invariant17(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
+          F: __dxlog_file24,
           L: 103,
           S: this,
           A: [
@@ -6303,8 +6576,8 @@ var InvitationsManager = class {
         invitations: cInvitations.map((invitation) => invitation.get())
       };
     } catch (err) {
-      log19.catch(err, void 0, {
-        F: __dxlog_file22,
+      log21.catch(err, void 0, {
+        F: __dxlog_file24,
         L: 110,
         S: this,
         C: (f, a) => f(...a)
@@ -6335,14 +6608,14 @@ var InvitationsManager = class {
     return invitation;
   }
   async authenticate({ invitationId, authCode }) {
-    log19("authenticating...", void 0, {
-      F: __dxlog_file22,
+    log21("authenticating...", void 0, {
+      F: __dxlog_file24,
       L: 140,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant16(invitationId, void 0, {
-      F: __dxlog_file22,
+    invariant17(invitationId, void 0, {
+      F: __dxlog_file24,
       L: 141,
       S: this,
       A: [
@@ -6352,10 +6625,10 @@ var InvitationsManager = class {
     });
     const observable = this._acceptInvitations.get(invitationId);
     if (!observable) {
-      log19.warn("invalid invitation", {
+      log21.warn("invalid invitation", {
         invitationId
       }, {
-        F: __dxlog_file22,
+        F: __dxlog_file24,
         L: 144,
         S: this,
         C: (f, a) => f(...a)
@@ -6365,16 +6638,16 @@ var InvitationsManager = class {
     }
   }
   async cancelInvitation({ invitationId }) {
-    log19("cancelInvitation...", {
+    log21("cancelInvitation...", {
       invitationId
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file24,
       L: 151,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant16(invitationId, void 0, {
-      F: __dxlog_file22,
+    invariant17(invitationId, void 0, {
+      F: __dxlog_file24,
       L: 152,
       S: this,
       A: [
@@ -6387,7 +6660,7 @@ var InvitationsManager = class {
       if (created.get().persistent) {
         await this._metadataStore.removeInvitation(invitationId);
       }
-      if (created.get().type === Invitation7.Type.DELEGATED) {
+      if (created.get().type === Invitation9.Type.DELEGATED) {
         const handler = this._getHandler(created.get());
         await handler.cancelDelegation(created.get());
       }
@@ -6421,8 +6694,8 @@ var InvitationsManager = class {
     }
   }
   _createInvitation(protocol, options) {
-    const { invitationId = PublicKey12.random().toHex(), type = Invitation7.Type.INTERACTIVE, authMethod = Invitation7.AuthMethod.SHARED_SECRET, state = Invitation7.State.INIT, timeout = INVITATION_TIMEOUT2, swarmKey = PublicKey12.random(), persistent = options?.authMethod !== Invitation7.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = SpaceMember7.Role.ADMIN, lifetime = 86400, multiUse = false } = options ?? {};
-    const authCode = options?.authCode ?? (authMethod === Invitation7.AuthMethod.SHARED_SECRET ? generatePasscode(AUTHENTICATION_CODE_LENGTH) : void 0);
+    const { invitationId = PublicKey12.random().toHex(), type = Invitation9.Type.INTERACTIVE, authMethod = Invitation9.AuthMethod.SHARED_SECRET, state = Invitation9.State.INIT, timeout = INVITATION_TIMEOUT2, swarmKey = PublicKey12.random(), persistent = options?.authMethod !== Invitation9.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = SpaceMember7.Role.ADMIN, lifetime = 86400, multiUse = false } = options ?? {};
+    const authCode = options?.authCode ?? (authMethod === Invitation9.AuthMethod.SHARED_SECRET ? generatePasscode(AUTHENTICATION_CODE_LENGTH) : void 0);
     return {
       invitationId,
       type,
@@ -6431,8 +6704,8 @@ var InvitationsManager = class {
       swarmKey,
       authCode,
       timeout,
-      persistent: persistent && type !== Invitation7.Type.DELEGATED,
-      guestKeypair: guestKeypair ?? (authMethod === Invitation7.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
+      persistent: persistent && type !== Invitation9.Type.DELEGATED,
+      guestKeypair: guestKeypair ?? (authMethod === Invitation9.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
       created,
       lifetime,
       role,
@@ -6449,14 +6722,14 @@ var InvitationsManager = class {
         void ctx.dispose();
       }
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file24,
       L: 234
     });
     ctx.onDispose(() => {
-      log19("complete", {
+      log21("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file22,
+        F: __dxlog_file24,
         L: 241,
         S: this,
         C: (f, a) => f(...a)
@@ -6469,7 +6742,7 @@ var InvitationsManager = class {
       onCancel: async () => {
         stream.next({
           ...invitation,
-          state: Invitation7.State.CANCELLED
+          state: Invitation9.State.CANCELLED
         });
         await ctx.dispose();
       }
@@ -6486,41 +6759,41 @@ var InvitationsManager = class {
     const ctx = new Context8({
       onError: (err) => {
         if (err instanceof TimeoutError3) {
-          log19("timeout", {
+          log21("timeout", {
             ...handler.toJSON()
           }, {
-            F: __dxlog_file22,
+            F: __dxlog_file24,
             L: 261,
             S: this,
             C: (f, a) => f(...a)
           });
           stream.next({
             ...initialState,
-            state: Invitation7.State.TIMEOUT
+            state: Invitation9.State.TIMEOUT
           });
         } else {
-          log19.warn("auth failed", err, {
-            F: __dxlog_file22,
+          log21.warn("auth failed", err, {
+            F: __dxlog_file24,
             L: 264,
             S: this,
             C: (f, a) => f(...a)
           });
           stream.next({
             ...initialState,
-            state: Invitation7.State.ERROR
+            state: Invitation9.State.ERROR
           });
         }
         void ctx.dispose();
       }
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file24,
       L: 258
     });
     ctx.onDispose(() => {
-      log19("complete", {
+      log21("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file22,
+        F: __dxlog_file24,
         L: 271,
         S: this,
         C: (f, a) => f(...a)
@@ -6533,7 +6806,7 @@ var InvitationsManager = class {
       onCancel: async () => {
         stream.next({
           ...initialState,
-          state: Invitation7.State.CANCELLED
+          state: Invitation9.State.CANCELLED
         });
         await ctx.dispose();
       },
@@ -6549,7 +6822,7 @@ var InvitationsManager = class {
     };
   }
   async _persistIfRequired(handler, changeStream, invitation) {
-    if (invitation.type === Invitation7.Type.DELEGATED && invitation.delegationCredentialId == null) {
+    if (invitation.type === Invitation9.Type.DELEGATED && invitation.delegationCredentialId == null) {
       const delegationCredentialId = await handler.delegate(invitation);
       changeStream.next({
         ...invitation,
@@ -6564,8 +6837,8 @@ var InvitationsManager = class {
     try {
       await this._metadataStore.removeInvitation(invitation.invitationId);
     } catch (err) {
-      log19.catch(err, void 0, {
-        F: __dxlog_file22,
+      log21.catch(err, void 0, {
+        F: __dxlog_file24,
         L: 307,
         S: this,
         C: (f, a) => f(...a)
@@ -6582,14 +6855,14 @@ var InvitationsManager = class {
 // packages/sdk/client-services/src/packlets/locks/browser.ts
 import { asyncTimeout as asyncTimeout2, Trigger as Trigger8 } from "@dxos/async";
 import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
-import { log as log20, logInfo as logInfo3 } from "@dxos/log";
+import { log as log22, logInfo as logInfo3 } from "@dxos/log";
 function _ts_decorate7(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") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) 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 __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/browser.ts";
+var __dxlog_file25 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/browser.ts";
 var Message;
 (function(Message2) {
   Message2["ACQUIRING"] = "acquiring";
@@ -6611,29 +6884,29 @@ var Lock = class {
       message: "acquiring"
     });
     try {
-      log20("aquiring lock...", void 0, {
-        F: __dxlog_file23,
+      log22("aquiring lock...", void 0, {
+        F: __dxlog_file25,
         L: 42,
         S: this,
         C: (f, a) => f(...a)
       });
       await asyncTimeout2(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
-      log20("acquired lock", void 0, {
-        F: __dxlog_file23,
+      log22("acquired lock", void 0, {
+        F: __dxlog_file25,
         L: 44,
         S: this,
         C: (f, a) => f(...a)
       });
     } catch {
-      log20("stealing lock...", void 0, {
-        F: __dxlog_file23,
+      log22("stealing lock...", void 0, {
+        F: __dxlog_file25,
         L: 46,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._requestLock(true);
-      log20("stolen lock", void 0, {
-        F: __dxlog_file23,
+      log22("stolen lock", void 0, {
+        F: __dxlog_file25,
         L: 48,
         S: this,
         C: (f, a) => f(...a)
@@ -6649,10 +6922,10 @@ var Lock = class {
     }
   }
   async _requestLock(steal = false) {
-    log20("requesting lock...", {
+    log22("requesting lock...", {
       steal
     }, {
-      F: __dxlog_file23,
+      F: __dxlog_file25,
       L: 63,
       S: this,
       C: (f, a) => f(...a)
@@ -6665,15 +6938,15 @@ var Lock = class {
       acquired.wake();
       this._releaseTrigger = new Trigger8();
       await this._releaseTrigger.wait();
-      log20("releasing lock...", void 0, {
-        F: __dxlog_file23,
+      log22("releasing lock...", void 0, {
+        F: __dxlog_file25,
         L: 72,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._onRelease?.();
-      log20("released lock", void 0, {
-        F: __dxlog_file23,
+      log22("released lock", void 0, {
+        F: __dxlog_file25,
         L: 74,
         S: this,
         C: (f, a) => f(...a)
@@ -6682,10 +6955,10 @@ var Lock = class {
       await this._onRelease?.();
     });
     await acquired.wait();
-    log20("recieved lock", {
+    log22("recieved lock", {
       steal
     }, {
-      F: __dxlog_file23,
+      F: __dxlog_file25,
       L: 81,
       S: this,
       C: (f, a) => f(...a)
@@ -6777,19 +7050,19 @@ ClientRpcServer = _ts_decorate8([
 ], ClientRpcServer);
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
-import { Mutex as Mutex4, scheduleMicroTask as scheduleMicroTask3, Trigger as Trigger9 } from "@dxos/async";
+import { Mutex as Mutex4, Trigger as Trigger9 } from "@dxos/async";
 import { Context as Context9, Resource as Resource6 } from "@dxos/context";
-import { getCredentialAssertion as getCredentialAssertion5 } from "@dxos/credentials";
+import { getCredentialAssertion as getCredentialAssertion6 } from "@dxos/credentials";
 import { failUndefined as failUndefined2, warnAfterTimeout as warnAfterTimeout2 } from "@dxos/debug";
 import { EchoEdgeReplicator, EchoHost, MeshEchoReplicator, MetadataStore, SpaceManager, valueEncoding } from "@dxos/echo-pipeline";
 import { createChainEdgeIdentity, createEphemeralEdgeIdentity } from "@dxos/edge-client";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
-import { invariant as invariant17 } from "@dxos/invariant";
+import { invariant as invariant18 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
 import { PublicKey as PublicKey13 } from "@dxos/keys";
-import { log as log21 } from "@dxos/log";
+import { log as log23 } from "@dxos/log";
 import { InvalidStorageVersionError, STORAGE_VERSION as STORAGE_VERSION2, trace as trace9 } from "@dxos/protocols";
-import { Invitation as Invitation8 } from "@dxos/protocols/proto/dxos/client/services";
+import { Invitation as Invitation10 } from "@dxos/protocols/proto/dxos/client/services";
 import { BlobStore } from "@dxos/teleport-extension-object-sync";
 import { trace as Trace3 } from "@dxos/tracing";
 import { safeInstanceof } from "@dxos/util";
@@ -6861,7 +7134,7 @@ function _using_ctx3() {
     }
   };
 }
-var __dxlog_file24 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var __dxlog_file26 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends Resource6 {
   constructor(storage, level, networkManager, signalManager, _edgeConnection, _edgeHttpClient, _runtimeParams, _edgeFeatures) {
     super();
@@ -6907,58 +7180,15 @@ var ServiceContext = class extends Resource6 {
       devicePresenceOfflineTimeout: this._runtimeParams?.devicePresenceOfflineTimeout,
       devicePresenceAnnounceInterval: this._runtimeParams?.devicePresenceAnnounceInterval,
       edgeConnection: this._edgeConnection,
-      edgeFeatures: this._edgeFeatures,
-      callbacks: {
-        onIdentityConstruction: (identity) => {
-          if (this._edgeConnection) {
-            scheduleMicroTask3(this._ctx, async () => {
-              try {
-                var _usingCtx = _using_ctx3();
-                const _ = _usingCtx.u(await this._edgeIdentityUpdateMutex.acquire());
-                log21.info("Setting identity on edge connection", {
-                  identity: identity.identityKey.toHex(),
-                  oldIdentity: this._edgeConnection.identityKey,
-                  swarms: this.networkManager.topics
-                }, {
-                  F: __dxlog_file24,
-                  L: 147,
-                  S: this,
-                  C: (f, a) => f(...a)
-                });
-                await warnAfterTimeout2(1e4, "Waiting for identity to be ready for edge connection", async () => {
-                  await identity.ready();
-                });
-                invariant17(identity.deviceCredentialChain, void 0, {
-                  F: __dxlog_file24,
-                  L: 157,
-                  S: this,
-                  A: [
-                    "identity.deviceCredentialChain",
-                    ""
-                  ]
-                });
-                this._edgeConnection.setIdentity(await createChainEdgeIdentity(identity.signer, identity.identityKey, identity.deviceKey, identity.deviceCredentialChain, []));
-                this.networkManager.setPeerInfo({
-                  identityKey: identity.identityKey.toHex(),
-                  peerKey: identity.deviceKey.toHex()
-                });
-              } catch (_) {
-                _usingCtx.e = _;
-              } finally {
-                _usingCtx.d();
-              }
-            });
-          }
-        }
-      }
+      edgeFeatures: this._edgeFeatures
     });
     this.echoHost = new EchoHost({
       kv: this.level
     });
     this._meshReplicator = new MeshEchoReplicator();
-    this.invitations = new InvitationsHandler(this.networkManager, _runtimeParams?.invitationConnectionDefaultParams);
+    this.invitations = new InvitationsHandler(this.networkManager, this._edgeHttpClient, _runtimeParams?.invitationConnectionDefaultParams);
     this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
-    this._handlerFactories.set(Invitation8.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined2(), this._acceptIdentity.bind(this)));
+    this._handlerFactories.set(Invitation10.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined2(), this._acceptIdentity.bind(this)));
     if (!this._runtimeParams?.disableP2pReplication) {
       this._meshReplicator = new MeshEchoReplicator();
     }
@@ -6970,24 +7200,23 @@ var ServiceContext = class extends Resource6 {
   }
   async _open(ctx) {
     await this._checkStorageVersion();
-    log21("opening...", void 0, {
-      F: __dxlog_file24,
-      L: 217,
+    log23("opening...", void 0, {
+      F: __dxlog_file26,
+      L: 184,
       S: this,
       C: (f, a) => f(...a)
     });
-    log21.trace("dxos.sdk.service-context.open", trace9.begin({
+    log23.trace("dxos.sdk.service-context.open", trace9.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file24,
-      L: 218,
+      F: __dxlog_file26,
+      L: 185,
       S: this,
       C: (f, a) => f(...a)
     });
-    if (this._edgeConnection) {
-      this._edgeConnection.setIdentity(await createEphemeralEdgeIdentity());
-      await this._edgeConnection.open();
-    }
+    await this.identityManager.open(ctx);
+    await this._setNetworkIdentity();
+    await this._edgeConnection?.open();
     await this.signalManager.open();
     await this.networkManager.open();
     await this.echoHost.open(ctx);
@@ -6999,38 +7228,38 @@ var ServiceContext = class extends Resource6 {
     }
     await this.metadataStore.load();
     await this.spaceManager.open();
-    await this.identityManager.open(ctx);
     if (this.identityManager.identity) {
+      await this.identityManager.identity.joinNetwork();
       await this._initialize(ctx);
     }
     const loadedInvitations = await this.invitationsManager.loadPersistentInvitations();
-    log21("loaded persistent invitations", {
+    log23("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
-      F: __dxlog_file24,
-      L: 245,
+      F: __dxlog_file26,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
-    log21.trace("dxos.sdk.service-context.open", trace9.end({
+    log23.trace("dxos.sdk.service-context.open", trace9.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file24,
-      L: 247,
+      F: __dxlog_file26,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
-    log21("opened", void 0, {
-      F: __dxlog_file24,
-      L: 248,
+    log23("opened", void 0, {
+      F: __dxlog_file26,
+      L: 216,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close(ctx) {
-    log21("closing...", void 0, {
-      F: __dxlog_file24,
-      L: 252,
+    log23("closing...", void 0, {
+      F: __dxlog_file26,
+      L: 220,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7046,26 +7275,28 @@ var ServiceContext = class extends Resource6 {
     await this.networkManager.close();
     await this.signalManager.close();
     await this._edgeConnection?.close();
-    log21("closed", void 0, {
-      F: __dxlog_file24,
-      L: 267,
+    log23("closed", void 0, {
+      F: __dxlog_file26,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async createIdentity(params = {}) {
     const identity = await this.identityManager.createIdentity(params);
+    await this._setNetworkIdentity();
+    await identity.joinNetwork();
     await this._initialize(new Context9(void 0, {
-      F: __dxlog_file24,
-      L: 272
+      F: __dxlog_file26,
+      L: 242
     }));
     return identity;
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    invariant17(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file24,
-      L: 278,
+    invariant18(factory, `Unknown invitation kind: ${invitation.kind}`, {
+      F: __dxlog_file26,
+      L: 248,
       S: this,
       A: [
         "factory",
@@ -7083,10 +7314,15 @@ var ServiceContext = class extends Resource6 {
     }
   }
   async _acceptIdentity(params) {
-    const identity = await this.identityManager.acceptIdentity(params);
+    const { identity, identityRecord } = await this.identityManager.prepareIdentity(params);
+    await this._setNetworkIdentity({
+      deviceCredential: params.authorizedDeviceCredential
+    });
+    await identity.joinNetwork();
+    await this.identityManager.acceptIdentity(identity, identityRecord, params.deviceProfile);
     await this._initialize(new Context9(void 0, {
-      F: __dxlog_file24,
-      L: 294
+      F: __dxlog_file26,
+      L: 267
     }));
     return identity;
   }
@@ -7098,9 +7334,9 @@ var ServiceContext = class extends Resource6 {
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    log21("initializing spaces...", void 0, {
-      F: __dxlog_file24,
-      L: 309,
+    log23("initializing spaces...", void 0, {
+      F: __dxlog_file26,
+      L: 282,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7134,10 +7370,10 @@ var ServiceContext = class extends Resource6 {
       edgeFeatures: this._edgeFeatures
     });
     await this.dataSpaceManager.open();
-    this._handlerFactories.set(Invitation8.Kind.SPACE, (invitation) => {
-      invariant17(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file24,
-        L: 339,
+    this._handlerFactories.set(Invitation10.Kind.SPACE, (invitation) => {
+      invariant18(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+        F: __dxlog_file26,
+        L: 312,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -7149,7 +7385,7 @@ var ServiceContext = class extends Resource6 {
     this.initialized.wake();
     this._deviceSpaceSync = {
       processCredential: async (credential) => {
-        const assertion = getCredentialAssertion5(credential);
+        const assertion = getCredentialAssertion6(credential);
         if (assertion["@type"] !== "dxos.halo.credentials.SpaceMember") {
           return;
         }
@@ -7157,33 +7393,33 @@ var ServiceContext = class extends Resource6 {
           return;
         }
         if (!this.dataSpaceManager) {
-          log21("dataSpaceManager not initialized yet, ignoring space admission", {
+          log23("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file24,
-            L: 355,
+            F: __dxlog_file26,
+            L: 328,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          log21("space already exists, ignoring space admission", {
+          log23("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file24,
-            L: 359,
+            F: __dxlog_file26,
+            L: 332,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         try {
-          log21("accepting space recorded in halo", {
+          log23("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file24,
-            L: 364,
+            F: __dxlog_file26,
+            L: 337,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7192,9 +7428,9 @@ var ServiceContext = class extends Resource6 {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          log21.catch(err, void 0, {
-            F: __dxlog_file24,
-            L: 370,
+          log23.catch(err, void 0, {
+            F: __dxlog_file26,
+            L: 343,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7203,6 +7439,57 @@ var ServiceContext = class extends Resource6 {
     };
     await identity.space.spaceState.addCredentialProcessor(this._deviceSpaceSync);
   }
+  async _setNetworkIdentity(params) {
+    try {
+      var _usingCtx = _using_ctx3();
+      const _ = _usingCtx.u(await this._edgeIdentityUpdateMutex.acquire());
+      let edgeIdentity;
+      const identity = this.identityManager.identity;
+      if (identity) {
+        log23.info("Setting identity on edge connection", {
+          identity: identity.identityKey.toHex(),
+          swarms: this.networkManager.topics
+        }, {
+          F: __dxlog_file26,
+          L: 357,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        if (params?.deviceCredential) {
+          edgeIdentity = await createChainEdgeIdentity(identity.signer, identity.identityKey, identity.deviceKey, {
+            credential: params.deviceCredential
+          }, []);
+        } else {
+          await warnAfterTimeout2(1e4, "Waiting for identity to be ready for edge connection", async () => {
+            await identity.ready();
+          });
+          invariant18(identity.deviceCredentialChain, void 0, {
+            F: __dxlog_file26,
+            L: 375,
+            S: this,
+            A: [
+              "identity.deviceCredentialChain",
+              ""
+            ]
+          });
+          edgeIdentity = await createChainEdgeIdentity(identity.signer, identity.identityKey, identity.deviceKey, identity.deviceCredentialChain, []);
+        }
+      } else {
+        edgeIdentity = await createEphemeralEdgeIdentity();
+      }
+      if (this._edgeConnection) {
+        this._edgeConnection.setIdentity(edgeIdentity);
+      }
+      this.networkManager.setPeerInfo({
+        identityKey: edgeIdentity.identityKey,
+        peerKey: edgeIdentity.peerKey
+      });
+    } catch (_) {
+      _usingCtx.e = _;
+    } finally {
+      _usingCtx.d();
+    }
+  }
 };
 _ts_decorate9([
   Trace3.span()
@@ -7315,11 +7602,11 @@ var createLevel = async (config) => {
 
 // packages/sdk/client-services/src/packlets/storage/profile-archive.ts
 import { cbor } from "@dxos/automerge/automerge-repo";
-import { invariant as invariant18 } from "@dxos/invariant";
-import { log as log22 } from "@dxos/log";
+import { invariant as invariant19 } from "@dxos/invariant";
+import { log as log24 } from "@dxos/log";
 import { ProfileArchiveEntryType } from "@dxos/protocols";
 import { arrayToBuffer as arrayToBuffer2 } from "@dxos/util";
-var __dxlog_file25 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.ts";
+var __dxlog_file27 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.ts";
 var encodeProfileArchive = (profile) => cbor.encode(profile);
 var decodeProfileArchive = (data) => cbor.decode(data);
 var exportProfileData = async ({ storage, level }) => {
@@ -7332,10 +7619,10 @@ var exportProfileData = async ({ storage, level }) => {
   {
     const directory = await storage.createDirectory();
     const files = await directory.list();
-    log22.info("begin exporting files", {
+    log24.info("begin exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file25,
+      F: __dxlog_file27,
       L: 30,
       S: void 0,
       C: (f, a) => f(...a)
@@ -7350,18 +7637,18 @@ var exportProfileData = async ({ storage, level }) => {
         value: data
       });
     }
-    log22.info("done exporting files", {
+    log24.info("done exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file25,
+      F: __dxlog_file27,
       L: 41,
       S: void 0,
       C: (f, a) => f(...a)
     });
   }
   {
-    log22.info("begin exporting kv pairs", void 0, {
-      F: __dxlog_file25,
+    log24.info("begin exporting kv pairs", void 0, {
+      F: __dxlog_file27,
       L: 45,
       S: void 0,
       C: (f, a) => f(...a)
@@ -7379,10 +7666,10 @@ var exportProfileData = async ({ storage, level }) => {
       });
       count++;
     }
-    log22.info("done exporting kv pairs", {
+    log24.info("done exporting kv pairs", {
       count
     }, {
-      F: __dxlog_file25,
+      F: __dxlog_file27,
       L: 56,
       S: void 0,
       C: (f, a) => f(...a)
@@ -7397,8 +7684,8 @@ var importProfileData = async ({ storage, level }, archive) => {
     switch (entry2.type) {
       case ProfileArchiveEntryType.FILE: {
         const directory = await storage.createDirectory();
-        invariant18(typeof entry2.key === "string", "Invalid key type", {
-          F: __dxlog_file25,
+        invariant19(typeof entry2.key === "string", "Invalid key type", {
+          F: __dxlog_file27,
           L: 79,
           S: void 0,
           A: [
@@ -7407,8 +7694,8 @@ var importProfileData = async ({ storage, level }, archive) => {
           ]
         });
         const file = await directory.getOrCreateFile(entry2.key);
-        invariant18(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file25,
+        invariant19(entry2.value instanceof Uint8Array, "Invalid value type", {
+          F: __dxlog_file27,
           L: 81,
           S: void 0,
           A: [
@@ -7421,8 +7708,8 @@ var importProfileData = async ({ storage, level }, archive) => {
         break;
       }
       case ProfileArchiveEntryType.KEY_VALUE: {
-        invariant18(entry2.key instanceof Uint8Array, "Invalid key type", {
-          F: __dxlog_file25,
+        invariant19(entry2.key instanceof Uint8Array, "Invalid key type", {
+          F: __dxlog_file27,
           L: 87,
           S: void 0,
           A: [
@@ -7430,8 +7717,8 @@ var importProfileData = async ({ storage, level }, archive) => {
             "'Invalid key type'"
           ]
         });
-        invariant18(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file25,
+        invariant19(entry2.value instanceof Uint8Array, "Invalid value type", {
+          F: __dxlog_file27,
           L: 88,
           S: void 0,
           A: [
@@ -7451,20 +7738,20 @@ var importProfileData = async ({ storage, level }, archive) => {
     if (++count % 1e3 === 0) {
       await batch.write();
       batch = level.batch();
-      log22.info("importing", {
+      log24.info("importing", {
         count,
         total: archive.storage.length,
         progress: `${(count / archive.storage.length * 100).toFixed()}%`
       }, {
-        F: __dxlog_file25,
+        F: __dxlog_file27,
         L: 101,
         S: void 0,
         C: (f, a) => f(...a)
       });
     }
   }
-  log22.info("committing changes..", void 0, {
-    F: __dxlog_file25,
+  log24.info("committing changes..", void 0, {
+    F: __dxlog_file27,
     L: 109,
     S: void 0,
     C: (f, a) => f(...a)
@@ -7477,9 +7764,9 @@ import { Event as Event10, synchronized as synchronized3 } from "@dxos/async";
 import { clientServiceBundle } from "@dxos/client-protocol";
 import { Context as Context10 } from "@dxos/context";
 import { EdgeClient, EdgeHttpClient, createStubEdgeIdentity } from "@dxos/edge-client";
-import { invariant as invariant20 } from "@dxos/invariant";
+import { invariant as invariant21 } from "@dxos/invariant";
 import { PublicKey as PublicKey17 } from "@dxos/keys";
-import { log as log24 } from "@dxos/log";
+import { log as log26 } from "@dxos/log";
 import { EdgeSignalManager, WebsocketSignalManager } from "@dxos/messaging";
 import { SwarmNetworkManager, createIceProvider, createRtcTransportFactory } from "@dxos/network-manager";
 import { trace as trace10 } from "@dxos/protocols";
@@ -7490,9 +7777,9 @@ import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
 import { EventSubscriptions as EventSubscriptions3 } from "@dxos/async";
 import { Stream as Stream11 } from "@dxos/codec-protobuf";
-import { invariant as invariant19 } from "@dxos/invariant";
+import { invariant as invariant20 } from "@dxos/invariant";
 import { Device as Device2, DeviceKind as DeviceKind2 } from "@dxos/protocols/proto/dxos/client/services";
-var __dxlog_file26 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+var __dxlog_file28 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
@@ -7509,8 +7796,8 @@ var DevicesServiceImpl = class {
             devices: []
           });
         } else {
-          invariant19(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file26,
+          invariant20(this._identityManager.identity?.presence, "presence not present", {
+            F: __dxlog_file28,
             L: 32,
             S: this,
             A: [
@@ -7570,7 +7857,7 @@ var DevicesServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/identity/contacts-service.ts
-import { EventSubscriptions as EventSubscriptions4, scheduleTask as scheduleTask7, UpdateScheduler as UpdateScheduler2 } from "@dxos/async";
+import { EventSubscriptions as EventSubscriptions4, scheduleTask as scheduleTask8, UpdateScheduler as UpdateScheduler2 } from "@dxos/async";
 import { Stream as Stream12 } from "@dxos/codec-protobuf";
 import { PublicKey as PublicKey15 } from "@dxos/keys";
 import { ComplexMap as ComplexMap5, ComplexSet as ComplexSet6 } from "@dxos/util";
@@ -7629,7 +7916,7 @@ var ContactsServiceImpl = class {
       }, {
         maxFrequency: 2
       });
-      scheduleTask7(ctx, async () => {
+      scheduleTask8(ctx, async () => {
         const subscriptions = new EventSubscriptions4();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeToSpaceAndUpdate = () => {
@@ -7656,7 +7943,7 @@ var ContactsServiceImpl = class {
 import { Event as Event9 } from "@dxos/async";
 import { Stream as Stream13 } from "@dxos/codec-protobuf";
 import { PublicKey as PublicKey16 } from "@dxos/keys";
-import { getContextFromEntry, log as log23 } from "@dxos/log";
+import { getContextFromEntry, log as log25 } from "@dxos/log";
 import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { getDebugName, jsonify, numericalValues, tracer } from "@dxos/util";
 var LoggingServiceImpl = class {
@@ -7669,11 +7956,11 @@ var LoggingServiceImpl = class {
     };
   }
   async open() {
-    log23.runtimeConfig.processors.push(this._logProcessor);
+    log25.runtimeConfig.processors.push(this._logProcessor);
   }
   async close() {
-    const index = log23.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
-    log23.runtimeConfig.processors.splice(index, 1);
+    const index = log25.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    log25.runtimeConfig.processors.splice(index, 1);
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
@@ -7873,7 +8160,7 @@ function _ts_decorate10(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) 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 __dxlog_file27 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file29 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var ClientServicesHost = class {
   constructor({
     config,
@@ -7912,7 +8199,7 @@ var ClientServicesHost = class {
         onAcquire: () => {
           if (!this._opening) {
             void this.open(new Context10(void 0, {
-              F: __dxlog_file27,
+              F: __dxlog_file29,
               L: 133
             }));
           }
@@ -7969,8 +8256,8 @@ var ClientServicesHost = class {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    invariant20(!this._open, "service host is open", {
-      F: __dxlog_file27,
+    invariant21(!this._open, "service host is open", {
+      F: __dxlog_file29,
       L: 199,
       S: this,
       A: [
@@ -7978,15 +8265,15 @@ var ClientServicesHost = class {
         "'service host is open'"
       ]
     });
-    log24("initializing...", void 0, {
-      F: __dxlog_file27,
+    log26("initializing...", void 0, {
+      F: __dxlog_file29,
       L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
-      invariant20(!this._config, "config already set", {
-        F: __dxlog_file27,
+      invariant21(!this._config, "config already set", {
+        F: __dxlog_file29,
         L: 203,
         S: this,
         A: [
@@ -8000,8 +8287,8 @@ var ClientServicesHost = class {
       }
     }
     if (!options.signalManager) {
-      log24.warn("running signaling without telemetry metadata.", void 0, {
-        F: __dxlog_file27,
+      log26.warn("running signaling without telemetry metadata.", void 0, {
+        F: __dxlog_file29,
         L: 211,
         S: this,
         C: (f, a) => f(...a)
@@ -8020,8 +8307,8 @@ var ClientServicesHost = class {
       edgeConnection: this._edgeConnection
     }) : new WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
-    invariant20(!this._networkManager, "network manager already set", {
-      F: __dxlog_file27,
+    invariant21(!this._networkManager, "network manager already set", {
+      F: __dxlog_file29,
       L: 233,
       S: this,
       A: [
@@ -8038,8 +8325,8 @@ var ClientServicesHost = class {
         peerKey: this._edgeConnection.peerKey
       } : void 0
     });
-    log24("initialized", void 0, {
-      F: __dxlog_file27,
+    log26("initialized", void 0, {
+      F: __dxlog_file29,
       L: 246,
       S: this,
       C: (f, a) => f(...a)
@@ -8050,16 +8337,16 @@ var ClientServicesHost = class {
       return;
     }
     const traceId = PublicKey17.random().toHex();
-    log24.trace("dxos.client-services.host.open", trace10.begin({
+    log26.trace("dxos.client-services.host.open", trace10.begin({
       id: traceId
     }), {
-      F: __dxlog_file27,
+      F: __dxlog_file29,
       L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant20(this._config, "config not set", {
-      F: __dxlog_file27,
+    invariant21(this._config, "config not set", {
+      F: __dxlog_file29,
       L: 259,
       S: this,
       A: [
@@ -8067,8 +8354,8 @@ var ClientServicesHost = class {
         "'config not set'"
       ]
     });
-    invariant20(this._storage, "storage not set", {
-      F: __dxlog_file27,
+    invariant21(this._storage, "storage not set", {
+      F: __dxlog_file29,
       L: 260,
       S: this,
       A: [
@@ -8076,8 +8363,8 @@ var ClientServicesHost = class {
         "'storage not set'"
       ]
     });
-    invariant20(this._signalManager, "signal manager not set", {
-      F: __dxlog_file27,
+    invariant21(this._signalManager, "signal manager not set", {
+      F: __dxlog_file29,
       L: 261,
       S: this,
       A: [
@@ -8085,8 +8372,8 @@ var ClientServicesHost = class {
         "'signal manager not set'"
       ]
     });
-    invariant20(this._networkManager, "network manager not set", {
-      F: __dxlog_file27,
+    invariant21(this._networkManager, "network manager not set", {
+      F: __dxlog_file29,
       L: 262,
       S: this,
       A: [
@@ -8095,10 +8382,10 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    log24("opening...", {
+    log26("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file27,
+      F: __dxlog_file29,
       L: 265,
       S: this,
       C: (f, a) => f(...a)
@@ -8151,18 +8438,18 @@ var ClientServicesHost = class {
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    log24("opened", {
+    log26("opened", {
       deviceKey
     }, {
-      F: __dxlog_file27,
+      F: __dxlog_file29,
       L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
-    log24.trace("dxos.client-services.host.open", trace10.end({
+    log26.trace("dxos.client-services.host.open", trace10.end({
       id: traceId
     }), {
-      F: __dxlog_file27,
+      F: __dxlog_file29,
       L: 355,
       S: this,
       C: (f, a) => f(...a)
@@ -8173,10 +8460,10 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    log24("closing...", {
+    log26("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file27,
+      F: __dxlog_file29,
       L: 366,
       S: this,
       C: (f, a) => f(...a)
@@ -8191,10 +8478,10 @@ var ClientServicesHost = class {
     await this._level?.close();
     this._open = false;
     this._statusUpdate.emit();
-    log24("closed", {
+    log26("closed", {
       deviceKey
     }, {
-      F: __dxlog_file27,
+      F: __dxlog_file29,
       L: 375,
       S: this,
       C: (f, a) => f(...a)
@@ -8202,32 +8489,32 @@ var ClientServicesHost = class {
   }
   async reset() {
     const traceId = PublicKey17.random().toHex();
-    log24.trace("dxos.sdk.client-services-host.reset", trace10.begin({
+    log26.trace("dxos.sdk.client-services-host.reset", trace10.begin({
       id: traceId
     }), {
-      F: __dxlog_file27,
+      F: __dxlog_file29,
       L: 380,
       S: this,
       C: (f, a) => f(...a)
     });
-    log24.info("resetting...", void 0, {
-      F: __dxlog_file27,
+    log26.info("resetting...", void 0, {
+      F: __dxlog_file29,
       L: 382,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
-    log24.info("reset", void 0, {
-      F: __dxlog_file27,
+    log26.info("reset", void 0, {
+      F: __dxlog_file29,
       L: 385,
       S: this,
       C: (f, a) => f(...a)
     });
-    log24.trace("dxos.sdk.client-services-host.reset", trace10.end({
+    log26.trace("dxos.sdk.client-services-host.reset", trace10.end({
       id: traceId
     }), {
-      F: __dxlog_file27,
+      F: __dxlog_file29,
       L: 386,
       S: this,
       C: (f, a) => f(...a)
@@ -8302,4 +8589,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-67FEJJ6J.mjs.map
+//# sourceMappingURL=chunk-XOKN3TE7.mjs.map