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

package/dist/lib/node/{chunk-2KIDYJ7O.cjs → chunk-IFHGVXW2.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_2KIDYJ7O_exports = {};
-__export(chunk_2KIDYJ7O_exports, {
+var chunk_IFHGVXW2_exports = {};
+__export(chunk_IFHGVXW2_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -70,7 +70,7 @@ __export(chunk_2KIDYJ7O_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_2KIDYJ7O_exports);
+module.exports = __toCommonJS(chunk_IFHGVXW2_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -177,6 +177,7 @@ var import_keys8 = require("@dxos/keys");
 var import_log9 = require("@dxos/log");
 var import_protocols5 = require("@dxos/protocols");
 var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
+var import_metadata = require("@dxos/protocols/proto/dxos/echo/metadata");
 var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
 var import_tracing5 = require("@dxos/tracing");
@@ -218,6 +219,7 @@ var import_invariant10 = require("@dxos/invariant");
 var import_log12 = require("@dxos/log");
 var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util9 = require("@dxos/util");
+var import_credentials17 = require("@dxos/credentials");
 var import_invariant11 = require("@dxos/invariant");
 var import_protocols8 = require("@dxos/protocols");
 var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
@@ -236,117 +238,128 @@ var import_invitations2 = require("@dxos/protocols/proto/dxos/halo/invitations")
 var import_tracing8 = require("@dxos/tracing");
 var import_util10 = require("@dxos/util");
 var import_async16 = require("@dxos/async");
-var import_context11 = require("@dxos/context");
+var import_crypto2 = require("@dxos/crypto");
 var import_invariant13 = require("@dxos/invariant");
+var import_keys11 = require("@dxos/keys");
 var import_log14 = require("@dxos/log");
 var import_protocols10 = require("@dxos/protocols");
 var import_proto3 = require("@dxos/protocols/proto");
-var import_invitations3 = require("@dxos/protocols/proto/dxos/halo/invitations");
-var import_teleport2 = require("@dxos/teleport");
-var import_context12 = require("@dxos/context");
 var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
+var import_context11 = require("@dxos/context");
+var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async17 = require("@dxos/async");
-var import_context13 = require("@dxos/context");
-var import_crypto2 = require("@dxos/crypto");
+var import_context12 = require("@dxos/context");
 var import_invariant14 = require("@dxos/invariant");
-var import_keys11 = require("@dxos/keys");
 var import_log15 = require("@dxos/log");
 var import_protocols11 = require("@dxos/protocols");
 var import_proto4 = require("@dxos/protocols/proto");
-var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
-var import_invitations4 = require("@dxos/protocols/proto/dxos/halo/invitations");
-var import_teleport3 = require("@dxos/teleport");
+var import_invitations3 = require("@dxos/protocols/proto/dxos/halo/invitations");
+var import_teleport2 = require("@dxos/teleport");
+var import_async18 = require("@dxos/async");
+var import_context13 = require("@dxos/context");
+var import_crypto3 = require("@dxos/crypto");
 var import_invariant15 = require("@dxos/invariant");
 var import_keys12 = require("@dxos/keys");
 var import_log16 = require("@dxos/log");
+var import_protocols12 = require("@dxos/protocols");
+var import_proto5 = require("@dxos/protocols/proto");
+var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
+var import_invitations4 = require("@dxos/protocols/proto/dxos/halo/invitations");
+var import_teleport3 = require("@dxos/teleport");
+var import_async19 = require("@dxos/async");
+var import_log17 = require("@dxos/log");
+var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
+var import_invariant16 = require("@dxos/invariant");
+var import_keys13 = require("@dxos/keys");
+var import_log18 = require("@dxos/log");
 var import_invitations5 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_util11 = require("@dxos/util");
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
-var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
-var import_credentials17 = require("@dxos/credentials");
+var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
+var import_credentials18 = require("@dxos/credentials");
 var import_feed_store5 = require("@dxos/feed-store");
-var import_invariant16 = require("@dxos/invariant");
-var import_log17 = require("@dxos/log");
-var import_protocols12 = require("@dxos/protocols");
-var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
-var import_credentials18 = require("@dxos/protocols/proto/dxos/halo/credentials");
-var import_async18 = require("@dxos/async");
+var import_invariant17 = require("@dxos/invariant");
+var import_log19 = require("@dxos/log");
+var import_protocols13 = require("@dxos/protocols");
+var import_services17 = require("@dxos/protocols/proto/dxos/client/services");
+var import_credentials19 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_async20 = require("@dxos/async");
 var import_client_protocol6 = require("@dxos/client-protocol");
 var import_context14 = require("@dxos/context");
-var import_credentials19 = require("@dxos/credentials");
+var import_credentials20 = require("@dxos/credentials");
 var import_echo_pipeline4 = require("@dxos/echo-pipeline");
-var import_invariant17 = require("@dxos/invariant");
-var import_keys13 = require("@dxos/keys");
-var import_log18 = require("@dxos/log");
-var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
-var import_credentials20 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_invariant18 = require("@dxos/invariant");
+var import_keys14 = require("@dxos/keys");
+var import_log20 = require("@dxos/log");
+var import_services18 = require("@dxos/protocols/proto/dxos/client/services");
+var import_credentials21 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_invariant19 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
-var import_log19 = require("@dxos/log");
+var import_log21 = require("@dxos/log");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_debug5 = require("@dxos/debug");
 var import_rpc = require("@dxos/rpc");
 var import_tracing9 = require("@dxos/tracing");
-var import_async19 = require("@dxos/async");
+var import_async21 = require("@dxos/async");
 var import_context15 = require("@dxos/context");
-var import_credentials21 = require("@dxos/credentials");
+var import_credentials22 = require("@dxos/credentials");
 var import_debug6 = require("@dxos/debug");
 var import_echo_pipeline5 = require("@dxos/echo-pipeline");
 var import_edge_client2 = require("@dxos/edge-client");
 var import_feed_store6 = require("@dxos/feed-store");
-var import_invariant19 = require("@dxos/invariant");
+var import_invariant20 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
-var import_keys14 = require("@dxos/keys");
-var import_log20 = require("@dxos/log");
-var import_protocols13 = require("@dxos/protocols");
-var import_services17 = require("@dxos/protocols/proto/dxos/client/services");
+var import_keys15 = require("@dxos/keys");
+var import_log22 = require("@dxos/log");
+var import_protocols14 = require("@dxos/protocols");
+var import_services19 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_tracing10 = require("@dxos/tracing");
 var import_util12 = require("@dxos/util");
-var import_protocols14 = require("@dxos/protocols");
+var import_protocols15 = require("@dxos/protocols");
 var import_config2 = require("@dxos/protocols/proto/dxos/config");
 var import_random_access_storage = require("@dxos/random-access-storage");
 var import_client_protocol7 = require("@dxos/client-protocol");
 var import_config3 = require("@dxos/protocols/proto/dxos/config");
 var import_util13 = require("@dxos/util");
 var import_node_path = __toESM(require("node:path"));
-var import_keys15 = require("@dxos/keys");
+var import_keys16 = require("@dxos/keys");
 var import_kv_store = require("@dxos/kv-store");
 var import_automerge_repo = require("@dxos/automerge/automerge-repo");
-var import_invariant20 = require("@dxos/invariant");
-var import_log21 = require("@dxos/log");
-var import_protocols15 = require("@dxos/protocols");
+var import_invariant21 = require("@dxos/invariant");
+var import_log23 = require("@dxos/log");
+var import_protocols16 = require("@dxos/protocols");
 var import_util14 = require("@dxos/util");
-var import_async20 = require("@dxos/async");
+var import_async22 = require("@dxos/async");
 var import_client_protocol8 = require("@dxos/client-protocol");
 var import_context16 = require("@dxos/context");
 var import_edge_client3 = require("@dxos/edge-client");
-var import_invariant21 = require("@dxos/invariant");
-var import_keys16 = require("@dxos/keys");
-var import_log22 = require("@dxos/log");
+var import_invariant22 = require("@dxos/invariant");
+var import_keys17 = require("@dxos/keys");
+var import_log24 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager2 = require("@dxos/network-manager");
-var import_protocols16 = require("@dxos/protocols");
-var import_services18 = require("@dxos/protocols/proto/dxos/client/services");
+var import_protocols17 = require("@dxos/protocols");
+var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing11 = require("@dxos/tracing");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
-var import_async21 = require("@dxos/async");
+var import_async23 = require("@dxos/async");
 var import_codec_protobuf12 = require("@dxos/codec-protobuf");
-var import_invariant22 = require("@dxos/invariant");
-var import_services19 = require("@dxos/protocols/proto/dxos/client/services");
-var import_async22 = require("@dxos/async");
+var import_invariant23 = require("@dxos/invariant");
+var import_services21 = require("@dxos/protocols/proto/dxos/client/services");
+var import_async24 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
-var import_keys17 = require("@dxos/keys");
+var import_keys18 = require("@dxos/keys");
 var import_util15 = require("@dxos/util");
-var import_async23 = require("@dxos/async");
+var import_async25 = require("@dxos/async");
 var import_codec_protobuf14 = require("@dxos/codec-protobuf");
-var import_keys18 = require("@dxos/keys");
-var import_log23 = require("@dxos/log");
-var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
+var import_keys19 = require("@dxos/keys");
+var import_log25 = require("@dxos/log");
+var import_services22 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util16 = require("@dxos/util");
 var import_codec_protobuf15 = require("@dxos/codec-protobuf");
 var import_codec_protobuf16 = require("@dxos/codec-protobuf");
-var import_services21 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services23 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util17 = require("@dxos/util");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devtools/feeds.ts";
 var subscribeToFeeds = ({ feedStore, spaceManager }, { feedKeys }) => {
@@ -706,7 +719,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.6.12-staging.e11e696";
+var DXOS_VERSION = "0.6.13-main.09887cd";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -2541,12 +2554,36 @@ var DataSpaceManager = class extends import_context7.Resource {
       }
     });
   }
+  async setSpaceEdgeReplicationSetting(spaceKey, setting) {
+    const space = this._spaces.get(spaceKey);
+    (0, import_invariant7.invariant)(space, "Space not found.", {
+      F: __dxlog_file9,
+      L: 399,
+      S: this,
+      A: [
+        "space",
+        "'Space not found.'"
+      ]
+    });
+    await this._metadataStore.setSpaceEdgeReplicationSetting(spaceKey, setting);
+    if (space.isOpen) {
+      switch (setting) {
+        case import_metadata.EdgeReplicationSetting.DISABLED:
+          await this._echoEdgeReplicator?.disconnectFromSpace(space.id);
+          break;
+        case import_metadata.EdgeReplicationSetting.ENABLED:
+          await this._echoEdgeReplicator?.connectToSpace(space.id);
+          break;
+      }
+    }
+    space.stateUpdate.emit();
+  }
   async _constructSpace(metadata) {
     (0, import_log9.log)("construct space", {
       metadata
     }, {
       F: __dxlog_file9,
-      L: 398,
+      L: 418,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2590,7 +2627,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             err
           }, {
             F: __dxlog_file9,
-            L: 440,
+            L: 460,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2600,7 +2637,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       onAuthFailure: () => {
         import_log9.log.warn("auth failure", void 0, {
           F: __dxlog_file9,
-          L: 445,
+          L: 465,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2633,7 +2670,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             space: space.key
           }, {
             F: __dxlog_file9,
-            L: 472,
+            L: 492,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2644,7 +2681,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             open: this._lifecycleState === import_context7.LifecycleState.OPEN
           }, {
             F: __dxlog_file9,
-            L: 475,
+            L: 495,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2663,7 +2700,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             space: space.key
           }, {
             F: __dxlog_file9,
-            L: 483,
+            L: 503,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2675,10 +2712,25 @@ var DataSpaceManager = class extends import_context7.Resource {
       edgeFeatures: this._edgeFeatures
     });
     dataSpace.postOpen.append(async () => {
-      await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
+      const setting = dataSpace.getEdgeReplicationSetting();
+      if (setting === import_metadata.EdgeReplicationSetting.ENABLED) {
+        await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
+      } else if (this._echoEdgeReplicator) {
+        (0, import_log9.log)("not connecting EchoEdgeReplicator because of EdgeReplicationSetting", {
+          spaceId: dataSpace.id
+        }, {
+          F: __dxlog_file9,
+          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 === import_metadata.EdgeReplicationSetting.ENABLED) {
+        await this._echoEdgeReplicator?.disconnectFromSpace(dataSpace.id);
+      }
     });
     presence.newPeer.on((peerState) => {
       if (dataSpace.state === import_services6.SpaceState.SPACE_READY) {
@@ -2698,7 +2750,7 @@ var DataSpaceManager = class extends import_context7.Resource {
         space: space.key
       }, {
         F: __dxlog_file9,
-        L: 515,
+        L: 543,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2731,7 +2783,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       closedSessions
     }, {
       F: __dxlog_file9,
-      L: 541,
+      L: 569,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2746,7 +2798,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file9,
-          L: 555,
+          L: 583,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2819,7 +2871,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) ?? (0, import_debug3.raise)(new import_protocols6.SpaceNotFoundError(spaceKey));
     if (state) {
@@ -2834,6 +2886,9 @@ var SpacesServiceImpl = class {
           throw new import_protocols6.ApiError("Invalid space state");
       }
     }
+    if (edgeReplication !== void 0) {
+      await dataSpaceManager.setSpaceEdgeReplicationSetting(spaceKey, edgeReplication);
+    }
   }
   async updateMemberRole(request) {
     const identity = this._requireIdentity();
@@ -2850,7 +2905,7 @@ var SpacesServiceImpl = class {
     const credentials = await (0, import_credentials13.createAdmissionCredentials)(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
     (0, import_invariant8.invariant)(credentials[0].credential, void 0, {
       F: __dxlog_file10,
-      L: 102,
+      L: 106,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2860,7 +2915,7 @@ var SpacesServiceImpl = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     (0, import_invariant8.invariant)((0, import_credentials13.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file10,
-      L: 104,
+      L: 108,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2878,7 +2933,7 @@ var SpacesServiceImpl = class {
           ids: spaces.map((space) => space.id)
         }), {
           F: __dxlog_file10,
-          L: 115,
+          L: 119,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2970,7 +3025,7 @@ var SpacesServiceImpl = class {
       } else {
         (0, import_invariant8.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file10,
-          L: 213,
+          L: 217,
           S: this,
           A: [
             "!credential.id",
@@ -2979,7 +3034,7 @@ var SpacesServiceImpl = class {
         });
         (0, import_invariant8.invariant)(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file10,
-          L: 214,
+          L: 218,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -2989,7 +3044,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         (0, import_invariant8.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file10,
-          L: 216,
+          L: 220,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -3039,7 +3094,7 @@ var SpacesServiceImpl = class {
     const assertion = (0, import_credentials13.getCredentialAssertion)(credential);
     (0, import_invariant8.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file10,
-      L: 250,
+      L: 254,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3049,7 +3104,7 @@ var SpacesServiceImpl = class {
     const myIdentity = this._identityManager.identity;
     (0, import_invariant8.invariant)(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
       F: __dxlog_file10,
-      L: 252,
+      L: 256,
       S: this,
       A: [
         "myIdentity && credential.subject.id.equals(myIdentity.identityKey)",
@@ -3111,7 +3166,8 @@ var SpacesServiceImpl = class {
       }),
       creator: space.inner.spaceState.creator?.key,
       cache: space.cache,
-      metrics: space.metrics
+      metrics: space.metrics,
+      edgeReplication: space.getEdgeReplicationSetting()
     };
   }
   _requireIdentity() {
@@ -3156,7 +3212,7 @@ var Identity = class {
       deviceKey: params.deviceKey
     }, {
       F: __dxlog_file11,
-      L: 78,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3197,10 +3253,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) {
@@ -3252,7 +3311,7 @@ var Identity = class {
   getIdentityCredentialSigner() {
     (0, import_invariant6.invariant)(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
       F: __dxlog_file11,
-      L: 189,
+      L: 191,
       S: this,
       A: [
         "this._deviceStateMachine.deviceCredentialChain",
@@ -3296,20 +3355,21 @@ var Identity = class {
       dataFeedKey
     }, {
       F: __dxlog_file11,
-      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 (0, import_feed_store2.writeMessages)(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: {
@@ -3335,6 +3395,7 @@ var Identity = class {
         credential
       }
     })));
+    return deviceCredential;
   }
 };
 _ts_decorate4([
@@ -3367,7 +3428,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;
@@ -3378,7 +3438,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file12,
-      L: 121,
+      L: 116,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3387,7 +3447,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file12,
-      L: 124,
+      L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3400,7 +3460,7 @@ var IdentityManager = class {
         displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file12,
-        L: 129,
+        L: 124,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3410,7 +3470,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file12,
-      L: 136,
+      L: 131,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3418,13 +3478,13 @@ var IdentityManager = class {
   async close() {
     await this._identity?.close(new import_context8.Context(void 0, {
       F: __dxlog_file12,
-      L: 140
+      L: 135
     }));
   }
   async createIdentity({ displayName, deviceProfile } = {}) {
     (0, import_invariant9.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file12,
-      L: 145,
+      L: 140,
       S: this,
       A: [
         "!this._identity",
@@ -3433,7 +3493,7 @@ var IdentityManager = class {
     });
     (0, import_log11.log)("creating identity...", void 0, {
       F: __dxlog_file12,
-      L: 146,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3451,13 +3511,13 @@ var IdentityManager = class {
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new import_context8.Context(void 0, {
       F: __dxlog_file12,
-      L: 161
+      L: 156
     }));
     {
       const generator = new import_credentials14.CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       (0, import_invariant9.invariant)(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
         F: __dxlog_file12,
-        L: 165,
+        L: 160,
         S: this,
         A: [
           "identityRecord.haloSpace.genesisFeedKey",
@@ -3466,7 +3526,7 @@ var IdentityManager = class {
       });
       (0, import_invariant9.invariant)(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
         F: __dxlog_file12,
-        L: 166,
+        L: 161,
         S: this,
         A: [
           "identityRecord.haloSpace.dataFeedKey",
@@ -3505,7 +3565,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file12,
-      L: 208,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3516,7 +3576,7 @@ var IdentityManager = class {
       profile: identity.profileDocument
     }, {
       F: __dxlog_file12,
-      L: 214,
+      L: 205,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3546,20 +3606,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) {
     (0, import_log11.log)("accepting identity", {
       params
     }, {
       F: __dxlog_file12,
-      L: 252,
+      L: 244,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant9.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file12,
-      L: 253,
+      L: 245,
       S: this,
       A: [
         "!this._identity",
@@ -3580,23 +3640,32 @@ var IdentityManager = class {
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new import_context8.Context(void 0, {
       F: __dxlog_file12,
-      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);
     import_log11.log.trace("dxos.halo.identity", {
-      identityKey: identityRecord.identityKey,
+      identityKey: this._identity.identityKey,
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file12,
-      L: 272,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
     await this.updateDeviceProfile({
       ...this.createDefaultDeviceProfile(),
-      ...params.deviceProfile
+      ...profile
     });
     this.stateUpdate.emit();
     (0, import_log11.log)("accepted identity", {
@@ -3604,11 +3673,10 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file12,
-      L: 282,
+      L: 284,
       S: this,
       C: (f, a) => f(...a)
     });
-    return identity;
   }
   /**
   * Update the profile document of an existing identity.
@@ -3616,7 +3684,7 @@ var IdentityManager = class {
   async updateProfile(profile) {
     (0, import_invariant9.invariant)(this._identity, "Identity not initialized.", {
       F: __dxlog_file12,
-      L: 290,
+      L: 291,
       S: this,
       A: [
         "this._identity",
@@ -3647,7 +3715,7 @@ var IdentityManager = class {
   async updateDeviceProfile(profile) {
     (0, import_invariant9.invariant)(this._identity, "Identity not initialized.", {
       F: __dxlog_file12,
-      L: 307,
+      L: 308,
       S: this,
       A: [
         "this._identity",
@@ -3683,7 +3751,7 @@ var IdentityManager = class {
   async _constructIdentity(identityRecord) {
     (0, import_invariant9.invariant)(!this._identity, void 0, {
       F: __dxlog_file12,
-      L: 333,
+      L: 334,
       S: this,
       A: [
         "!this._identity",
@@ -3694,7 +3762,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file12,
-      L: 334,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3709,7 +3777,7 @@ var IdentityManager = class {
     });
     (0, import_invariant9.invariant)(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file12,
-      L: 347,
+      L: 348,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -3721,7 +3789,7 @@ var IdentityManager = class {
     });
     (0, import_invariant9.invariant)(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file12,
-      L: 351,
+      L: 352,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -3758,11 +3826,10 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file12,
-      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);
     }
@@ -4131,13 +4198,14 @@ var DataSpace = class {
       F: __dxlog_file14,
       L: 244
     }));
+    await this._inner.startProtocol();
     await this._edgeFeedReplicator?.open();
     this._state = import_services4.SpaceState.SPACE_CONTROL_ONLY;
     (0, import_log4.log)("new state", {
       state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file14,
-      L: 249,
+      L: 250,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4157,14 +4225,14 @@ var DataSpace = class {
       state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file14,
-      L: 268,
+      L: 269,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
     this._ctx = new import_context4.Context(void 0, {
       F: __dxlog_file14,
-      L: 270
+      L: 271
     });
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.remove(this._onFeedAdded);
@@ -4197,7 +4265,7 @@ var DataSpace = class {
         if (err instanceof import_protocols3.CancelledError || err instanceof import_context4.ContextDisposedError) {
           (0, import_log4.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file14,
-            L: 308,
+            L: 309,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4205,7 +4273,7 @@ var DataSpace = class {
         }
         import_log4.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file14,
-          L: 312,
+          L: 313,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4214,7 +4282,7 @@ var DataSpace = class {
           state: import_services4.SpaceState[this._state]
         }, {
           F: __dxlog_file14,
-          L: 314,
+          L: 315,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4234,13 +4302,13 @@ var DataSpace = class {
       state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file14,
-      L: 330,
+      L: 331,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log4.log)("initializing control pipeline", void 0, {
       F: __dxlog_file14,
-      L: 332,
+      L: 333,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4249,21 +4317,21 @@ var DataSpace = class {
     const ready = this.stateUpdate.waitForCondition(() => this._state === import_services4.SpaceState.SPACE_READY);
     (0, import_log4.log)("initializing automerge root", void 0, {
       F: __dxlog_file14,
-      L: 340,
+      L: 341,
       S: this,
       C: (f, a) => f(...a)
     });
     this._automergeSpaceState.startProcessingRootDocs();
     (0, import_log4.log)("waiting for space to be ready", void 0, {
       F: __dxlog_file14,
-      L: 344,
+      L: 345,
       S: this,
       C: (f, a) => f(...a)
     });
     await ready;
     (0, import_log4.log)("space is ready", void 0, {
       F: __dxlog_file14,
-      L: 346,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4275,7 +4343,7 @@ var DataSpace = class {
       state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file14,
-      L: 353,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4292,7 +4360,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     (0, import_log4.log)("writable feeds created", void 0, {
       F: __dxlog_file14,
-      L: 370,
+      L: 371,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4346,7 +4414,7 @@ var DataSpace = class {
           count: credentials.length
         }, {
           F: __dxlog_file14,
-          L: 428,
+          L: 429,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4357,14 +4425,14 @@ var DataSpace = class {
         });
         (0, import_log4.log)("credentials notarized", void 0, {
           F: __dxlog_file14,
-          L: 432,
+          L: 433,
           S: this,
           C: (f, a) => f(...a)
         });
       } catch (err) {
         import_log4.log.error("error notarizing credentials for feed admission", err, {
           F: __dxlog_file14,
-          L: 434,
+          L: 435,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4379,7 +4447,7 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file14,
-      L: 444,
+      L: 445,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4431,7 +4499,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file14,
-          L: 487,
+          L: 488,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4521,12 +4589,15 @@ var DataSpace = class {
       state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file14,
-      L: 569,
+      L: 570,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdate.emit();
   }
+  getEdgeReplicationSetting() {
+    return this._metadataStore.getSpaceEdgeReplicationSetting(this.key);
+  }
 };
 _ts_decorate6([
   import_tracing3.trace.info()
@@ -4603,7 +4674,7 @@ var DeviceInvitationProtocol = class {
   async admit(_, request) {
     (0, import_invariant11.invariant)(request.device, void 0, {
       F: __dxlog_file15,
-      L: 50,
+      L: 51,
       S: this,
       A: [
         "request.device",
@@ -4611,13 +4682,23 @@ var DeviceInvitationProtocol = class {
       ]
     });
     const identity = this._getIdentity();
-    await identity.admitDevice(request.device);
+    const credential = await identity.admitDevice(request.device);
+    (0, import_invariant11.invariant)((0, import_credentials17.getCredentialAssertion)(credential)["@type"] === "dxos.halo.credentials.AuthorizedDevice", void 0, {
+      F: __dxlog_file15,
+      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
       }
     };
   }
@@ -4649,7 +4730,7 @@ var DeviceInvitationProtocol = class {
   async accept(response, request) {
     (0, import_invariant11.invariant)(response.device, void 0, {
       F: __dxlog_file15,
-      L: 95,
+      L: 98,
       S: this,
       A: [
         "response.device",
@@ -4659,7 +4740,7 @@ var DeviceInvitationProtocol = class {
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
     (0, import_invariant11.invariant)(request.device, void 0, {
       F: __dxlog_file15,
-      L: 98,
+      L: 101,
       S: this,
       A: [
         "request.device",
@@ -4675,7 +4756,8 @@ var DeviceInvitationProtocol = class {
       controlFeedKey,
       dataFeedKey,
       controlTimeframe,
-      deviceProfile: profile
+      deviceProfile: profile,
+      authorizedDeviceCredential: response.device.credential
     });
     return {
       identityKey
@@ -4683,39 +4765,189 @@ var DeviceInvitationProtocol = class {
   }
 };
 var stateToString = (state) => {
-  return Object.entries(import_services12.Invitation.State).find(([key, val]) => val === state)?.[0] ?? "unknown";
+  return Object.entries(import_services13.Invitation.State).find(([key, val]) => val === state)?.[0] ?? "unknown";
 };
 var tryAcquireBeforeContextDisposed = async (ctx, mutex) => {
   let guard;
-  return (0, import_context12.cancelWithContext)(ctx, (async () => {
+  return (0, import_context11.cancelWithContext)(ctx, (async () => {
     guard = await mutex.acquire();
     if (ctx.disposed) {
       guard.release();
       guard = void 0;
-      throw new import_context12.ContextDisposedError();
+      throw new import_context11.ContextDisposedError();
     }
     return guard;
   })());
 };
-var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts";
+var __dxlog_file16 = "/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) {
+      (0, import_log14.log)("edge disabled", void 0, {
+        F: __dxlog_file16,
+        L: 65,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    const invitation = guardedState.current;
+    const spaceId = invitation.spaceId;
+    const canBeHandledByEdge = invitation.authMethod !== import_services12.Invitation.AuthMethod.SHARED_SECRET && invitation.type === import_services12.Invitation.Type.DELEGATED && invitation.kind === import_services12.Invitation.Kind.SPACE && spaceId != null && import_keys11.SpaceId.isValid(spaceId);
+    if (!canBeHandledByEdge) {
+      (0, import_log14.log)("invitation could not be handled by edge", {
+        invitation
+      }, {
+        F: __dxlog_file16,
+        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 import_protocols10.EdgeCallFailedError) {
+            import_log14.log.info("join space with edge unsuccessful", {
+              reason: error.message,
+              retryable: error.isRetryable,
+              after: error.retryAfterMs ?? this._calculateNextRetryMs()
+            }, {
+              F: __dxlog_file16,
+              L: 95,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            if (error.isRetryable) {
+              (0, import_async16.scheduleTask)(ctx, tryHandleInvitation, error.retryAfterMs ?? this._calculateNextRetryMs());
+            }
+          } else {
+            import_log14.log.info("failed to handle invitation with edge", {
+              error
+            }, {
+              F: __dxlog_file16,
+              L: 104,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            (0, import_async16.scheduleTask)(ctx, tryHandleInvitation, this._calculateNextRetryMs());
+          }
+        }
+      }
+    };
+    (0, import_async16.scheduleMicroTask)(ctx, tryHandleInvitation);
+  }
+  async _handleSpaceInvitationFlow(ctx, guardedState, admissionRequest, spaceId) {
+    try {
+      (0, import_log14.log)("edge invitation flow", void 0, {
+        F: __dxlog_file16,
+        L: 120,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._flowLock = await tryAcquireBeforeContextDisposed(ctx, guardedState.mutex);
+      (0, import_log14.log)("edge invitation flow acquired the lock", void 0, {
+        F: __dxlog_file16,
+        L: 122,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      guardedState.set(this, import_services12.Invitation.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, import_services12.Invitation.State.ERROR);
+      throw error;
+    } finally {
+      this._flowLock?.release();
+      this._flowLock = void 0;
+    }
+  }
+  async _mapToAdmissionResponse(edgeResponse) {
+    const credentialBytes = Buffer.from(edgeResponse.spaceMemberCredential, "base64");
+    const codec = import_proto3.schema.getCodecForType("dxos.halo.credentials.Credential");
+    return {
+      space: {
+        credential: codec.decode(credentialBytes)
+      }
+    };
+  }
+  async _joinSpaceByInvitation(guardedState, spaceId, request) {
+    (0, import_invariant13.invariant)(this._client, void 0, {
+      F: __dxlog_file16,
+      L: 157,
+      S: this,
+      A: [
+        "this._client",
+        ""
+      ]
+    });
+    try {
+      return await this._client.joinSpaceByInvitation(spaceId, request);
+    } catch (error) {
+      if (error instanceof import_protocols10.EdgeAuthChallengeError) {
+        guardedState.set(this, import_services12.Invitation.State.AUTHENTICATING);
+        const publicKey = guardedState.current.guestKeypair?.publicKey;
+        const privateKey = guardedState.current.guestKeypair?.privateKey;
+        if (!privateKey || !publicKey) {
+          throw error;
+        }
+        const signature = await (0, import_crypto2.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;
+  }
+};
+var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts";
 var OPTIONS_TIMEOUT = 1e4;
 var InvitationGuestExtension = class extends import_teleport2.RpcExtension {
   constructor(_invitationFlowMutex, _callbacks) {
     super({
       requested: {
-        InvitationHostService: import_proto3.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_proto4.schema.getService("dxos.halo.invitations.InvitationHostService")
       },
       exposed: {
-        InvitationHostService: import_proto3.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_proto4.schema.getService("dxos.halo.invitations.InvitationHostService")
       }
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
-    this._ctx = new import_context11.Context(void 0, {
-      F: __dxlog_file16,
-      L: 34
+    this._ctx = new import_context12.Context(void 0, {
+      F: __dxlog_file17,
+      L: 38
     });
-    this._remoteOptionsTrigger = new import_async16.Trigger();
+    this._remoteOptionsTrigger = new import_async17.Trigger();
     this._invitationFlowLock = null;
   }
   hasFlowLock() {
@@ -4725,9 +4957,9 @@ var InvitationGuestExtension = class extends import_teleport2.RpcExtension {
     return {
       InvitationHostService: {
         options: async (options) => {
-          (0, import_invariant13.invariant)(!this._remoteOptions, "Remote options already set.", {
-            F: __dxlog_file16,
-            L: 64,
+          (0, import_invariant14.invariant)(!this._remoteOptions, "Remote options already set.", {
+            F: __dxlog_file17,
+            L: 68,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -4752,39 +4984,39 @@ var InvitationGuestExtension = class extends import_teleport2.RpcExtension {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      (0, import_log14.log)("guest acquire lock", void 0, {
-        F: __dxlog_file16,
-        L: 85,
+      (0, import_log15.log)("guest acquire lock", void 0, {
+        F: __dxlog_file17,
+        L: 89,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      (0, import_log14.log)("guest lock acquired", void 0, {
-        F: __dxlog_file16,
-        L: 87,
+      (0, import_log15.log)("guest lock acquired", void 0, {
+        F: __dxlog_file17,
+        L: 91,
         S: this,
         C: (f, a) => f(...a)
       });
-      await (0, import_context11.cancelWithContext)(this._ctx, this.rpc.InvitationHostService.options({
+      await (0, import_context12.cancelWithContext)(this._ctx, this.rpc.InvitationHostService.options({
         role: import_invitations3.InvitationOptions.Role.GUEST
       }));
-      (0, import_log14.log)("options sent", void 0, {
-        F: __dxlog_file16,
-        L: 92,
+      (0, import_log15.log)("options sent", void 0, {
+        F: __dxlog_file17,
+        L: 96,
         S: this,
         C: (f, a) => f(...a)
       });
-      await (0, import_context11.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
+      await (0, import_context12.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT
       }));
-      (0, import_log14.log)("options received", void 0, {
-        F: __dxlog_file16,
-        L: 94,
+      (0, import_log15.log)("options received", void 0, {
+        F: __dxlog_file17,
+        L: 98,
         S: this,
         C: (f, a) => f(...a)
       });
       if (this._remoteOptions?.role !== import_invitations3.InvitationOptions.Role.HOST) {
-        throw new import_protocols10.InvalidInvitationExtensionRoleError(void 0, {
+        throw new import_protocols11.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations3.InvitationOptions.Role.HOST,
           remoteOptions: this._remoteOptions,
           remotePeerId: context.remotePeerId
@@ -4811,40 +5043,40 @@ var InvitationGuestExtension = class extends import_teleport2.RpcExtension {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock.release();
       this._invitationFlowLock = null;
-      (0, import_log14.log)("invitation flow lock released", void 0, {
-        F: __dxlog_file16,
-        L: 127,
+      (0, import_log15.log)("invitation flow lock released", void 0, {
+        F: __dxlog_file17,
+        L: 131,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
 };
-var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
+var __dxlog_file18 = "/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 import_teleport3.RpcExtension {
   constructor(_invitationFlowMutex, _callbacks) {
     super({
       requested: {
-        InvitationHostService: import_proto4.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_proto5.schema.getService("dxos.halo.invitations.InvitationHostService")
       },
       exposed: {
-        InvitationHostService: import_proto4.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_proto5.schema.getService("dxos.halo.invitations.InvitationHostService")
       }
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
     this._ctx = new import_context13.Context(void 0, {
-      F: __dxlog_file17,
-      L: 53
+      F: __dxlog_file18,
+      L: 57
     });
-    this._remoteOptionsTrigger = new import_async17.Trigger();
+    this._remoteOptionsTrigger = new import_async18.Trigger();
     this._challenge = void 0;
     this.guestProfile = void 0;
     this.authenticationPassed = false;
     this.authenticationRetry = 0;
-    this.completedTrigger = new import_async17.Trigger();
+    this.completedTrigger = new import_async18.Trigger();
     this._invitationFlowLock = null;
   }
   hasFlowLock() {
@@ -4856,9 +5088,9 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
       // Perhaps in the future we will have more complex logic here.
       InvitationHostService: {
         options: async (options) => {
-          (0, import_invariant14.invariant)(!this._remoteOptions, "Remote options already set.", {
-            F: __dxlog_file17,
-            L: 102,
+          (0, import_invariant15.invariant)(!this._remoteOptions, "Remote options already set.", {
+            F: __dxlog_file18,
+            L: 106,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -4870,49 +5102,49 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
         },
         introduce: async (request) => {
           const { profile, invitationId } = request;
-          const traceId = import_keys11.PublicKey.random().toHex();
-          import_log15.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols11.trace.begin({
+          const traceId = import_keys12.PublicKey.random().toHex();
+          import_log16.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols12.trace.begin({
             id: traceId
           }), {
-            F: __dxlog_file17,
-            L: 110,
+            F: __dxlog_file18,
+            L: 114,
             S: this,
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
-          this._assertInvitationState(import_services13.Invitation.State.CONNECTED);
+          this._assertInvitationState(import_services14.Invitation.State.CONNECTED);
           if (invitationId !== invitation?.invitationId) {
-            import_log15.log.warn("incorrect invitationId", {
+            import_log16.log.warn("incorrect invitationId", {
               expected: invitation.invitationId,
               actual: invitationId
             }, {
-              F: __dxlog_file17,
-              L: 115,
+              F: __dxlog_file18,
+              L: 119,
               S: this,
               C: (f, a) => f(...a)
             });
             this._callbacks.onError(new Error("Incorrect invitationId."));
-            (0, import_async17.scheduleTask)(this._ctx, () => this.close());
+            (0, import_async18.scheduleTask)(this._ctx, () => this.close());
             return {
-              authMethod: import_services13.Invitation.AuthMethod.NONE
+              authMethod: import_services14.Invitation.AuthMethod.NONE
             };
           }
-          (0, import_log15.log)("guest introduced themselves", {
+          (0, import_log16.log)("guest introduced themselves", {
             guestProfile: profile
           }, {
-            F: __dxlog_file17,
-            L: 124,
+            F: __dxlog_file18,
+            L: 128,
             S: this,
             C: (f, a) => f(...a)
           });
           this.guestProfile = profile;
-          this._callbacks.onStateUpdate(import_services13.Invitation.State.READY_FOR_AUTHENTICATION);
-          this._challenge = invitation.authMethod === import_services13.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? (0, import_crypto2.randomBytes)(32) : void 0;
-          import_log15.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols11.trace.end({
+          this._callbacks.onStateUpdate(import_services14.Invitation.State.READY_FOR_AUTHENTICATION);
+          this._challenge = invitation.authMethod === import_services14.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? (0, import_crypto3.randomBytes)(32) : void 0;
+          import_log16.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols12.trace.end({
             id: traceId
           }), {
-            F: __dxlog_file17,
-            L: 130,
+            F: __dxlog_file18,
+            L: 134,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4922,35 +5154,35 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
           };
         },
         authenticate: async ({ authCode: code, signedChallenge }) => {
-          const traceId = import_keys11.PublicKey.random().toHex();
-          import_log15.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols11.trace.begin({
+          const traceId = import_keys12.PublicKey.random().toHex();
+          import_log16.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols12.trace.begin({
             id: traceId
           }), {
-            F: __dxlog_file17,
-            L: 139,
+            F: __dxlog_file18,
+            L: 143,
             S: this,
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
-          (0, import_log15.log)("received authentication request", {
+          (0, import_log16.log)("received authentication request", {
             authCode: code
           }, {
-            F: __dxlog_file17,
-            L: 142,
+            F: __dxlog_file18,
+            L: 146,
             S: this,
             C: (f, a) => f(...a)
           });
           let status = import_invitations4.AuthenticationResponse.Status.OK;
           this._assertInvitationState([
-            import_services13.Invitation.State.AUTHENTICATING,
-            import_services13.Invitation.State.READY_FOR_AUTHENTICATION
+            import_services14.Invitation.State.AUTHENTICATING,
+            import_services14.Invitation.State.READY_FOR_AUTHENTICATION
           ]);
-          this._callbacks.onStateUpdate(import_services13.Invitation.State.AUTHENTICATING);
+          this._callbacks.onStateUpdate(import_services14.Invitation.State.AUTHENTICATING);
           switch (invitation.authMethod) {
-            case import_services13.Invitation.AuthMethod.NONE: {
-              (0, import_log15.log)("authentication not required", void 0, {
-                F: __dxlog_file17,
-                L: 150,
+            case import_services14.Invitation.AuthMethod.NONE: {
+              (0, import_log16.log)("authentication not required", void 0, {
+                F: __dxlog_file18,
+                L: 154,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -4958,7 +5190,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
                 status: import_invitations4.AuthenticationResponse.Status.OK
               };
             }
-            case import_services13.Invitation.AuthMethod.SHARED_SECRET: {
+            case import_services14.Invitation.AuthMethod.SHARED_SECRET: {
               if (invitation.authCode) {
                 if (this.authenticationRetry++ > MAX_OTP_ATTEMPTS) {
                   status = import_invitations4.AuthenticationResponse.Status.INVALID_OPT_ATTEMPTS;
@@ -4970,12 +5202,12 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
               }
               break;
             }
-            case import_services13.Invitation.AuthMethod.KNOWN_PUBLIC_KEY: {
+            case import_services14.Invitation.AuthMethod.KNOWN_PUBLIC_KEY: {
               if (!invitation.guestKeypair) {
                 status = import_invitations4.AuthenticationResponse.Status.INTERNAL_ERROR;
                 break;
               }
-              const isSignatureValid = this._challenge && (0, import_crypto2.verify)(this._challenge, Buffer.from(signedChallenge ?? []), invitation.guestKeypair.publicKey.asBuffer());
+              const isSignatureValid = this._challenge && (0, import_crypto3.verify)(this._challenge, Buffer.from(signedChallenge ?? []), invitation.guestKeypair.publicKey.asBuffer());
               if (isSignatureValid) {
                 this.authenticationPassed = true;
               } else {
@@ -4984,11 +5216,11 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
               break;
             }
             default: {
-              import_log15.log.error("invalid authentication method", {
+              import_log16.log.error("invalid authentication method", {
                 authMethod: invitation.authMethod
               }, {
-                F: __dxlog_file17,
-                L: 188,
+                F: __dxlog_file18,
+                L: 192,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5001,19 +5233,19 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
             import_invitations4.AuthenticationResponse.Status.INVALID_OTP
           ].includes(status)) {
             this._callbacks.onError(new Error(`Authentication failed, with status=${status}`));
-            (0, import_async17.scheduleTask)(this._ctx, () => this.close());
+            (0, import_async18.scheduleTask)(this._ctx, () => this.close());
             return {
               status
             };
           }
-          import_log15.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols11.trace.end({
+          import_log16.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols12.trace.end({
             id: traceId,
             data: {
               status
             }
           }), {
-            F: __dxlog_file17,
-            L: 200,
+            F: __dxlog_file18,
+            L: 204,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5022,29 +5254,29 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
           };
         },
         admit: async (request) => {
-          const traceId = import_keys11.PublicKey.random().toHex();
-          import_log15.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols11.trace.begin({
+          const traceId = import_keys12.PublicKey.random().toHex();
+          import_log16.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols12.trace.begin({
             id: traceId
           }), {
-            F: __dxlog_file17,
-            L: 206,
+            F: __dxlog_file18,
+            L: 210,
             S: this,
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
           try {
             if (isAuthenticationRequired(invitation)) {
-              this._assertInvitationState(import_services13.Invitation.State.AUTHENTICATING);
+              this._assertInvitationState(import_services14.Invitation.State.AUTHENTICATING);
               if (!this.authenticationPassed) {
                 throw new Error("Not authenticated");
               }
             }
             const response = await this._callbacks.admit(request);
-            import_log15.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols11.trace.end({
+            import_log16.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols12.trace.end({
               id: traceId
             }), {
-              F: __dxlog_file17,
-              L: 220,
+              F: __dxlog_file18,
+              L: 224,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5060,48 +5292,48 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      (0, import_log15.log)("host acquire lock", void 0, {
-        F: __dxlog_file17,
-        L: 235,
+      (0, import_log16.log)("host acquire lock", void 0, {
+        F: __dxlog_file18,
+        L: 239,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      (0, import_log15.log)("host lock acquired", void 0, {
-        F: __dxlog_file17,
-        L: 237,
+      (0, import_log16.log)("host lock acquired", void 0, {
+        F: __dxlog_file18,
+        L: 241,
         S: this,
         C: (f, a) => f(...a)
       });
       const lastState = this._requireActiveInvitation().state;
-      this._callbacks.onStateUpdate(import_services13.Invitation.State.CONNECTING);
+      this._callbacks.onStateUpdate(import_services14.Invitation.State.CONNECTING);
       await this.rpc.InvitationHostService.options({
         role: import_invitations4.InvitationOptions.Role.HOST
       });
-      (0, import_log15.log)("options sent", void 0, {
-        F: __dxlog_file17,
-        L: 241,
+      (0, import_log16.log)("options sent", void 0, {
+        F: __dxlog_file18,
+        L: 245,
         S: this,
         C: (f, a) => f(...a)
       });
       await (0, import_context13.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT2
       }));
-      (0, import_log15.log)("options received", void 0, {
-        F: __dxlog_file17,
-        L: 243,
+      (0, import_log16.log)("options received", void 0, {
+        F: __dxlog_file18,
+        L: 247,
         S: this,
         C: (f, a) => f(...a)
       });
       if (this._remoteOptions?.role !== import_invitations4.InvitationOptions.Role.GUEST) {
         this._callbacks.onStateUpdate(lastState);
-        throw new import_protocols11.InvalidInvitationExtensionRoleError(void 0, {
+        throw new import_protocols12.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations4.InvitationOptions.Role.GUEST,
           remoteOptions: this._remoteOptions,
           remotePeerId: context.remotePeerId
         });
       }
-      this._callbacks.onStateUpdate(import_services13.Invitation.State.CONNECTED);
+      this._callbacks.onStateUpdate(import_services14.Invitation.State.CONNECTED);
       this._callbacks.onOpen(this._ctx, context);
     } catch (err) {
       if (this._invitationFlowLock != null) {
@@ -5115,7 +5347,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
   _requireActiveInvitation() {
     const invitation = this._callbacks.activeInvitation;
     if (invitation == null) {
-      (0, import_async17.scheduleTask)(this._ctx, () => this.close());
+      (0, import_async18.scheduleTask)(this._ctx, () => this.close());
       throw new Error("Active invitation not found");
     }
     return invitation;
@@ -5126,8 +5358,8 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
       stateOrMany
     ];
     if (!validStates.includes(invitation.state)) {
-      (0, import_async17.scheduleTask)(this._ctx, () => this.close());
-      throw new import_invariant14.InvariantViolation(`Expected ${stateToString(invitation.state)} to be one of [${validStates.map(stateToString).join(", ")}]`);
+      (0, import_async18.scheduleTask)(this._ctx, () => this.close());
+      throw new import_invariant15.InvariantViolation(`Expected ${stateToString(invitation.state)} to be one of [${validStates.map(stateToString).join(", ")}]`);
     }
   }
   async onClose() {
@@ -5141,25 +5373,115 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock?.release();
       this._invitationFlowLock = null;
-      (0, import_log15.log)("invitation flow lock released", void 0, {
-        F: __dxlog_file17,
-        L: 298,
+      (0, import_log16.log)("invitation flow lock released", void 0, {
+        F: __dxlog_file18,
+        L: 302,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
 };
-var isAuthenticationRequired = (invitation) => invitation.authMethod !== import_services13.Invitation.AuthMethod.NONE;
-var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
+var isAuthenticationRequired = (invitation) => invitation.authMethod !== import_services14.Invitation.AuthMethod.NONE;
+var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-state.ts";
+var createGuardedInvitationState = (ctx, invitation, stream) => {
+  const mutex = new import_async19.Mutex();
+  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, import_services15.Invitation.State.ERROR);
+        currentInvitation = {
+          ...currentInvitation,
+          state: import_services15.Invitation.State.ERROR
+        };
+        stream.next(currentInvitation);
+        stream.error(error);
+        lastActiveLockHolder = lockHolder;
+        return true;
+      }
+      return false;
+    }
+  };
+};
+var logStateUpdate = (invitation, actor, newState) => {
+  if (isNonTerminalState(newState)) {
+    (0, import_log17.log)("invitation state update", {
+      actor: actor?.constructor.name,
+      newState: stateToString(newState),
+      oldState: stateToString(invitation.state)
+    }, {
+      F: __dxlog_file19,
+      L: 89,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  } else {
+    import_log17.log.info("invitation state update", {
+      actor: actor?.constructor.name,
+      newState: stateToString(newState),
+      oldState: stateToString(invitation.state)
+    }, {
+      F: __dxlog_file19,
+      L: 95,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  }
+};
+var isNonTerminalState = (currentState) => {
+  return ![
+    import_services15.Invitation.State.SUCCESS,
+    import_services15.Invitation.State.ERROR,
+    import_services15.Invitation.State.CANCELLED,
+    import_services15.Invitation.State.TIMEOUT,
+    import_services15.Invitation.State.EXPIRED
+  ].includes(currentState);
+};
+var __dxlog_file20 = "/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 import_util11.ComplexSet(import_keys12.PublicKey.hash);
+    this._seenPeers = new import_util11.ComplexSet(import_keys13.PublicKey.hash);
   }
   init(controller) {
-    (0, import_invariant15.invariant)(!this._controller, "Already initialized.", {
-      F: __dxlog_file18,
+    (0, import_invariant16.invariant)(!this._controller, "Already initialized.", {
+      F: __dxlog_file20,
       L: 42,
       S: this,
       A: [
@@ -5170,8 +5492,8 @@ var InvitationTopology = class {
     this._controller = controller;
   }
   update() {
-    (0, import_invariant15.invariant)(this._controller, "Not initialized.", {
-      F: __dxlog_file18,
+    (0, import_invariant16.invariant)(this._controller, "Not initialized.", {
+      F: __dxlog_file20,
       L: 47,
       S: this,
       A: [
@@ -5188,13 +5510,13 @@ var InvitationTopology = class {
       return;
     }
     const firstUnknownPeer = candidates.find((peerId) => !this._seenPeers.has(peerId));
-    this._seenPeers = new import_util11.ComplexSet(import_keys12.PublicKey.hash, allPeers.filter((peerId) => this._seenPeers.has(peerId)));
+    this._seenPeers = new import_util11.ComplexSet(import_keys13.PublicKey.hash, allPeers.filter((peerId) => this._seenPeers.has(peerId)));
     if (firstUnknownPeer != null) {
-      (0, import_log16.log)("invitation connect", {
+      (0, import_log18.log)("invitation connect", {
         ownPeerId,
         remotePeerId: firstUnknownPeer
       }, {
-        F: __dxlog_file18,
+        F: __dxlog_file20,
         L: 69,
         S: this,
         C: (f, a) => f(...a)
@@ -5204,8 +5526,8 @@ var InvitationTopology = class {
     }
   }
   async onOffer(peer) {
-    (0, import_invariant15.invariant)(this._controller, "Not initialized.", {
-      F: __dxlog_file18,
+    (0, import_invariant16.invariant)(this._controller, "Not initialized.", {
+      F: __dxlog_file20,
       L: 76,
       S: this,
       A: [
@@ -5222,20 +5544,21 @@ var InvitationTopology = class {
     return `InvitationTopology(${this._role === import_invitations5.InvitationOptions.Role.GUEST ? "guest" : "host"})`;
   }
 };
-var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
+var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
 var metrics = import_tracing8.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() {
@@ -5249,8 +5572,8 @@ var InvitationsHandler = class {
           try {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             (0, import_invariant12.invariant)(deviceKey, void 0, {
-              F: __dxlog_file19,
-              L: 94,
+              F: __dxlog_file21,
+              L: 100,
               S: this,
               A: [
                 "deviceKey",
@@ -5278,16 +5601,16 @@ var InvitationsHandler = class {
               import_log13.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols9.trace.begin({
                 id: traceId
               }), {
-                F: __dxlog_file19,
-                L: 119,
+                F: __dxlog_file21,
+                L: 125,
                 S: this,
                 C: (f, a) => f(...a)
               });
               (0, import_log13.log)("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file19,
-                L: 120,
+                F: __dxlog_file21,
+                L: 126,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5298,8 +5621,8 @@ var InvitationsHandler = class {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file19,
-                L: 122,
+                F: __dxlog_file21,
+                L: 128,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5308,8 +5631,8 @@ var InvitationsHandler = class {
               import_log13.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols9.trace.end({
                 id: traceId
               }), {
-                F: __dxlog_file19,
-                L: 125,
+                F: __dxlog_file21,
+                L: 131,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5324,8 +5647,8 @@ var InvitationsHandler = class {
                   (0, import_log13.log)("timeout", {
                     ...protocol.toJSON()
                   }, {
-                    F: __dxlog_file19,
-                    L: 135,
+                    F: __dxlog_file21,
+                    L: 141,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -5334,8 +5657,8 @@ var InvitationsHandler = class {
                 if (guardedState.error(extension, err)) {
                   metrics.increment("dxos.invitation.failed");
                   import_log13.log.error("failed", err, {
-                    F: __dxlog_file19,
-                    L: 140,
+                    F: __dxlog_file21,
+                    L: 146,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -5345,8 +5668,8 @@ var InvitationsHandler = class {
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file19,
-                L: 143,
+                F: __dxlog_file21,
+                L: 149,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5359,8 +5682,8 @@ var InvitationsHandler = class {
             (0, import_log13.log)("invalid role", {
               ...err.context
             }, {
-              F: __dxlog_file19,
-              L: 151,
+              F: __dxlog_file21,
+              L: 157,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5372,8 +5695,8 @@ var InvitationsHandler = class {
               (0, import_log13.log)("timeout", {
                 err
               }, {
-                F: __dxlog_file19,
-                L: 157,
+                F: __dxlog_file21,
+                L: 163,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5382,8 +5705,8 @@ var InvitationsHandler = class {
             if (guardedState.error(extension, err)) {
               metrics.increment("dxos.invitation.failed");
               import_log13.log.error("failed", err, {
-                F: __dxlog_file19,
-                L: 162,
+                F: __dxlog_file21,
+                L: 168,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5396,8 +5719,8 @@ var InvitationsHandler = class {
     if (invitation.lifetime && invitation.created) {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
         import_log13.log.warn("invitation has already expired", void 0, {
-          F: __dxlog_file19,
-          L: 173,
+          F: __dxlog_file21,
+          L: 179,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5420,8 +5743,8 @@ var InvitationsHandler = class {
     const { timeout = import_client_protocol5.INVITATION_TIMEOUT } = invitation;
     if (deviceProfile) {
       (0, import_invariant12.invariant)(invitation.kind === import_services11.Invitation.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
-        F: __dxlog_file19,
-        L: 207,
+        F: __dxlog_file21,
+        L: 213,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -5430,7 +5753,7 @@ var InvitationsHandler = class {
       });
     }
     const triedPeersIds = new import_util10.ComplexSet(import_keys10.PublicKey.hash);
-    const guardedState = this._createGuardedState(ctx, invitation, stream);
+    const guardedState = createGuardedInvitationState(ctx, invitation, stream);
     const shouldCancelInvitationFlow = (extension) => {
       const isLockedByAnotherConnection = guardedState.mutex.isLocked() && !extension.hasFlowLock();
       (0, import_log13.log)("should cancel invitation flow", {
@@ -5438,8 +5761,8 @@ var InvitationsHandler = class {
         invitationType: import_services11.Invitation.Type.DELEGATED,
         triedPeers: triedPeersIds.size
       }, {
-        F: __dxlog_file19,
-        L: 215,
+        F: __dxlog_file21,
+        L: 221,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5465,8 +5788,8 @@ var InvitationsHandler = class {
               admitted,
               currentState: guardedState.current.state
             }, {
-              F: __dxlog_file19,
-              L: 243,
+              F: __dxlog_file21,
+              L: 249,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5483,8 +5806,8 @@ var InvitationsHandler = class {
               import_log13.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols9.trace.begin({
                 id: traceId
               }), {
-                F: __dxlog_file19,
-                L: 255,
+                F: __dxlog_file21,
+                L: 261,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5495,8 +5818,8 @@ var InvitationsHandler = class {
               (0, import_log13.log)("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file19,
-                L: 266,
+                F: __dxlog_file21,
+                L: 272,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5504,8 +5827,8 @@ var InvitationsHandler = class {
               (0, import_log13.log)("introduce", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file19,
-                L: 270,
+                F: __dxlog_file21,
+                L: 276,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5517,8 +5840,8 @@ var InvitationsHandler = class {
                 ...protocol.toJSON(),
                 response: introductionResponse
               }, {
-                F: __dxlog_file19,
-                L: 275,
+                F: __dxlog_file21,
+                L: 281,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5538,8 +5861,8 @@ var InvitationsHandler = class {
               (0, import_log13.log)("request admission", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file19,
-                L: 301,
+                F: __dxlog_file21,
+                L: 307,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5550,12 +5873,12 @@ var InvitationsHandler = class {
               (0, import_log13.log)("admitted by host", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file19,
-                L: 312,
+                F: __dxlog_file21,
+                L: 318,
                 S: this,
                 C: (f, a) => f(...a)
               });
-              await guardedState.complete({
+              guardedState.complete({
                 ...guardedState.current,
                 ...result,
                 state: import_services11.Invitation.State.SUCCESS
@@ -5563,8 +5886,8 @@ var InvitationsHandler = class {
               import_log13.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols9.trace.end({
                 id: traceId
               }), {
-                F: __dxlog_file19,
-                L: 318,
+                F: __dxlog_file21,
+                L: 324,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5573,16 +5896,16 @@ var InvitationsHandler = class {
                 (0, import_log13.log)("timeout", {
                   ...protocol.toJSON()
                 }, {
-                  F: __dxlog_file19,
-                  L: 321,
+                  F: __dxlog_file21,
+                  L: 327,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 guardedState.set(extension, import_services11.Invitation.State.TIMEOUT);
               } else {
                 (0, import_log13.log)("auth failed", err, {
-                  F: __dxlog_file19,
-                  L: 324,
+                  F: __dxlog_file21,
+                  L: 330,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -5593,8 +5916,8 @@ var InvitationsHandler = class {
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file19,
-                L: 328,
+                F: __dxlog_file21,
+                L: 334,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5609,16 +5932,16 @@ var InvitationsHandler = class {
             (0, import_log13.log)("timeout", {
               ...protocol.toJSON()
             }, {
-              F: __dxlog_file19,
-              L: 337,
+              F: __dxlog_file21,
+              L: 343,
               S: this,
               C: (f, a) => f(...a)
             });
             guardedState.set(extension, import_services11.Invitation.State.TIMEOUT);
           } else {
             (0, import_log13.log)("auth failed", err, {
-              F: __dxlog_file19,
-              L: 340,
+              F: __dxlog_file21,
+              L: 346,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5628,6 +5951,25 @@ var InvitationsHandler = class {
       });
       return extension;
     };
+    const edgeInvitationHandler = new EdgeInvitationHandler(this._connectionParams?.edgeInvitations, this._edgeClient, {
+      onInvitationSuccess: async (admissionResponse, admissionRequest) => {
+        const result = await protocol.accept(admissionResponse, admissionRequest);
+        (0, import_log13.log)("admitted by edge", {
+          ...protocol.toJSON()
+        }, {
+          F: __dxlog_file21,
+          L: 358,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        guardedState.complete({
+          ...guardedState.current,
+          ...result,
+          state: import_services11.Invitation.State.SUCCESS
+        });
+      }
+    });
+    edgeInvitationHandler.handle(ctx, guardedState, protocol, deviceProfile);
     (0, import_async15.scheduleTask)(ctx, async () => {
       const error = protocol.checkInvitation(invitation);
       if (error) {
@@ -5635,8 +5977,8 @@ var InvitationsHandler = class {
         await ctx.dispose();
       } else {
         (0, import_invariant12.invariant)(invitation.swarmKey, void 0, {
-          F: __dxlog_file19,
-          L: 355,
+          F: __dxlog_file21,
+          L: 370,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -5669,119 +6011,26 @@ var InvitationsHandler = class {
       topic: invitation.swarmKey,
       protocolProvider: (0, import_network_manager.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 import_async15.Mutex();
-    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, import_services11.Invitation.State.ERROR);
-          currentInvitation = {
-            ...currentInvitation,
-            state: import_services11.Invitation.State.ERROR
-          };
-          stream.next(currentInvitation);
-          stream.error(error);
-          lastActiveExtension = extension;
-          return true;
-        }
-        return false;
-      }
-    };
-  }
-  _logStateUpdate(invitation, actor, newState) {
-    if (this._isNotTerminal(newState)) {
-      (0, import_log13.log)("invitation state update", {
-        actor: actor?.constructor.name,
-        newState: stateToString(newState),
-        oldState: stateToString(invitation.state)
-      }, {
-        F: __dxlog_file19,
-        L: 460,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    } else {
-      (0, import_log13.log)("invitation state update", {
-        actor: actor?.constructor.name,
-        newState: stateToString(newState),
-        oldState: stateToString(invitation.state)
-      }, {
-        F: __dxlog_file19,
-        L: 466,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-  _isNotTerminal(currentState) {
-    return ![
-      import_services11.Invitation.State.SUCCESS,
-      import_services11.Invitation.State.ERROR,
-      import_services11.Invitation.State.CANCELLED,
-      import_services11.Invitation.State.TIMEOUT,
-      import_services11.Invitation.State.EXPIRED
-    ].includes(currentState);
-  }
   async _handleGuestOtpAuth(extension, setState, authenticated, options) {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       (0, import_log13.log)("guest waiting for authentication code...", void 0, {
-        F: __dxlog_file19,
-        L: 491,
+        F: __dxlog_file21,
+        L: 422,
         S: this,
         C: (f, a) => f(...a)
       });
       setState(import_services11.Invitation.State.READY_FOR_AUTHENTICATION);
       const authCode = await authenticated.wait(options);
       (0, import_log13.log)("sending authentication request", void 0, {
-        F: __dxlog_file19,
-        L: 495,
+        F: __dxlog_file21,
+        L: 426,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5799,8 +6048,8 @@ var InvitationsHandler = class {
           (0, import_log13.log)("retrying invalid code", {
             attempt
           }, {
-            F: __dxlog_file19,
-            L: 506,
+            F: __dxlog_file21,
+            L: 437,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5817,8 +6066,8 @@ var InvitationsHandler = class {
       throw new Error("challenge missing in the introduction");
     }
     (0, import_log13.log)("sending authentication request", void 0, {
-      F: __dxlog_file19,
-      L: 525,
+      F: __dxlog_file21,
+      L: 456,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5868,8 +6117,8 @@ var InvitationsServiceImpl = class {
     return new import_codec_protobuf10.Stream(({ next, ctx }) => {
       this._invitationsManager.invitationCreated.on(ctx, (invitation) => {
         next({
-          action: import_services14.QueryInvitationsResponse.Action.ADDED,
-          type: import_services14.QueryInvitationsResponse.Type.CREATED,
+          action: import_services16.QueryInvitationsResponse.Action.ADDED,
+          type: import_services16.QueryInvitationsResponse.Type.CREATED,
           invitations: [
             invitation
           ]
@@ -5877,8 +6126,8 @@ var InvitationsServiceImpl = class {
       });
       this._invitationsManager.invitationAccepted.on(ctx, (invitation) => {
         next({
-          action: import_services14.QueryInvitationsResponse.Action.ADDED,
-          type: import_services14.QueryInvitationsResponse.Type.ACCEPTED,
+          action: import_services16.QueryInvitationsResponse.Action.ADDED,
+          type: import_services16.QueryInvitationsResponse.Type.ACCEPTED,
           invitations: [
             invitation
           ]
@@ -5886,8 +6135,8 @@ var InvitationsServiceImpl = class {
       });
       this._invitationsManager.removedCreated.on(ctx, (invitation) => {
         next({
-          action: import_services14.QueryInvitationsResponse.Action.REMOVED,
-          type: import_services14.QueryInvitationsResponse.Type.CREATED,
+          action: import_services16.QueryInvitationsResponse.Action.REMOVED,
+          type: import_services16.QueryInvitationsResponse.Type.CREATED,
           invitations: [
             invitation
           ]
@@ -5895,8 +6144,8 @@ var InvitationsServiceImpl = class {
       });
       this._invitationsManager.removedAccepted.on(ctx, (invitation) => {
         next({
-          action: import_services14.QueryInvitationsResponse.Action.REMOVED,
-          type: import_services14.QueryInvitationsResponse.Type.ACCEPTED,
+          action: import_services16.QueryInvitationsResponse.Action.REMOVED,
+          type: import_services16.QueryInvitationsResponse.Type.ACCEPTED,
           invitations: [
             invitation
           ]
@@ -5904,35 +6153,35 @@ var InvitationsServiceImpl = class {
       });
       this._invitationsManager.saved.on(ctx, (invitation) => {
         next({
-          action: import_services14.QueryInvitationsResponse.Action.SAVED,
-          type: import_services14.QueryInvitationsResponse.Type.CREATED,
+          action: import_services16.QueryInvitationsResponse.Action.SAVED,
+          type: import_services16.QueryInvitationsResponse.Type.CREATED,
           invitations: [
             invitation
           ]
         });
       });
       next({
-        action: import_services14.QueryInvitationsResponse.Action.ADDED,
-        type: import_services14.QueryInvitationsResponse.Type.CREATED,
+        action: import_services16.QueryInvitationsResponse.Action.ADDED,
+        type: import_services16.QueryInvitationsResponse.Type.CREATED,
         invitations: this._invitationsManager.getCreatedInvitations(),
         existing: true
       });
       next({
-        action: import_services14.QueryInvitationsResponse.Action.ADDED,
-        type: import_services14.QueryInvitationsResponse.Type.ACCEPTED,
+        action: import_services16.QueryInvitationsResponse.Action.ADDED,
+        type: import_services16.QueryInvitationsResponse.Type.ACCEPTED,
         invitations: this._invitationsManager.getAcceptedInvitations(),
         existing: true
       });
       this._invitationsManager.onPersistentInvitationsLoaded(ctx, () => {
         next({
-          action: import_services14.QueryInvitationsResponse.Action.LOAD_COMPLETE,
-          type: import_services14.QueryInvitationsResponse.Type.CREATED
+          action: import_services16.QueryInvitationsResponse.Action.LOAD_COMPLETE,
+          type: import_services16.QueryInvitationsResponse.Type.CREATED
         });
       });
     });
   }
 };
-var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
+var __dxlog_file22 = "/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;
@@ -5948,46 +6197,66 @@ var SpaceInvitationProtocol = class {
   }
   checkCanInviteNewMembers() {
     if (this._spaceKey == null) {
-      return new import_protocols12.InvalidInvitationError("No spaceKey was provided for a space invitation.");
+      return new import_protocols13.InvalidInvitationError("No spaceKey was provided for a space invitation.");
     }
     const space = this._spaceManager.spaces.get(this._spaceKey);
     if (space == null) {
-      return new import_protocols12.SpaceNotFoundError(this._spaceKey);
+      return new import_protocols13.SpaceNotFoundError(this._spaceKey);
     }
     if (!space?.inner.spaceState.hasMembershipManagementPermission(this._signingContext.identityKey)) {
-      return new import_protocols12.AuthorizationError("No member management permission.");
+      return new import_protocols13.AuthorizationError("No member management permission.");
     }
     return void 0;
   }
   getInvitationContext() {
+    (0, import_invariant17.invariant)(this._spaceKey, void 0, {
+      F: __dxlog_file22,
+      L: 63,
+      S: this,
+      A: [
+        "this._spaceKey",
+        ""
+      ]
+    });
+    const space = this._spaceManager.spaces.get(this._spaceKey);
+    (0, import_invariant17.invariant)(space, void 0, {
+      F: __dxlog_file22,
+      L: 65,
+      S: this,
+      A: [
+        "space",
+        ""
+      ]
+    });
     return {
-      kind: import_services15.Invitation.Kind.SPACE,
-      spaceKey: this._spaceKey
+      kind: import_services17.Invitation.Kind.SPACE,
+      spaceKey: this._spaceKey,
+      spaceId: space.id
     };
   }
   async admit(invitation, request, guestProfile) {
-    (0, import_invariant16.invariant)(this._spaceKey && request.space, void 0, {
-      F: __dxlog_file20,
-      L: 74,
+    (0, import_invariant17.invariant)(this._spaceKey && request.space, void 0, {
+      F: __dxlog_file22,
+      L: 78,
       S: this,
       A: [
         "this._spaceKey && request.space",
         ""
       ]
     });
-    (0, import_log17.log)("writing guest credentials", {
+    (0, import_log19.log)("writing guest credentials", {
       host: this._signingContext.deviceKey,
       guest: request.space.deviceKey
     }, {
-      F: __dxlog_file20,
-      L: 75,
+      F: __dxlog_file22,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
     const spaceMemberCredential = await this._spaceManager.admitMember({
       spaceKey: this._spaceKey,
       identityKey: request.space.identityKey,
-      role: invitation.role ?? import_credentials18.SpaceMember.Role.ADMIN,
+      role: invitation.role ?? import_credentials19.SpaceMember.Role.ADMIN,
       profile: guestProfile,
       delegationCredentialId: invitation.delegationCredentialId
     });
@@ -6000,9 +6269,9 @@ var SpaceInvitationProtocol = class {
     };
   }
   async delegate(invitation) {
-    (0, import_invariant16.invariant)(this._spaceKey, void 0, {
-      F: __dxlog_file20,
-      L: 95,
+    (0, import_invariant17.invariant)(this._spaceKey, void 0, {
+      F: __dxlog_file22,
+      L: 99,
       S: this,
       A: [
         "this._spaceKey",
@@ -6010,19 +6279,19 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const space = this._spaceManager.spaces.get(this._spaceKey);
-    (0, import_invariant16.invariant)(space, void 0, {
-      F: __dxlog_file20,
-      L: 97,
+    (0, import_invariant17.invariant)(space, void 0, {
+      F: __dxlog_file22,
+      L: 101,
       S: this,
       A: [
         "space",
         ""
       ]
     });
-    if (invitation.authMethod === import_services15.Invitation.AuthMethod.KNOWN_PUBLIC_KEY) {
-      (0, import_invariant16.invariant)(invitation.guestKeypair?.publicKey, void 0, {
-        F: __dxlog_file20,
-        L: 99,
+    if (invitation.authMethod === import_services17.Invitation.AuthMethod.KNOWN_PUBLIC_KEY) {
+      (0, import_invariant17.invariant)(invitation.guestKeypair?.publicKey, void 0, {
+        F: __dxlog_file22,
+        L: 103,
         S: this,
         A: [
           "invitation.guestKeypair?.publicKey",
@@ -6030,27 +6299,27 @@ var SpaceInvitationProtocol = class {
         ]
       });
     }
-    (0, import_log17.log)("writing delegate space invitation", {
+    (0, import_log19.log)("writing delegate space invitation", {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
-      F: __dxlog_file20,
-      L: 102,
+      F: __dxlog_file22,
+      L: 106,
       S: this,
       C: (f, a) => f(...a)
     });
-    const credential = await (0, import_credentials17.createDelegatedSpaceInvitationCredential)(this._signingContext.credentialSigner, space.key, {
+    const credential = await (0, import_credentials18.createDelegatedSpaceInvitationCredential)(this._signingContext.credentialSigner, space.key, {
       invitationId: invitation.invitationId,
       authMethod: invitation.authMethod,
       swarmKey: invitation.swarmKey,
-      role: invitation.role ?? import_credentials18.SpaceMember.Role.ADMIN,
+      role: invitation.role ?? import_credentials19.SpaceMember.Role.ADMIN,
       expiresOn: invitation.lifetime ? new Date((invitation.created?.getTime() ?? Date.now()) + invitation.lifetime) : void 0,
       multiUse: invitation.multiUse ?? false,
-      guestKey: invitation.authMethod === import_services15.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
+      guestKey: invitation.authMethod === import_services17.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
     });
-    (0, import_invariant16.invariant)(credential.credential, void 0, {
-      F: __dxlog_file20,
-      L: 122,
+    (0, import_invariant17.invariant)(credential.credential, void 0, {
+      F: __dxlog_file22,
+      L: 126,
       S: this,
       A: [
         "credential.credential",
@@ -6063,18 +6332,18 @@ var SpaceInvitationProtocol = class {
     return credential.credential.credential.id;
   }
   async cancelDelegation(invitation) {
-    (0, import_invariant16.invariant)(this._spaceKey, void 0, {
-      F: __dxlog_file20,
-      L: 128,
+    (0, import_invariant17.invariant)(this._spaceKey, void 0, {
+      F: __dxlog_file22,
+      L: 132,
       S: this,
       A: [
         "this._spaceKey",
         ""
       ]
     });
-    (0, import_invariant16.invariant)(invitation.type === import_services15.Invitation.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
-      F: __dxlog_file20,
-      L: 129,
+    (0, import_invariant17.invariant)(invitation.type === import_services17.Invitation.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
+      F: __dxlog_file22,
+      L: 133,
       S: this,
       A: [
         "invitation.type === Invitation.Type.DELEGATED && invitation.delegationCredentialId",
@@ -6082,28 +6351,28 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const space = this._spaceManager.spaces.get(this._spaceKey);
-    (0, import_invariant16.invariant)(space, void 0, {
-      F: __dxlog_file20,
-      L: 131,
+    (0, import_invariant17.invariant)(space, void 0, {
+      F: __dxlog_file22,
+      L: 135,
       S: this,
       A: [
         "space",
         ""
       ]
     });
-    (0, import_log17.log)("cancelling delegated space invitation", {
+    (0, import_log19.log)("cancelling delegated space invitation", {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
-      F: __dxlog_file20,
-      L: 133,
+      F: __dxlog_file22,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
-    const credential = await (0, import_credentials17.createCancelDelegatedSpaceInvitationCredential)(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
-    (0, import_invariant16.invariant)(credential.credential, void 0, {
-      F: __dxlog_file20,
-      L: 140,
+    const credential = await (0, import_credentials18.createCancelDelegatedSpaceInvitationCredential)(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
+    (0, import_invariant17.invariant)(credential.credential, void 0, {
+      F: __dxlog_file22,
+      L: 144,
       S: this,
       A: [
         "credential.credential",
@@ -6116,10 +6385,10 @@ var SpaceInvitationProtocol = class {
   }
   checkInvitation(invitation) {
     if (invitation.spaceKey == null) {
-      return new import_protocols12.InvalidInvitationError("No spaceKey was provided for a space invitation.");
+      return new import_protocols13.InvalidInvitationError("No spaceKey was provided for a space invitation.");
     }
     if (this._spaceManager.spaces.has(invitation.spaceKey)) {
-      return new import_protocols12.AlreadyJoinedError("Already joined space.");
+      return new import_protocols13.AlreadyJoinedError("Already joined space.");
     }
   }
   createIntroduction() {
@@ -6140,9 +6409,9 @@ var SpaceInvitationProtocol = class {
     };
   }
   async accept(response) {
-    (0, import_invariant16.invariant)(response.space, void 0, {
-      F: __dxlog_file20,
-      L: 175,
+    (0, import_invariant17.invariant)(response.space, void 0, {
+      F: __dxlog_file22,
+      L: 179,
       S: this,
       A: [
         "response.space",
@@ -6150,19 +6419,19 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const { credential, controlTimeframe, dataTimeframe } = response.space;
-    const assertion = (0, import_credentials17.getCredentialAssertion)(credential);
-    (0, import_invariant16.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
-      F: __dxlog_file20,
-      L: 178,
+    const assertion = (0, import_credentials18.getCredentialAssertion)(credential);
+    (0, import_invariant17.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
+      F: __dxlog_file22,
+      L: 182,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
         "'Invalid credential'"
       ]
     });
-    (0, import_invariant16.invariant)(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
-      F: __dxlog_file20,
-      L: 179,
+    (0, import_invariant17.invariant)(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
+      F: __dxlog_file22,
+      L: 183,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
@@ -6170,7 +6439,7 @@ var SpaceInvitationProtocol = class {
       ]
     });
     if (this._spaceManager.spaces.has(assertion.spaceKey)) {
-      throw new import_protocols12.AlreadyJoinedError("Already joined space.");
+      throw new import_protocols13.AlreadyJoinedError("Already joined space.");
     }
     await this._spaceManager.acceptSpace({
       spaceKey: assertion.spaceKey,
@@ -6184,7 +6453,7 @@ var SpaceInvitationProtocol = class {
     };
   }
 };
-var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
+var __dxlog_file23 = "/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;
@@ -6192,12 +6461,12 @@ var InvitationsManager = class {
     this._metadataStore = _metadataStore;
     this._createInvitations = /* @__PURE__ */ new Map();
     this._acceptInvitations = /* @__PURE__ */ new Map();
-    this.invitationCreated = new import_async18.Event();
-    this.invitationAccepted = new import_async18.Event();
-    this.removedCreated = new import_async18.Event();
-    this.removedAccepted = new import_async18.Event();
-    this.saved = new import_async18.Event();
-    this._persistentInvitationsLoadedEvent = new import_async18.Event();
+    this.invitationCreated = new import_async20.Event();
+    this.invitationAccepted = new import_async20.Event();
+    this.removedCreated = new import_async20.Event();
+    this.removedAccepted = new import_async20.Event();
+    this.saved = new import_async20.Event();
+    this._persistentInvitationsLoadedEvent = new import_async20.Event();
     this._persistentInvitationsLoaded = false;
   }
   async createInvitation(options) {
@@ -6226,8 +6495,8 @@ var InvitationsManager = class {
     try {
       await this._persistIfRequired(handler, stream, invitation);
     } catch (err) {
-      import_log18.log.catch(err, void 0, {
-        F: __dxlog_file21,
+      import_log20.log.catch(err, void 0, {
+        F: __dxlog_file23,
         L: 82,
         S: this,
         C: (f, a) => f(...a)
@@ -6249,8 +6518,8 @@ var InvitationsManager = class {
       const persistentInvitations = this._metadataStore.getInvitations();
       const freshInvitations = persistentInvitations.filter((invitation) => !(0, import_echo_pipeline4.hasInvitationExpired)(invitation));
       const loadTasks = freshInvitations.map((persistentInvitation) => {
-        (0, import_invariant17.invariant)(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
-          F: __dxlog_file21,
+        (0, import_invariant18.invariant)(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
+          F: __dxlog_file23,
           L: 103,
           S: this,
           A: [
@@ -6268,8 +6537,8 @@ var InvitationsManager = class {
         invitations: cInvitations.map((invitation) => invitation.get())
       };
     } catch (err) {
-      import_log18.log.catch(err, void 0, {
-        F: __dxlog_file21,
+      import_log20.log.catch(err, void 0, {
+        F: __dxlog_file23,
         L: 110,
         S: this,
         C: (f, a) => f(...a)
@@ -6300,14 +6569,14 @@ var InvitationsManager = class {
     return invitation;
   }
   async authenticate({ invitationId, authCode }) {
-    (0, import_log18.log)("authenticating...", void 0, {
-      F: __dxlog_file21,
+    (0, import_log20.log)("authenticating...", void 0, {
+      F: __dxlog_file23,
       L: 140,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant17.invariant)(invitationId, void 0, {
-      F: __dxlog_file21,
+    (0, import_invariant18.invariant)(invitationId, void 0, {
+      F: __dxlog_file23,
       L: 141,
       S: this,
       A: [
@@ -6317,10 +6586,10 @@ var InvitationsManager = class {
     });
     const observable = this._acceptInvitations.get(invitationId);
     if (!observable) {
-      import_log18.log.warn("invalid invitation", {
+      import_log20.log.warn("invalid invitation", {
         invitationId
       }, {
-        F: __dxlog_file21,
+        F: __dxlog_file23,
         L: 144,
         S: this,
         C: (f, a) => f(...a)
@@ -6330,16 +6599,16 @@ var InvitationsManager = class {
     }
   }
   async cancelInvitation({ invitationId }) {
-    (0, import_log18.log)("cancelInvitation...", {
+    (0, import_log20.log)("cancelInvitation...", {
       invitationId
     }, {
-      F: __dxlog_file21,
+      F: __dxlog_file23,
       L: 151,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant17.invariant)(invitationId, void 0, {
-      F: __dxlog_file21,
+    (0, import_invariant18.invariant)(invitationId, void 0, {
+      F: __dxlog_file23,
       L: 152,
       S: this,
       A: [
@@ -6352,7 +6621,7 @@ var InvitationsManager = class {
       if (created.get().persistent) {
         await this._metadataStore.removeInvitation(invitationId);
       }
-      if (created.get().type === import_services16.Invitation.Type.DELEGATED) {
+      if (created.get().type === import_services18.Invitation.Type.DELEGATED) {
         const handler = this._getHandler(created.get());
         await handler.cancelDelegation(created.get());
       }
@@ -6386,8 +6655,8 @@ var InvitationsManager = class {
     }
   }
   _createInvitation(protocol, options) {
-    const { invitationId = import_keys13.PublicKey.random().toHex(), type = import_services16.Invitation.Type.INTERACTIVE, authMethod = import_services16.Invitation.AuthMethod.SHARED_SECRET, state = import_services16.Invitation.State.INIT, timeout = import_client_protocol6.INVITATION_TIMEOUT, swarmKey = import_keys13.PublicKey.random(), persistent = options?.authMethod !== import_services16.Invitation.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = import_credentials20.SpaceMember.Role.ADMIN, lifetime = 86400, multiUse = false } = options ?? {};
-    const authCode = options?.authCode ?? (authMethod === import_services16.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials19.generatePasscode)(import_client_protocol6.AUTHENTICATION_CODE_LENGTH) : void 0);
+    const { invitationId = import_keys14.PublicKey.random().toHex(), type = import_services18.Invitation.Type.INTERACTIVE, authMethod = import_services18.Invitation.AuthMethod.SHARED_SECRET, state = import_services18.Invitation.State.INIT, timeout = import_client_protocol6.INVITATION_TIMEOUT, swarmKey = import_keys14.PublicKey.random(), persistent = options?.authMethod !== import_services18.Invitation.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = import_credentials21.SpaceMember.Role.ADMIN, lifetime = 86400, multiUse = false } = options ?? {};
+    const authCode = options?.authCode ?? (authMethod === import_services18.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials20.generatePasscode)(import_client_protocol6.AUTHENTICATION_CODE_LENGTH) : void 0);
     return {
       invitationId,
       type,
@@ -6396,8 +6665,8 @@ var InvitationsManager = class {
       swarmKey,
       authCode,
       timeout,
-      persistent: persistent && type !== import_services16.Invitation.Type.DELEGATED,
-      guestKeypair: guestKeypair ?? (authMethod === import_services16.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
+      persistent: persistent && type !== import_services18.Invitation.Type.DELEGATED,
+      guestKeypair: guestKeypair ?? (authMethod === import_services18.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
       created,
       lifetime,
       role,
@@ -6407,21 +6676,21 @@ var InvitationsManager = class {
     };
   }
   _createObservableInvitation(handler, invitation) {
-    const stream = new import_async18.PushStream();
+    const stream = new import_async20.PushStream();
     const ctx = new import_context14.Context({
       onError: (err) => {
         stream.error(err);
         void ctx.dispose();
       }
     }, {
-      F: __dxlog_file21,
+      F: __dxlog_file23,
       L: 234
     });
     ctx.onDispose(() => {
-      (0, import_log18.log)("complete", {
+      (0, import_log20.log)("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file21,
+        F: __dxlog_file23,
         L: 241,
         S: this,
         C: (f, a) => f(...a)
@@ -6434,7 +6703,7 @@ var InvitationsManager = class {
       onCancel: async () => {
         stream.next({
           ...invitation,
-          state: import_services16.Invitation.State.CANCELLED
+          state: import_services18.Invitation.State.CANCELLED
         });
         await ctx.dispose();
       }
@@ -6446,46 +6715,46 @@ var InvitationsManager = class {
     };
   }
   _createObservableAcceptingInvitation(handler, initialState) {
-    const otpEnteredTrigger = new import_async18.Trigger();
-    const stream = new import_async18.PushStream();
+    const otpEnteredTrigger = new import_async20.Trigger();
+    const stream = new import_async20.PushStream();
     const ctx = new import_context14.Context({
       onError: (err) => {
-        if (err instanceof import_async18.TimeoutError) {
-          (0, import_log18.log)("timeout", {
+        if (err instanceof import_async20.TimeoutError) {
+          (0, import_log20.log)("timeout", {
             ...handler.toJSON()
           }, {
-            F: __dxlog_file21,
+            F: __dxlog_file23,
             L: 261,
             S: this,
             C: (f, a) => f(...a)
           });
           stream.next({
             ...initialState,
-            state: import_services16.Invitation.State.TIMEOUT
+            state: import_services18.Invitation.State.TIMEOUT
           });
         } else {
-          import_log18.log.warn("auth failed", err, {
-            F: __dxlog_file21,
+          import_log20.log.warn("auth failed", err, {
+            F: __dxlog_file23,
             L: 264,
             S: this,
             C: (f, a) => f(...a)
           });
           stream.next({
             ...initialState,
-            state: import_services16.Invitation.State.ERROR
+            state: import_services18.Invitation.State.ERROR
           });
         }
         void ctx.dispose();
       }
     }, {
-      F: __dxlog_file21,
+      F: __dxlog_file23,
       L: 258
     });
     ctx.onDispose(() => {
-      (0, import_log18.log)("complete", {
+      (0, import_log20.log)("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file21,
+        F: __dxlog_file23,
         L: 271,
         S: this,
         C: (f, a) => f(...a)
@@ -6498,7 +6767,7 @@ var InvitationsManager = class {
       onCancel: async () => {
         stream.next({
           ...initialState,
-          state: import_services16.Invitation.State.CANCELLED
+          state: import_services18.Invitation.State.CANCELLED
         });
         await ctx.dispose();
       },
@@ -6514,7 +6783,7 @@ var InvitationsManager = class {
     };
   }
   async _persistIfRequired(handler, changeStream, invitation) {
-    if (invitation.type === import_services16.Invitation.Type.DELEGATED && invitation.delegationCredentialId == null) {
+    if (invitation.type === import_services18.Invitation.Type.DELEGATED && invitation.delegationCredentialId == null) {
       const delegationCredentialId = await handler.delegate(invitation);
       changeStream.next({
         ...invitation,
@@ -6529,8 +6798,8 @@ var InvitationsManager = class {
     try {
       await this._metadataStore.removeInvitation(invitation.invitationId);
     } catch (err) {
-      import_log18.log.catch(err, void 0, {
-        F: __dxlog_file21,
+      import_log20.log.catch(err, void 0, {
+        F: __dxlog_file23,
         L: 307,
         S: this,
         C: (f, a) => f(...a)
@@ -6549,7 +6818,7 @@ function _ts_decorate7(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_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/node.ts";
+var __dxlog_file24 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/node.ts";
 var Lock = class {
   constructor({ lockKey: lockPath, onAcquire, onRelease }) {
     this._lockPath = lockPath;
@@ -6560,16 +6829,16 @@ var Lock = class {
     return this._lockPath;
   }
   async acquire() {
-    (0, import_log19.log)("acquiring lock...", void 0, {
-      F: __dxlog_file22,
+    (0, import_log21.log)("acquiring lock...", void 0, {
+      F: __dxlog_file24,
       L: 32,
       S: this,
       C: (f, a) => f(...a)
     });
     this._fileHandle = await import_lock_file.LockFile.acquire(this._lockPath);
     await this._onAcquire?.();
-    (0, import_log19.log)("acquired lock", void 0, {
-      F: __dxlog_file22,
+    (0, import_log21.log)("acquired lock", void 0, {
+      F: __dxlog_file24,
       L: 37,
       S: this,
       C: (f, a) => f(...a)
@@ -6577,8 +6846,8 @@ var Lock = class {
   }
   async release() {
     await this._onRelease?.();
-    (0, import_invariant18.invariant)(this._fileHandle, "Lock is not acquired", {
-      F: __dxlog_file22,
+    (0, import_invariant19.invariant)(this._fileHandle, "Lock is not acquired", {
+      F: __dxlog_file24,
       L: 42,
       S: this,
       A: [
@@ -6590,7 +6859,7 @@ var Lock = class {
   }
 };
 _ts_decorate7([
-  import_log19.logInfo
+  import_log21.logInfo
 ], Lock.prototype, "lockKey", null);
 var isLocked = (lockPath) => import_lock_file.LockFile.isLocked(lockPath);
 function _ts_decorate8(decorators, target, key, desc) {
@@ -6732,7 +7001,7 @@ function _using_ctx3() {
     }
   };
 }
-var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var __dxlog_file25 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends import_context15.Resource {
   constructor(storage, level, networkManager, signalManager, _edgeConnection, _edgeHttpClient, _runtimeParams, _edgeFeatures) {
     super();
@@ -6744,12 +7013,12 @@ var ServiceContext = class extends import_context15.Resource {
     this._edgeHttpClient = _edgeHttpClient;
     this._runtimeParams = _runtimeParams;
     this._edgeFeatures = _edgeFeatures;
-    this._edgeIdentityUpdateMutex = new import_async19.Mutex();
-    this.initialized = new import_async19.Trigger();
+    this._edgeIdentityUpdateMutex = new import_async21.Mutex();
+    this.initialized = new import_async21.Trigger();
     this._meshReplicator = void 0;
     this._echoEdgeReplicator = void 0;
     this._handlerFactories = /* @__PURE__ */ new Map();
-    this._instanceId = import_keys14.PublicKey.random().toHex();
+    this._instanceId = import_keys15.PublicKey.random().toHex();
     this.metadataStore = new import_echo_pipeline5.MetadataStore(storage.createDirectory("metadata"));
     this.blobStore = new import_teleport_extension_object_sync.BlobStore(storage.createDirectory("blobs"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
@@ -6778,58 +7047,15 @@ var ServiceContext = class extends import_context15.Resource {
       devicePresenceOfflineTimeout: this._runtimeParams?.devicePresenceOfflineTimeout,
       devicePresenceAnnounceInterval: this._runtimeParams?.devicePresenceAnnounceInterval,
       edgeConnection: this._edgeConnection,
-      edgeFeatures: this._edgeFeatures,
-      callbacks: {
-        onIdentityConstruction: (identity) => {
-          if (this._edgeConnection) {
-            (0, import_async19.scheduleMicroTask)(this._ctx, async () => {
-              try {
-                var _usingCtx = _using_ctx3();
-                const _ = _usingCtx.u(await this._edgeIdentityUpdateMutex.acquire());
-                import_log20.log.info("Setting identity on edge connection", {
-                  identity: identity.identityKey.toHex(),
-                  oldIdentity: this._edgeConnection.identityKey,
-                  swarms: this.networkManager.topics
-                }, {
-                  F: __dxlog_file23,
-                  L: 147,
-                  S: this,
-                  C: (f, a) => f(...a)
-                });
-                await (0, import_debug6.warnAfterTimeout)(1e4, "Waiting for identity to be ready for edge connection", async () => {
-                  await identity.ready();
-                });
-                (0, import_invariant19.invariant)(identity.deviceCredentialChain, void 0, {
-                  F: __dxlog_file23,
-                  L: 157,
-                  S: this,
-                  A: [
-                    "identity.deviceCredentialChain",
-                    ""
-                  ]
-                });
-                this._edgeConnection.setIdentity(await (0, import_edge_client2.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 import_echo_pipeline5.EchoHost({
       kv: this.level
     });
     this._meshReplicator = new import_echo_pipeline5.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(import_services17.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug6.failUndefined)(), this._acceptIdentity.bind(this)));
+    this._handlerFactories.set(import_services19.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug6.failUndefined)(), this._acceptIdentity.bind(this)));
     if (!this._runtimeParams?.disableP2pReplication) {
       this._meshReplicator = new import_echo_pipeline5.MeshEchoReplicator();
     }
@@ -6841,24 +7067,23 @@ var ServiceContext = class extends import_context15.Resource {
   }
   async _open(ctx) {
     await this._checkStorageVersion();
-    (0, import_log20.log)("opening...", void 0, {
-      F: __dxlog_file23,
-      L: 217,
+    (0, import_log22.log)("opening...", void 0, {
+      F: __dxlog_file25,
+      L: 184,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log20.log.trace("dxos.sdk.service-context.open", import_protocols13.trace.begin({
+    import_log22.log.trace("dxos.sdk.service-context.open", import_protocols14.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file23,
-      L: 218,
+      F: __dxlog_file25,
+      L: 185,
       S: this,
       C: (f, a) => f(...a)
     });
-    if (this._edgeConnection) {
-      this._edgeConnection.setIdentity(await (0, import_edge_client2.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);
@@ -6870,38 +7095,38 @@ var ServiceContext = class extends import_context15.Resource {
     }
     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();
-    (0, import_log20.log)("loaded persistent invitations", {
+    (0, import_log22.log)("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
-      F: __dxlog_file23,
-      L: 245,
+      F: __dxlog_file25,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log20.log.trace("dxos.sdk.service-context.open", import_protocols13.trace.end({
+    import_log22.log.trace("dxos.sdk.service-context.open", import_protocols14.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file23,
-      L: 247,
+      F: __dxlog_file25,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log20.log)("opened", void 0, {
-      F: __dxlog_file23,
-      L: 248,
+    (0, import_log22.log)("opened", void 0, {
+      F: __dxlog_file25,
+      L: 216,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close(ctx) {
-    (0, import_log20.log)("closing...", void 0, {
-      F: __dxlog_file23,
-      L: 252,
+    (0, import_log22.log)("closing...", void 0, {
+      F: __dxlog_file25,
+      L: 220,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6917,26 +7142,28 @@ var ServiceContext = class extends import_context15.Resource {
     await this.networkManager.close();
     await this.signalManager.close();
     await this._edgeConnection?.close();
-    (0, import_log20.log)("closed", void 0, {
-      F: __dxlog_file23,
-      L: 267,
+    (0, import_log22.log)("closed", void 0, {
+      F: __dxlog_file25,
+      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 import_context15.Context(void 0, {
-      F: __dxlog_file23,
-      L: 272
+      F: __dxlog_file25,
+      L: 242
     }));
     return identity;
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    (0, import_invariant19.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file23,
-      L: 278,
+    (0, import_invariant20.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
+      F: __dxlog_file25,
+      L: 248,
       S: this,
       A: [
         "factory",
@@ -6954,24 +7181,29 @@ var ServiceContext = class extends import_context15.Resource {
     }
   }
   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 import_context15.Context(void 0, {
-      F: __dxlog_file23,
-      L: 294
+      F: __dxlog_file25,
+      L: 267
     }));
     return identity;
   }
   async _checkStorageVersion() {
     await this.metadataStore.load();
-    if (this.metadataStore.version !== import_protocols13.STORAGE_VERSION) {
-      throw new import_protocols13.InvalidStorageVersionError(import_protocols13.STORAGE_VERSION, this.metadataStore.version);
+    if (this.metadataStore.version !== import_protocols14.STORAGE_VERSION) {
+      throw new import_protocols14.InvalidStorageVersionError(import_protocols14.STORAGE_VERSION, this.metadataStore.version);
     }
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    (0, import_log20.log)("initializing spaces...", void 0, {
-      F: __dxlog_file23,
-      L: 309,
+    (0, import_log22.log)("initializing spaces...", void 0, {
+      F: __dxlog_file25,
+      L: 282,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7005,10 +7237,10 @@ var ServiceContext = class extends import_context15.Resource {
       edgeFeatures: this._edgeFeatures
     });
     await this.dataSpaceManager.open();
-    this._handlerFactories.set(import_services17.Invitation.Kind.SPACE, (invitation) => {
-      (0, import_invariant19.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file23,
-        L: 339,
+    this._handlerFactories.set(import_services19.Invitation.Kind.SPACE, (invitation) => {
+      (0, import_invariant20.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+        F: __dxlog_file25,
+        L: 312,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -7020,7 +7252,7 @@ var ServiceContext = class extends import_context15.Resource {
     this.initialized.wake();
     this._deviceSpaceSync = {
       processCredential: async (credential) => {
-        const assertion = (0, import_credentials21.getCredentialAssertion)(credential);
+        const assertion = (0, import_credentials22.getCredentialAssertion)(credential);
         if (assertion["@type"] !== "dxos.halo.credentials.SpaceMember") {
           return;
         }
@@ -7028,33 +7260,33 @@ var ServiceContext = class extends import_context15.Resource {
           return;
         }
         if (!this.dataSpaceManager) {
-          (0, import_log20.log)("dataSpaceManager not initialized yet, ignoring space admission", {
+          (0, import_log22.log)("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file23,
-            L: 355,
+            F: __dxlog_file25,
+            L: 328,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          (0, import_log20.log)("space already exists, ignoring space admission", {
+          (0, import_log22.log)("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file23,
-            L: 359,
+            F: __dxlog_file25,
+            L: 332,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         try {
-          (0, import_log20.log)("accepting space recorded in halo", {
+          (0, import_log22.log)("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file23,
-            L: 364,
+            F: __dxlog_file25,
+            L: 337,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7063,9 +7295,9 @@ var ServiceContext = class extends import_context15.Resource {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          import_log20.log.catch(err, void 0, {
-            F: __dxlog_file23,
-            L: 370,
+          import_log22.log.catch(err, void 0, {
+            F: __dxlog_file25,
+            L: 343,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7074,6 +7306,57 @@ var ServiceContext = class extends import_context15.Resource {
     };
     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) {
+        import_log22.log.info("Setting identity on edge connection", {
+          identity: identity.identityKey.toHex(),
+          swarms: this.networkManager.topics
+        }, {
+          F: __dxlog_file25,
+          L: 357,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        if (params?.deviceCredential) {
+          edgeIdentity = await (0, import_edge_client2.createChainEdgeIdentity)(identity.signer, identity.identityKey, identity.deviceKey, {
+            credential: params.deviceCredential
+          }, []);
+        } else {
+          await (0, import_debug6.warnAfterTimeout)(1e4, "Waiting for identity to be ready for edge connection", async () => {
+            await identity.ready();
+          });
+          (0, import_invariant20.invariant)(identity.deviceCredentialChain, void 0, {
+            F: __dxlog_file25,
+            L: 375,
+            S: this,
+            A: [
+              "identity.deviceCredentialChain",
+              ""
+            ]
+          });
+          edgeIdentity = await (0, import_edge_client2.createChainEdgeIdentity)(identity.signer, identity.identityKey, identity.deviceKey, identity.deviceCredentialChain, []);
+        }
+      } else {
+        edgeIdentity = await (0, import_edge_client2.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([
   import_tracing10.trace.span()
@@ -7119,16 +7402,16 @@ var StorageDriver = import_config2.Runtime.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
   const { persistent = false, keyStore, dataStore } = config ?? {};
   if (persistent && dataStore === StorageDriver.RAM) {
-    throw new import_protocols14.InvalidConfigError("RAM storage cannot be used in persistent mode.");
+    throw new import_protocols15.InvalidConfigError("RAM storage cannot be used in persistent mode.");
   }
   if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
-    throw new import_protocols14.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
+    throw new import_protocols15.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
   }
   if (persistent && keyStore === StorageDriver.RAM) {
-    throw new import_protocols14.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
+    throw new import_protocols15.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
   }
   if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
-    throw new import_protocols14.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+    throw new import_protocols15.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
   }
   return {
     storage: (0, import_random_access_storage.createStorage)({
@@ -7159,12 +7442,12 @@ var toStorageType = (type) => {
 };
 var createLevel = async (config) => {
   const persistent = isPersistent(config);
-  const storagePath = persistent ? import_node_path.default.join(getRootPath(config), "level") : `/tmp/dxos-${import_keys15.PublicKey.random().toHex()}`;
+  const storagePath = persistent ? import_node_path.default.join(getRootPath(config), "level") : `/tmp/dxos-${import_keys16.PublicKey.random().toHex()}`;
   const level = (0, import_kv_store.createLevel)(storagePath);
   await level.open();
   return level;
 };
-var __dxlog_file24 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.ts";
+var __dxlog_file26 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.ts";
 var encodeProfileArchive = (profile) => import_automerge_repo.cbor.encode(profile);
 var decodeProfileArchive = (data) => import_automerge_repo.cbor.decode(data);
 var exportProfileData = async ({ storage, level }) => {
@@ -7177,10 +7460,10 @@ var exportProfileData = async ({ storage, level }) => {
   {
     const directory = await storage.createDirectory();
     const files = await directory.list();
-    import_log21.log.info("begin exporting files", {
+    import_log23.log.info("begin exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file24,
+      F: __dxlog_file26,
       L: 30,
       S: void 0,
       C: (f, a) => f(...a)
@@ -7190,23 +7473,23 @@ var exportProfileData = async ({ storage, level }) => {
       const { size } = await file.stat();
       const data = await file.read(0, size);
       archive.storage.push({
-        type: import_protocols15.ProfileArchiveEntryType.FILE,
+        type: import_protocols16.ProfileArchiveEntryType.FILE,
         key: filename,
         value: data
       });
     }
-    import_log21.log.info("done exporting files", {
+    import_log23.log.info("done exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file24,
+      F: __dxlog_file26,
       L: 41,
       S: void 0,
       C: (f, a) => f(...a)
     });
   }
   {
-    import_log21.log.info("begin exporting kv pairs", void 0, {
-      F: __dxlog_file24,
+    import_log23.log.info("begin exporting kv pairs", void 0, {
+      F: __dxlog_file26,
       L: 45,
       S: void 0,
       C: (f, a) => f(...a)
@@ -7218,16 +7501,16 @@ var exportProfileData = async ({ storage, level }) => {
     let count = 0;
     for await (const [key, value] of iter) {
       archive.storage.push({
-        type: import_protocols15.ProfileArchiveEntryType.KEY_VALUE,
+        type: import_protocols16.ProfileArchiveEntryType.KEY_VALUE,
         key,
         value
       });
       count++;
     }
-    import_log21.log.info("done exporting kv pairs", {
+    import_log23.log.info("done exporting kv pairs", {
       count
     }, {
-      F: __dxlog_file24,
+      F: __dxlog_file26,
       L: 56,
       S: void 0,
       C: (f, a) => f(...a)
@@ -7240,10 +7523,10 @@ var importProfileData = async ({ storage, level }, archive) => {
   let count = 0;
   for (const entry2 of archive.storage) {
     switch (entry2.type) {
-      case import_protocols15.ProfileArchiveEntryType.FILE: {
+      case import_protocols16.ProfileArchiveEntryType.FILE: {
         const directory = await storage.createDirectory();
-        (0, import_invariant20.invariant)(typeof entry2.key === "string", "Invalid key type", {
-          F: __dxlog_file24,
+        (0, import_invariant21.invariant)(typeof entry2.key === "string", "Invalid key type", {
+          F: __dxlog_file26,
           L: 79,
           S: void 0,
           A: [
@@ -7252,8 +7535,8 @@ var importProfileData = async ({ storage, level }, archive) => {
           ]
         });
         const file = await directory.getOrCreateFile(entry2.key);
-        (0, import_invariant20.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file24,
+        (0, import_invariant21.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
+          F: __dxlog_file26,
           L: 81,
           S: void 0,
           A: [
@@ -7265,9 +7548,9 @@ var importProfileData = async ({ storage, level }, archive) => {
         await file.close();
         break;
       }
-      case import_protocols15.ProfileArchiveEntryType.KEY_VALUE: {
-        (0, import_invariant20.invariant)(entry2.key instanceof Uint8Array, "Invalid key type", {
-          F: __dxlog_file24,
+      case import_protocols16.ProfileArchiveEntryType.KEY_VALUE: {
+        (0, import_invariant21.invariant)(entry2.key instanceof Uint8Array, "Invalid key type", {
+          F: __dxlog_file26,
           L: 87,
           S: void 0,
           A: [
@@ -7275,8 +7558,8 @@ var importProfileData = async ({ storage, level }, archive) => {
             "'Invalid key type'"
           ]
         });
-        (0, import_invariant20.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file24,
+        (0, import_invariant21.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
+          F: __dxlog_file26,
           L: 88,
           S: void 0,
           A: [
@@ -7296,27 +7579,27 @@ var importProfileData = async ({ storage, level }, archive) => {
     if (++count % 1e3 === 0) {
       await batch.write();
       batch = level.batch();
-      import_log21.log.info("importing", {
+      import_log23.log.info("importing", {
         count,
         total: archive.storage.length,
         progress: `${(count / archive.storage.length * 100).toFixed()}%`
       }, {
-        F: __dxlog_file24,
+        F: __dxlog_file26,
         L: 101,
         S: void 0,
         C: (f, a) => f(...a)
       });
     }
   }
-  import_log21.log.info("committing changes..", void 0, {
-    F: __dxlog_file24,
+  import_log23.log.info("committing changes..", void 0, {
+    F: __dxlog_file26,
     L: 109,
     S: void 0,
     C: (f, a) => f(...a)
   });
   await batch.write();
 };
-var __dxlog_file25 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+var __dxlog_file27 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
@@ -7333,8 +7616,8 @@ var DevicesServiceImpl = class {
             devices: []
           });
         } else {
-          (0, import_invariant22.invariant)(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file25,
+          (0, import_invariant23.invariant)(this._identityManager.identity?.presence, "presence not present", {
+            F: __dxlog_file27,
             L: 32,
             S: this,
             A: [
@@ -7349,9 +7632,9 @@ var DevicesServiceImpl = class {
               const peerState = peers.find((peer) => peer.identityKey.equals(key));
               return {
                 deviceKey: key,
-                kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services19.DeviceKind.CURRENT : import_services19.DeviceKind.TRUSTED,
+                kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services21.DeviceKind.CURRENT : import_services21.DeviceKind.TRUSTED,
                 profile,
-                presence: isMe ? import_services19.Device.PresenceState.ONLINE : peerState ? import_services19.Device.PresenceState.ONLINE : import_services19.Device.PresenceState.OFFLINE
+                presence: isMe ? import_services21.Device.PresenceState.ONLINE : peerState ? import_services21.Device.PresenceState.ONLINE : import_services21.Device.PresenceState.OFFLINE
               };
             })
           });
@@ -7375,7 +7658,7 @@ var DevicesServiceImpl = class {
           presenceSubscribed = true;
         }
       };
-      const subscriptions = new import_async21.EventSubscriptions();
+      const subscriptions = new import_async23.EventSubscriptions();
       if (this._identityManager.identity) {
         subscribeIdentity();
         subscribePresence();
@@ -7431,7 +7714,7 @@ var ContactsServiceImpl = class {
         });
       }
       return acc;
-    }, new import_util15.ComplexMap(import_keys17.PublicKey.hash));
+    }, new import_util15.ComplexMap(import_keys18.PublicKey.hash));
     return {
       contacts: [
         ...contacts.values()
@@ -7439,16 +7722,16 @@ var ContactsServiceImpl = class {
     };
   }
   queryContacts() {
-    const subscribedSpaceKeySet = new import_util15.ComplexSet(import_keys17.PublicKey.hash);
+    const subscribedSpaceKeySet = new import_util15.ComplexSet(import_keys18.PublicKey.hash);
     return new import_codec_protobuf13.Stream(({ next, ctx }) => {
-      const pushUpdateTask = new import_async22.UpdateScheduler(ctx, async () => {
+      const pushUpdateTask = new import_async24.UpdateScheduler(ctx, async () => {
         const contacts = await this.getContacts();
         next(contacts);
       }, {
         maxFrequency: 2
       });
-      (0, import_async22.scheduleTask)(ctx, async () => {
-        const subscriptions = new import_async22.EventSubscriptions();
+      (0, import_async24.scheduleTask)(ctx, async () => {
+        const subscriptions = new import_async24.EventSubscriptions();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeToSpaceAndUpdate = () => {
           const oldSetSize = subscribedSpaceKeySet.size;
@@ -7471,19 +7754,19 @@ var ContactsServiceImpl = class {
 };
 var LoggingServiceImpl = class {
   constructor() {
-    this._logs = new import_async23.Event();
+    this._logs = new import_async25.Event();
     this._started = Date.now();
-    this._sessionId = import_keys18.PublicKey.random().toHex();
+    this._sessionId = import_keys19.PublicKey.random().toHex();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
   }
   async open() {
-    import_log23.log.runtimeConfig.processors.push(this._logProcessor);
+    import_log25.log.runtimeConfig.processors.push(this._logProcessor);
   }
   async close() {
-    const index = import_log23.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
-    import_log23.log.runtimeConfig.processors.splice(index, 1);
+    const index = import_log25.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    import_log25.log.runtimeConfig.processors.splice(index, 1);
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
@@ -7544,7 +7827,7 @@ var LoggingServiceImpl = class {
         }
         const record = {
           ...entry2,
-          context: (0, import_util16.jsonify)((0, import_log23.getContextFromEntry)(entry2)),
+          context: (0, import_util16.jsonify)((0, import_log25.getContextFromEntry)(entry2)),
           timestamp: /* @__PURE__ */ new Date(),
           meta: {
             // TODO(dmaretskyi): Fix proto.
@@ -7570,16 +7853,16 @@ var LoggingServiceImpl = class {
 };
 var matchFilter = (filter, level, path2, options) => {
   switch (options) {
-    case import_services20.QueryLogsRequest.MatchingOptions.INCLUSIVE:
+    case import_services22.QueryLogsRequest.MatchingOptions.INCLUSIVE:
       return level >= filter.level && (!filter.pattern || path2.includes(filter.pattern));
-    case import_services20.QueryLogsRequest.MatchingOptions.EXPLICIT:
+    case import_services22.QueryLogsRequest.MatchingOptions.EXPLICIT:
       return level === filter.level && (!filter.pattern || path2.includes(filter.pattern));
   }
 };
 var shouldLog = (entry2, request) => {
-  const options = request.options ?? import_services20.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  const options = request.options ?? import_services22.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   if (request.filters === void 0) {
-    return options === import_services20.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+    return options === import_services22.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   } else {
     return request.filters.some((filter) => matchFilter(filter, entry2.level, entry2.meta?.F ?? "", options));
   }
@@ -7635,8 +7918,8 @@ var SystemServiceImpl = class {
     return {
       timestamp: /* @__PURE__ */ new Date(),
       diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util17.jsonKeyReplacer)({
-        truncate: keys === import_services21.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
-        humanize: keys === import_services21.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
+        truncate: keys === import_services23.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
+        humanize: keys === import_services23.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
       })))
     };
   }
@@ -7673,7 +7956,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_file26 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file28 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var ClientServicesHost = class {
   constructor({
     config,
@@ -7687,7 +7970,7 @@ var ClientServicesHost = class {
     runtimeParams
   } = {}) {
     this._tracingService = import_tracing11.TRACE_PROCESSOR.createTraceSender();
-    this._statusUpdate = new import_async20.Event();
+    this._statusUpdate = new import_async22.Event();
     this._edgeConnection = void 0;
     this._edgeHttpClient = void 0;
     this._opening = false;
@@ -7712,7 +7995,7 @@ var ClientServicesHost = class {
         onAcquire: () => {
           if (!this._opening) {
             void this.open(new import_context16.Context(void 0, {
-              F: __dxlog_file26,
+              F: __dxlog_file28,
               L: 133
             }));
           }
@@ -7723,14 +8006,14 @@ var ClientServicesHost = class {
     this._systemService = new SystemServiceImpl({
       config: () => this._config,
       statusUpdate: this._statusUpdate,
-      getCurrentStatus: () => this.isOpen ? import_services18.SystemStatus.ACTIVE : import_services18.SystemStatus.INACTIVE,
+      getCurrentStatus: () => this.isOpen ? import_services20.SystemStatus.ACTIVE : import_services20.SystemStatus.INACTIVE,
       getDiagnostics: () => {
         return createDiagnostics(this._serviceRegistry.services, this._serviceContext, this._config);
       },
       onUpdateStatus: async (status) => {
-        if (!this.isOpen && status === import_services18.SystemStatus.ACTIVE) {
+        if (!this.isOpen && status === import_services20.SystemStatus.ACTIVE) {
           await this._resourceLock?.acquire();
-        } else if (this.isOpen && status === import_services18.SystemStatus.INACTIVE) {
+        } else if (this.isOpen && status === import_services20.SystemStatus.INACTIVE) {
           await this._resourceLock?.release();
         }
       },
@@ -7769,8 +8052,8 @@ var ClientServicesHost = class {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    (0, import_invariant21.invariant)(!this._open, "service host is open", {
-      F: __dxlog_file26,
+    (0, import_invariant22.invariant)(!this._open, "service host is open", {
+      F: __dxlog_file28,
       L: 199,
       S: this,
       A: [
@@ -7778,15 +8061,15 @@ var ClientServicesHost = class {
         "'service host is open'"
       ]
     });
-    (0, import_log22.log)("initializing...", void 0, {
-      F: __dxlog_file26,
+    (0, import_log24.log)("initializing...", void 0, {
+      F: __dxlog_file28,
       L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
-      (0, import_invariant21.invariant)(!this._config, "config already set", {
-        F: __dxlog_file26,
+      (0, import_invariant22.invariant)(!this._config, "config already set", {
+        F: __dxlog_file28,
         L: 203,
         S: this,
         A: [
@@ -7800,8 +8083,8 @@ var ClientServicesHost = class {
       }
     }
     if (!options.signalManager) {
-      import_log22.log.warn("running signaling without telemetry metadata.", void 0, {
-        F: __dxlog_file26,
+      import_log24.log.warn("running signaling without telemetry metadata.", void 0, {
+        F: __dxlog_file28,
         L: 211,
         S: this,
         C: (f, a) => f(...a)
@@ -7820,8 +8103,8 @@ var ClientServicesHost = class {
       edgeConnection: this._edgeConnection
     }) : new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
-    (0, import_invariant21.invariant)(!this._networkManager, "network manager already set", {
-      F: __dxlog_file26,
+    (0, import_invariant22.invariant)(!this._networkManager, "network manager already set", {
+      F: __dxlog_file28,
       L: 233,
       S: this,
       A: [
@@ -7838,8 +8121,8 @@ var ClientServicesHost = class {
         peerKey: this._edgeConnection.peerKey
       } : void 0
     });
-    (0, import_log22.log)("initialized", void 0, {
-      F: __dxlog_file26,
+    (0, import_log24.log)("initialized", void 0, {
+      F: __dxlog_file28,
       L: 246,
       S: this,
       C: (f, a) => f(...a)
@@ -7849,17 +8132,17 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    const traceId = import_keys16.PublicKey.random().toHex();
-    import_log22.log.trace("dxos.client-services.host.open", import_protocols16.trace.begin({
+    const traceId = import_keys17.PublicKey.random().toHex();
+    import_log24.log.trace("dxos.client-services.host.open", import_protocols17.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file26,
+      F: __dxlog_file28,
       L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant21.invariant)(this._config, "config not set", {
-      F: __dxlog_file26,
+    (0, import_invariant22.invariant)(this._config, "config not set", {
+      F: __dxlog_file28,
       L: 259,
       S: this,
       A: [
@@ -7867,8 +8150,8 @@ var ClientServicesHost = class {
         "'config not set'"
       ]
     });
-    (0, import_invariant21.invariant)(this._storage, "storage not set", {
-      F: __dxlog_file26,
+    (0, import_invariant22.invariant)(this._storage, "storage not set", {
+      F: __dxlog_file28,
       L: 260,
       S: this,
       A: [
@@ -7876,8 +8159,8 @@ var ClientServicesHost = class {
         "'storage not set'"
       ]
     });
-    (0, import_invariant21.invariant)(this._signalManager, "signal manager not set", {
-      F: __dxlog_file26,
+    (0, import_invariant22.invariant)(this._signalManager, "signal manager not set", {
+      F: __dxlog_file28,
       L: 261,
       S: this,
       A: [
@@ -7885,8 +8168,8 @@ var ClientServicesHost = class {
         "'signal manager not set'"
       ]
     });
-    (0, import_invariant21.invariant)(this._networkManager, "network manager not set", {
-      F: __dxlog_file26,
+    (0, import_invariant22.invariant)(this._networkManager, "network manager not set", {
+      F: __dxlog_file28,
       L: 262,
       S: this,
       A: [
@@ -7895,10 +8178,10 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    (0, import_log22.log)("opening...", {
+    (0, import_log24.log)("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file26,
+      F: __dxlog_file28,
       L: 265,
       S: this,
       C: (f, a) => f(...a)
@@ -7951,18 +8234,18 @@ var ClientServicesHost = class {
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log22.log)("opened", {
+    (0, import_log24.log)("opened", {
       deviceKey
     }, {
-      F: __dxlog_file26,
+      F: __dxlog_file28,
       L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log22.log.trace("dxos.client-services.host.open", import_protocols16.trace.end({
+    import_log24.log.trace("dxos.client-services.host.open", import_protocols17.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file26,
+      F: __dxlog_file28,
       L: 355,
       S: this,
       C: (f, a) => f(...a)
@@ -7973,10 +8256,10 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log22.log)("closing...", {
+    (0, import_log24.log)("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file26,
+      F: __dxlog_file28,
       L: 366,
       S: this,
       C: (f, a) => f(...a)
@@ -7991,43 +8274,43 @@ var ClientServicesHost = class {
     await this._level?.close();
     this._open = false;
     this._statusUpdate.emit();
-    (0, import_log22.log)("closed", {
+    (0, import_log24.log)("closed", {
       deviceKey
     }, {
-      F: __dxlog_file26,
+      F: __dxlog_file28,
       L: 375,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
-    const traceId = import_keys16.PublicKey.random().toHex();
-    import_log22.log.trace("dxos.sdk.client-services-host.reset", import_protocols16.trace.begin({
+    const traceId = import_keys17.PublicKey.random().toHex();
+    import_log24.log.trace("dxos.sdk.client-services-host.reset", import_protocols17.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file26,
+      F: __dxlog_file28,
       L: 380,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log22.log.info("resetting...", void 0, {
-      F: __dxlog_file26,
+    import_log24.log.info("resetting...", void 0, {
+      F: __dxlog_file28,
       L: 382,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
-    import_log22.log.info("reset", void 0, {
-      F: __dxlog_file26,
+    import_log24.log.info("reset", void 0, {
+      F: __dxlog_file28,
       L: 385,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log22.log.trace("dxos.sdk.client-services-host.reset", import_protocols16.trace.end({
+    import_log24.log.trace("dxos.sdk.client-services-host.reset", import_protocols17.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file26,
+      F: __dxlog_file28,
       L: 386,
       S: this,
       C: (f, a) => f(...a)
@@ -8047,11 +8330,11 @@ _ts_decorate10([
   import_tracing11.trace.info()
 ], ClientServicesHost.prototype, "_open", void 0);
 _ts_decorate10([
-  import_async20.synchronized,
+  import_async22.synchronized,
   import_tracing11.trace.span()
 ], ClientServicesHost.prototype, "open", null);
 _ts_decorate10([
-  import_async20.synchronized,
+  import_async22.synchronized,
   import_tracing11.trace.span()
 ], ClientServicesHost.prototype, "close", null);
 ClientServicesHost = _ts_decorate10([
@@ -8101,4 +8384,4 @@ ClientServicesHost = _ts_decorate10([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-2KIDYJ7O.cjs.map
+//# sourceMappingURL=chunk-IFHGVXW2.cjs.map