@dxos/client-services 0.4.10-main.3e0c8a5 → 0.4.10-main.3f5e2d2

package/dist/lib/node/{chunk-D5VK6MZQ.cjs → chunk-JGUWA36I.cjs}

@@ -26,19 +26,22 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_D5VK6MZQ_exports = {};
-__export(chunk_D5VK6MZQ_exports, {
+var chunk_JGUWA36I_exports = {};
+__export(chunk_JGUWA36I_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
+  ClientServicesProviderResource: () => ClientServicesProviderResource,
   DataSpace: () => DataSpace,
   DataSpaceManager: () => DataSpaceManager,
   DeviceInvitationProtocol: () => DeviceInvitationProtocol,
   DevtoolsHostEvents: () => DevtoolsHostEvents,
   DevtoolsServiceImpl: () => DevtoolsServiceImpl,
+  DiagnosticsCollector: () => DiagnosticsCollector,
   Identity: () => Identity,
   IdentityManager: () => IdentityManager,
   IdentityServiceImpl: () => IdentityServiceImpl,
   InvitationsHandler: () => InvitationsHandler,
+  InvitationsManager: () => InvitationsManager,
   InvitationsServiceImpl: () => InvitationsServiceImpl,
   Lock: () => Lock,
   ServiceContext: () => ServiceContext,
@@ -46,11 +49,14 @@ __export(chunk_D5VK6MZQ_exports, {
   SpaceInvitationProtocol: () => SpaceInvitationProtocol,
   SpacesServiceImpl: () => SpacesServiceImpl,
   TrustedKeySetAuthVerifier: () => TrustedKeySetAuthVerifier,
+  createAdmissionKeypair: () => createAdmissionKeypair,
   createAuthProvider: () => createAuthProvider,
+  createCollectDiagnosticsBroadcastHandler: () => createCollectDiagnosticsBroadcastHandler,
+  createCollectDiagnosticsBroadcastSender: () => createCollectDiagnosticsBroadcastSender,
   createDiagnostics: () => createDiagnostics,
+  createLevel: () => createLevel,
   createStorageObjects: () => createStorageObjects,
   getNetworkPeers: () => getNetworkPeers,
-  invitationExpired: () => invitationExpired,
   isLocked: () => isLocked,
   subscribeToFeedBlocks: () => subscribeToFeedBlocks,
   subscribeToFeeds: () => subscribeToFeeds,
@@ -60,7 +66,7 @@ __export(chunk_D5VK6MZQ_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_D5VK6MZQ_exports);
+module.exports = __toCommonJS(chunk_JGUWA36I_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -114,7 +120,7 @@ var import_services2 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async7 = require("@dxos/async");
 var import_client_protocol2 = require("@dxos/client-protocol");
 var import_context4 = require("@dxos/context");
-var import_credentials7 = require("@dxos/credentials");
+var import_crypto = require("@dxos/crypto");
 var import_invariant5 = require("@dxos/invariant");
 var import_keys5 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
@@ -124,6 +130,7 @@ var import_services3 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_async8 = require("@dxos/async");
 var import_context5 = require("@dxos/context");
+var import_crypto2 = require("@dxos/crypto");
 var import_invariant6 = require("@dxos/invariant");
 var import_keys6 = require("@dxos/keys");
 var import_log5 = require("@dxos/log");
@@ -131,63 +138,62 @@ var import_protocols5 = require("@dxos/protocols");
 var import_services4 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations2 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_teleport = require("@dxos/teleport");
-var import_async9 = require("@dxos/async");
 var import_codec_protobuf8 = require("@dxos/codec-protobuf");
-var import_context6 = require("@dxos/context");
-var import_invariant7 = require("@dxos/invariant");
-var import_log6 = require("@dxos/log");
 var import_services5 = require("@dxos/protocols/proto/dxos/client/services");
-var import_credentials8 = require("@dxos/credentials");
+var import_credentials7 = require("@dxos/credentials");
 var import_feed_store3 = require("@dxos/feed-store");
-var import_invariant8 = require("@dxos/invariant");
-var import_log7 = require("@dxos/log");
+var import_invariant7 = require("@dxos/invariant");
+var import_log6 = require("@dxos/log");
 var import_protocols6 = require("@dxos/protocols");
 var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
+var import_credentials8 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_async9 = require("@dxos/async");
+var import_client_protocol3 = require("@dxos/client-protocol");
+var import_context6 = require("@dxos/context");
+var import_credentials9 = require("@dxos/credentials");
+var import_echo_pipeline = require("@dxos/echo-pipeline");
+var import_invariant8 = require("@dxos/invariant");
+var import_keys7 = require("@dxos/keys");
+var import_log7 = require("@dxos/log");
+var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_codec_protobuf9 = require("@dxos/codec-protobuf");
 var import_debug2 = require("@dxos/debug");
 var import_rpc = require("@dxos/rpc");
 var import_tracing3 = require("@dxos/tracing");
-var import_codec_protobuf10 = require("@dxos/codec-protobuf");
-var import_credentials9 = require("@dxos/credentials");
-var import_invariant9 = require("@dxos/invariant");
-var import_protocols7 = require("@dxos/protocols");
-var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
-var import_tracing4 = require("@dxos/tracing");
-var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async10 = require("@dxos/async");
-var import_client_protocol3 = require("@dxos/client-protocol");
+var import_client_protocol4 = require("@dxos/client-protocol");
 var import_context7 = require("@dxos/context");
 var import_debug3 = require("@dxos/debug");
-var import_echo_db = require("@dxos/echo-db");
-var import_echo_pipeline = require("@dxos/echo-pipeline");
 var import_echo_pipeline2 = require("@dxos/echo-pipeline");
-var import_invariant10 = require("@dxos/invariant");
-var import_keys7 = require("@dxos/keys");
+var import_echo_pipeline3 = require("@dxos/echo-pipeline");
+var import_echo_schema = require("@dxos/echo-schema");
+var import_invariant9 = require("@dxos/invariant");
+var import_keys8 = require("@dxos/keys");
 var import_log8 = require("@dxos/log");
-var import_protocols8 = require("@dxos/protocols");
-var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
+var import_protocols7 = require("@dxos/protocols");
+var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe2 = require("@dxos/timeframe");
-var import_tracing5 = require("@dxos/tracing");
+var import_tracing4 = require("@dxos/tracing");
 var import_util4 = require("@dxos/util");
 var import_async11 = require("@dxos/async");
 var import_credentials11 = require("@dxos/credentials");
 var import_async12 = require("@dxos/async");
 var import_context8 = require("@dxos/context");
-var import_invariant11 = require("@dxos/invariant");
-var import_keys8 = require("@dxos/keys");
+var import_invariant10 = require("@dxos/invariant");
+var import_keys9 = require("@dxos/keys");
 var import_log9 = require("@dxos/log");
-var import_protocols9 = require("@dxos/protocols");
+var import_protocols8 = require("@dxos/protocols");
 var import_teleport2 = require("@dxos/teleport");
 var import_util5 = require("@dxos/util");
 var import_async13 = require("@dxos/async");
 var import_context9 = require("@dxos/context");
 var import_credentials12 = require("@dxos/credentials");
-var import_invariant12 = require("@dxos/invariant");
-var import_keys9 = require("@dxos/keys");
+var import_invariant11 = require("@dxos/invariant");
+var import_keys10 = require("@dxos/keys");
 var import_log10 = require("@dxos/log");
-var import_protocols10 = require("@dxos/protocols");
-var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
+var import_protocols9 = require("@dxos/protocols");
+var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_gossip2 = require("@dxos/teleport-extension-gossip");
 var import_util6 = require("@dxos/util");
 var import_credentials13 = require("@dxos/credentials");
@@ -195,70 +201,82 @@ var import_debug4 = require("@dxos/debug");
 var import_credentials14 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe3 = require("@dxos/timeframe");
 var import_async14 = require("@dxos/async");
-var import_codec_protobuf11 = require("@dxos/codec-protobuf");
+var import_codec_protobuf10 = require("@dxos/codec-protobuf");
 var import_debug5 = require("@dxos/debug");
-var import_invariant13 = require("@dxos/invariant");
+var import_invariant12 = require("@dxos/invariant");
 var import_log11 = require("@dxos/log");
-var import_protocols11 = require("@dxos/protocols");
-var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
+var import_protocols10 = require("@dxos/protocols");
+var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async15 = require("@dxos/async");
 var import_context10 = require("@dxos/context");
 var import_credentials15 = require("@dxos/credentials");
 var import_debug6 = require("@dxos/debug");
-var import_echo_pipeline3 = require("@dxos/echo-pipeline");
+var import_echo_db = require("@dxos/echo-db");
+var import_echo_pipeline4 = require("@dxos/echo-pipeline");
 var import_feed_store4 = require("@dxos/feed-store");
-var import_indexing = require("@dxos/indexing");
-var import_invariant14 = require("@dxos/invariant");
+var import_invariant13 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
-var import_keys10 = require("@dxos/keys");
+var import_keys11 = require("@dxos/keys");
 var import_log12 = require("@dxos/log");
+var import_protocols11 = require("@dxos/protocols");
+var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
+var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
+var import_tracing5 = require("@dxos/tracing");
+var import_util7 = require("@dxos/util");
+var import_codec_protobuf11 = require("@dxos/codec-protobuf");
+var import_credentials16 = require("@dxos/credentials");
+var import_invariant14 = require("@dxos/invariant");
 var import_protocols12 = require("@dxos/protocols");
 var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
-var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_tracing6 = require("@dxos/tracing");
-var import_util7 = require("@dxos/util");
-var import_automerge = require("@dxos/automerge/automerge");
-var import_debug7 = require("@dxos/debug");
-var import_protocols13 = require("@dxos/protocols");
-var import_invariant15 = require("@dxos/invariant");
-var import_lock_file = require("@dxos/lock-file");
-var import_log13 = require("@dxos/log");
-var import_client_protocol4 = require("@dxos/client-protocol");
-var import_protocols14 = require("@dxos/protocols");
-var import_config = require("@dxos/protocols/proto/dxos/config");
-var import_random_access_storage = require("@dxos/random-access-storage");
+var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
+var import_config = require("@dxos/config");
+var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
+var import_tracing7 = require("@dxos/tracing");
 var import_util8 = require("@dxos/util");
 var import_async16 = require("@dxos/async");
 var import_client_protocol5 = require("@dxos/client-protocol");
 var import_context11 = require("@dxos/context");
-var import_echo_pipeline4 = require("@dxos/echo-pipeline");
-var E = __toESM(require("@dxos/echo-schema"));
-var import_echo_schema = require("@dxos/echo-schema");
-var import_indexing2 = require("@dxos/indexing");
-var import_invariant16 = require("@dxos/invariant");
-var import_keys11 = require("@dxos/keys");
-var import_log14 = require("@dxos/log");
+var import_echo_pipeline5 = require("@dxos/echo-pipeline");
+var import_echo_schema2 = require("@dxos/echo-schema");
+var import_invariant15 = require("@dxos/invariant");
+var import_keys12 = require("@dxos/keys");
+var import_log13 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager2 = require("@dxos/network-manager");
-var import_protocols15 = require("@dxos/protocols");
-var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
-var import_tracing7 = require("@dxos/tracing");
+var import_protocols13 = require("@dxos/protocols");
+var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
+var import_tracing8 = require("@dxos/tracing");
 var import_util9 = require("@dxos/util");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
 var import_async17 = require("@dxos/async");
 var import_codec_protobuf12 = require("@dxos/codec-protobuf");
+var import_invariant16 = require("@dxos/invariant");
+var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invariant17 = require("@dxos/invariant");
-var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
+var import_lock_file = require("@dxos/lock-file");
+var import_log14 = require("@dxos/log");
 var import_async18 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
-var import_keys12 = require("@dxos/keys");
+var import_keys13 = require("@dxos/keys");
 var import_log15 = require("@dxos/log");
-var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services17 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util10 = require("@dxos/util");
 var import_codec_protobuf14 = require("@dxos/codec-protobuf");
-var import_codec_protobuf15 = require("@dxos/codec-protobuf");
-var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
+var import_protocols14 = 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_protocol6 = require("@dxos/client-protocol");
+var import_config3 = require("@dxos/protocols/proto/dxos/config");
 var import_util11 = require("@dxos/util");
+var import_level = require("level");
+var import_node_path = __toESM(require("node:path"));
+var import_keys14 = require("@dxos/keys");
+var import_codec_protobuf15 = require("@dxos/codec-protobuf");
+var import_services18 = require("@dxos/protocols/proto/dxos/client/services");
+var import_util12 = require("@dxos/util");
+var import_keys15 = require("@dxos/keys");
+var import_util13 = require("@dxos/util");
 var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
   return new import_codec_protobuf.Stream(({ next }) => {
     const subscriptions = new import_async.EventSubscriptions();
@@ -1276,7 +1294,9 @@ var IdentityManager = class {
           C: (f, a) => f(...a)
         });
       },
-      memberKey: identityKey
+      memberKey: identityKey,
+      onDelegatedInvitationStatusChange: async () => {
+      }
     });
   }
 };
@@ -1373,10 +1393,13 @@ var DeviceInvitationProtocol = class {
       kind: import_services2.Invitation.Kind.DEVICE
     };
   }
-  async admit(request) {
+  async delegate(invitation) {
+    throw new Error("delegation not supported");
+  }
+  async admit(_, request) {
     (0, import_invariant4.invariant)(request.device, void 0, {
       F: __dxlog_file5,
-      L: 37,
+      L: 42,
       S: this,
       A: [
         "request.device",
@@ -1422,7 +1445,7 @@ var DeviceInvitationProtocol = class {
   async accept(response, request) {
     (0, import_invariant4.invariant)(response.device, void 0, {
       F: __dxlog_file5,
-      L: 82,
+      L: 87,
       S: this,
       A: [
         "response.device",
@@ -1432,7 +1455,7 @@ var DeviceInvitationProtocol = class {
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
     (0, import_invariant4.invariant)(request.device, void 0, {
       F: __dxlog_file5,
-      L: 85,
+      L: 90,
       S: this,
       A: [
         "request.device",
@@ -1471,6 +1494,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
     this._callbacks = _callbacks;
     this._ctx = new import_context5.Context();
     this._remoteOptionsTrigger = new import_async8.Trigger();
+    this._challenge = void 0;
     this.invitation = void 0;
     this.guestProfile = void 0;
     this.authenticationPassed = false;
@@ -1485,7 +1509,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         options: async (options) => {
           (0, import_invariant6.invariant)(!this._remoteOptions, "Remote options already set.", {
             F: __dxlog_file6,
-            L: 87,
+            L: 90,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -1502,7 +1526,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 96,
+            L: 99,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1512,7 +1536,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
               invitationId
             }, {
               F: __dxlog_file6,
-              L: 100,
+              L: 103,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1526,7 +1550,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             guestProfile: profile
           }, {
             F: __dxlog_file6,
-            L: 109,
+            L: 112,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1535,25 +1559,27 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             ...this.invitation,
             state: import_services4.Invitation.State.READY_FOR_AUTHENTICATION
           });
+          this._challenge = this.invitation.authMethod === import_services4.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? (0, import_crypto2.randomBytes)(32) : void 0;
           import_log5.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols5.trace.end({
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 116,
+            L: 122,
             S: this,
             C: (f, a) => f(...a)
           });
           return {
-            authMethod: this.invitation.authMethod
+            authMethod: this.invitation.authMethod,
+            challenge: this._challenge
           };
         },
-        authenticate: async ({ authCode: code }) => {
+        authenticate: async ({ authCode: code, signedChallenge }) => {
           const traceId = import_keys6.PublicKey.random().toHex();
           import_log5.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols5.trace.begin({
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 124,
+            L: 131,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1561,14 +1587,14 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             authCode: code
           }, {
             F: __dxlog_file6,
-            L: 125,
+            L: 132,
             S: this,
             C: (f, a) => f(...a)
           });
           let status = import_invitations2.AuthenticationResponse.Status.OK;
           (0, import_invariant6.invariant)(this.invitation, "Invitation is not set.", {
             F: __dxlog_file6,
-            L: 128,
+            L: 135,
             S: this,
             A: [
               "this.invitation",
@@ -1579,7 +1605,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             case import_services4.Invitation.AuthMethod.NONE: {
               (0, import_log5.log)("authentication not required", void 0, {
                 F: __dxlog_file6,
-                L: 131,
+                L: 138,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1599,12 +1625,25 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
               }
               break;
             }
+            case import_services4.Invitation.AuthMethod.KNOWN_PUBLIC_KEY: {
+              if (!this.invitation.guestKeypair) {
+                status = import_invitations2.AuthenticationResponse.Status.INTERNAL_ERROR;
+                break;
+              }
+              const isSignatureValid = this._challenge && (0, import_crypto2.verify)(this._challenge, Buffer.from(signedChallenge ?? []), this.invitation.guestKeypair.publicKey.asBuffer());
+              if (isSignatureValid) {
+                this.authenticationPassed = true;
+              } else {
+                status = import_invitations2.AuthenticationResponse.Status.INVALID_SIGNATURE;
+              }
+              break;
+            }
             default: {
               import_log5.log.error("invalid authentication method", {
                 authMethod: this.invitation.authMethod
               }, {
                 F: __dxlog_file6,
-                L: 149,
+                L: 176,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1619,7 +1658,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             }
           }), {
             F: __dxlog_file6,
-            L: 155,
+            L: 182,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1633,14 +1672,14 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 161,
+            L: 188,
             S: this,
             C: (f, a) => f(...a)
           });
           try {
             (0, import_invariant6.invariant)(this.invitation, "Invitation is not set.", {
               F: __dxlog_file6,
-              L: 164,
+              L: 191,
               S: this,
               A: [
                 "this.invitation",
@@ -1655,7 +1694,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
               id: traceId
             }), {
               F: __dxlog_file6,
-              L: 172,
+              L: 199,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1712,7 +1751,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
         options: async (options) => {
           (0, import_invariant6.invariant)(!this._remoteOptions, "Remote options already set.", {
             F: __dxlog_file6,
-            L: 239,
+            L: 266,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -1739,7 +1778,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     try {
       (0, import_log5.log)("begin options", void 0, {
         F: __dxlog_file6,
-        L: 260,
+        L: 287,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1751,7 +1790,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
       }));
       (0, import_log5.log)("end options", void 0, {
         F: __dxlog_file6,
-        L: 263,
+        L: 290,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1765,7 +1804,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     } catch (err) {
       (0, import_log5.log)("openError", err, {
         F: __dxlog_file6,
-        L: 273,
+        L: 300,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1775,7 +1814,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
   async onClose() {
     (0, import_log5.log)("onClose", void 0, {
       F: __dxlog_file6,
-      L: 279,
+      L: 306,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1791,49 +1830,7 @@ var InvitationsHandler = class {
   constructor(_networkManager) {
     this._networkManager = _networkManager;
   }
-  createInvitation(protocol, options) {
-    const { invitationId = import_keys5.PublicKey.random().toHex(), type = import_services3.Invitation.Type.INTERACTIVE, authMethod = import_services3.Invitation.AuthMethod.SHARED_SECRET, state = import_services3.Invitation.State.INIT, timeout = import_client_protocol2.INVITATION_TIMEOUT, swarmKey = import_keys5.PublicKey.random(), persistent = true, created = /* @__PURE__ */ new Date(), lifetime = 86400 } = options ?? {};
-    const authCode = options?.authCode ?? (authMethod === import_services3.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials7.generatePasscode)(import_client_protocol2.AUTHENTICATION_CODE_LENGTH) : void 0);
-    (0, import_invariant5.invariant)(protocol, void 0, {
-      F: __dxlog_file7,
-      L: 84,
-      S: this,
-      A: [
-        "protocol",
-        ""
-      ]
-    });
-    const invitation = {
-      invitationId,
-      type,
-      authMethod,
-      state,
-      swarmKey,
-      authCode,
-      timeout,
-      persistent,
-      created,
-      lifetime,
-      ...protocol.getInvitationContext()
-    };
-    const stream = new import_async7.PushStream();
-    const ctx = new import_context4.Context({
-      onError: (err) => {
-        stream.error(err);
-        void ctx.dispose();
-      }
-    });
-    ctx.onDispose(() => {
-      (0, import_log4.log)("complete", {
-        ...protocol.toJSON()
-      }, {
-        F: __dxlog_file7,
-        L: 109,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      stream.complete();
-    });
+  handleInvitationFlow(ctx, stream, protocol, invitation) {
     const createExtension = () => {
       const extension = new InvitationHostExtension({
         onStateUpdate: (invitation2) => {
@@ -1842,8 +1839,8 @@ var InvitationsHandler = class {
             state: import_services3.Invitation.State.READY_FOR_AUTHENTICATION
           });
         },
-        resolveInvitation: async ({ invitationId: invitationId2 }) => {
-          if (invitationId2 && invitationId2 !== invitation.invitationId) {
+        resolveInvitation: async ({ invitationId }) => {
+          if (invitationId && invitationId !== invitation.invitationId) {
             return void 0;
           }
           return invitation;
@@ -1853,14 +1850,14 @@ var InvitationsHandler = class {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             (0, import_invariant5.invariant)(deviceKey, void 0, {
               F: __dxlog_file7,
-              L: 130,
+              L: 87,
               S: this,
               A: [
                 "deviceKey",
                 ""
               ]
             });
-            const admissionResponse = await protocol.admit(admissionRequest, extension.guestProfile);
+            const admissionResponse = await protocol.admit(invitation, admissionRequest, extension.guestProfile);
             extension.completedTrigger.wake(deviceKey);
             return admissionResponse;
           } catch (err) {
@@ -1876,7 +1873,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 148,
+                L: 105,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1884,7 +1881,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 149,
+                L: 106,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1893,14 +1890,14 @@ var InvitationsHandler = class {
                 state: import_services3.Invitation.State.CONNECTED
               });
               const deviceKey = await extension.completedTrigger.wait({
-                timeout
+                timeout: invitation.timeout
               });
               (0, import_log4.log)("admitted guest", {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 152,
+                L: 109,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1912,7 +1909,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 154,
+                L: 111,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1922,7 +1919,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 157,
+                  L: 114,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1933,7 +1930,7 @@ var InvitationsHandler = class {
               } else {
                 import_log4.log.error("failed", err, {
                   F: __dxlog_file7,
-                  L: 160,
+                  L: 117,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1944,12 +1941,12 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 163,
+                L: 120,
                 S: this,
                 C: (f, a) => f(...a)
               });
             } finally {
-              if (type !== import_services3.Invitation.Type.MULTIUSE) {
+              if (!invitation.multiUse) {
                 await swarmConnection.close();
                 await ctx.dispose();
               }
@@ -1965,7 +1962,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 178,
+              L: 135,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1976,7 +1973,7 @@ var InvitationsHandler = class {
           } else {
             import_log4.log.error("failed", err, {
               F: __dxlog_file7,
-              L: 181,
+              L: 138,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1986,11 +1983,11 @@ var InvitationsHandler = class {
       });
       return extension;
     };
-    if (invitation.lifetime && invitation.created && invitation.lifetime !== 0) {
+    if (invitation.lifetime && invitation.created) {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
         import_log4.log.warn("invitation has already expired", void 0, {
           F: __dxlog_file7,
-          L: 192,
+          L: 149,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2024,24 +2021,12 @@ var InvitationsHandler = class {
         state: import_services3.Invitation.State.CONNECTING
       });
     });
-    const observable = new import_client_protocol2.CancellableInvitation({
-      initialInvitation: invitation,
-      subscriber: stream.observable,
-      onCancel: async () => {
-        stream.next({
-          ...invitation,
-          state: import_services3.Invitation.State.CANCELLED
-        });
-        await ctx.dispose();
-      }
-    });
-    return observable;
   }
   acceptInvitation(protocol, invitation, deviceProfile) {
     const { timeout = import_client_protocol2.INVITATION_TIMEOUT } = invitation;
     (0, import_invariant5.invariant)(protocol, void 0, {
       F: __dxlog_file7,
-      L: 246,
+      L: 191,
       S: this,
       A: [
         "protocol",
@@ -2051,7 +2036,7 @@ var InvitationsHandler = class {
     if (deviceProfile) {
       (0, import_invariant5.invariant)(invitation.kind === import_services3.Invitation.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file7,
-        L: 250,
+        L: 194,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -2066,7 +2051,7 @@ var InvitationsHandler = class {
     const setState = (newData) => {
       (0, import_invariant5.invariant)(newData.state !== void 0, void 0, {
         F: __dxlog_file7,
-        L: 261,
+        L: 205,
         S: this,
         A: [
           "newData.state !== undefined",
@@ -2086,7 +2071,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             F: __dxlog_file7,
-            L: 269,
+            L: 213,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2096,7 +2081,7 @@ var InvitationsHandler = class {
         } else {
           import_log4.log.warn("auth failed", err, {
             F: __dxlog_file7,
-            L: 272,
+            L: 216,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2110,7 +2095,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 280,
+        L: 224,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2125,7 +2110,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               F: __dxlog_file7,
-              L: 290,
+              L: 234,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2140,7 +2125,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 299,
+                L: 243,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2152,7 +2137,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 307,
+                L: 251,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2163,7 +2148,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 311,
+                L: 255,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2173,62 +2158,28 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file7,
-                L: 315,
+                L: 259,
                 S: this,
                 C: (f, a) => f(...a)
               });
               invitation.authMethod = introductionResponse.authMethod;
               if (isAuthenticationRequired(invitation)) {
-                for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
-                  (0, import_log4.log)("guest waiting for authentication code...", void 0, {
-                    F: __dxlog_file7,
-                    L: 321,
-                    S: this,
-                    C: (f, a) => f(...a)
-                  });
-                  setState({
-                    state: import_services3.Invitation.State.READY_FOR_AUTHENTICATION
-                  });
-                  const authCode = await authenticated.wait({
-                    timeout
-                  });
-                  (0, import_log4.log)("sending authentication request", void 0, {
-                    F: __dxlog_file7,
-                    L: 325,
-                    S: this,
-                    C: (f, a) => f(...a)
-                  });
-                  setState({
-                    state: import_services3.Invitation.State.AUTHENTICATING
-                  });
-                  const response = await extension.rpc.InvitationHostService.authenticate({
-                    authCode
-                  });
-                  if (response.status === void 0 || response.status === import_invitations.AuthenticationResponse.Status.OK) {
+                switch (invitation.authMethod) {
+                  case import_services3.Invitation.AuthMethod.SHARED_SECRET:
+                    await this._handleGuestOtpAuth(extension, setState, authenticated, {
+                      timeout
+                    });
+                    break;
+                  case import_services3.Invitation.AuthMethod.KNOWN_PUBLIC_KEY:
+                    await this._handleGuestKpkAuth(extension, setState, invitation, introductionResponse);
                     break;
-                  }
-                  if (response.status === import_invitations.AuthenticationResponse.Status.INVALID_OTP) {
-                    if (attempt === MAX_OTP_ATTEMPTS) {
-                      throw new Error(`Maximum retry attempts: ${MAX_OTP_ATTEMPTS}`);
-                    } else {
-                      (0, import_log4.log)("retrying invalid code", {
-                        attempt
-                      }, {
-                        F: __dxlog_file7,
-                        L: 336,
-                        S: this,
-                        C: (f, a) => f(...a)
-                      });
-                      authenticated.reset();
-                    }
-                  }
                 }
               }
               (0, import_log4.log)("request admission", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 344,
+                L: 275,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2240,7 +2191,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 355,
+                L: 286,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2253,7 +2204,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 357,
+                L: 288,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2263,7 +2214,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 360,
+                  L: 291,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2273,7 +2224,7 @@ var InvitationsHandler = class {
               } else {
                 (0, import_log4.log)("auth failed", err, {
                   F: __dxlog_file7,
-                  L: 363,
+                  L: 294,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2284,7 +2235,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 366,
+                L: 297,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2302,7 +2253,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 377,
+              L: 308,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2312,7 +2263,7 @@ var InvitationsHandler = class {
           } else {
             (0, import_log4.log)("auth failed", err, {
               F: __dxlog_file7,
-              L: 380,
+              L: 311,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2329,7 +2280,7 @@ var InvitationsHandler = class {
       } else {
         (0, import_invariant5.invariant)(invitation.swarmKey, void 0, {
           F: __dxlog_file7,
-          L: 394,
+          L: 325,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -2367,198 +2318,110 @@ var InvitationsHandler = class {
     });
     return observable;
   }
+  async _handleGuestOtpAuth(extension, setState, authenticated, options) {
+    for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
+      (0, import_log4.log)("guest waiting for authentication code...", void 0, {
+        F: __dxlog_file7,
+        L: 365,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      setState({
+        state: import_services3.Invitation.State.READY_FOR_AUTHENTICATION
+      });
+      const authCode = await authenticated.wait(options);
+      (0, import_log4.log)("sending authentication request", void 0, {
+        F: __dxlog_file7,
+        L: 369,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      setState({
+        state: import_services3.Invitation.State.AUTHENTICATING
+      });
+      const response = await extension.rpc.InvitationHostService.authenticate({
+        authCode
+      });
+      if (response.status === void 0 || response.status === import_invitations.AuthenticationResponse.Status.OK) {
+        break;
+      }
+      if (response.status === import_invitations.AuthenticationResponse.Status.INVALID_OTP) {
+        if (attempt === MAX_OTP_ATTEMPTS) {
+          throw new Error(`Maximum retry attempts: ${MAX_OTP_ATTEMPTS}`);
+        } else {
+          (0, import_log4.log)("retrying invalid code", {
+            attempt
+          }, {
+            F: __dxlog_file7,
+            L: 380,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          authenticated.reset();
+        }
+      }
+    }
+  }
+  async _handleGuestKpkAuth(extension, setState, invitation, introductionResponse) {
+    if (invitation.guestKeypair?.privateKey == null) {
+      throw new Error("keypair missing in the invitation");
+    }
+    if (introductionResponse.challenge == null) {
+      throw new Error("challenge missing in the introduction");
+    }
+    (0, import_log4.log)("sending authentication request", void 0, {
+      F: __dxlog_file7,
+      L: 399,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    setState({
+      state: import_services3.Invitation.State.AUTHENTICATING
+    });
+    const signature = (0, import_crypto.sign)(Buffer.from(introductionResponse.challenge), invitation.guestKeypair.privateKey);
+    const response = await extension.rpc.InvitationHostService.authenticate({
+      signedChallenge: signature
+    });
+    if (response.status !== import_invitations.AuthenticationResponse.Status.OK) {
+      throw new Error(`Authentication failed with code: ${response.status}`);
+    }
+  }
 };
-var invitationExpired = (invitation) => {
-  return invitation.created && invitation.lifetime && invitation.lifetime !== 0 && invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now();
+var createAdmissionKeypair = () => {
+  const keypair = (0, import_crypto.createKeyPair)();
+  return {
+    publicKey: import_keys5.PublicKey.from(keypair.publicKey),
+    privateKey: keypair.secretKey
+  };
 };
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-service.ts";
 var InvitationsServiceImpl = class {
-  constructor(_invitationsHandler, _getHandler, _metadataStore) {
-    this._invitationsHandler = _invitationsHandler;
-    this._getHandler = _getHandler;
-    this._metadataStore = _metadataStore;
-    this._createInvitations = /* @__PURE__ */ new Map();
-    this._acceptInvitations = /* @__PURE__ */ new Map();
-    this._invitationCreated = new import_async9.Event();
-    this._invitationAccepted = new import_async9.Event();
-    this._removedCreated = new import_async9.Event();
-    this._removedAccepted = new import_async9.Event();
-    this._saved = new import_async9.Event();
-    this._persistentInvitationsLoadedEvent = new import_async9.Event();
-    this._persistentInvitationsLoaded = false;
+  constructor(_invitationsManager) {
+    this._invitationsManager = _invitationsManager;
   }
   // TODO(burdon): Guest/host label.
   getLoggingContext() {
     return {};
   }
   createInvitation(options) {
-    let invitation;
-    const savePersistentInvitationCtx = new import_context6.Context();
-    const existingInvitation = this._createInvitations.get(options.invitationId);
-    if (existingInvitation) {
-      invitation = existingInvitation;
-    } else {
-      const handler = this._getHandler(options);
-      invitation = this._invitationsHandler.createInvitation(handler, options);
-      this._createInvitations.set(invitation.get().invitationId, invitation);
-      this._invitationCreated.emit(invitation.get());
-    }
     return new import_codec_protobuf8.Stream(({ next, close }) => {
-      if (invitation.get().persistent) {
-        (0, import_async9.scheduleTask)(savePersistentInvitationCtx, async () => {
-          try {
-            await this._metadataStore.addInvitation(invitation.get());
-            this._saved.emit(invitation.get());
-          } catch (err) {
-            close(err);
-          }
-        });
-      }
-      invitation.subscribe((invitation2) => {
-        next(invitation2);
-      }, async (err) => {
-        await savePersistentInvitationCtx.dispose();
-        close(err);
-      }, async () => {
-        close();
-        if (invitation.get().persistent) {
-          await savePersistentInvitationCtx.dispose();
-          await this._metadataStore.removeInvitation(invitation.get().invitationId);
-        }
-        this._createInvitations.delete(invitation.get().invitationId);
-        if (invitation.get().type !== import_services5.Invitation.Type.MULTIUSE) {
-          this._removedCreated.emit(invitation.get());
-        }
-      });
+      void this._invitationsManager.createInvitation(options).then((invitation) => invitation.subscribe(next, close, close)).catch(close);
     });
   }
-  async loadPersistentInvitations() {
-    const persistentInvitations = this._metadataStore.getInvitations();
-    const freshInvitations = persistentInvitations.filter(async (invitation) => !invitationExpired(invitation));
-    const cInvitations = freshInvitations.map((persistentInvitation) => {
-      (0, import_invariant7.invariant)(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
-        F: __dxlog_file8,
-        L: 109,
-        S: this,
-        A: [
-          "!this._createInvitations.get(persistentInvitation.invitationId)",
-          "'invitation already exists'"
-        ]
-      });
-      const handler = this._getHandler(persistentInvitation);
-      const invitation = this._invitationsHandler.createInvitation(handler, persistentInvitation);
-      this._createInvitations.set(invitation.get().invitationId, invitation);
-      this._invitationCreated.emit(invitation.get());
-      return persistentInvitation;
-    });
-    this._persistentInvitationsLoadedEvent.emit();
-    this._persistentInvitationsLoaded = true;
-    return {
-      invitations: cInvitations
-    };
-  }
-  acceptInvitation({ invitation: options, deviceProfile }) {
-    let invitation;
-    if (deviceProfile) {
-      (0, import_invariant7.invariant)(options.kind === import_services5.Invitation.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
-        F: __dxlog_file8,
-        L: 127,
-        S: this,
-        A: [
-          "options.kind === Invitation.Kind.DEVICE",
-          "'deviceProfile provided for non-device invitation'"
-        ]
-      });
-    }
-    const existingInvitation = this._acceptInvitations.get(options.invitationId);
-    if (existingInvitation) {
-      invitation = existingInvitation;
-    } else {
-      const handler = this._getHandler(options);
-      invitation = this._invitationsHandler.acceptInvitation(handler, options, deviceProfile);
-      this._acceptInvitations.set(invitation.get().invitationId, invitation);
-      this._invitationAccepted.emit(invitation.get());
-    }
+  acceptInvitation(request) {
+    const invitation = this._invitationsManager.acceptInvitation(request);
     return new import_codec_protobuf8.Stream(({ next, close }) => {
-      invitation.subscribe((invitation2) => {
-        next(invitation2);
-      }, (err) => {
-        close(err);
-      }, () => {
-        close();
-        this._acceptInvitations.delete(invitation.get().invitationId);
-        if (invitation.get().type !== import_services5.Invitation.Type.MULTIUSE) {
-          this._removedAccepted.emit(invitation.get());
-        }
-      });
+      invitation.subscribe(next, close, close);
     });
   }
-  async authenticate({ invitationId, authCode }) {
-    (0, import_log6.log)("authenticating...", void 0, {
-      F: __dxlog_file8,
-      L: 160,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    (0, import_invariant7.invariant)(invitationId, void 0, {
-      F: __dxlog_file8,
-      L: 161,
-      S: this,
-      A: [
-        "invitationId",
-        ""
-      ]
-    });
-    const observable = this._acceptInvitations.get(invitationId);
-    if (!observable) {
-      import_log6.log.warn("invalid invitation", {
-        invitationId
-      }, {
-        F: __dxlog_file8,
-        L: 164,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    } else {
-      await observable.authenticate(authCode);
-    }
+  async authenticate(request) {
+    return this._invitationsManager.authenticate(request);
   }
-  async cancelInvitation({ invitationId }) {
-    (0, import_log6.log)("cancelInvitation...", {
-      invitationId
-    }, {
-      F: __dxlog_file8,
-      L: 171,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    (0, import_invariant7.invariant)(invitationId, void 0, {
-      F: __dxlog_file8,
-      L: 172,
-      S: this,
-      A: [
-        "invitationId",
-        ""
-      ]
-    });
-    const created = this._createInvitations.get(invitationId);
-    const accepted = this._acceptInvitations.get(invitationId);
-    if (created) {
-      await created.cancel();
-      this._createInvitations.delete(invitationId);
-      this._removedCreated.emit(created.get());
-      if (created.get().persistent) {
-        await this._metadataStore.removeInvitation(created.get().invitationId);
-      }
-    } else if (accepted) {
-      await accepted.cancel();
-      this._acceptInvitations.delete(invitationId);
-      this._removedAccepted.emit(accepted.get());
-    }
+  async cancelInvitation(request) {
+    return this._invitationsManager.cancelInvitation(request);
   }
   queryInvitations() {
     return new import_codec_protobuf8.Stream(({ next, ctx }) => {
-      this._invitationCreated.on(ctx, (invitation) => {
+      this._invitationsManager.invitationCreated.on(ctx, (invitation) => {
         next({
           action: import_services5.QueryInvitationsResponse.Action.ADDED,
           type: import_services5.QueryInvitationsResponse.Type.CREATED,
@@ -2567,7 +2430,7 @@ var InvitationsServiceImpl = class {
           ]
         });
       });
-      this._invitationAccepted.on(ctx, (invitation) => {
+      this._invitationsManager.invitationAccepted.on(ctx, (invitation) => {
         next({
           action: import_services5.QueryInvitationsResponse.Action.ADDED,
           type: import_services5.QueryInvitationsResponse.Type.ACCEPTED,
@@ -2576,7 +2439,7 @@ var InvitationsServiceImpl = class {
           ]
         });
       });
-      this._removedCreated.on(ctx, (invitation) => {
+      this._invitationsManager.removedCreated.on(ctx, (invitation) => {
         next({
           action: import_services5.QueryInvitationsResponse.Action.REMOVED,
           type: import_services5.QueryInvitationsResponse.Type.CREATED,
@@ -2585,7 +2448,7 @@ var InvitationsServiceImpl = class {
           ]
         });
       });
-      this._removedAccepted.on(ctx, (invitation) => {
+      this._invitationsManager.removedAccepted.on(ctx, (invitation) => {
         next({
           action: import_services5.QueryInvitationsResponse.Action.REMOVED,
           type: import_services5.QueryInvitationsResponse.Type.ACCEPTED,
@@ -2594,7 +2457,7 @@ var InvitationsServiceImpl = class {
           ]
         });
       });
-      this._saved.on(ctx, (invitation) => {
+      this._invitationsManager.saved.on(ctx, (invitation) => {
         next({
           action: import_services5.QueryInvitationsResponse.Action.SAVED,
           type: import_services5.QueryInvitationsResponse.Type.CREATED,
@@ -2606,32 +2469,25 @@ var InvitationsServiceImpl = class {
       next({
         action: import_services5.QueryInvitationsResponse.Action.ADDED,
         type: import_services5.QueryInvitationsResponse.Type.CREATED,
-        invitations: Array.from(this._createInvitations.values()).map((invitation) => invitation.get()),
+        invitations: this._invitationsManager.getCreatedInvitations(),
         existing: true
       });
       next({
         action: import_services5.QueryInvitationsResponse.Action.ADDED,
         type: import_services5.QueryInvitationsResponse.Type.ACCEPTED,
-        invitations: Array.from(this._acceptInvitations.values()).map((invitation) => invitation.get()),
+        invitations: this._invitationsManager.getAcceptedInvitations(),
         existing: true
       });
-      if (this._persistentInvitationsLoaded) {
+      this._invitationsManager.onPersistentInvitationsLoaded(ctx, () => {
         next({
           action: import_services5.QueryInvitationsResponse.Action.LOAD_COMPLETE,
           type: import_services5.QueryInvitationsResponse.Type.CREATED
         });
-      } else {
-        this._persistentInvitationsLoadedEvent.on(ctx, () => {
-          next({
-            action: import_services5.QueryInvitationsResponse.Action.LOAD_COMPLETE,
-            type: import_services5.QueryInvitationsResponse.Type.CREATED
-          });
-        });
-      }
+      });
     });
   }
 };
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
+var __dxlog_file8 = "/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;
@@ -2651,10 +2507,10 @@ var SpaceInvitationProtocol = class {
       spaceKey: this._spaceKey
     };
   }
-  async admit(request, guestProfile) {
-    (0, import_invariant8.invariant)(this._spaceKey, void 0, {
-      F: __dxlog_file9,
-      L: 47,
+  async admit(invitation, request, guestProfile) {
+    (0, import_invariant7.invariant)(this._spaceKey, void 0, {
+      F: __dxlog_file8,
+      L: 55,
       S: this,
       A: [
         "this._spaceKey",
@@ -2662,18 +2518,18 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const space = await this._spaceManager.spaces.get(this._spaceKey);
-    (0, import_invariant8.invariant)(space, void 0, {
-      F: __dxlog_file9,
-      L: 49,
+    (0, import_invariant7.invariant)(space, void 0, {
+      F: __dxlog_file8,
+      L: 57,
       S: this,
       A: [
         "space",
         ""
       ]
     });
-    (0, import_invariant8.invariant)(request.space, void 0, {
-      F: __dxlog_file9,
-      L: 51,
+    (0, import_invariant7.invariant)(request.space, void 0, {
+      F: __dxlog_file8,
+      L: 59,
       S: this,
       A: [
         "request.space",
@@ -2681,19 +2537,19 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const { identityKey, deviceKey } = request.space;
-    (0, import_log7.log)("writing guest credentials", {
+    (0, import_log6.log)("writing guest credentials", {
       host: this._signingContext.deviceKey,
       guest: deviceKey
     }, {
-      F: __dxlog_file9,
-      L: 54,
+      F: __dxlog_file8,
+      L: 62,
       S: this,
       C: (f, a) => f(...a)
     });
-    const credentials = await (0, import_credentials8.createAdmissionCredentials)(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, guestProfile);
-    (0, import_invariant8.invariant)(credentials[0].credential, void 0, {
-      F: __dxlog_file9,
-      L: 65,
+    const credentials = await (0, import_credentials7.createAdmissionCredentials)(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, guestProfile, invitation.delegationCredentialId);
+    (0, import_invariant7.invariant)(credentials[0].credential, void 0, {
+      F: __dxlog_file8,
+      L: 74,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2701,9 +2557,9 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const spaceMemberCredential = credentials[0].credential.credential;
-    (0, import_invariant8.invariant)((0, import_credentials8.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file9,
-      L: 67,
+    (0, import_invariant7.invariant)((0, import_credentials7.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file8,
+      L: 76,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2718,6 +2574,69 @@ var SpaceInvitationProtocol = class {
       }
     };
   }
+  async delegate(invitation) {
+    (0, import_invariant7.invariant)(this._spaceKey, void 0, {
+      F: __dxlog_file8,
+      L: 89,
+      S: this,
+      A: [
+        "this._spaceKey",
+        ""
+      ]
+    });
+    const space = await this._spaceManager.spaces.get(this._spaceKey);
+    (0, import_invariant7.invariant)(space, void 0, {
+      F: __dxlog_file8,
+      L: 91,
+      S: this,
+      A: [
+        "space",
+        ""
+      ]
+    });
+    if (invitation.authMethod === import_services6.Invitation.AuthMethod.KNOWN_PUBLIC_KEY) {
+      (0, import_invariant7.invariant)(invitation.guestKeypair?.publicKey, void 0, {
+        F: __dxlog_file8,
+        L: 93,
+        S: this,
+        A: [
+          "invitation.guestKeypair?.publicKey",
+          ""
+        ]
+      });
+    }
+    (0, import_log6.log)("writing delegate space invitation", {
+      host: this._signingContext.deviceKey,
+      id: invitation.invitationId
+    }, {
+      F: __dxlog_file8,
+      L: 96,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const credential = await (0, import_credentials7.createDelegatedSpaceInvitationCredential)(this._signingContext.credentialSigner, space.key, {
+      invitationId: invitation.invitationId,
+      authMethod: invitation.authMethod,
+      swarmKey: invitation.swarmKey,
+      role: import_credentials8.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_services6.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
+    });
+    (0, import_invariant7.invariant)(credential.credential, void 0, {
+      F: __dxlog_file8,
+      L: 116,
+      S: this,
+      A: [
+        "credential.credential",
+        ""
+      ]
+    });
+    await (0, import_feed_store3.writeMessages)(space.inner.controlPipeline.writer, [
+      credential
+    ]);
+    return credential.credential.credential.id;
+  }
   checkInvitation(invitation) {
     if (invitation.spaceKey && this._spaceManager.spaces.has(invitation.spaceKey)) {
       return new import_protocols6.AlreadyJoinedError("Already joined space.");
@@ -2741,9 +2660,9 @@ var SpaceInvitationProtocol = class {
     };
   }
   async accept(response) {
-    (0, import_invariant8.invariant)(response.space, void 0, {
-      F: __dxlog_file9,
-      L: 107,
+    (0, import_invariant7.invariant)(response.space, void 0, {
+      F: __dxlog_file8,
+      L: 149,
       S: this,
       A: [
         "response.space",
@@ -2751,19 +2670,19 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const { credential, controlTimeframe, dataTimeframe } = response.space;
-    const assertion = (0, import_credentials8.getCredentialAssertion)(credential);
-    (0, import_invariant8.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
-      F: __dxlog_file9,
-      L: 110,
+    const assertion = (0, import_credentials7.getCredentialAssertion)(credential);
+    (0, import_invariant7.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
+      F: __dxlog_file8,
+      L: 152,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
         "'Invalid credential'"
       ]
     });
-    (0, import_invariant8.invariant)(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
-      F: __dxlog_file9,
-      L: 111,
+    (0, import_invariant7.invariant)(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
+      F: __dxlog_file8,
+      L: 153,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
@@ -2785,6 +2704,284 @@ var SpaceInvitationProtocol = class {
     };
   }
 };
+var __dxlog_file9 = "/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;
+    this._getHandler = _getHandler;
+    this._metadataStore = _metadataStore;
+    this._createInvitations = /* @__PURE__ */ new Map();
+    this._acceptInvitations = /* @__PURE__ */ new Map();
+    this.invitationCreated = new import_async9.Event();
+    this.invitationAccepted = new import_async9.Event();
+    this.removedCreated = new import_async9.Event();
+    this.removedAccepted = new import_async9.Event();
+    this.saved = new import_async9.Event();
+    this._persistentInvitationsLoadedEvent = new import_async9.Event();
+    this._persistentInvitationsLoaded = false;
+  }
+  async createInvitation(options) {
+    if (options.invitationId) {
+      const existingInvitation = this._createInvitations.get(options.invitationId);
+      if (existingInvitation) {
+        return existingInvitation;
+      }
+    }
+    const handler = this._getHandler(options);
+    const invitation = this._createInvitation(handler, options);
+    const { ctx, stream, observableInvitation } = this._createObservableInvitation(handler, invitation);
+    this._createInvitations.set(invitation.invitationId, observableInvitation);
+    this.invitationCreated.emit(invitation);
+    this._onInvitationComplete(observableInvitation, async () => {
+      this._createInvitations.delete(observableInvitation.get().invitationId);
+      this.removedCreated.emit(observableInvitation.get());
+      if (observableInvitation.get().persistent) {
+        await this._safeDeleteInvitation(observableInvitation.get());
+      }
+    });
+    try {
+      await this._persistIfRequired(handler, stream, invitation);
+    } catch (err) {
+      import_log7.log.catch(err, void 0, {
+        F: __dxlog_file9,
+        L: 76,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await observableInvitation.cancel();
+      return observableInvitation;
+    }
+    this._invitationsHandler.handleInvitationFlow(ctx, stream, handler, observableInvitation.get());
+    return observableInvitation;
+  }
+  async loadPersistentInvitations() {
+    if (this._persistentInvitationsLoaded) {
+      const invitations = this.getCreatedInvitations().filter((i) => i.persistent);
+      return {
+        invitations
+      };
+    }
+    try {
+      const persistentInvitations = this._metadataStore.getInvitations();
+      const freshInvitations = persistentInvitations.filter((invitation) => !(0, import_echo_pipeline.hasInvitationExpired)(invitation));
+      const loadTasks = freshInvitations.map((persistentInvitation) => {
+        (0, import_invariant8.invariant)(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
+          F: __dxlog_file9,
+          L: 97,
+          S: this,
+          A: [
+            "!this._createInvitations.get(persistentInvitation.invitationId)",
+            "'invitation already exists'"
+          ]
+        });
+        return this.createInvitation({
+          ...persistentInvitation,
+          persistent: false
+        });
+      });
+      const cInvitations = await Promise.all(loadTasks);
+      return {
+        invitations: cInvitations.map((invitation) => invitation.get())
+      };
+    } catch (err) {
+      import_log7.log.catch(err, void 0, {
+        F: __dxlog_file9,
+        L: 104,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return {
+        invitations: []
+      };
+    } finally {
+      this._persistentInvitationsLoadedEvent.emit();
+      this._persistentInvitationsLoaded = true;
+    }
+  }
+  acceptInvitation(request) {
+    const options = request.invitation;
+    const existingInvitation = this._acceptInvitations.get(options.invitationId);
+    if (existingInvitation) {
+      return existingInvitation;
+    }
+    const handler = this._getHandler(options);
+    const invitation = this._invitationsHandler.acceptInvitation(handler, options, request.deviceProfile);
+    this._acceptInvitations.set(invitation.get().invitationId, invitation);
+    this.invitationAccepted.emit(invitation.get());
+    this._onInvitationComplete(invitation, () => {
+      this._acceptInvitations.delete(invitation.get().invitationId);
+      this.removedAccepted.emit(invitation.get());
+    });
+    return invitation;
+  }
+  async authenticate({ invitationId, authCode }) {
+    (0, import_log7.log)("authenticating...", void 0, {
+      F: __dxlog_file9,
+      L: 133,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    (0, import_invariant8.invariant)(invitationId, void 0, {
+      F: __dxlog_file9,
+      L: 134,
+      S: this,
+      A: [
+        "invitationId",
+        ""
+      ]
+    });
+    const observable = this._acceptInvitations.get(invitationId);
+    if (!observable) {
+      import_log7.log.warn("invalid invitation", {
+        invitationId
+      }, {
+        F: __dxlog_file9,
+        L: 137,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    } else {
+      await observable.authenticate(authCode);
+    }
+  }
+  async cancelInvitation({ invitationId }) {
+    (0, import_log7.log)("cancelInvitation...", {
+      invitationId
+    }, {
+      F: __dxlog_file9,
+      L: 144,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    (0, import_invariant8.invariant)(invitationId, void 0, {
+      F: __dxlog_file9,
+      L: 145,
+      S: this,
+      A: [
+        "invitationId",
+        ""
+      ]
+    });
+    const created = this._createInvitations.get(invitationId);
+    if (created) {
+      if (created.get().persistent) {
+        await this._metadataStore.removeInvitation(invitationId);
+      }
+      await created.cancel();
+      this._createInvitations.delete(invitationId);
+      this.removedCreated.emit(created.get());
+      return;
+    }
+    const accepted = this._acceptInvitations.get(invitationId);
+    if (accepted) {
+      await accepted.cancel();
+      this._acceptInvitations.delete(invitationId);
+      this.removedAccepted.emit(accepted.get());
+    }
+  }
+  getCreatedInvitations() {
+    return [
+      ...this._createInvitations.values()
+    ].map((i) => i.get());
+  }
+  getAcceptedInvitations() {
+    return [
+      ...this._acceptInvitations.values()
+    ].map((i) => i.get());
+  }
+  onPersistentInvitationsLoaded(ctx, callback) {
+    if (this._persistentInvitationsLoaded) {
+      callback();
+    } else {
+      this._persistentInvitationsLoadedEvent.once(ctx, () => callback());
+    }
+  }
+  _createInvitation(protocol, options) {
+    const { invitationId = import_keys7.PublicKey.random().toHex(), type = import_services7.Invitation.Type.INTERACTIVE, authMethod = import_services7.Invitation.AuthMethod.SHARED_SECRET, state = import_services7.Invitation.State.INIT, timeout = import_client_protocol3.INVITATION_TIMEOUT, swarmKey = import_keys7.PublicKey.random(), persistent = options?.authMethod !== import_services7.Invitation.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, lifetime = 86400, multiUse = false } = options ?? {};
+    const authCode = options?.authCode ?? (authMethod === import_services7.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials9.generatePasscode)(import_client_protocol3.AUTHENTICATION_CODE_LENGTH) : void 0);
+    return {
+      invitationId,
+      type,
+      authMethod,
+      state,
+      swarmKey,
+      authCode,
+      timeout,
+      persistent: persistent && type !== import_services7.Invitation.Type.DELEGATED,
+      guestKeypair: guestKeypair ?? (authMethod === import_services7.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
+      created,
+      lifetime,
+      multiUse,
+      delegationCredentialId: options?.delegationCredentialId,
+      ...protocol.getInvitationContext()
+    };
+  }
+  _createObservableInvitation(handler, invitation) {
+    const stream = new import_async9.PushStream();
+    const ctx = new import_context6.Context({
+      onError: (err) => {
+        stream.error(err);
+        void ctx.dispose();
+      }
+    });
+    ctx.onDispose(() => {
+      (0, import_log7.log)("complete", {
+        ...handler.toJSON()
+      }, {
+        F: __dxlog_file9,
+        L: 228,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      stream.complete();
+    });
+    const observableInvitation = new import_client_protocol3.CancellableInvitation({
+      initialInvitation: invitation,
+      subscriber: stream.observable,
+      onCancel: async () => {
+        stream.next({
+          ...invitation,
+          state: import_services7.Invitation.State.CANCELLED
+        });
+        await ctx.dispose();
+      }
+    });
+    return {
+      ctx,
+      stream,
+      observableInvitation
+    };
+  }
+  async _persistIfRequired(handler, changeStream, invitation) {
+    if (invitation.type === import_services7.Invitation.Type.DELEGATED && invitation.delegationCredentialId == null) {
+      const delegationCredentialId = await handler.delegate(invitation);
+      changeStream.next({
+        ...invitation,
+        delegationCredentialId
+      });
+    } else if (invitation.persistent) {
+      await this._metadataStore.addInvitation(invitation);
+      this.saved.emit(invitation);
+    }
+  }
+  async _safeDeleteInvitation(invitation) {
+    try {
+      await this._metadataStore.removeInvitation(invitation.invitationId);
+    } catch (err) {
+      import_log7.log.catch(err, void 0, {
+        F: __dxlog_file9,
+        L: 260,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  _onInvitationComplete(invitation, callback) {
+    invitation.subscribe(() => {
+    }, () => {
+    }, callback);
+  }
+};
 function _ts_decorate3(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -2827,174 +3024,39 @@ var ClientRpcServer = class {
         } else {
           return handler(methodName, params2);
         }
-      }
-    });
-  }
-  get _services() {
-    return Object.keys(this._serviceRegistry.services);
-  }
-  async open() {
-    await this._rpcPeer.open();
-  }
-  async close() {
-    await this._rpcPeer.close();
-  }
-  _getServiceHandler(serviceName) {
-    if (!this._handlerCache.has(serviceName)) {
-      const [key, descriptor] = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName) ?? (0, import_debug2.raise)(new Error(`Service not available: ${serviceName}`));
-      const service = this._serviceRegistry.services[key];
-      if (!service) {
-        throw new Error(`Service not available: ${serviceName}`);
-      }
-      this._handlerCache.set(serviceName, descriptor.createServer(service));
-    }
-    return this._handlerCache.get(serviceName);
-  }
-};
-_ts_decorate3([
-  import_tracing3.trace.metricsCounter()
-], ClientRpcServer.prototype, "_callMetrics", void 0);
-_ts_decorate3([
-  import_tracing3.trace.info()
-], ClientRpcServer.prototype, "_services", null);
-ClientRpcServer = _ts_decorate3([
-  import_tracing3.trace.resource()
-], ClientRpcServer);
-var getPlatform = () => {
-  if (process.browser) {
-    if (typeof window !== "undefined") {
-      const { userAgent } = window.navigator;
-      return {
-        type: import_services8.Platform.PLATFORM_TYPE.BROWSER,
-        userAgent,
-        uptime: Math.floor((Date.now() - window.performance.timeOrigin) / 1e3)
-      };
-    } else {
-      return {
-        type: import_services8.Platform.PLATFORM_TYPE.SHARED_WORKER,
-        uptime: Math.floor((Date.now() - performance.timeOrigin) / 1e3)
-      };
-    }
-  } else {
-    const { platform: platform2, version, arch } = process;
-    return {
-      type: import_services8.Platform.PLATFORM_TYPE.NODE,
-      platform: platform2,
-      arch,
-      runtime: version,
-      uptime: Math.floor(process.uptime()),
-      memory: process.memoryUsage()
-    };
-  }
-};
-var DXOS_VERSION = "0.4.10-main.3e0c8a5";
-var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
-var DEFAULT_TIMEOUT = 1e3;
-var createDiagnostics = async (clientServices, serviceContext, config) => {
-  const diagnostics = {
-    created: (/* @__PURE__ */ new Date()).toISOString(),
-    platform: getPlatform(),
-    client: {
-      version: DXOS_VERSION,
-      storage: {
-        version: import_protocols7.STORAGE_VERSION
-      }
-    },
-    trace: import_tracing4.TRACE_PROCESSOR.getDiagnostics()
-  };
-  {
-    (0, import_invariant9.invariant)(clientServices.LoggingService, "SystemService is not available.", {
-      F: __dxlog_file10,
-      L: 108,
-      S: void 0,
-      A: [
-        "clientServices.LoggingService",
-        "'SystemService is not available.'"
-      ]
-    });
-    diagnostics.metrics = await (0, import_codec_protobuf10.getFirstStreamValue)(clientServices.LoggingService.queryMetrics({}), {
-      timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0);
-  }
-  if (typeof navigator !== "undefined" && navigator.storage) {
-    const map = /* @__PURE__ */ new Map();
-    const dir = await navigator.storage.getDirectory();
-    for await (const filename of dir?.keys()) {
-      const idx = filename.indexOf("-", filename.indexOf("-") + 1);
-      if (idx === -1) {
-        continue;
-      }
-      map.set(filename.slice(0, idx), (map.get(filename.slice(0, idx)) ?? 0) + 1);
-    }
-    diagnostics.storage = Array.from(map.entries()).sort((a, b) => b[1] - a[1]).map(([file, count]) => ({
-      file,
-      count
-    }));
-  }
-  const identity = serviceContext.identityManager.identity;
-  if (identity) {
-    diagnostics.identity = {
-      identityKey: identity.identityKey,
-      spaceKey: identity.space.key,
-      profile: identity.profileDocument
-    };
-    const { devices } = await (0, import_codec_protobuf10.getFirstStreamValue)(clientServices.DevicesService.queryDevices(), {
-      timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0) ?? {};
-    diagnostics.devices = devices;
-    if (serviceContext.dataSpaceManager) {
-      diagnostics.spaces = await Promise.all(Array.from(serviceContext.dataSpaceManager.spaces.values()).map((space) => getSpaceStats(space)) ?? []);
-    }
-    const { feeds = [] } = await (0, import_codec_protobuf10.getFirstStreamValue)(clientServices.DevtoolsHost.subscribeToFeeds({}), {
-      timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0) ?? {};
-    diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
-      feedKey,
-      bytes,
-      length
-    }));
-    const status = await (0, import_codec_protobuf10.getFirstStreamValue)(clientServices.NetworkService.queryStatus(), {
-      timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0);
-    diagnostics.networkStatus = status;
-    diagnostics.swarms = serviceContext.networkManager.connectionLog?.swarms;
-  }
-  diagnostics.config = config.values;
-  return diagnostics;
-};
-var getSpaceStats = async (space) => {
-  const stats = {
-    key: space.key,
-    metrics: space.metrics,
-    epochs: space.inner.spaceState.credentials.filter((0, import_credentials9.credentialTypeFilter)("dxos.halo.credentials.Epoch")).map((credential) => ({
-      ...credential.subject.assertion,
-      id: credential.id
-    })),
-    members: Array.from(space.inner.spaceState.members.values()).map((member) => ({
-      identity: {
-        identityKey: member.key,
-        profile: {
-          displayName: member.assertion.profile?.displayName
-        }
-      },
-      presence: space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? import_services7.SpaceMember.PresenceState.ONLINE : import_services7.SpaceMember.PresenceState.OFFLINE
-    })),
-    pipeline: {
-      // TODO(burdon): Pick properties from credentials if needed.
-      currentEpoch: space.automergeSpaceState.lastEpoch,
-      appliedEpoch: space.automergeSpaceState.lastEpoch,
-      controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
-      currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
-      targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
-      totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe
+      }
+    });
+  }
+  get _services() {
+    return Object.keys(this._serviceRegistry.services);
+  }
+  async open() {
+    await this._rpcPeer.open();
+  }
+  async close() {
+    await this._rpcPeer.close();
+  }
+  _getServiceHandler(serviceName) {
+    if (!this._handlerCache.has(serviceName)) {
+      const [key, descriptor] = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName) ?? (0, import_debug2.raise)(new Error(`Service not available: ${serviceName}`));
+      const service = this._serviceRegistry.services[key];
+      if (!service) {
+        throw new Error(`Service not available: ${serviceName}`);
+      }
+      this._handlerCache.set(serviceName, descriptor.createServer(service));
     }
-  };
-  if (stats.metrics) {
-    const { open, ready } = stats.metrics;
-    stats.metrics.startupTime = open && ready && ready.getTime() - open.getTime();
+    return this._handlerCache.get(serviceName);
   }
-  return stats;
 };
+_ts_decorate3([
+  import_tracing3.trace.metricsCounter()
+], ClientRpcServer.prototype, "_callMetrics", void 0);
+_ts_decorate3([
+  import_tracing3.trace.info()
+], ClientRpcServer.prototype, "_services", null);
+ClientRpcServer = _ts_decorate3([
+  import_tracing3.trace.resource()
+], ClientRpcServer);
 var AutomergeSpaceState = class {
   constructor(_onNewRoot) {
     this._onNewRoot = _onNewRoot;
@@ -3029,7 +3091,7 @@ var AutomergeSpaceState = class {
     await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
   }
 };
-var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
+var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
 var DEFAULT_RETRY_TIMEOUT = 1e3;
 var DEFAULT_SUCCESS_DELAY = 1e3;
 var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
@@ -3039,8 +3101,8 @@ var NotarizationPlugin = class {
     this._ctx = new import_context8.Context();
     this._extensionOpened = new import_async12.Event();
     this._extensions = /* @__PURE__ */ new Set();
-    this._processedCredentials = new import_util5.ComplexSet(import_keys8.PublicKey.hash);
-    this._processCredentialsTriggers = new import_util5.ComplexMap(import_keys8.PublicKey.hash);
+    this._processedCredentials = new import_util5.ComplexSet(import_keys9.PublicKey.hash);
+    this._processCredentialsTriggers = new import_util5.ComplexMap(import_keys9.PublicKey.hash);
   }
   get hasWriter() {
     return !!this._writer;
@@ -3057,13 +3119,13 @@ var NotarizationPlugin = class {
     (0, import_log9.log)("notarize", {
       credentials
     }, {
-      F: __dxlog_file11,
+      F: __dxlog_file10,
       L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant11.invariant)(credentials.every((credential) => credential.id), "Credentials must have an id", {
-      F: __dxlog_file11,
+    (0, import_invariant10.invariant)(credentials.every((credential) => credential.id), "Credentials must have an id", {
+      F: __dxlog_file10,
       L: 91,
       S: this,
       A: [
@@ -3077,7 +3139,7 @@ var NotarizationPlugin = class {
         import_log9.log.warn("Notarization error", {
           err
         }, {
-          F: __dxlog_file11,
+          F: __dxlog_file10,
           L: 99,
           S: this,
           C: (f, a) => f(...a)
@@ -3093,7 +3155,7 @@ var NotarizationPlugin = class {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
-          F: __dxlog_file11,
+          F: __dxlog_file10,
           L: 111,
           S: this,
           C: (f, a) => f(...a)
@@ -3116,7 +3178,7 @@ var NotarizationPlugin = class {
           import_log9.log.info("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
-            F: __dxlog_file11,
+            F: __dxlog_file10,
             L: 136,
             S: this,
             C: (f, a) => f(...a)
@@ -3130,7 +3192,7 @@ var NotarizationPlugin = class {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
-          F: __dxlog_file11,
+          F: __dxlog_file10,
           L: 143,
           S: this,
           C: (f, a) => f(...a)
@@ -3139,7 +3201,7 @@ var NotarizationPlugin = class {
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
         (0, import_log9.log)("success", void 0, {
-          F: __dxlog_file11,
+          F: __dxlog_file10,
           L: 147,
           S: this,
           C: (f, a) => f(...a)
@@ -3148,7 +3210,7 @@ var NotarizationPlugin = class {
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
           import_log9.log.info("error notarizing (recoverable)", err, {
-            F: __dxlog_file11,
+            F: __dxlog_file10,
             L: 151,
             S: this,
             C: (f, a) => f(...a)
@@ -3166,7 +3228,7 @@ var NotarizationPlugin = class {
         errors.wait()
       ]);
       (0, import_log9.log)("done", void 0, {
-        F: __dxlog_file11,
+        F: __dxlog_file10,
         L: 162,
         S: this,
         C: (f, a) => f(...a)
@@ -3187,8 +3249,8 @@ var NotarizationPlugin = class {
     this._processCredentialsTriggers.delete(credential.id);
   }
   setWriter(writer) {
-    (0, import_invariant11.invariant)(!this._writer, "Writer already set.", {
-      F: __dxlog_file11,
+    (0, import_invariant10.invariant)(!this._writer, "Writer already set.", {
+      F: __dxlog_file10,
       L: 181,
       S: this,
       A: [
@@ -3212,8 +3274,8 @@ var NotarizationPlugin = class {
       throw new Error(WRITER_NOT_SET_ERROR_CODE);
     }
     for (const credential of request.credentials ?? []) {
-      (0, import_invariant11.invariant)(credential.id, "Credential must have an id", {
-        F: __dxlog_file11,
+      (0, import_invariant10.invariant)(credential.id, "Credential must have an id", {
+        F: __dxlog_file10,
         L: 200,
         S: this,
         A: [
@@ -3233,7 +3295,7 @@ var NotarizationPlugin = class {
         (0, import_log9.log)("extension opened", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file11,
+          F: __dxlog_file10,
           L: 211,
           S: this,
           C: (f, a) => f(...a)
@@ -3245,7 +3307,7 @@ var NotarizationPlugin = class {
         (0, import_log9.log)("extension closed", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file11,
+          F: __dxlog_file10,
           L: 216,
           S: this,
           C: (f, a) => f(...a)
@@ -3261,10 +3323,10 @@ var NotarizationTeleportExtension = class extends import_teleport2.RpcExtension
   constructor(_params) {
     super({
       requested: {
-        NotarizationService: import_protocols9.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_protocols8.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       },
       exposed: {
-        NotarizationService: import_protocols9.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_protocols8.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       }
     });
     this._params = _params;
@@ -3297,14 +3359,14 @@ function _ts_decorate4(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
+var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var DataSpace = class {
   constructor(params) {
     this._ctx = new import_context7.Context();
     this._notarizationPlugin = new NotarizationPlugin();
     this._cache = void 0;
     this._automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
-    this._state = import_services9.SpaceState.CLOSED;
+    this._state = import_services8.SpaceState.CLOSED;
     this.error = void 0;
     this.stateUpdate = new import_async10.Event();
     this.metrics = {};
@@ -3317,19 +3379,19 @@ var DataSpace = class {
     this._metadataStore = params.metadataStore;
     this._signingContext = params.signingContext;
     this._callbacks = params.callbacks ?? {};
-    this._automergeHost = params.automergeHost;
+    this._echoHost = params.echoHost;
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new import_util4.ComplexSet(import_keys7.PublicKey.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
+      trustedKeysProvider: () => new import_util4.ComplexSet(import_keys8.PublicKey.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
       update: this._inner.stateUpdate,
-      authTimeout: import_client_protocol3.AUTH_TIMEOUT
+      authTimeout: import_client_protocol4.AUTH_TIMEOUT
     });
     this._cache = params.cache;
     this._state = params.initialState;
     (0, import_log8.log)("new state", {
-      state: import_services9.SpaceState[this._state]
+      state: import_services8.SpaceState[this._state]
     }, {
-      F: __dxlog_file12,
-      L: 140,
+      F: __dxlog_file11,
+      L: 135,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3374,12 +3436,12 @@ var DataSpace = class {
     await this._inner.spaceState.addCredentialProcessor(this._notarizationPlugin);
     await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
     await this._inner.open(new import_context7.Context());
-    this._state = import_services9.SpaceState.CONTROL_ONLY;
+    this._state = import_services8.SpaceState.CONTROL_ONLY;
     (0, import_log8.log)("new state", {
-      state: import_services9.SpaceState[this._state]
+      state: import_services8.SpaceState[this._state]
     }, {
-      F: __dxlog_file12,
-      L: 198,
+      F: __dxlog_file11,
+      L: 193,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3392,12 +3454,12 @@ var DataSpace = class {
   }
   async _close() {
     await this._callbacks.beforeClose?.();
-    this._state = import_services9.SpaceState.CLOSED;
+    this._state = import_services8.SpaceState.CLOSED;
     (0, import_log8.log)("new state", {
-      state: import_services9.SpaceState[this._state]
+      state: import_services8.SpaceState[this._state]
     }, {
-      F: __dxlog_file12,
-      L: 212,
+      F: __dxlog_file11,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3426,27 +3488,27 @@ var DataSpace = class {
         this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
       } catch (err) {
-        if (err instanceof import_protocols8.CancelledError || err instanceof import_context7.ContextDisposedError) {
+        if (err instanceof import_protocols7.CancelledError || err instanceof import_context7.ContextDisposedError) {
           (0, import_log8.log)("data pipeline initialization cancelled", err, {
-            F: __dxlog_file12,
-            L: 245,
+            F: __dxlog_file11,
+            L: 240,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         import_log8.log.error("Error initializing data pipeline", err, {
-          F: __dxlog_file12,
-          L: 249,
+          F: __dxlog_file11,
+          L: 244,
           S: this,
           C: (f, a) => f(...a)
         });
-        this._state = import_services9.SpaceState.ERROR;
+        this._state = import_services8.SpaceState.ERROR;
         (0, import_log8.log)("new state", {
-          state: import_services9.SpaceState[this._state]
+          state: import_services8.SpaceState[this._state]
         }, {
-          F: __dxlog_file12,
-          L: 251,
+          F: __dxlog_file11,
+          L: 246,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3458,15 +3520,15 @@ var DataSpace = class {
     });
   }
   async initializeDataPipeline() {
-    if (this._state !== import_services9.SpaceState.CONTROL_ONLY) {
-      throw new import_protocols8.SystemError("Invalid operation");
+    if (this._state !== import_services8.SpaceState.CONTROL_ONLY) {
+      throw new import_protocols7.SystemError("Invalid operation");
     }
-    this._state = import_services9.SpaceState.INITIALIZING;
+    this._state = import_services8.SpaceState.INITIALIZING;
     (0, import_log8.log)("new state", {
-      state: import_services9.SpaceState[this._state]
+      state: import_services8.SpaceState[this._state]
     }, {
-      F: __dxlog_file12,
-      L: 267,
+      F: __dxlog_file11,
+      L: 262,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3475,18 +3537,18 @@ var DataSpace = class {
     this._automergeSpaceState.startProcessingRootDocs();
     await (0, import_context7.cancelWithContext)(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
     (0, import_log8.log)("data pipeline ready", void 0, {
-      F: __dxlog_file12,
-      L: 279,
+      F: __dxlog_file11,
+      L: 274,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._callbacks.beforeReady?.();
-    this._state = import_services9.SpaceState.READY;
+    this._state = import_services8.SpaceState.READY;
     (0, import_log8.log)("new state", {
-      state: import_services9.SpaceState[this._state]
+      state: import_services8.SpaceState[this._state]
     }, {
-      F: __dxlog_file12,
-      L: 283,
+      F: __dxlog_file11,
+      L: 278,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3501,14 +3563,14 @@ var DataSpace = class {
     this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
     (0, import_log8.log)("writable feeds created", void 0, {
-      F: __dxlog_file12,
-      L: 299,
+      F: __dxlog_file11,
+      L: 294,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdate.emit();
     if (!this.notarizationPlugin.hasWriter) {
-      this.notarizationPlugin.setWriter((0, import_echo_pipeline.createMappedFeedWriter)((credential) => ({
+      this.notarizationPlugin.setWriter((0, import_echo_pipeline2.createMappedFeedWriter)((credential) => ({
         credential: {
           credential
         }
@@ -3564,13 +3626,13 @@ var DataSpace = class {
       space: this.key,
       rootUrl
     }, {
-      F: __dxlog_file12,
-      L: 365,
+      F: __dxlog_file11,
+      L: 360,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._automergeHost._requestedDocs.add(rootUrl);
-    const handle = this._automergeHost.repo.find(rootUrl);
+    this._echoHost.replicateDocument(rootUrl);
+    const handle = this._echoHost.automergeRepo.find(rootUrl);
     queueMicrotask(async () => {
       try {
         await (0, import_debug3.warnAfterTimeout)(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
@@ -3579,7 +3641,7 @@ var DataSpace = class {
         if (this._ctx.disposed) {
           return;
         }
-        const doc = handle.docSync() ?? (0, import_invariant10.failedInvariant)();
+        const doc = handle.docSync() ?? (0, import_invariant9.failedInvariant)();
         if (!doc.access?.spaceKey) {
           handle.change((doc2) => {
             doc2.access = {
@@ -3596,8 +3658,8 @@ var DataSpace = class {
           rootUrl,
           err
         }, {
-          F: __dxlog_file12,
-          L: 388,
+          F: __dxlog_file11,
+          L: 383,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3623,7 +3685,7 @@ var DataSpace = class {
     let epoch;
     switch (options?.migration) {
       case void 0:
-      case import_services9.CreateEpochRequest.Migration.NONE:
+      case import_services8.CreateEpochRequest.Migration.NONE:
         {
           epoch = {
             previousId: this._automergeSpaceState.lastEpoch?.id,
@@ -3633,9 +3695,9 @@ var DataSpace = class {
           };
         }
         break;
-      case import_services9.CreateEpochRequest.Migration.INIT_AUTOMERGE:
+      case import_services8.CreateEpochRequest.Migration.INIT_AUTOMERGE:
         {
-          const document = this._automergeHost.repo.create();
+          const document = this._echoHost.automergeRepo.create();
           epoch = {
             previousId: this._automergeSpaceState.lastEpoch?.id,
             number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
@@ -3644,15 +3706,15 @@ var DataSpace = class {
           };
         }
         break;
-      case import_services9.CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY:
+      case import_services8.CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY:
         {
           const currentRootUrl = this._automergeSpaceState.rootUrl;
-          const rootHandle = this._automergeHost.repo.find(currentRootUrl);
+          const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl);
           await (0, import_context7.cancelWithContext)(this._ctx, (0, import_async10.asyncTimeout)(rootHandle.whenReady(), 1e4));
-          const newRoot = this._automergeHost.repo.create(rootHandle.docSync());
-          (0, import_invariant10.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-            F: __dxlog_file12,
-            L: 438,
+          const newRoot = this._echoHost.automergeRepo.create(rootHandle.docSync());
+          (0, import_invariant9.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
+            F: __dxlog_file11,
+            L: 433,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
@@ -3667,23 +3729,23 @@ var DataSpace = class {
           };
         }
         break;
-      case import_services9.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT:
+      case import_services8.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT:
         {
           import_log8.log.info("Fragmenting", void 0, {
-            F: __dxlog_file12,
-            L: 450,
+            F: __dxlog_file11,
+            L: 445,
             S: this,
             C: (f, a) => f(...a)
           });
           const currentRootUrl = this._automergeSpaceState.rootUrl;
-          const rootHandle = this._automergeHost.repo.find(currentRootUrl);
+          const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl);
           await (0, import_context7.cancelWithContext)(this._ctx, (0, import_async10.asyncTimeout)(rootHandle.whenReady(), 1e4));
           const objects = Object.entries(rootHandle.docSync().objects);
-          const properties = objects.find(([_, value]) => value.system.type?.itemId === import_echo_db.TYPE_PROPERTIES);
+          const properties = objects.find(([_, value]) => value.system.type?.itemId === import_echo_schema.TYPE_PROPERTIES);
           const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
-          (0, import_invariant10.invariant)(properties, "Properties not found", {
-            F: __dxlog_file12,
-            L: 460,
+          (0, import_invariant9.invariant)(properties, "Properties not found", {
+            F: __dxlog_file11,
+            L: 455,
             S: this,
             A: [
               "properties",
@@ -3696,17 +3758,17 @@ var DataSpace = class {
               properties
             ])
           };
-          const newRoot = this._automergeHost.repo.create(newSpaceDoc);
-          (0, import_invariant10.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-            F: __dxlog_file12,
-            L: 465,
+          const newRoot = this._echoHost.automergeRepo.create(newSpaceDoc);
+          (0, import_invariant9.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
+            F: __dxlog_file11,
+            L: 460,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
               ""
             ]
           });
-          const docLoader = new import_echo_pipeline2.AutomergeDocumentLoaderImpl(this.key, this._automergeHost.repo);
+          const docLoader = new import_echo_pipeline3.AutomergeDocumentLoaderImpl(this.key, this._echoHost.automergeRepo);
           await docLoader.loadSpaceRootDocHandle(this._ctx, {
             rootUrl: newRoot.url
           });
@@ -3750,25 +3812,25 @@ var DataSpace = class {
     ]));
   }
   async activate() {
-    if (this._state !== import_services9.SpaceState.INACTIVE) {
+    if (this._state !== import_services8.SpaceState.INACTIVE) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, import_services9.SpaceState.ACTIVE);
+    await this._metadataStore.setSpaceState(this.key, import_services8.SpaceState.ACTIVE);
     await this._open();
     this.initializeDataPipelineAsync();
   }
   async deactivate() {
-    if (this._state === import_services9.SpaceState.INACTIVE) {
+    if (this._state === import_services8.SpaceState.INACTIVE) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, import_services9.SpaceState.INACTIVE);
+    await this._metadataStore.setSpaceState(this.key, import_services8.SpaceState.INACTIVE);
     await this._close();
-    this._state = import_services9.SpaceState.INACTIVE;
+    this._state = import_services8.SpaceState.INACTIVE;
     (0, import_log8.log)("new state", {
-      state: import_services9.SpaceState[this._state]
+      state: import_services8.SpaceState[this._state]
     }, {
-      F: __dxlog_file12,
-      L: 531,
+      F: __dxlog_file11,
+      L: 526,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3776,18 +3838,18 @@ var DataSpace = class {
   }
 };
 _ts_decorate4([
-  import_tracing5.trace.info()
+  import_tracing4.trace.info()
 ], DataSpace.prototype, "_inner", void 0);
 _ts_decorate4([
-  import_tracing5.trace.info()
+  import_tracing4.trace.info()
 ], DataSpace.prototype, "key", null);
 _ts_decorate4([
-  import_tracing5.trace.info({
-    enum: import_services9.SpaceState
+  import_tracing4.trace.info({
+    enum: import_services8.SpaceState
   })
 ], DataSpace.prototype, "state", null);
 _ts_decorate4([
-  import_tracing5.trace.info({
+  import_tracing4.trace.info({
     depth: null
   })
 ], DataSpace.prototype, "_automergeInfo", null);
@@ -3798,12 +3860,12 @@ _ts_decorate4([
   import_async10.synchronized
 ], DataSpace.prototype, "close", null);
 _ts_decorate4([
-  import_tracing5.trace.span({
+  import_tracing4.trace.span({
     showInBrowserTimeline: true
   })
 ], DataSpace.prototype, "initializeDataPipeline", null);
 _ts_decorate4([
-  import_tracing5.trace.span({
+  import_tracing4.trace.span({
     showInBrowserTimeline: true
   })
 ], DataSpace.prototype, "_initializeAndReadControlPipeline", null);
@@ -3818,7 +3880,7 @@ _ts_decorate4([
 ], DataSpace.prototype, "deactivate", null);
 DataSpace = _ts_decorate4([
   (0, import_async10.trackLeaks)("open", "close"),
-  import_tracing5.trace.resource()
+  import_tracing4.trace.resource()
 ], DataSpace);
 var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
   const credentials = [
@@ -3894,22 +3956,23 @@ function _ts_decorate5(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
+var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
 var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var DataSpaceManager = class {
-  constructor(_spaceManager, _metadataStore, _keyring, _signingContext, _feedStore, _automergeHost, params) {
+  constructor(_spaceManager, _metadataStore, _keyring, _signingContext, _feedStore, _echoHost, _invitationsManager, params) {
     this._spaceManager = _spaceManager;
     this._metadataStore = _metadataStore;
     this._keyring = _keyring;
     this._signingContext = _signingContext;
     this._feedStore = _feedStore;
-    this._automergeHost = _automergeHost;
+    this._echoHost = _echoHost;
+    this._invitationsManager = _invitationsManager;
     this._ctx = new import_context9.Context();
     this.updated = new import_async13.Event();
-    this._spaces = new import_util6.ComplexMap(import_keys9.PublicKey.hash);
+    this._spaces = new import_util6.ComplexMap(import_keys10.PublicKey.hash);
     this._isOpen = false;
-    this._instanceId = import_keys9.PublicKey.random().toHex();
+    this._instanceId = import_keys10.PublicKey.random().toHex();
     const { spaceMemberPresenceAnnounceInterval = PRESENCE_ANNOUNCE_INTERVAL, spaceMemberPresenceOfflineTimeout = PRESENCE_OFFLINE_TIMEOUT } = params ?? {};
     this._spaceMemberPresenceAnnounceInterval = spaceMemberPresenceAnnounceInterval;
     this._spaceMemberPresenceOfflineTimeout = spaceMemberPresenceOfflineTimeout;
@@ -3920,24 +3983,24 @@ var DataSpaceManager = class {
   }
   async open() {
     (0, import_log10.log)("open", void 0, {
-      F: __dxlog_file13,
-      L: 98,
+      F: __dxlog_file12,
+      L: 102,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log10.log.trace("dxos.echo.data-space-manager.open", import_protocols10.trace.begin({
+    import_log10.log.trace("dxos.echo.data-space-manager.open", import_protocols9.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file13,
-      L: 99,
+      F: __dxlog_file12,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log10.log)("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
-      F: __dxlog_file13,
-      L: 100,
+      F: __dxlog_file12,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3946,8 +4009,8 @@ var DataSpaceManager = class {
         (0, import_log10.log)("load space", {
           spaceMetadata
         }, {
-          F: __dxlog_file13,
-          L: 104,
+          F: __dxlog_file12,
+          L: 108,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3957,8 +4020,8 @@ var DataSpaceManager = class {
           spaceMetadata,
           err
         }, {
-          F: __dxlog_file13,
-          L: 107,
+          F: __dxlog_file12,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3967,23 +4030,23 @@ var DataSpaceManager = class {
     this._isOpen = true;
     this.updated.emit();
     for (const space of this._spaces.values()) {
-      if (space.state !== import_services10.SpaceState.INACTIVE) {
+      if (space.state !== import_services9.SpaceState.INACTIVE) {
         space.initializeDataPipelineAsync();
       }
     }
-    import_log10.log.trace("dxos.echo.data-space-manager.open", import_protocols10.trace.end({
+    import_log10.log.trace("dxos.echo.data-space-manager.open", import_protocols9.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file13,
-      L: 120,
+      F: __dxlog_file12,
+      L: 124,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
     (0, import_log10.log)("close", void 0, {
-      F: __dxlog_file13,
-      L: 125,
+      F: __dxlog_file12,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3997,9 +4060,9 @@ var DataSpaceManager = class {
   * Creates a new space writing the genesis credentials to the control feed.
   */
   async createSpace() {
-    (0, import_invariant12.invariant)(this._isOpen, "Not open.", {
-      F: __dxlog_file13,
-      L: 138,
+    (0, import_invariant11.invariant)(this._isOpen, "Not open.", {
+      F: __dxlog_file12,
+      L: 142,
       S: this,
       A: [
         "this._isOpen",
@@ -4014,28 +4077,23 @@ var DataSpaceManager = class {
       genesisFeedKey: controlFeedKey,
       controlFeedKey,
       dataFeedKey,
-      state: import_services10.SpaceState.ACTIVE
+      state: import_services9.SpaceState.ACTIVE
     };
     (0, import_log10.log)("creating space...", {
       spaceKey
     }, {
-      F: __dxlog_file13,
-      L: 150,
+      F: __dxlog_file12,
+      L: 154,
       S: this,
       C: (f, a) => f(...a)
     });
-    const automergeRoot = this._automergeHost.repo.create();
-    automergeRoot.change((doc) => {
-      doc.access = {
-        spaceKey: spaceKey.toHex()
-      };
-    });
+    const automergeRootUrl = await this._echoHost.createSpaceRoot(spaceKey);
     const space = await this._constructSpace(metadata);
-    const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRoot.url);
+    const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRootUrl);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    (0, import_invariant12.invariant)((0, import_credentials12.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file13,
+    (0, import_invariant11.invariant)((0, import_credentials12.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file12,
       L: 163,
       S: this,
       A: [
@@ -4053,13 +4111,13 @@ var DataSpaceManager = class {
     (0, import_log10.log)("accept space", {
       opts
     }, {
-      F: __dxlog_file13,
+      F: __dxlog_file12,
       L: 175,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant12.invariant)(this._isOpen, "Not open.", {
-      F: __dxlog_file13,
+    (0, import_invariant11.invariant)(this._isOpen, "Not open.", {
+      F: __dxlog_file12,
       L: 176,
       S: this,
       A: [
@@ -4067,8 +4125,8 @@ var DataSpaceManager = class {
         "'Not open.'"
       ]
     });
-    (0, import_invariant12.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
-      F: __dxlog_file13,
+    (0, import_invariant11.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
+      F: __dxlog_file12,
       L: 177,
       S: this,
       A: [
@@ -4096,14 +4154,14 @@ var DataSpaceManager = class {
   async waitUntilSpaceReady(spaceKey) {
     await (0, import_context9.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
-      return !!space && space.state === import_services10.SpaceState.READY;
+      return !!space && space.state === import_services9.SpaceState.READY;
     }));
   }
   async _constructSpace(metadata) {
     (0, import_log10.log)("construct space", {
       metadata
     }, {
-      F: __dxlog_file13,
+      F: __dxlog_file12,
       L: 210,
       S: this,
       C: (f, a) => f(...a)
@@ -4136,37 +4194,41 @@ var DataSpaceManager = class {
           remotePeerId: session.remotePeerId
         }));
         session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
-        this._automergeHost.authorizeDevice(space.key, session.remotePeerId);
-        session.addExtension("dxos.mesh.teleport.automerge", this._automergeHost.createExtension());
+        this._echoHost.authorizeDevice(space.key, session.remotePeerId);
+        session.addExtension("dxos.mesh.teleport.automerge", this._echoHost.createReplicationExtension());
       },
       onAuthFailure: () => {
         import_log10.log.warn("auth failure", void 0, {
-          F: __dxlog_file13,
+          F: __dxlog_file12,
           L: 247,
           S: this,
           C: (f, a) => f(...a)
         });
       },
-      memberKey: this._signingContext.identityKey
+      memberKey: this._signingContext.identityKey,
+      onDelegatedInvitationStatusChange: (invitation, isActive) => {
+        return this._handleInvitationStatusChange(dataSpace, invitation, isActive);
+      }
     });
     controlFeed && await space.setControlFeed(controlFeed);
     dataFeed && await space.setDataFeed(dataFeed);
     const dataSpace = new DataSpace({
       inner: space,
-      initialState: metadata.state === import_services10.SpaceState.INACTIVE ? import_services10.SpaceState.INACTIVE : import_services10.SpaceState.CLOSED,
+      initialState: metadata.state === import_services9.SpaceState.INACTIVE ? import_services9.SpaceState.INACTIVE : import_services9.SpaceState.CLOSED,
       metadataStore: this._metadataStore,
       gossip,
       presence,
       keyring: this._keyring,
       feedStore: this._feedStore,
+      echoHost: this._echoHost,
       signingContext: this._signingContext,
       callbacks: {
         beforeReady: async () => {
           (0, import_log10.log)("before space ready", {
             space: space.key
           }, {
-            F: __dxlog_file13,
-            L: 265,
+            F: __dxlog_file12,
+            L: 269,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4176,12 +4238,15 @@ var DataSpaceManager = class {
             space: space.key,
             open: this._isOpen
           }, {
-            F: __dxlog_file13,
-            L: 268,
+            F: __dxlog_file12,
+            L: 272,
             S: this,
             C: (f, a) => f(...a)
           });
           if (this._isOpen) {
+            await this._createDelegatedInvitations(dataSpace, [
+              ...space.spaceState.invitations.entries()
+            ]);
             this.updated.emit();
           }
         },
@@ -4189,17 +4254,16 @@ var DataSpaceManager = class {
           (0, import_log10.log)("before space close", {
             space: space.key
           }, {
-            F: __dxlog_file13,
-            L: 274,
+            F: __dxlog_file12,
+            L: 279,
             S: this,
             C: (f, a) => f(...a)
           });
         }
       },
-      cache: metadata.cache,
-      automergeHost: this._automergeHost
+      cache: metadata.cache
     });
-    if (metadata.state !== import_services10.SpaceState.INACTIVE) {
+    if (metadata.state !== import_services9.SpaceState.INACTIVE) {
       await dataSpace.open();
     }
     if (metadata.controlTimeframe) {
@@ -4208,6 +4272,41 @@ var DataSpaceManager = class {
     this._spaces.set(metadata.key, dataSpace);
     return dataSpace;
   }
+  async _handleInvitationStatusChange(dataSpace, delegatedInvitation, isActive) {
+    if (dataSpace?.state !== import_services9.SpaceState.READY) {
+      return;
+    }
+    if (isActive) {
+      await this._createDelegatedInvitations(dataSpace, [
+        [
+          delegatedInvitation.credentialId,
+          delegatedInvitation.invitation
+        ]
+      ]);
+    } else {
+      await this._invitationsManager.cancelInvitation(delegatedInvitation.invitation);
+    }
+  }
+  async _createDelegatedInvitations(space, invitations) {
+    const tasks = invitations.map(([credentialId, invitation]) => {
+      return this._invitationsManager.createInvitation({
+        type: import_services9.Invitation.Type.DELEGATED,
+        kind: import_services9.Invitation.Kind.SPACE,
+        spaceKey: space.key,
+        authMethod: invitation.authMethod,
+        invitationId: invitation.invitationId,
+        swarmKey: invitation.swarmKey,
+        guestKeypair: invitation.guestKey ? {
+          publicKey: invitation.guestKey
+        } : void 0,
+        lifetime: invitation.expiresOn ? invitation.expiresOn.getTime() - Date.now() : void 0,
+        multiUse: invitation.multiUse,
+        delegationCredentialId: credentialId,
+        persistent: false
+      });
+    });
+    await Promise.all(tasks);
+  }
 };
 _ts_decorate5([
   import_async13.synchronized
@@ -4224,7 +4323,7 @@ _ts_decorate5([
 DataSpaceManager = _ts_decorate5([
   (0, import_async13.trackLeaks)("open", "close")
 ], DataSpaceManager);
-var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
+var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
   constructor(_identityManager, _spaceManager, _getDataSpaceManager) {
     this._identityManager = _identityManager;
@@ -4241,29 +4340,29 @@ var SpacesServiceImpl = class {
   }
   async updateSpace({ spaceKey, state }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols10.SpaceNotFoundError(spaceKey));
     if (state) {
       switch (state) {
-        case import_services11.SpaceState.ACTIVE:
+        case import_services10.SpaceState.ACTIVE:
           await space.activate();
           break;
-        case import_services11.SpaceState.INACTIVE:
+        case import_services10.SpaceState.INACTIVE:
           await space.deactivate();
           break;
         default:
-          throw new import_protocols11.ApiError("Invalid space state");
+          throw new import_protocols10.ApiError("Invalid space state");
       }
     }
   }
   querySpaces() {
-    return new import_codec_protobuf11.Stream(({ next, ctx }) => {
+    return new import_codec_protobuf10.Stream(({ next, ctx }) => {
       const scheduler = new import_async14.UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
         (0, import_log11.log)("update", {
           spaces
         }, {
-          F: __dxlog_file14,
+          F: __dxlog_file13,
           L: 77,
           S: this,
           C: (f, a) => f(...a)
@@ -4303,14 +4402,14 @@ var SpacesServiceImpl = class {
   }
   async postMessage({ spaceKey, channel, message }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols10.SpaceNotFoundError(spaceKey));
     await space.postMessage(getChannelId(channel), message);
   }
   subscribeMessages({ spaceKey, channel }) {
-    return new import_codec_protobuf11.Stream(({ ctx, next }) => {
+    return new import_codec_protobuf10.Stream(({ ctx, next }) => {
       (0, import_async14.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
+        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols10.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
           next(message);
         });
@@ -4319,8 +4418,8 @@ var SpacesServiceImpl = class {
     });
   }
   queryCredentials({ spaceKey, noTail }) {
-    return new import_codec_protobuf11.Stream(({ ctx, next, close }) => {
-      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
+    return new import_codec_protobuf10.Stream(({ ctx, next, close }) => {
+      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols10.SpaceNotFoundError(spaceKey));
       const processor = {
         processCredential: async (credential) => {
           next(credential);
@@ -4336,7 +4435,7 @@ var SpacesServiceImpl = class {
     });
   }
   async writeCredentials({ spaceKey, credentials }) {
-    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
+    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols10.SpaceNotFoundError(spaceKey));
     for (const credential of credentials ?? []) {
       if (credential.proof) {
         await space.controlPipeline.writer.write({
@@ -4345,8 +4444,8 @@ var SpacesServiceImpl = class {
           }
         });
       } else {
-        (0, import_invariant13.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
-          F: __dxlog_file14,
+        (0, import_invariant12.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
+          F: __dxlog_file13,
           L: 164,
           S: this,
           A: [
@@ -4354,8 +4453,8 @@ var SpacesServiceImpl = class {
             "'Id on unsigned credentials is not allowed'"
           ]
         });
-        (0, import_invariant13.invariant)(this._identityManager.identity, "Identity is not available", {
-          F: __dxlog_file14,
+        (0, import_invariant12.invariant)(this._identityManager.identity, "Identity is not available", {
+          F: __dxlog_file13,
           L: 165,
           S: this,
           A: [
@@ -4364,8 +4463,8 @@ var SpacesServiceImpl = class {
           ]
         });
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
-        (0, import_invariant13.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
-          F: __dxlog_file14,
+        (0, import_invariant12.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
+          F: __dxlog_file13,
           L: 167,
           S: this,
           A: [
@@ -4387,7 +4486,7 @@ var SpacesServiceImpl = class {
   }
   async createEpoch({ spaceKey, migration }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols10.SpaceNotFoundError(spaceKey));
     await space.createEpoch({
       migration
     });
@@ -4396,7 +4495,7 @@ var SpacesServiceImpl = class {
     return {
       spaceKey: space.key,
       state: space.state,
-      error: space.error ? (0, import_protocols11.encodeError)(space.error) : void 0,
+      error: space.error ? (0, import_protocols10.encodeError)(space.error) : void 0,
       pipeline: {
         currentEpoch: space.automergeSpaceState.lastEpoch,
         appliedEpoch: space.automergeSpaceState.lastEpoch,
@@ -4421,7 +4520,7 @@ var SpacesServiceImpl = class {
             identityKey: member.key,
             profile: member.profile ?? {}
           },
-          presence: member.removed ? import_services11.SpaceMember.PresenceState.REMOVED : isMe || peers.length > 0 ? import_services11.SpaceMember.PresenceState.ONLINE : import_services11.SpaceMember.PresenceState.OFFLINE,
+          presence: member.removed ? import_services10.SpaceMember.PresenceState.REMOVED : isMe || peers.length > 0 ? import_services10.SpaceMember.PresenceState.ONLINE : import_services10.SpaceMember.PresenceState.OFFLINE,
           peerStates: peers
         };
       }),
@@ -4432,80 +4531,6 @@ var SpacesServiceImpl = class {
   }
 };
 var getChannelId = (channel) => `user-channel/${channel}`;
-var createSelectedDocumentsIterator = (automergeHost) => (
-  /**
-  * Get object data blobs from Automerge Repo by ids.
-  * @param ids
-  */
-  // TODO(mykola): Unload automerge handles after usage.
-  async function* loadDocuments(ids) {
-    for (const id of ids) {
-      const { documentId, objectId } = import_protocols13.idCodec.decode(id);
-      const handle = automergeHost.repo.find(documentId);
-      await (0, import_debug7.warnAfterTimeout)(5e3, "to long to load doc", () => handle.whenReady());
-      const doc = handle.docSync();
-      const hash = (0, import_automerge.getHeads)(doc).join("");
-      yield doc.objects?.[objectId] ? [
-        {
-          id,
-          object: doc.objects[objectId],
-          currentHash: hash
-        }
-      ] : [];
-    }
-  }
-);
-var createDocumentsIterator = (automergeHost) => (
-  /**
-  * Recursively get all object data blobs from Automerge Repo.
-  * @param ids
-  */
-  // TODO(mykola): Unload automerge handles after usage.
-  async function* getAllDocuments() {
-    const visited = /* @__PURE__ */ new Set();
-    async function* getObjectsFromHandle(handle) {
-      if (visited.has(handle.documentId)) {
-        return;
-      }
-      await (0, import_debug7.warnAfterTimeout)(5e3, "to long to load doc", () => handle.whenReady());
-      const doc = handle.docSync();
-      const heads = (0, import_automerge.getHeads)(doc);
-      if (doc.objects) {
-        yield Object.entries(doc.objects).map(([objectId, object]) => {
-          return {
-            id: import_protocols13.idCodec.encode({
-              documentId: handle.documentId,
-              objectId
-            }),
-            object,
-            currentHash: heads.join("")
-          };
-        });
-      }
-      if (doc.links) {
-        for (const id of Object.values(doc.links)) {
-          if (visited.has(id)) {
-            continue;
-          }
-          const linkHandle = automergeHost.repo.find(id);
-          for await (const result of getObjectsFromHandle(linkHandle)) {
-            yield result;
-          }
-        }
-      }
-      visited.add(handle.documentId);
-    }
-    for (const handle of Object.values(automergeHost.repo.handles)) {
-      if (visited.has(handle.documentId)) {
-        continue;
-      }
-      for await (const result of getObjectsFromHandle(handle)) {
-        yield result;
-      }
-      visited.add(handle.documentId);
-    }
-  }
-);
 function _ts_decorate6(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -4516,18 +4541,20 @@ function _ts_decorate6(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
-var ServiceContext = class {
-  constructor(storage, networkManager, signalManager, _runtimeParams) {
+var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var ServiceContext = class extends import_context10.Resource {
+  constructor(storage, level, networkManager, signalManager, _runtimeParams) {
+    super();
     this.storage = storage;
+    this.level = level;
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this._runtimeParams = _runtimeParams;
     this.initialized = new import_async15.Trigger();
     this._handlerFactories = /* @__PURE__ */ new Map();
-    this._instanceId = import_keys10.PublicKey.random().toHex();
-    this.metadataStore = new import_echo_pipeline3.MetadataStore(storage.createDirectory("metadata"));
-    this.snapshotStore = new import_echo_pipeline3.SnapshotStore(storage.createDirectory("snapshots"));
+    this._instanceId = import_keys11.PublicKey.random().toHex();
+    this.metadataStore = new import_echo_pipeline4.MetadataStore(storage.createDirectory("metadata"));
+    this.snapshotStore = new import_echo_pipeline4.SnapshotStore(storage.createDirectory("snapshots"));
     this.blobStore = new import_teleport_extension_object_sync.BlobStore(storage.createDirectory("blobs"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
     this.feedStore = new import_feed_store4.FeedStore({
@@ -4535,12 +4562,12 @@ var ServiceContext = class {
         root: storage.createDirectory("feeds"),
         signer: this.keyring,
         hypercore: {
-          valueEncoding: import_echo_pipeline3.valueEncoding,
+          valueEncoding: import_echo_pipeline4.valueEncoding,
           stats: true
         }
       })
     });
-    this.spaceManager = new import_echo_pipeline3.SpaceManager({
+    this.spaceManager = new import_echo_pipeline4.SpaceManager({
       feedStore: this.feedStore,
       networkManager: this.networkManager,
       blobStore: this.blobStore,
@@ -4548,85 +4575,84 @@ var ServiceContext = class {
       snapshotStore: this.snapshotStore
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams);
-    this.indexMetadata = new import_indexing.IndexMetadataStore({
-      directory: storage.createDirectory("index-metadata")
-    });
-    this.automergeHost = new import_echo_pipeline3.AutomergeHost({
-      directory: storage.createDirectory("automerge"),
-      metadata: this.indexMetadata
-    });
-    this.indexer = new import_indexing.Indexer({
-      indexStore: new import_indexing.IndexStore({
-        directory: storage.createDirectory("index-store")
-      }),
-      metadataStore: this.indexMetadata,
-      loadDocuments: createSelectedDocumentsIterator(this.automergeHost),
-      getAllDocuments: createDocumentsIterator(this.automergeHost)
+    this.echoHost = new import_echo_db.EchoHost({
+      kv: this.level,
+      storage: this.storage
     });
     this.invitations = new InvitationsHandler(this.networkManager);
-    this._handlerFactories.set(import_services12.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug6.failUndefined)(), this._acceptIdentity.bind(this)));
+    this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
+    this._handlerFactories.set(import_services11.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug6.failUndefined)(), this._acceptIdentity.bind(this)));
   }
-  async open(ctx) {
+  async _open(ctx) {
     await this._checkStorageVersion();
     (0, import_log12.log)("opening...", void 0, {
-      F: __dxlog_file15,
+      F: __dxlog_file14,
       L: 151,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log12.log.trace("dxos.sdk.service-context.open", import_protocols12.trace.begin({
+    import_log12.log.trace("dxos.sdk.service-context.open", import_protocols11.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file15,
+      F: __dxlog_file14,
       L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
     await this.signalManager.open();
     await this.networkManager.open();
+    await this.echoHost.open(ctx);
     await this.metadataStore.load();
     await this.spaceManager.open();
     await this.identityManager.open(ctx);
     if (this.identityManager.identity) {
       await this._initialize(ctx);
     }
-    import_log12.log.trace("dxos.sdk.service-context.open", import_protocols12.trace.end({
+    const loadedInvitations = await this.invitationsManager.loadPersistentInvitations();
+    (0, import_log12.log)("loaded persistent invitations", {
+      count: loadedInvitations.invitations?.length
+    }, {
+      F: __dxlog_file14,
+      L: 165,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    import_log12.log.trace("dxos.sdk.service-context.open", import_protocols11.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file15,
-      L: 162,
+      F: __dxlog_file14,
+      L: 167,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log12.log)("opened", void 0, {
-      F: __dxlog_file15,
-      L: 163,
+      F: __dxlog_file14,
+      L: 168,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async close() {
+  async _close(ctx) {
     (0, import_log12.log)("closing...", void 0, {
-      F: __dxlog_file15,
-      L: 167,
+      F: __dxlog_file14,
+      L: 172,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._deviceSpaceSync && this.identityManager.identity) {
       await this.identityManager.identity.space.spaceState.removeCredentialProcessor(this._deviceSpaceSync);
     }
-    await this.automergeHost.close();
     await this.dataSpaceManager?.close();
     await this.identityManager.close();
     await this.spaceManager.close();
     await this.feedStore.close();
+    await this.metadataStore.close();
+    await this.echoHost.close(ctx);
     await this.networkManager.close();
     await this.signalManager.close();
-    await this.metadataStore.close();
-    await this.indexer.destroy();
     (0, import_log12.log)("closed", void 0, {
-      F: __dxlog_file15,
-      L: 180,
+      F: __dxlog_file14,
+      L: 184,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4638,9 +4664,9 @@ var ServiceContext = class {
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    (0, import_invariant14.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file15,
-      L: 191,
+    (0, import_invariant13.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
+      F: __dxlog_file14,
+      L: 195,
       S: this,
       A: [
         "factory",
@@ -4664,15 +4690,15 @@ var ServiceContext = class {
   }
   async _checkStorageVersion() {
     await this.metadataStore.load();
-    if (this.metadataStore.version !== import_protocols12.STORAGE_VERSION) {
-      throw new import_protocols12.InvalidStorageVersionError(import_protocols12.STORAGE_VERSION, this.metadataStore.version);
+    if (this.metadataStore.version !== import_protocols11.STORAGE_VERSION) {
+      throw new import_protocols11.InvalidStorageVersionError(import_protocols11.STORAGE_VERSION, this.metadataStore.version);
     }
   }
   // Called when identity is created.
   async _initialize(ctx) {
     (0, import_log12.log)("initializing spaces...", void 0, {
-      F: __dxlog_file15,
-      L: 222,
+      F: __dxlog_file14,
+      L: 226,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4690,12 +4716,12 @@ var ServiceContext = class {
         });
       }
     };
-    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, signingContext, this.feedStore, this.automergeHost, this._runtimeParams);
+    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, signingContext, this.feedStore, this.echoHost, this.invitationsManager, this._runtimeParams);
     await this.dataSpaceManager.open();
-    this._handlerFactories.set(import_services12.Invitation.Kind.SPACE, (invitation) => {
-      (0, import_invariant14.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file15,
-        L: 246,
+    this._handlerFactories.set(import_services11.Invitation.Kind.SPACE, (invitation) => {
+      (0, import_invariant13.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+        F: __dxlog_file14,
+        L: 251,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4718,8 +4744,8 @@ var ServiceContext = class {
           (0, import_log12.log)("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file15,
-            L: 262,
+            F: __dxlog_file14,
+            L: 267,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4729,8 +4755,8 @@ var ServiceContext = class {
           (0, import_log12.log)("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file15,
-            L: 266,
+            F: __dxlog_file14,
+            L: 271,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4740,8 +4766,8 @@ var ServiceContext = class {
           (0, import_log12.log)("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file15,
-            L: 271,
+            F: __dxlog_file14,
+            L: 276,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4751,8 +4777,8 @@ var ServiceContext = class {
           });
         } catch (err) {
           import_log12.log.catch(err, void 0, {
-            F: __dxlog_file15,
-            L: 277,
+            F: __dxlog_file14,
+            L: 282,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4763,14 +4789,14 @@ var ServiceContext = class {
   }
 };
 _ts_decorate6([
-  import_tracing6.trace.span()
-], ServiceContext.prototype, "open", null);
+  import_tracing5.trace.span()
+], ServiceContext.prototype, "_open", null);
 _ts_decorate6([
-  import_tracing6.trace.span()
+  import_tracing5.trace.span()
 ], ServiceContext.prototype, "_initialize", null);
 ServiceContext = _ts_decorate6([
   (0, import_util7.safeInstanceof)("dxos.client-services.ServiceContext"),
-  import_tracing6.trace.resource()
+  import_tracing5.trace.resource()
 ], ServiceContext);
 var ServiceRegistry = class {
   // prettier-ignore
@@ -4794,103 +4820,155 @@ var ServiceRegistry = class {
     delete this._handlers[name];
   }
 };
-function _ts_decorate7(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
-    r = Reflect.decorate(decorators, target, key, desc);
-  else
-    for (var i = decorators.length - 1; i >= 0; i--)
-      if (d = decorators[i])
-        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-var __dxlog_file16 = "/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;
-    this._onAcquire = onAcquire;
-    this._onRelease = onRelease;
-  }
-  get lockKey() {
-    return this._lockPath;
-  }
-  async acquire() {
-    (0, import_log13.log)("acquiring lock...", void 0, {
-      F: __dxlog_file16,
-      L: 32,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._fileHandle = await import_lock_file.LockFile.acquire(this._lockPath);
-    await this._onAcquire?.();
-    (0, import_log13.log)("acquired lock", void 0, {
-      F: __dxlog_file16,
-      L: 37,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+var DXOS_VERSION = "0.4.10-main.3f5e2d2";
+var getPlatform = () => {
+  if (process.browser) {
+    if (typeof window !== "undefined") {
+      const { userAgent } = window.navigator;
+      return {
+        type: import_services13.Platform.PLATFORM_TYPE.BROWSER,
+        userAgent,
+        uptime: Math.floor((Date.now() - window.performance.timeOrigin) / 1e3)
+      };
+    } else {
+      return {
+        type: import_services13.Platform.PLATFORM_TYPE.SHARED_WORKER,
+        uptime: Math.floor((Date.now() - performance.timeOrigin) / 1e3)
+      };
+    }
+  } else {
+    const { platform: platform2, version, arch } = process;
+    return {
+      type: import_services13.Platform.PLATFORM_TYPE.NODE,
+      platform: platform2,
+      arch,
+      runtime: version,
+      uptime: Math.floor(process.uptime()),
+      memory: process.memoryUsage()
+    };
   }
-  async release() {
-    await this._onRelease?.();
-    (0, import_invariant15.invariant)(this._fileHandle, "Lock is not acquired", {
-      F: __dxlog_file16,
-      L: 42,
-      S: this,
+};
+var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts";
+var DEFAULT_TIMEOUT = 1e3;
+var createDiagnostics = async (clientServices, serviceContext, config) => {
+  const diagnostics = {
+    created: (/* @__PURE__ */ new Date()).toISOString(),
+    platform: getPlatform(),
+    client: {
+      version: DXOS_VERSION,
+      storage: {
+        version: import_protocols12.STORAGE_VERSION
+      }
+    },
+    trace: import_tracing6.TRACE_PROCESSOR.getDiagnostics()
+  };
+  {
+    (0, import_invariant14.invariant)(clientServices.LoggingService, "SystemService is not available.", {
+      F: __dxlog_file15,
+      L: 108,
+      S: void 0,
       A: [
-        "this._fileHandle",
-        "'Lock is not acquired'"
+        "clientServices.LoggingService",
+        "'SystemService is not available.'"
       ]
     });
-    await import_lock_file.LockFile.release(this._fileHandle);
-  }
-};
-_ts_decorate7([
-  import_log13.logInfo
-], Lock.prototype, "lockKey", null);
-var isLocked = (lockPath) => import_lock_file.LockFile.isLocked(lockPath);
-var StorageDriver = import_config.Runtime.Client.Storage.StorageDriver;
-var createStorageObjects = (config) => {
-  const { persistent = false, keyStore, dataStore, dataRoot = (0, import_util8.isNode)() ? import_client_protocol4.DX_DATA : "dxos/storage" } = config ?? {};
-  if (persistent && dataStore === StorageDriver.RAM) {
-    throw new import_protocols14.InvalidConfigError("RAM storage cannot be used in persistent mode.");
+    diagnostics.metrics = await (0, import_codec_protobuf11.getFirstStreamValue)(clientServices.LoggingService.queryMetrics({}), {
+      timeout: DEFAULT_TIMEOUT
+    }).catch(() => void 0);
   }
-  if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
-    throw new import_protocols14.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
+  if (typeof navigator !== "undefined" && navigator.storage) {
+    const map = /* @__PURE__ */ new Map();
+    const dir = await navigator.storage.getDirectory();
+    for await (const filename of dir?.keys()) {
+      const idx = filename.indexOf("-", filename.indexOf("-") + 1);
+      if (idx === -1) {
+        continue;
+      }
+      map.set(filename.slice(0, idx), (map.get(filename.slice(0, idx)) ?? 0) + 1);
+    }
+    diagnostics.storage = Array.from(map.entries()).sort((a, b) => b[1] - a[1]).map(([file, count]) => ({
+      file,
+      count
+    }));
   }
-  if (persistent && keyStore === StorageDriver.RAM) {
-    throw new import_protocols14.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
+  const identity = serviceContext.identityManager.identity;
+  if (identity) {
+    diagnostics.identity = {
+      identityKey: identity.identityKey,
+      spaceKey: identity.space.key,
+      profile: identity.profileDocument
+    };
+    const { devices } = await (0, import_codec_protobuf11.getFirstStreamValue)(clientServices.DevicesService.queryDevices(), {
+      timeout: DEFAULT_TIMEOUT
+    }).catch(() => void 0) ?? {};
+    diagnostics.devices = devices;
+    if (serviceContext.dataSpaceManager) {
+      diagnostics.spaces = await Promise.all(Array.from(serviceContext.dataSpaceManager.spaces.values()).map((space) => getSpaceStats(space)) ?? []);
+    }
+    const { feeds = [] } = await (0, import_codec_protobuf11.getFirstStreamValue)(clientServices.DevtoolsHost.subscribeToFeeds({}), {
+      timeout: DEFAULT_TIMEOUT
+    }).catch(() => void 0) ?? {};
+    diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
+      feedKey,
+      bytes,
+      length
+    }));
+    const status = await (0, import_codec_protobuf11.getFirstStreamValue)(clientServices.NetworkService.queryStatus(), {
+      timeout: DEFAULT_TIMEOUT
+    }).catch(() => void 0);
+    diagnostics.networkStatus = status;
+    diagnostics.swarms = serviceContext.networkManager.connectionLog?.swarms;
   }
-  if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
-    throw new import_protocols14.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+  diagnostics.config = config.values;
+  return diagnostics;
+};
+var getSpaceStats = async (space) => {
+  const stats = {
+    key: space.key,
+    metrics: space.metrics,
+    epochs: space.inner.spaceState.credentials.filter((0, import_credentials16.credentialTypeFilter)("dxos.halo.credentials.Epoch")).map((credential) => ({
+      ...credential.subject.assertion,
+      id: credential.id
+    })),
+    members: Array.from(space.inner.spaceState.members.values()).map((member) => ({
+      identity: {
+        identityKey: member.key,
+        profile: {
+          displayName: member.assertion.profile?.displayName
+        }
+      },
+      presence: space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? import_services12.SpaceMember.PresenceState.ONLINE : import_services12.SpaceMember.PresenceState.OFFLINE
+    })),
+    pipeline: {
+      // TODO(burdon): Pick properties from credentials if needed.
+      currentEpoch: space.automergeSpaceState.lastEpoch,
+      appliedEpoch: space.automergeSpaceState.lastEpoch,
+      controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
+      currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
+      targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
+      totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe
+    }
+  };
+  if (stats.metrics) {
+    const { open, ready } = stats.metrics;
+    stats.metrics.startupTime = open && ready && ready.getTime() - open.getTime();
   }
+  return stats;
+};
+var createCollectDiagnosticsBroadcastSender = () => {
   return {
-    storage: (0, import_random_access_storage.createStorage)({
-      type: persistent ? toStorageType(dataStore) : import_random_access_storage.StorageType.RAM,
-      root: `${dataRoot}/`
-    })
+    broadcastDiagnosticsRequest: async () => void 0
   };
 };
-var toStorageType = (type) => {
-  switch (type) {
-    case void 0:
-      return void 0;
-    case StorageDriver.RAM:
-      return import_random_access_storage.StorageType.RAM;
-    case StorageDriver.CHROME:
-      return import_random_access_storage.StorageType.CHROME;
-    case StorageDriver.FIREFOX:
-      return import_random_access_storage.StorageType.FIREFOX;
-    case StorageDriver.IDB:
-      return import_random_access_storage.StorageType.IDB;
-    case StorageDriver.NODE:
-      return import_random_access_storage.StorageType.NODE;
-    case StorageDriver.WEBFS:
-      return import_random_access_storage.StorageType.WEBFS;
-    default:
-      throw new Error(`Invalid storage type: ${StorageDriver[type]}`);
-  }
+var createCollectDiagnosticsBroadcastHandler = (_) => {
+  return {
+    start: () => {
+    },
+    stop: () => {
+    }
+  };
 };
-var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
@@ -4907,8 +4985,8 @@ var DevicesServiceImpl = class {
             devices: []
           });
         } else {
-          (0, import_invariant17.invariant)(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file17,
+          (0, import_invariant16.invariant)(this._identityManager.identity?.presence, "presence not present", {
+            F: __dxlog_file16,
             L: 32,
             S: this,
             A: [
@@ -4923,9 +5001,9 @@ var DevicesServiceImpl = class {
               const peerState = peers.find((peer) => peer.identityKey.equals(key));
               return {
                 deviceKey: key,
-                kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services14.DeviceKind.CURRENT : import_services14.DeviceKind.TRUSTED,
+                kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services16.DeviceKind.CURRENT : import_services16.DeviceKind.TRUSTED,
                 profile,
-                presence: isMe ? import_services14.Device.PresenceState.ONLINE : peerState ? import_services14.Device.PresenceState.ONLINE : import_services14.Device.PresenceState.OFFLINE
+                presence: isMe ? import_services16.Device.PresenceState.ONLINE : peerState ? import_services16.Device.PresenceState.ONLINE : import_services16.Device.PresenceState.OFFLINE
               };
             })
           });
@@ -4966,11 +5044,65 @@ var DevicesServiceImpl = class {
     });
   }
 };
+function _ts_decorate7(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+var __dxlog_file17 = "/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;
+    this._onAcquire = onAcquire;
+    this._onRelease = onRelease;
+  }
+  get lockKey() {
+    return this._lockPath;
+  }
+  async acquire() {
+    (0, import_log14.log)("acquiring lock...", void 0, {
+      F: __dxlog_file17,
+      L: 32,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this._fileHandle = await import_lock_file.LockFile.acquire(this._lockPath);
+    await this._onAcquire?.();
+    (0, import_log14.log)("acquired lock", void 0, {
+      F: __dxlog_file17,
+      L: 37,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
+  async release() {
+    await this._onRelease?.();
+    (0, import_invariant17.invariant)(this._fileHandle, "Lock is not acquired", {
+      F: __dxlog_file17,
+      L: 42,
+      S: this,
+      A: [
+        "this._fileHandle",
+        "'Lock is not acquired'"
+      ]
+    });
+    await import_lock_file.LockFile.release(this._fileHandle);
+  }
+};
+_ts_decorate7([
+  import_log14.logInfo
+], Lock.prototype, "lockKey", null);
+var isLocked = (lockPath) => import_lock_file.LockFile.isLocked(lockPath);
 var LoggingServiceImpl = class {
   constructor() {
     this._logs = new import_async18.Event();
     this._started = Date.now();
-    this._sessionId = import_keys12.PublicKey.random().toHex();
+    this._sessionId = import_keys13.PublicKey.random().toHex();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
@@ -5065,18 +5197,18 @@ var LoggingServiceImpl = class {
     });
   }
 };
-var matchFilter = (filter, level, path, options) => {
+var matchFilter = (filter, level, path2, options) => {
   switch (options) {
-    case import_services15.QueryLogsRequest.MatchingOptions.INCLUSIVE:
-      return level >= filter.level && (!filter.pattern || path.includes(filter.pattern));
-    case import_services15.QueryLogsRequest.MatchingOptions.EXPLICIT:
-      return level === filter.level && (!filter.pattern || path.includes(filter.pattern));
+    case import_services17.QueryLogsRequest.MatchingOptions.INCLUSIVE:
+      return level >= filter.level && (!filter.pattern || path2.includes(filter.pattern));
+    case import_services17.QueryLogsRequest.MatchingOptions.EXPLICIT:
+      return level === filter.level && (!filter.pattern || path2.includes(filter.pattern));
   }
 };
 var shouldLog = (entry2, request) => {
-  const options = request.options ?? import_services15.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  const options = request.options ?? import_services17.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   if (request.filters === void 0) {
-    return options === import_services15.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+    return options === import_services17.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   } else {
     return request.filters.some((filter) => matchFilter(filter, entry2.level, entry2.meta?.F ?? "", options));
   }
@@ -5112,6 +5244,63 @@ var NetworkServiceImpl = class {
     await this.networkManager.setConnectionState(request.swarm);
   }
 };
+var getRootPath = (config) => {
+  const { dataRoot = (0, import_util11.isNode)() ? import_client_protocol6.DX_DATA : "dxos/storage" } = config ?? {};
+  return `${dataRoot}/`;
+};
+var isPersistent = (config) => {
+  const { persistent = false } = config ?? {};
+  return config.dataStore !== void 0 && config.dataStore !== import_config3.Runtime.Client.Storage.StorageDriver.RAM || persistent;
+};
+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.");
+  }
+  if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
+    throw new import_protocols14.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.");
+  }
+  if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
+    throw new import_protocols14.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+  }
+  return {
+    storage: (0, import_random_access_storage.createStorage)({
+      type: persistent ? toStorageType(dataStore) : import_random_access_storage.StorageType.RAM,
+      root: getRootPath(config)
+    })
+  };
+};
+var toStorageType = (type) => {
+  switch (type) {
+    case void 0:
+      return void 0;
+    case StorageDriver.RAM:
+      return import_random_access_storage.StorageType.RAM;
+    case StorageDriver.CHROME:
+      return import_random_access_storage.StorageType.CHROME;
+    case StorageDriver.FIREFOX:
+      return import_random_access_storage.StorageType.FIREFOX;
+    case StorageDriver.IDB:
+      return import_random_access_storage.StorageType.IDB;
+    case StorageDriver.NODE:
+      return import_random_access_storage.StorageType.NODE;
+    case StorageDriver.WEBFS:
+      return import_random_access_storage.StorageType.WEBFS;
+    default:
+      throw new Error(`Invalid storage type: ${StorageDriver[type]}`);
+  }
+};
+var createLevel = async (config) => {
+  const persistent = isPersistent(config);
+  const storagePath = persistent ? import_node_path.default.join(getRootPath(config), "level") : `/tmp/dxos-${import_keys14.PublicKey.random().toHex()}`;
+  const level = new import_level.Level(storagePath);
+  await level.open();
+  return level;
+};
 var SystemServiceImpl = class {
   constructor({ config, statusUpdate, getDiagnostics, onUpdateStatus, getCurrentStatus, onReset }) {
     this._config = config;
@@ -5131,9 +5320,9 @@ var SystemServiceImpl = class {
     const diagnostics = await this._getDiagnostics();
     return {
       timestamp: /* @__PURE__ */ new Date(),
-      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util11.jsonKeyReplacer)({
-        truncate: keys === import_services16.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
-        humanize: keys === import_services16.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
+      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util12.jsonKeyReplacer)({
+        truncate: keys === import_services18.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
+        humanize: keys === import_services18.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
       })))
     };
   }
@@ -5181,16 +5370,18 @@ var ClientServicesHost = class {
     transportFactory,
     signalManager,
     storage,
+    level,
     // TODO(wittjosiah): Turn this on by default.
     lockKey,
     callbacks,
     runtimeParams
   } = {}) {
-    this._tracingService = import_tracing7.TRACE_PROCESSOR.createTraceSender();
+    this._tracingService = import_tracing8.TRACE_PROCESSOR.createTraceSender();
     this._statusUpdate = new import_async16.Event();
     this._opening = false;
     this._open = false;
     this._storage = storage;
+    this._level = level;
     this._callbacks = callbacks;
     this._runtimeParams = runtimeParams;
     if (config) {
@@ -5214,14 +5405,14 @@ var ClientServicesHost = class {
     this._systemService = new SystemServiceImpl({
       config: () => this._config,
       statusUpdate: this._statusUpdate,
-      getCurrentStatus: () => this.isOpen ? import_services13.SystemStatus.ACTIVE : import_services13.SystemStatus.INACTIVE,
+      getCurrentStatus: () => this.isOpen ? import_services15.SystemStatus.ACTIVE : import_services15.SystemStatus.INACTIVE,
       getDiagnostics: () => {
         return createDiagnostics(this._serviceRegistry.services, this._serviceContext, this._config);
       },
       onUpdateStatus: async (status) => {
-        if (!this.isOpen && status === import_services13.SystemStatus.ACTIVE) {
+        if (!this.isOpen && status === import_services15.SystemStatus.ACTIVE) {
           await this._resourceLock?.acquire();
-        } else if (this.isOpen && status === import_services13.SystemStatus.INACTIVE) {
+        } else if (this.isOpen && status === import_services15.SystemStatus.INACTIVE) {
           await this._resourceLock?.release();
         }
       },
@@ -5229,6 +5420,7 @@ var ClientServicesHost = class {
         await this.reset();
       }
     });
+    this.diagnosticsBroadcastHandler = createCollectDiagnosticsBroadcastHandler(this._systemService);
     this._loggingService = new LoggingServiceImpl();
     this._serviceRegistry = new ServiceRegistry(import_client_protocol5.clientServiceBundle, {
       SystemService: this._systemService,
@@ -5259,25 +5451,25 @@ var ClientServicesHost = class {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    (0, import_invariant16.invariant)(!this._open, "service host is open", {
+    (0, import_invariant15.invariant)(!this._open, "service host is open", {
       F: __dxlog_file18,
-      L: 180,
+      L: 190,
       S: this,
       A: [
         "!this._open",
         "'service host is open'"
       ]
     });
-    (0, import_log14.log)("initializing...", void 0, {
+    (0, import_log13.log)("initializing...", void 0, {
       F: __dxlog_file18,
-      L: 181,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
-      (0, import_invariant16.invariant)(!this._config, "config already set", {
+      (0, import_invariant15.invariant)(!this._config, "config already set", {
         F: __dxlog_file18,
-        L: 184,
+        L: 194,
         S: this,
         A: [
           "!this._config",
@@ -5290,9 +5482,9 @@ var ClientServicesHost = class {
       }
     }
     if (!options.signalManager) {
-      import_log14.log.warn("running signaling without telemetry metadata.", void 0, {
+      import_log13.log.warn("running signaling without telemetry metadata.", void 0, {
         F: __dxlog_file18,
-        L: 192,
+        L: 202,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5301,9 +5493,9 @@ var ClientServicesHost = class {
       iceServers: this._config?.get("runtime.services.ice")
     }), signalManager = new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
-    (0, import_invariant16.invariant)(!this._networkManager, "network manager already set", {
+    (0, import_invariant15.invariant)(!this._networkManager, "network manager already set", {
       F: __dxlog_file18,
-      L: 203,
+      L: 213,
       S: this,
       A: [
         "!this._networkManager",
@@ -5315,9 +5507,9 @@ var ClientServicesHost = class {
       transportFactory,
       signalManager
     });
-    (0, import_log14.log)("initialized", void 0, {
+    (0, import_log13.log)("initialized", void 0, {
       F: __dxlog_file18,
-      L: 210,
+      L: 220,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5326,45 +5518,45 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    const traceId = import_keys11.PublicKey.random().toHex();
-    import_log14.log.trace("dxos.client-services.host.open", import_protocols15.trace.begin({
+    const traceId = import_keys12.PublicKey.random().toHex();
+    import_log13.log.trace("dxos.client-services.host.open", import_protocols13.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 221,
+      L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant16.invariant)(this._config, "config not set", {
+    (0, import_invariant15.invariant)(this._config, "config not set", {
       F: __dxlog_file18,
-      L: 223,
+      L: 233,
       S: this,
       A: [
         "this._config",
         "'config not set'"
       ]
     });
-    (0, import_invariant16.invariant)(this._storage, "storage not set", {
+    (0, import_invariant15.invariant)(this._storage, "storage not set", {
       F: __dxlog_file18,
-      L: 224,
+      L: 234,
       S: this,
       A: [
         "this._storage",
         "'storage not set'"
       ]
     });
-    (0, import_invariant16.invariant)(this._signalManager, "signal manager not set", {
+    (0, import_invariant15.invariant)(this._signalManager, "signal manager not set", {
       F: __dxlog_file18,
-      L: 225,
+      L: 235,
       S: this,
       A: [
         "this._signalManager",
         "'signal manager not set'"
       ]
     });
-    (0, import_invariant16.invariant)(this._networkManager, "network manager not set", {
+    (0, import_invariant15.invariant)(this._networkManager, "network manager not set", {
       F: __dxlog_file18,
-      L: 226,
+      L: 236,
       S: this,
       A: [
         "this._networkManager",
@@ -5372,31 +5564,32 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    (0, import_log14.log)("opening...", {
+    (0, import_log13.log)("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file18,
-      L: 229,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
+    if (!this._level) {
+      this._level = await createLevel(this._config.get("runtime.client.storage", {}));
+    }
+    await this._level.open();
     await this._resourceLock?.acquire();
     await this._loggingService.open();
-    this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._signalManager, this._runtimeParams);
+    this._serviceContext = new ServiceContext(this._storage, this._level, this._networkManager, this._signalManager, this._runtimeParams);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
       IdentityService: new IdentityServiceImpl((params) => this._createIdentity(params), this._serviceContext.identityManager, this._serviceContext.keyring, (profile) => this._serviceContext.broadcastProfileUpdate(profile)),
-      InvitationsService: new InvitationsServiceImpl(this._serviceContext.invitations, (invitation) => this._serviceContext.getInvitationHandler(invitation), this._serviceContext.metadataStore),
+      InvitationsService: new InvitationsServiceImpl(this._serviceContext.invitationsManager),
       DevicesService: new DevicesServiceImpl(this._serviceContext.identityManager),
       SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, async () => {
         await this._serviceContext.initialized.wait();
         return this._serviceContext.dataSpaceManager;
       }),
-      DataService: new import_echo_pipeline4.DataServiceImpl(this._serviceContext.automergeHost),
-      IndexService: new import_indexing2.IndexServiceImpl({
-        indexer: this._serviceContext.indexer,
-        automergeHost: this._serviceContext.automergeHost
-      }),
+      DataService: this._serviceContext.echoHost.dataService,
+      QueryService: this._serviceContext.echoHost.queryService,
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
       LoggingService: this._loggingService,
       TracingService: this._tracingService,
@@ -5408,24 +5601,6 @@ var ClientServicesHost = class {
       })
     });
     await this._serviceContext.open(ctx);
-    (0, import_invariant16.invariant)(this.serviceRegistry.services.InvitationsService, void 0, {
-      F: __dxlog_file18,
-      L: 290,
-      S: this,
-      A: [
-        "this.serviceRegistry.services.InvitationsService",
-        ""
-      ]
-    });
-    const loadedInvitations = await this.serviceRegistry.services.InvitationsService.loadPersistentInvitations();
-    (0, import_log14.log)("loaded persistent invitations", {
-      count: loadedInvitations.invitations?.length
-    }, {
-      F: __dxlog_file18,
-      L: 293,
-      S: this,
-      C: (f, a) => f(...a)
-    });
     const devtoolsProxy = this._config?.get("runtime.client.devtoolsProxy");
     if (devtoolsProxy) {
       this._devtoolsProxy = new import_websocket_rpc.WebsocketRpcClient({
@@ -5436,23 +5611,24 @@ var ClientServicesHost = class {
       });
       void this._devtoolsProxy.open();
     }
+    this.diagnosticsBroadcastHandler.start();
     this._opening = false;
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log14.log)("opened", {
+    (0, import_log13.log)("opened", {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 310,
+      L: 315,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log14.log.trace("dxos.client-services.host.open", import_protocols15.trace.end({
+    import_log13.log.trace("dxos.client-services.host.open", import_protocols13.trace.end({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 311,
+      L: 316,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5462,60 +5638,62 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log14.log)("closing...", {
+    (0, import_log13.log)("closing...", {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 322,
+      L: 327,
       S: this,
       C: (f, a) => f(...a)
     });
+    this.diagnosticsBroadcastHandler.stop();
     await this._devtoolsProxy?.close();
     this._serviceRegistry.setServices({
       SystemService: this._systemService
     });
     await this._loggingService.close();
     await this._serviceContext.close();
+    await this._level?.close();
     this._open = false;
     this._statusUpdate.emit();
-    (0, import_log14.log)("closed", {
+    (0, import_log13.log)("closed", {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 329,
+      L: 336,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
-    const traceId = import_keys11.PublicKey.random().toHex();
-    import_log14.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.begin({
+    const traceId = import_keys12.PublicKey.random().toHex();
+    import_log13.log.trace("dxos.sdk.client-services-host.reset", import_protocols13.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 334,
+      L: 341,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log14.log)("resetting...", void 0, {
+    (0, import_log13.log)("resetting...", void 0, {
       F: __dxlog_file18,
-      L: 336,
+      L: 343,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
-    (0, import_log14.log)("reset", void 0, {
+    (0, import_log13.log)("reset", void 0, {
       F: __dxlog_file18,
-      L: 339,
+      L: 346,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log14.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.end({
+    import_log13.log.trace("dxos.sdk.client-services-host.reset", import_protocols13.trace.end({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 340,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5526,62 +5704,104 @@ var ClientServicesHost = class {
     await this._serviceContext.initialized.wait();
     const space = await this._serviceContext.dataSpaceManager.createSpace();
     const automergeIndex = space.automergeSpaceState.rootUrl;
-    (0, import_invariant16.invariant)(automergeIndex, void 0, {
+    (0, import_invariant15.invariant)(automergeIndex, void 0, {
       F: __dxlog_file18,
-      L: 352,
+      L: 359,
       S: this,
       A: [
         "automergeIndex",
         ""
       ]
     });
-    const document = await this._serviceContext.automergeHost.repo.find(automergeIndex);
+    const document = await this._serviceContext.echoHost.automergeRepo.find(automergeIndex);
     await document.whenReady();
-    const objectDocument = (0, import_echo_schema.createRawObjectDoc)({
-      [import_client_protocol5.defaultKey]: identity.identityKey.toHex()
-    }, {
-      type: E.getTypeReference(import_client_protocol5.PropertiesSchema)
-    });
+    const properties = {
+      system: {
+        type: (0, import_echo_pipeline5.encodeReference)((0, import_echo_schema2.getTypeReference)(import_client_protocol5.Properties))
+      },
+      data: {
+        [import_client_protocol5.defaultKey]: identity.identityKey.toHex()
+      },
+      meta: {
+        keys: []
+      }
+    };
+    const propertiesId = import_keys12.PublicKey.random().toHex();
     document.change((doc) => {
       (0, import_util9.assignDeep)(doc, [
         "objects",
-        objectDocument.id
-      ], objectDocument.handle.docSync());
+        propertiesId
+      ], properties);
     });
-    await (0, import_async16.sleep)(200);
+    await this._serviceContext.echoHost.flush();
     return identity;
   }
 };
 _ts_decorate8([
-  import_tracing7.trace.info()
+  import_tracing8.trace.info()
 ], ClientServicesHost.prototype, "_opening", void 0);
 _ts_decorate8([
-  import_tracing7.trace.info()
+  import_tracing8.trace.info()
 ], ClientServicesHost.prototype, "_open", void 0);
 _ts_decorate8([
   import_async16.synchronized,
-  import_tracing7.trace.span()
+  import_tracing8.trace.span()
 ], ClientServicesHost.prototype, "open", null);
 _ts_decorate8([
   import_async16.synchronized,
-  import_tracing7.trace.span()
+  import_tracing8.trace.span()
 ], ClientServicesHost.prototype, "close", null);
 ClientServicesHost = _ts_decorate8([
-  import_tracing7.trace.resource()
+  import_tracing8.trace.resource()
 ], ClientServicesHost);
+var ClientServicesProviderResource = Symbol.for("dxos.resource.ClientServices");
+var DiagnosticsCollector = class {
+  static {
+    this.broadcastSender = createCollectDiagnosticsBroadcastSender();
+  }
+  static async collect(config = findConfigs(), services = findSystemServiceProvider(), options = {}) {
+    const serviceDiagnostics = await services?.services?.SystemService?.getDiagnostics({
+      keys: options.humanize ? import_services14.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE : options.truncate ? import_services14.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE : void 0
+    });
+    const clientDiagnostics = {
+      config,
+      trace: import_tracing7.TRACE_PROCESSOR.getDiagnostics()
+    };
+    const diagnostics = serviceDiagnostics != null ? {
+      client: clientDiagnostics,
+      services: serviceDiagnostics
+    } : {
+      client: clientDiagnostics,
+      broadcast: await this.broadcastSender.broadcastDiagnosticsRequest()
+    };
+    return JSON.parse(JSON.stringify(diagnostics, (0, import_util8.jsonKeyReplacer)(options)));
+  }
+};
+var findSystemServiceProvider = () => {
+  const serviceProviders = import_tracing7.TRACE_PROCESSOR.findByAnnotation(ClientServicesProviderResource);
+  const providerResource = serviceProviders.find((r) => r.instance.deref()?.services?.SystemService != null);
+  return providerResource?.instance?.deref() ?? null;
+};
+var findConfigs = () => {
+  const configs = import_tracing7.TRACE_PROCESSOR.findByAnnotation(import_config.ConfigResource);
+  return configs.map((r) => r.instance.deref()).filter(import_util8.nonNullable);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ClientRpcServer,
   ClientServicesHost,
+  ClientServicesProviderResource,
   DataSpace,
   DataSpaceManager,
   DeviceInvitationProtocol,
   DevtoolsHostEvents,
   DevtoolsServiceImpl,
+  DiagnosticsCollector,
   Identity,
   IdentityManager,
   IdentityServiceImpl,
   InvitationsHandler,
+  InvitationsManager,
   InvitationsServiceImpl,
   Lock,
   ServiceContext,
@@ -5589,11 +5809,14 @@ ClientServicesHost = _ts_decorate8([
   SpaceInvitationProtocol,
   SpacesServiceImpl,
   TrustedKeySetAuthVerifier,
+  createAdmissionKeypair,
   createAuthProvider,
+  createCollectDiagnosticsBroadcastHandler,
+  createCollectDiagnosticsBroadcastSender,
   createDiagnostics,
+  createLevel,
   createStorageObjects,
   getNetworkPeers,
-  invitationExpired,
   isLocked,
   subscribeToFeedBlocks,
   subscribeToFeeds,
@@ -5603,4 +5826,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-D5VK6MZQ.cjs.map
+//# sourceMappingURL=chunk-JGUWA36I.cjs.map