@dxos/client-services 0.4.10-main.fd4f2a3 → 0.4.10-main.fd8ea31

package/dist/lib/browser/{chunk-V2ALN47T.mjs → chunk-WLE7E36I.mjs}

@@ -1086,7 +1086,9 @@ var IdentityManager = class {
           C: (f, a) => f(...a)
         });
       },
-      memberKey: identityKey
+      memberKey: identityKey,
+      onDelegatedInvitationStatusChange: async () => {
+      }
     });
   }
 };
@@ -1194,10 +1196,13 @@ var DeviceInvitationProtocol = class {
       kind: Invitation.Kind.DEVICE
     };
   }
-  async admit(request) {
+  async delegate(invitation) {
+    throw new Error("delegation not supported");
+  }
+  async admit(_, request) {
     invariant4(request.device, void 0, {
       F: __dxlog_file5,
-      L: 37,
+      L: 42,
       S: this,
       A: [
         "request.device",
@@ -1243,7 +1248,7 @@ var DeviceInvitationProtocol = class {
   async accept(response, request) {
     invariant4(response.device, void 0, {
       F: __dxlog_file5,
-      L: 82,
+      L: 87,
       S: this,
       A: [
         "response.device",
@@ -1253,7 +1258,7 @@ var DeviceInvitationProtocol = class {
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
     invariant4(request.device, void 0, {
       F: __dxlog_file5,
-      L: 85,
+      L: 90,
       S: this,
       A: [
         "request.device",
@@ -1279,9 +1284,9 @@ var DeviceInvitationProtocol = class {
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
 import { PushStream, scheduleTask as scheduleTask2, TimeoutError, Trigger as Trigger3 } from "@dxos/async";
-import { AuthenticatingInvitation, AUTHENTICATION_CODE_LENGTH, CancellableInvitation, INVITATION_TIMEOUT } from "@dxos/client-protocol";
+import { AuthenticatingInvitation, INVITATION_TIMEOUT } from "@dxos/client-protocol";
 import { Context as Context5 } from "@dxos/context";
-import { generatePasscode } from "@dxos/credentials";
+import { createKeyPair, sign } from "@dxos/crypto";
 import { invariant as invariant6 } from "@dxos/invariant";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { log as log5 } from "@dxos/log";
@@ -1293,6 +1298,7 @@ import { AuthenticationResponse as AuthenticationResponse2 } from "@dxos/protoco
 // packages/sdk/client-services/src/packlets/invitations/invitation-extension.ts
 import { Trigger as Trigger2 } from "@dxos/async";
 import { cancelWithContext, Context as Context4 } from "@dxos/context";
+import { randomBytes, verify } from "@dxos/crypto";
 import { invariant as invariant5 } from "@dxos/invariant";
 import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log4 } from "@dxos/log";
@@ -1316,6 +1322,7 @@ var InvitationHostExtension = class extends RpcExtension {
     this._callbacks = _callbacks;
     this._ctx = new Context4();
     this._remoteOptionsTrigger = new Trigger2();
+    this._challenge = void 0;
     this.invitation = void 0;
     this.guestProfile = void 0;
     this.authenticationPassed = false;
@@ -1330,7 +1337,7 @@ var InvitationHostExtension = class extends RpcExtension {
         options: async (options) => {
           invariant5(!this._remoteOptions, "Remote options already set.", {
             F: __dxlog_file6,
-            L: 87,
+            L: 90,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -1347,7 +1354,7 @@ var InvitationHostExtension = class extends RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 96,
+            L: 99,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1357,7 +1364,7 @@ var InvitationHostExtension = class extends RpcExtension {
               invitationId
             }, {
               F: __dxlog_file6,
-              L: 100,
+              L: 103,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1371,7 +1378,7 @@ var InvitationHostExtension = class extends RpcExtension {
             guestProfile: profile
           }, {
             F: __dxlog_file6,
-            L: 109,
+            L: 112,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1380,25 +1387,27 @@ var InvitationHostExtension = class extends RpcExtension {
             ...this.invitation,
             state: Invitation2.State.READY_FOR_AUTHENTICATION
           });
+          this._challenge = this.invitation.authMethod === Invitation2.AuthMethod.KNOWN_PUBLIC_KEY ? randomBytes(32) : void 0;
           log4.trace("dxos.sdk.invitation-handler.host.introduce", trace3.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 = PublicKey5.random().toHex();
           log4.trace("dxos.sdk.invitation-handler.host.authenticate", trace3.begin({
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 124,
+            L: 131,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1406,14 +1415,14 @@ var InvitationHostExtension = class extends RpcExtension {
             authCode: code
           }, {
             F: __dxlog_file6,
-            L: 125,
+            L: 132,
             S: this,
             C: (f, a) => f(...a)
           });
           let status = AuthenticationResponse.Status.OK;
           invariant5(this.invitation, "Invitation is not set.", {
             F: __dxlog_file6,
-            L: 128,
+            L: 135,
             S: this,
             A: [
               "this.invitation",
@@ -1424,7 +1433,7 @@ var InvitationHostExtension = class extends RpcExtension {
             case Invitation2.AuthMethod.NONE: {
               log4("authentication not required", void 0, {
                 F: __dxlog_file6,
-                L: 131,
+                L: 138,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1444,12 +1453,25 @@ var InvitationHostExtension = class extends RpcExtension {
               }
               break;
             }
+            case Invitation2.AuthMethod.KNOWN_PUBLIC_KEY: {
+              if (!this.invitation.guestKeypair) {
+                status = AuthenticationResponse.Status.INTERNAL_ERROR;
+                break;
+              }
+              const isSignatureValid = this._challenge && verify(this._challenge, Buffer.from(signedChallenge ?? []), this.invitation.guestKeypair.publicKey.asBuffer());
+              if (isSignatureValid) {
+                this.authenticationPassed = true;
+              } else {
+                status = AuthenticationResponse.Status.INVALID_SIGNATURE;
+              }
+              break;
+            }
             default: {
               log4.error("invalid authentication method", {
                 authMethod: this.invitation.authMethod
               }, {
                 F: __dxlog_file6,
-                L: 149,
+                L: 176,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1464,7 +1486,7 @@ var InvitationHostExtension = class extends RpcExtension {
             }
           }), {
             F: __dxlog_file6,
-            L: 155,
+            L: 182,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1478,14 +1500,14 @@ var InvitationHostExtension = class extends RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 161,
+            L: 188,
             S: this,
             C: (f, a) => f(...a)
           });
           try {
             invariant5(this.invitation, "Invitation is not set.", {
               F: __dxlog_file6,
-              L: 164,
+              L: 191,
               S: this,
               A: [
                 "this.invitation",
@@ -1500,7 +1522,7 @@ var InvitationHostExtension = class extends RpcExtension {
               id: traceId
             }), {
               F: __dxlog_file6,
-              L: 172,
+              L: 199,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1557,7 +1579,7 @@ var InvitationGuestExtension = class extends RpcExtension {
         options: async (options) => {
           invariant5(!this._remoteOptions, "Remote options already set.", {
             F: __dxlog_file6,
-            L: 239,
+            L: 266,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -1584,7 +1606,7 @@ var InvitationGuestExtension = class extends RpcExtension {
     try {
       log4("begin options", void 0, {
         F: __dxlog_file6,
-        L: 260,
+        L: 287,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1596,7 +1618,7 @@ var InvitationGuestExtension = class extends RpcExtension {
       }));
       log4("end options", void 0, {
         F: __dxlog_file6,
-        L: 263,
+        L: 290,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1610,7 +1632,7 @@ var InvitationGuestExtension = class extends RpcExtension {
     } catch (err) {
       log4("openError", err, {
         F: __dxlog_file6,
-        L: 273,
+        L: 300,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1620,7 +1642,7 @@ var InvitationGuestExtension = class extends RpcExtension {
   async onClose() {
     log4("onClose", void 0, {
       F: __dxlog_file6,
-      L: 279,
+      L: 306,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1638,49 +1660,7 @@ var InvitationsHandler = class {
   constructor(_networkManager) {
     this._networkManager = _networkManager;
   }
-  createInvitation(protocol, options) {
-    const { invitationId = PublicKey6.random().toHex(), type = Invitation3.Type.INTERACTIVE, authMethod = Invitation3.AuthMethod.SHARED_SECRET, state = Invitation3.State.INIT, timeout = INVITATION_TIMEOUT, swarmKey = PublicKey6.random(), persistent = true, created = /* @__PURE__ */ new Date(), lifetime = 86400 } = options ?? {};
-    const authCode = options?.authCode ?? (authMethod === Invitation3.AuthMethod.SHARED_SECRET ? generatePasscode(AUTHENTICATION_CODE_LENGTH) : void 0);
-    invariant6(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 PushStream();
-    const ctx = new Context5({
-      onError: (err) => {
-        stream.error(err);
-        void ctx.dispose();
-      }
-    });
-    ctx.onDispose(() => {
-      log5("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) => {
@@ -1689,8 +1669,8 @@ var InvitationsHandler = class {
             state: Invitation3.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;
@@ -1700,14 +1680,14 @@ var InvitationsHandler = class {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             invariant6(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) {
@@ -1723,7 +1703,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 148,
+                L: 105,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1731,7 +1711,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 149,
+                L: 106,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1740,14 +1720,14 @@ var InvitationsHandler = class {
                 state: Invitation3.State.CONNECTED
               });
               const deviceKey = await extension.completedTrigger.wait({
-                timeout
+                timeout: invitation.timeout
               });
               log5("admitted guest", {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 152,
+                L: 109,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1759,7 +1739,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 154,
+                L: 111,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1769,7 +1749,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 157,
+                  L: 114,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1780,7 +1760,7 @@ var InvitationsHandler = class {
               } else {
                 log5.error("failed", err, {
                   F: __dxlog_file7,
-                  L: 160,
+                  L: 117,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1791,12 +1771,12 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 163,
+                L: 120,
                 S: this,
                 C: (f, a) => f(...a)
               });
             } finally {
-              if (type !== Invitation3.Type.MULTIUSE) {
+              if (!invitation.multiUse) {
                 await swarmConnection.close();
                 await ctx.dispose();
               }
@@ -1812,7 +1792,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 178,
+              L: 135,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1823,7 +1803,7 @@ var InvitationsHandler = class {
           } else {
             log5.error("failed", err, {
               F: __dxlog_file7,
-              L: 181,
+              L: 138,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1833,11 +1813,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()) {
         log5.warn("invitation has already expired", void 0, {
           F: __dxlog_file7,
-          L: 192,
+          L: 149,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1871,24 +1851,12 @@ var InvitationsHandler = class {
         state: Invitation3.State.CONNECTING
       });
     });
-    const observable = new CancellableInvitation({
-      initialInvitation: invitation,
-      subscriber: stream.observable,
-      onCancel: async () => {
-        stream.next({
-          ...invitation,
-          state: Invitation3.State.CANCELLED
-        });
-        await ctx.dispose();
-      }
-    });
-    return observable;
   }
   acceptInvitation(protocol, invitation, deviceProfile) {
     const { timeout = INVITATION_TIMEOUT } = invitation;
     invariant6(protocol, void 0, {
       F: __dxlog_file7,
-      L: 246,
+      L: 191,
       S: this,
       A: [
         "protocol",
@@ -1898,7 +1866,7 @@ var InvitationsHandler = class {
     if (deviceProfile) {
       invariant6(invitation.kind === Invitation3.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file7,
-        L: 250,
+        L: 194,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -1913,7 +1881,7 @@ var InvitationsHandler = class {
     const setState = (newData) => {
       invariant6(newData.state !== void 0, void 0, {
         F: __dxlog_file7,
-        L: 261,
+        L: 205,
         S: this,
         A: [
           "newData.state !== undefined",
@@ -1933,7 +1901,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             F: __dxlog_file7,
-            L: 269,
+            L: 213,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1943,7 +1911,7 @@ var InvitationsHandler = class {
         } else {
           log5.warn("auth failed", err, {
             F: __dxlog_file7,
-            L: 272,
+            L: 216,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1957,7 +1925,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 280,
+        L: 224,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1972,7 +1940,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               F: __dxlog_file7,
-              L: 290,
+              L: 234,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1987,7 +1955,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 299,
+                L: 243,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1999,7 +1967,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 307,
+                L: 251,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2010,7 +1978,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 311,
+                L: 255,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2020,62 +1988,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++) {
-                  log5("guest waiting for authentication code...", void 0, {
-                    F: __dxlog_file7,
-                    L: 321,
-                    S: this,
-                    C: (f, a) => f(...a)
-                  });
-                  setState({
-                    state: Invitation3.State.READY_FOR_AUTHENTICATION
-                  });
-                  const authCode = await authenticated.wait({
-                    timeout
-                  });
-                  log5("sending authentication request", void 0, {
-                    F: __dxlog_file7,
-                    L: 325,
-                    S: this,
-                    C: (f, a) => f(...a)
-                  });
-                  setState({
-                    state: Invitation3.State.AUTHENTICATING
-                  });
-                  const response = await extension.rpc.InvitationHostService.authenticate({
-                    authCode
-                  });
-                  if (response.status === void 0 || response.status === AuthenticationResponse2.Status.OK) {
+                switch (invitation.authMethod) {
+                  case Invitation3.AuthMethod.SHARED_SECRET:
+                    await this._handleGuestOtpAuth(extension, setState, authenticated, {
+                      timeout
+                    });
+                    break;
+                  case Invitation3.AuthMethod.KNOWN_PUBLIC_KEY:
+                    await this._handleGuestKpkAuth(extension, setState, invitation, introductionResponse);
                     break;
-                  }
-                  if (response.status === AuthenticationResponse2.Status.INVALID_OTP) {
-                    if (attempt === MAX_OTP_ATTEMPTS) {
-                      throw new Error(`Maximum retry attempts: ${MAX_OTP_ATTEMPTS}`);
-                    } else {
-                      log5("retrying invalid code", {
-                        attempt
-                      }, {
-                        F: __dxlog_file7,
-                        L: 336,
-                        S: this,
-                        C: (f, a) => f(...a)
-                      });
-                      authenticated.reset();
-                    }
-                  }
                 }
               }
               log5("request admission", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 344,
+                L: 275,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2087,7 +2021,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 355,
+                L: 286,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2100,7 +2034,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 357,
+                L: 288,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2110,7 +2044,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 360,
+                  L: 291,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2120,7 +2054,7 @@ var InvitationsHandler = class {
               } else {
                 log5("auth failed", err, {
                   F: __dxlog_file7,
-                  L: 363,
+                  L: 294,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2131,7 +2065,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 366,
+                L: 297,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2149,7 +2083,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 377,
+              L: 308,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2159,7 +2093,7 @@ var InvitationsHandler = class {
           } else {
             log5("auth failed", err, {
               F: __dxlog_file7,
-              L: 380,
+              L: 311,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2176,7 +2110,7 @@ var InvitationsHandler = class {
       } else {
         invariant6(invitation.swarmKey, void 0, {
           F: __dxlog_file7,
-          L: 394,
+          L: 325,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -2214,206 +2148,114 @@ var InvitationsHandler = class {
     });
     return observable;
   }
+  async _handleGuestOtpAuth(extension, setState, authenticated, options) {
+    for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
+      log5("guest waiting for authentication code...", void 0, {
+        F: __dxlog_file7,
+        L: 365,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      setState({
+        state: Invitation3.State.READY_FOR_AUTHENTICATION
+      });
+      const authCode = await authenticated.wait(options);
+      log5("sending authentication request", void 0, {
+        F: __dxlog_file7,
+        L: 369,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      setState({
+        state: Invitation3.State.AUTHENTICATING
+      });
+      const response = await extension.rpc.InvitationHostService.authenticate({
+        authCode
+      });
+      if (response.status === void 0 || response.status === AuthenticationResponse2.Status.OK) {
+        break;
+      }
+      if (response.status === AuthenticationResponse2.Status.INVALID_OTP) {
+        if (attempt === MAX_OTP_ATTEMPTS) {
+          throw new Error(`Maximum retry attempts: ${MAX_OTP_ATTEMPTS}`);
+        } else {
+          log5("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");
+    }
+    log5("sending authentication request", void 0, {
+      F: __dxlog_file7,
+      L: 399,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    setState({
+      state: Invitation3.State.AUTHENTICATING
+    });
+    const signature = sign(Buffer.from(introductionResponse.challenge), invitation.guestKeypair.privateKey);
+    const response = await extension.rpc.InvitationHostService.authenticate({
+      signedChallenge: signature
+    });
+    if (response.status !== AuthenticationResponse2.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 = createKeyPair();
+  return {
+    publicKey: PublicKey6.from(keypair.publicKey),
+    privateKey: keypair.secretKey
+  };
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-service.ts
-import { Event as Event3, scheduleTask as scheduleTask3 } from "@dxos/async";
 import { Stream as Stream8 } from "@dxos/codec-protobuf";
-import { Context as Context6 } from "@dxos/context";
-import { invariant as invariant7 } from "@dxos/invariant";
-import { log as log6 } from "@dxos/log";
-import { Invitation as Invitation4, QueryInvitationsResponse } from "@dxos/protocols/proto/dxos/client/services";
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-service.ts";
+import { QueryInvitationsResponse } from "@dxos/protocols/proto/dxos/client/services";
 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 Event3();
-    this._invitationAccepted = new Event3();
-    this._removedCreated = new Event3();
-    this._removedAccepted = new Event3();
-    this._saved = new Event3();
-    this._persistentInvitationsLoadedEvent = new Event3();
-    this._persistentInvitationsLoaded = false;
+  constructor(_invitationsManager) {
+    this._invitationsManager = _invitationsManager;
   }
   // TODO(burdon): Guest/host label.
   getLoggingContext() {
     return {};
   }
   createInvitation(options) {
-    let invitation;
-    const savePersistentInvitationCtx = new Context6();
-    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 Stream8(({ next, close }) => {
-      if (invitation.get().persistent) {
-        scheduleTask3(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 !== Invitation4.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) => {
-      invariant7(!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) {
-      invariant7(options.kind === Invitation4.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 Stream8(({ next, close }) => {
-      invitation.subscribe((invitation2) => {
-        next(invitation2);
-      }, (err) => {
-        close(err);
-      }, () => {
-        close();
-        this._acceptInvitations.delete(invitation.get().invitationId);
-        if (invitation.get().type !== Invitation4.Type.MULTIUSE) {
-          this._removedAccepted.emit(invitation.get());
-        }
-      });
+      invitation.subscribe(next, close, close);
     });
   }
-  async authenticate({ invitationId, authCode }) {
-    log6("authenticating...", void 0, {
-      F: __dxlog_file8,
-      L: 160,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant7(invitationId, void 0, {
-      F: __dxlog_file8,
-      L: 161,
-      S: this,
-      A: [
-        "invitationId",
-        ""
-      ]
-    });
-    const observable = this._acceptInvitations.get(invitationId);
-    if (!observable) {
-      log6.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 }) {
-    log6("cancelInvitation...", {
-      invitationId
-    }, {
-      F: __dxlog_file8,
-      L: 171,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant7(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 Stream8(({ next, ctx }) => {
-      this._invitationCreated.on(ctx, (invitation) => {
+      this._invitationsManager.invitationCreated.on(ctx, (invitation) => {
         next({
           action: QueryInvitationsResponse.Action.ADDED,
           type: QueryInvitationsResponse.Type.CREATED,
@@ -2422,7 +2264,7 @@ var InvitationsServiceImpl = class {
           ]
         });
       });
-      this._invitationAccepted.on(ctx, (invitation) => {
+      this._invitationsManager.invitationAccepted.on(ctx, (invitation) => {
         next({
           action: QueryInvitationsResponse.Action.ADDED,
           type: QueryInvitationsResponse.Type.ACCEPTED,
@@ -2431,7 +2273,7 @@ var InvitationsServiceImpl = class {
           ]
         });
       });
-      this._removedCreated.on(ctx, (invitation) => {
+      this._invitationsManager.removedCreated.on(ctx, (invitation) => {
         next({
           action: QueryInvitationsResponse.Action.REMOVED,
           type: QueryInvitationsResponse.Type.CREATED,
@@ -2440,7 +2282,7 @@ var InvitationsServiceImpl = class {
           ]
         });
       });
-      this._removedAccepted.on(ctx, (invitation) => {
+      this._invitationsManager.removedAccepted.on(ctx, (invitation) => {
         next({
           action: QueryInvitationsResponse.Action.REMOVED,
           type: QueryInvitationsResponse.Type.ACCEPTED,
@@ -2449,7 +2291,7 @@ var InvitationsServiceImpl = class {
           ]
         });
       });
-      this._saved.on(ctx, (invitation) => {
+      this._invitationsManager.saved.on(ctx, (invitation) => {
         next({
           action: QueryInvitationsResponse.Action.SAVED,
           type: QueryInvitationsResponse.Type.CREATED,
@@ -2461,40 +2303,34 @@ var InvitationsServiceImpl = class {
       next({
         action: QueryInvitationsResponse.Action.ADDED,
         type: QueryInvitationsResponse.Type.CREATED,
-        invitations: Array.from(this._createInvitations.values()).map((invitation) => invitation.get()),
+        invitations: this._invitationsManager.getCreatedInvitations(),
         existing: true
       });
       next({
         action: QueryInvitationsResponse.Action.ADDED,
         type: 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: QueryInvitationsResponse.Action.LOAD_COMPLETE,
           type: QueryInvitationsResponse.Type.CREATED
         });
-      } else {
-        this._persistentInvitationsLoadedEvent.on(ctx, () => {
-          next({
-            action: QueryInvitationsResponse.Action.LOAD_COMPLETE,
-            type: QueryInvitationsResponse.Type.CREATED
-          });
-        });
-      }
+      });
     });
   }
 };
 
 // packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts
-import { createAdmissionCredentials, getCredentialAssertion } from "@dxos/credentials";
+import { createAdmissionCredentials, createDelegatedSpaceInvitationCredential, getCredentialAssertion } from "@dxos/credentials";
 import { writeMessages as writeMessages2 } from "@dxos/feed-store";
-import { invariant as invariant8 } from "@dxos/invariant";
-import { log as log7 } from "@dxos/log";
+import { invariant as invariant7 } from "@dxos/invariant";
+import { log as log6 } from "@dxos/log";
 import { AlreadyJoinedError as AlreadyJoinedError2 } from "@dxos/protocols";
-import { Invitation as Invitation5 } from "@dxos/protocols/proto/dxos/client/services";
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
+import { Invitation as Invitation4 } from "@dxos/protocols/proto/dxos/client/services";
+import { SpaceMember } from "@dxos/protocols/proto/dxos/halo/credentials";
+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;
@@ -2510,14 +2346,14 @@ var SpaceInvitationProtocol = class {
   }
   getInvitationContext() {
     return {
-      kind: Invitation5.Kind.SPACE,
+      kind: Invitation4.Kind.SPACE,
       spaceKey: this._spaceKey
     };
   }
-  async admit(request, guestProfile) {
-    invariant8(this._spaceKey, void 0, {
-      F: __dxlog_file9,
-      L: 47,
+  async admit(invitation, request, guestProfile) {
+    invariant7(this._spaceKey, void 0, {
+      F: __dxlog_file8,
+      L: 55,
       S: this,
       A: [
         "this._spaceKey",
@@ -2525,18 +2361,18 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const space = await this._spaceManager.spaces.get(this._spaceKey);
-    invariant8(space, void 0, {
-      F: __dxlog_file9,
-      L: 49,
+    invariant7(space, void 0, {
+      F: __dxlog_file8,
+      L: 57,
       S: this,
       A: [
         "space",
         ""
       ]
     });
-    invariant8(request.space, void 0, {
-      F: __dxlog_file9,
-      L: 51,
+    invariant7(request.space, void 0, {
+      F: __dxlog_file8,
+      L: 59,
       S: this,
       A: [
         "request.space",
@@ -2544,19 +2380,19 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const { identityKey, deviceKey } = request.space;
-    log7("writing guest credentials", {
+    log6("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 createAdmissionCredentials(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, guestProfile);
-    invariant8(credentials[0].credential, void 0, {
-      F: __dxlog_file9,
-      L: 65,
+    const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, guestProfile, invitation.delegationCredentialId);
+    invariant7(credentials[0].credential, void 0, {
+      F: __dxlog_file8,
+      L: 74,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2564,9 +2400,9 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const spaceMemberCredential = credentials[0].credential.credential;
-    invariant8(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file9,
-      L: 67,
+    invariant7(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file8,
+      L: 76,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2581,6 +2417,69 @@ var SpaceInvitationProtocol = class {
       }
     };
   }
+  async delegate(invitation) {
+    invariant7(this._spaceKey, void 0, {
+      F: __dxlog_file8,
+      L: 89,
+      S: this,
+      A: [
+        "this._spaceKey",
+        ""
+      ]
+    });
+    const space = await this._spaceManager.spaces.get(this._spaceKey);
+    invariant7(space, void 0, {
+      F: __dxlog_file8,
+      L: 91,
+      S: this,
+      A: [
+        "space",
+        ""
+      ]
+    });
+    if (invitation.authMethod === Invitation4.AuthMethod.KNOWN_PUBLIC_KEY) {
+      invariant7(invitation.guestKeypair?.publicKey, void 0, {
+        F: __dxlog_file8,
+        L: 93,
+        S: this,
+        A: [
+          "invitation.guestKeypair?.publicKey",
+          ""
+        ]
+      });
+    }
+    log6("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 createDelegatedSpaceInvitationCredential(this._signingContext.credentialSigner, space.key, {
+      invitationId: invitation.invitationId,
+      authMethod: invitation.authMethod,
+      swarmKey: invitation.swarmKey,
+      role: SpaceMember.Role.ADMIN,
+      expiresOn: invitation.lifetime ? new Date((invitation.created?.getTime() ?? Date.now()) + invitation.lifetime) : void 0,
+      multiUse: invitation.multiUse ?? false,
+      guestKey: invitation.authMethod === Invitation4.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
+    });
+    invariant7(credential.credential, void 0, {
+      F: __dxlog_file8,
+      L: 116,
+      S: this,
+      A: [
+        "credential.credential",
+        ""
+      ]
+    });
+    await writeMessages2(space.inner.controlPipeline.writer, [
+      credential
+    ]);
+    return credential.credential.credential.id;
+  }
   checkInvitation(invitation) {
     if (invitation.spaceKey && this._spaceManager.spaces.has(invitation.spaceKey)) {
       return new AlreadyJoinedError2("Already joined space.");
@@ -2604,9 +2503,9 @@ var SpaceInvitationProtocol = class {
     };
   }
   async accept(response) {
-    invariant8(response.space, void 0, {
-      F: __dxlog_file9,
-      L: 107,
+    invariant7(response.space, void 0, {
+      F: __dxlog_file8,
+      L: 149,
       S: this,
       A: [
         "response.space",
@@ -2615,18 +2514,18 @@ var SpaceInvitationProtocol = class {
     });
     const { credential, controlTimeframe, dataTimeframe } = response.space;
     const assertion = getCredentialAssertion(credential);
-    invariant8(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
-      F: __dxlog_file9,
-      L: 110,
+    invariant7(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
+      F: __dxlog_file8,
+      L: 152,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
         "'Invalid credential'"
       ]
     });
-    invariant8(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
-      F: __dxlog_file9,
-      L: 111,
+    invariant7(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
+      F: __dxlog_file8,
+      L: 153,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
@@ -2649,6 +2548,295 @@ var SpaceInvitationProtocol = class {
   }
 };
 
+// packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts
+import { Event as Event3, PushStream as PushStream2 } from "@dxos/async";
+import { AUTHENTICATION_CODE_LENGTH, CancellableInvitation, INVITATION_TIMEOUT as INVITATION_TIMEOUT2 } from "@dxos/client-protocol";
+import { Context as Context6 } from "@dxos/context";
+import { generatePasscode } from "@dxos/credentials";
+import { hasInvitationExpired } from "@dxos/echo-pipeline";
+import { invariant as invariant8 } from "@dxos/invariant";
+import { PublicKey as PublicKey7 } from "@dxos/keys";
+import { log as log7 } from "@dxos/log";
+import { Invitation as Invitation5 } from "@dxos/protocols/proto/dxos/client/services";
+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 Event3();
+    this.invitationAccepted = new Event3();
+    this.removedCreated = new Event3();
+    this.removedAccepted = new Event3();
+    this.saved = new Event3();
+    this._persistentInvitationsLoadedEvent = new Event3();
+    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) {
+      log7.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) => !hasInvitationExpired(invitation));
+      const loadTasks = freshInvitations.map((persistentInvitation) => {
+        invariant8(!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) {
+      log7.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 }) {
+    log7("authenticating...", void 0, {
+      F: __dxlog_file9,
+      L: 133,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    invariant8(invitationId, void 0, {
+      F: __dxlog_file9,
+      L: 134,
+      S: this,
+      A: [
+        "invitationId",
+        ""
+      ]
+    });
+    const observable = this._acceptInvitations.get(invitationId);
+    if (!observable) {
+      log7.warn("invalid invitation", {
+        invitationId
+      }, {
+        F: __dxlog_file9,
+        L: 137,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    } else {
+      await observable.authenticate(authCode);
+    }
+  }
+  async cancelInvitation({ invitationId }) {
+    log7("cancelInvitation...", {
+      invitationId
+    }, {
+      F: __dxlog_file9,
+      L: 144,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    invariant8(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 = PublicKey7.random().toHex(), type = Invitation5.Type.INTERACTIVE, authMethod = Invitation5.AuthMethod.SHARED_SECRET, state = Invitation5.State.INIT, timeout = INVITATION_TIMEOUT2, swarmKey = PublicKey7.random(), persistent = options?.authMethod !== Invitation5.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, lifetime = 86400, multiUse = false } = options ?? {};
+    const authCode = options?.authCode ?? (authMethod === Invitation5.AuthMethod.SHARED_SECRET ? generatePasscode(AUTHENTICATION_CODE_LENGTH) : void 0);
+    return {
+      invitationId,
+      type,
+      authMethod,
+      state,
+      swarmKey,
+      authCode,
+      timeout,
+      persistent: persistent && type !== Invitation5.Type.DELEGATED,
+      guestKeypair: guestKeypair ?? (authMethod === Invitation5.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
+      created,
+      lifetime,
+      multiUse,
+      delegationCredentialId: options?.delegationCredentialId,
+      ...protocol.getInvitationContext()
+    };
+  }
+  _createObservableInvitation(handler, invitation) {
+    const stream = new PushStream2();
+    const ctx = new Context6({
+      onError: (err) => {
+        stream.error(err);
+        void ctx.dispose();
+      }
+    });
+    ctx.onDispose(() => {
+      log7("complete", {
+        ...handler.toJSON()
+      }, {
+        F: __dxlog_file9,
+        L: 228,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      stream.complete();
+    });
+    const observableInvitation = new CancellableInvitation({
+      initialInvitation: invitation,
+      subscriber: stream.observable,
+      onCancel: async () => {
+        stream.next({
+          ...invitation,
+          state: Invitation5.State.CANCELLED
+        });
+        await ctx.dispose();
+      }
+    });
+    return {
+      ctx,
+      stream,
+      observableInvitation
+    };
+  }
+  async _persistIfRequired(handler, changeStream, invitation) {
+    if (invitation.type === Invitation5.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) {
+      log7.catch(err, void 0, {
+        F: __dxlog_file9,
+        L: 260,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  _onInvitationComplete(invitation, callback) {
+    invitation.subscribe(() => {
+    }, () => {
+    }, callback);
+  }
+};
+
 // packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
 import { Stream as Stream9 } from "@dxos/codec-protobuf";
 import { raise } from "@dxos/debug";
@@ -2730,222 +2918,72 @@ ClientRpcServer = _ts_decorate3([
   trace5.resource()
 ], ClientRpcServer);
 
-// packages/sdk/client-services/src/packlets/services/diagnostics.ts
-import { getFirstStreamValue } from "@dxos/codec-protobuf";
-import { credentialTypeFilter } from "@dxos/credentials";
-import { invariant as invariant9 } from "@dxos/invariant";
-import { STORAGE_VERSION } from "@dxos/protocols";
-import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
-import { TRACE_PROCESSOR } from "@dxos/tracing";
+// packages/sdk/client-services/src/packlets/spaces/data-space.ts
+import { Event as Event6, asyncTimeout, scheduleTask as scheduleTask4, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
+import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
+import { cancelWithContext as cancelWithContext2, Context as Context8, ContextDisposedError } from "@dxos/context";
+import { timed, warnAfterTimeout } from "@dxos/debug";
+import { createMappedFeedWriter } from "@dxos/echo-pipeline";
+import { AutomergeDocumentLoaderImpl } from "@dxos/echo-pipeline";
+import { TYPE_PROPERTIES } from "@dxos/echo-schema";
+import { failedInvariant, invariant as invariant10 } from "@dxos/invariant";
+import { PublicKey as PublicKey9 } from "@dxos/keys";
+import { log as log9 } from "@dxos/log";
+import { CancelledError, SystemError } from "@dxos/protocols";
+import { SpaceState, CreateEpochRequest } from "@dxos/protocols/proto/dxos/client/services";
+import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { Timeframe as Timeframe2 } from "@dxos/timeframe";
+import { trace as trace6 } from "@dxos/tracing";
+import { ComplexSet as ComplexSet3, assignDeep } from "@dxos/util";
 
-// packages/sdk/client-services/src/packlets/services/platform.ts
-import { Platform } from "@dxos/protocols/proto/dxos/client/services";
-var getPlatform = () => {
-  if (process.browser) {
-    if (typeof window !== "undefined") {
-      const { userAgent } = window.navigator;
-      return {
-        type: Platform.PLATFORM_TYPE.BROWSER,
-        userAgent,
-        uptime: Math.floor((Date.now() - window.performance.timeOrigin) / 1e3)
-      };
-    } else {
-      return {
-        type: Platform.PLATFORM_TYPE.SHARED_WORKER,
-        uptime: Math.floor((Date.now() - performance.timeOrigin) / 1e3)
-      };
+// packages/sdk/client-services/src/packlets/spaces/automerge-space-state.ts
+import { Event as Event4 } from "@dxos/async";
+import { checkCredentialType } from "@dxos/credentials";
+var AutomergeSpaceState = class {
+  constructor(_onNewRoot) {
+    this._onNewRoot = _onNewRoot;
+    this.rootUrl = void 0;
+    this.lastEpoch = void 0;
+    this.onNewEpoch = new Event4();
+    this._isProcessingRootDocs = false;
+  }
+  async processCredential(credential) {
+    if (!checkCredentialType(credential, "dxos.halo.credentials.Epoch")) {
+      return;
     }
-  } else {
-    const { platform: platform2, version, arch } = process;
-    return {
-      type: Platform.PLATFORM_TYPE.NODE,
-      platform: platform2,
-      arch,
-      runtime: version,
-      uptime: Math.floor(process.uptime()),
-      memory: process.memoryUsage()
-    };
-  }
-};
-
-// packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.4.10-main.fd4f2a3";
-
-// packages/sdk/client-services/src/packlets/services/diagnostics.ts
-var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
-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: STORAGE_VERSION
-      }
-    },
-    trace: TRACE_PROCESSOR.getDiagnostics()
-  };
-  {
-    invariant9(clientServices.LoggingService, "SystemService is not available.", {
-      F: __dxlog_file10,
-      L: 108,
-      S: void 0,
-      A: [
-        "clientServices.LoggingService",
-        "'SystemService is not available.'"
-      ]
-    });
-    diagnostics.metrics = await 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 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 getFirstStreamValue(clientServices.DevtoolsHost.subscribeToFeeds({}), {
-      timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0) ?? {};
-    diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
-      feedKey,
-      bytes,
-      length
-    }));
-    const status = await 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(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 ? SpaceMember.PresenceState.ONLINE : 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;
-};
-
-// packages/sdk/client-services/src/packlets/spaces/data-space.ts
-import { Event as Event6, asyncTimeout, scheduleTask as scheduleTask5, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
-import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
-import { cancelWithContext as cancelWithContext2, Context as Context8, ContextDisposedError } from "@dxos/context";
-import { timed, warnAfterTimeout } from "@dxos/debug";
-import { TYPE_PROPERTIES } from "@dxos/echo-db";
-import { createMappedFeedWriter } from "@dxos/echo-pipeline";
-import { AutomergeDocumentLoaderImpl } from "@dxos/echo-pipeline";
-import { failedInvariant, invariant as invariant11 } from "@dxos/invariant";
-import { PublicKey as PublicKey8 } from "@dxos/keys";
-import { log as log9 } from "@dxos/log";
-import { CancelledError, SystemError } from "@dxos/protocols";
-import { SpaceState, CreateEpochRequest } from "@dxos/protocols/proto/dxos/client/services";
-import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
-import { Timeframe as Timeframe2 } from "@dxos/timeframe";
-import { trace as trace6 } from "@dxos/tracing";
-import { ComplexSet as ComplexSet3, assignDeep } from "@dxos/util";
-
-// packages/sdk/client-services/src/packlets/spaces/automerge-space-state.ts
-import { Event as Event4 } from "@dxos/async";
-import { checkCredentialType } from "@dxos/credentials";
-var AutomergeSpaceState = class {
-  constructor(_onNewRoot) {
-    this._onNewRoot = _onNewRoot;
-    this.rootUrl = void 0;
-    this.lastEpoch = void 0;
-    this.onNewEpoch = new Event4();
-    this._isProcessingRootDocs = false;
-  }
-  async processCredential(credential) {
-    if (!checkCredentialType(credential, "dxos.halo.credentials.Epoch")) {
-      return;
-    }
-    this.lastEpoch = credential;
-    if (credential.subject.assertion.automergeRoot) {
-      this.rootUrl = credential.subject.assertion.automergeRoot;
-      if (this._isProcessingRootDocs) {
-        this._onNewRoot(this.rootUrl);
-      }
-    }
-    this.onNewEpoch.emit(credential);
-  }
-  startProcessingRootDocs() {
-    if (this._isProcessingRootDocs) {
-      return;
-    }
-    if (this.rootUrl) {
-      this._onNewRoot(this.rootUrl);
-    }
-    this._isProcessingRootDocs = true;
-  }
-  async ensureEpochInitialized() {
-    await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
+    this.lastEpoch = credential;
+    if (credential.subject.assertion.automergeRoot) {
+      this.rootUrl = credential.subject.assertion.automergeRoot;
+      if (this._isProcessingRootDocs) {
+        this._onNewRoot(this.rootUrl);
+      }
+    }
+    this.onNewEpoch.emit(credential);
+  }
+  startProcessingRootDocs() {
+    if (this._isProcessingRootDocs) {
+      return;
+    }
+    if (this.rootUrl) {
+      this._onNewRoot(this.rootUrl);
+    }
+    this._isProcessingRootDocs = true;
+  }
+  async ensureEpochInitialized() {
+    await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
   }
 };
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
-import { DeferredTask, Event as Event5, scheduleTask as scheduleTask4, sleep, TimeoutError as TimeoutError2, Trigger as Trigger4 } from "@dxos/async";
+import { DeferredTask, Event as Event5, scheduleTask as scheduleTask3, sleep, TimeoutError as TimeoutError2, Trigger as Trigger4 } from "@dxos/async";
 import { Context as Context7, rejectOnDispose } from "@dxos/context";
-import { invariant as invariant10 } from "@dxos/invariant";
-import { PublicKey as PublicKey7 } from "@dxos/keys";
+import { invariant as invariant9 } from "@dxos/invariant";
+import { PublicKey as PublicKey8 } from "@dxos/keys";
 import { log as log8 } from "@dxos/log";
 import { schema as schema3 } from "@dxos/protocols";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
 import { ComplexMap as ComplexMap2, ComplexSet as ComplexSet2, entry } from "@dxos/util";
-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;
@@ -2955,8 +2993,8 @@ var NotarizationPlugin = class {
     this._ctx = new Context7();
     this._extensionOpened = new Event5();
     this._extensions = /* @__PURE__ */ new Set();
-    this._processedCredentials = new ComplexSet2(PublicKey7.hash);
-    this._processCredentialsTriggers = new ComplexMap2(PublicKey7.hash);
+    this._processedCredentials = new ComplexSet2(PublicKey8.hash);
+    this._processCredentialsTriggers = new ComplexMap2(PublicKey8.hash);
   }
   get hasWriter() {
     return !!this._writer;
@@ -2973,13 +3011,13 @@ var NotarizationPlugin = class {
     log8("notarize", {
       credentials
     }, {
-      F: __dxlog_file11,
+      F: __dxlog_file10,
       L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant10(credentials.every((credential) => credential.id), "Credentials must have an id", {
-      F: __dxlog_file11,
+    invariant9(credentials.every((credential) => credential.id), "Credentials must have an id", {
+      F: __dxlog_file10,
       L: 91,
       S: this,
       A: [
@@ -2993,7 +3031,7 @@ var NotarizationPlugin = class {
         log8.warn("Notarization error", {
           err
         }, {
-          F: __dxlog_file11,
+          F: __dxlog_file10,
           L: 99,
           S: this,
           C: (f, a) => f(...a)
@@ -3004,12 +3042,12 @@ var NotarizationPlugin = class {
     });
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
-      scheduleTask4(ctx, () => {
+      scheduleTask3(ctx, () => {
         log8.warn("Notarization timeout", {
           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)
@@ -3032,13 +3070,13 @@ var NotarizationPlugin = class {
           log8.info("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
-            F: __dxlog_file11,
+            F: __dxlog_file10,
             L: 136,
             S: this,
             C: (f, a) => f(...a)
           });
           peersTried.clear();
-          scheduleTask4(ctx, () => notarizeTask.schedule(), retryTimeout);
+          scheduleTask3(ctx, () => notarizeTask.schedule(), retryTimeout);
           return;
         }
         peersTried.add(peer);
@@ -3046,7 +3084,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)
@@ -3055,7 +3093,7 @@ var NotarizationPlugin = class {
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
         log8("success", void 0, {
-          F: __dxlog_file11,
+          F: __dxlog_file10,
           L: 147,
           S: this,
           C: (f, a) => f(...a)
@@ -3064,7 +3102,7 @@ var NotarizationPlugin = class {
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
           log8.info("error notarizing (recoverable)", err, {
-            F: __dxlog_file11,
+            F: __dxlog_file10,
             L: 151,
             S: this,
             C: (f, a) => f(...a)
@@ -3082,7 +3120,7 @@ var NotarizationPlugin = class {
         errors.wait()
       ]);
       log8("done", void 0, {
-        F: __dxlog_file11,
+        F: __dxlog_file10,
         L: 162,
         S: this,
         C: (f, a) => f(...a)
@@ -3103,8 +3141,8 @@ var NotarizationPlugin = class {
     this._processCredentialsTriggers.delete(credential.id);
   }
   setWriter(writer) {
-    invariant10(!this._writer, "Writer already set.", {
-      F: __dxlog_file11,
+    invariant9(!this._writer, "Writer already set.", {
+      F: __dxlog_file10,
       L: 181,
       S: this,
       A: [
@@ -3128,8 +3166,8 @@ var NotarizationPlugin = class {
       throw new Error(WRITER_NOT_SET_ERROR_CODE);
     }
     for (const credential of request.credentials ?? []) {
-      invariant10(credential.id, "Credential must have an id", {
-        F: __dxlog_file11,
+      invariant9(credential.id, "Credential must have an id", {
+        F: __dxlog_file10,
         L: 200,
         S: this,
         A: [
@@ -3149,7 +3187,7 @@ var NotarizationPlugin = class {
         log8("extension opened", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file11,
+          F: __dxlog_file10,
           L: 211,
           S: this,
           C: (f, a) => f(...a)
@@ -3161,7 +3199,7 @@ var NotarizationPlugin = class {
         log8("extension closed", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file11,
+          F: __dxlog_file10,
           L: 216,
           S: this,
           C: (f, a) => f(...a)
@@ -3215,7 +3253,7 @@ 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 Context8();
@@ -3241,7 +3279,7 @@ var DataSpace = class {
     this._callbacks = params.callbacks ?? {};
     this._automergeHost = params.automergeHost;
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new ComplexSet3(PublicKey8.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
+      trustedKeysProvider: () => new ComplexSet3(PublicKey9.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
       update: this._inner.stateUpdate,
       authTimeout: AUTH_TIMEOUT2
     });
@@ -3250,7 +3288,7 @@ var DataSpace = class {
     log9("new state", {
       state: SpaceState[this._state]
     }, {
-      F: __dxlog_file12,
+      F: __dxlog_file11,
       L: 140,
       S: this,
       C: (f, a) => f(...a)
@@ -3300,7 +3338,7 @@ var DataSpace = class {
     log9("new state", {
       state: SpaceState[this._state]
     }, {
-      F: __dxlog_file12,
+      F: __dxlog_file11,
       L: 198,
       S: this,
       C: (f, a) => f(...a)
@@ -3318,7 +3356,7 @@ var DataSpace = class {
     log9("new state", {
       state: SpaceState[this._state]
     }, {
-      F: __dxlog_file12,
+      F: __dxlog_file11,
       L: 212,
       S: this,
       C: (f, a) => f(...a)
@@ -3343,14 +3381,14 @@ var DataSpace = class {
   * Initialize the data pipeline in a separate task.
   */
   initializeDataPipelineAsync() {
-    scheduleTask5(this._ctx, async () => {
+    scheduleTask4(this._ctx, async () => {
       try {
         this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
       } catch (err) {
         if (err instanceof CancelledError || err instanceof ContextDisposedError) {
           log9("data pipeline initialization cancelled", err, {
-            F: __dxlog_file12,
+            F: __dxlog_file11,
             L: 245,
             S: this,
             C: (f, a) => f(...a)
@@ -3358,7 +3396,7 @@ var DataSpace = class {
           return;
         }
         log9.error("Error initializing data pipeline", err, {
-          F: __dxlog_file12,
+          F: __dxlog_file11,
           L: 249,
           S: this,
           C: (f, a) => f(...a)
@@ -3367,7 +3405,7 @@ var DataSpace = class {
         log9("new state", {
           state: SpaceState[this._state]
         }, {
-          F: __dxlog_file12,
+          F: __dxlog_file11,
           L: 251,
           S: this,
           C: (f, a) => f(...a)
@@ -3387,7 +3425,7 @@ var DataSpace = class {
     log9("new state", {
       state: SpaceState[this._state]
     }, {
-      F: __dxlog_file12,
+      F: __dxlog_file11,
       L: 267,
       S: this,
       C: (f, a) => f(...a)
@@ -3397,7 +3435,7 @@ var DataSpace = class {
     this._automergeSpaceState.startProcessingRootDocs();
     await cancelWithContext2(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
     log9("data pipeline ready", void 0, {
-      F: __dxlog_file12,
+      F: __dxlog_file11,
       L: 279,
       S: this,
       C: (f, a) => f(...a)
@@ -3407,7 +3445,7 @@ var DataSpace = class {
     log9("new state", {
       state: SpaceState[this._state]
     }, {
-      F: __dxlog_file12,
+      F: __dxlog_file11,
       L: 283,
       S: this,
       C: (f, a) => f(...a)
@@ -3423,7 +3461,7 @@ var DataSpace = class {
     this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
     log9("writable feeds created", void 0, {
-      F: __dxlog_file12,
+      F: __dxlog_file11,
       L: 299,
       S: this,
       C: (f, a) => f(...a)
@@ -3486,7 +3524,7 @@ var DataSpace = class {
       space: this.key,
       rootUrl
     }, {
-      F: __dxlog_file12,
+      F: __dxlog_file11,
       L: 365,
       S: this,
       C: (f, a) => f(...a)
@@ -3518,7 +3556,7 @@ var DataSpace = class {
           rootUrl,
           err
         }, {
-          F: __dxlog_file12,
+          F: __dxlog_file11,
           L: 388,
           S: this,
           C: (f, a) => f(...a)
@@ -3572,8 +3610,8 @@ var DataSpace = class {
           const rootHandle = this._automergeHost.repo.find(currentRootUrl);
           await cancelWithContext2(this._ctx, asyncTimeout(rootHandle.whenReady(), 1e4));
           const newRoot = this._automergeHost.repo.create(rootHandle.docSync());
-          invariant11(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-            F: __dxlog_file12,
+          invariant10(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
+            F: __dxlog_file11,
             L: 438,
             S: this,
             A: [
@@ -3592,7 +3630,7 @@ var DataSpace = class {
       case CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT:
         {
           log9.info("Fragmenting", void 0, {
-            F: __dxlog_file12,
+            F: __dxlog_file11,
             L: 450,
             S: this,
             C: (f, a) => f(...a)
@@ -3603,8 +3641,8 @@ var DataSpace = class {
           const objects = Object.entries(rootHandle.docSync().objects);
           const properties = objects.find(([_, value]) => value.system.type?.itemId === TYPE_PROPERTIES);
           const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
-          invariant11(properties, "Properties not found", {
-            F: __dxlog_file12,
+          invariant10(properties, "Properties not found", {
+            F: __dxlog_file11,
             L: 460,
             S: this,
             A: [
@@ -3619,8 +3657,8 @@ var DataSpace = class {
             ])
           };
           const newRoot = this._automergeHost.repo.create(newSpaceDoc);
-          invariant11(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-            F: __dxlog_file12,
+          invariant10(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
+            F: __dxlog_file11,
             L: 465,
             S: this,
             A: [
@@ -3689,7 +3727,7 @@ var DataSpace = class {
     log9("new state", {
       state: SpaceState[this._state]
     }, {
-      F: __dxlog_file12,
+      F: __dxlog_file11,
       L: 531,
       S: this,
       C: (f, a) => f(...a)
@@ -3747,11 +3785,11 @@ DataSpace = _ts_decorate4([
 import { Event as Event7, synchronized as synchronized2, trackLeaks as trackLeaks2 } from "@dxos/async";
 import { Context as Context9, cancelWithContext as cancelWithContext3 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
-import { invariant as invariant12 } from "@dxos/invariant";
-import { PublicKey as PublicKey9 } from "@dxos/keys";
+import { invariant as invariant11 } from "@dxos/invariant";
+import { PublicKey as PublicKey10 } from "@dxos/keys";
 import { log as log10 } from "@dxos/log";
 import { trace as trace7 } from "@dxos/protocols";
-import { SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
+import { Invitation as Invitation6, SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
 import { Gossip as Gossip2, Presence as Presence2 } from "@dxos/teleport-extension-gossip";
 import { ComplexMap as ComplexMap3, deferFunction as deferFunction2, forEachAsync } from "@dxos/util";
 
@@ -3836,22 +3874,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, _automergeHost, _invitationsManager, params) {
     this._spaceManager = _spaceManager;
     this._metadataStore = _metadataStore;
     this._keyring = _keyring;
     this._signingContext = _signingContext;
     this._feedStore = _feedStore;
     this._automergeHost = _automergeHost;
+    this._invitationsManager = _invitationsManager;
     this._ctx = new Context9();
     this.updated = new Event7();
-    this._spaces = new ComplexMap3(PublicKey9.hash);
+    this._spaces = new ComplexMap3(PublicKey10.hash);
     this._isOpen = false;
-    this._instanceId = PublicKey9.random().toHex();
+    this._instanceId = PublicKey10.random().toHex();
     const { spaceMemberPresenceAnnounceInterval = PRESENCE_ANNOUNCE_INTERVAL, spaceMemberPresenceOfflineTimeout = PRESENCE_OFFLINE_TIMEOUT } = params ?? {};
     this._spaceMemberPresenceAnnounceInterval = spaceMemberPresenceAnnounceInterval;
     this._spaceMemberPresenceOfflineTimeout = spaceMemberPresenceOfflineTimeout;
@@ -3862,24 +3901,24 @@ var DataSpaceManager = class {
   }
   async open() {
     log10("open", void 0, {
-      F: __dxlog_file13,
-      L: 98,
+      F: __dxlog_file12,
+      L: 101,
       S: this,
       C: (f, a) => f(...a)
     });
     log10.trace("dxos.echo.data-space-manager.open", trace7.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file13,
-      L: 99,
+      F: __dxlog_file12,
+      L: 102,
       S: this,
       C: (f, a) => f(...a)
     });
     log10("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
-      F: __dxlog_file13,
-      L: 100,
+      F: __dxlog_file12,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3888,8 +3927,8 @@ var DataSpaceManager = class {
         log10("load space", {
           spaceMetadata
         }, {
-          F: __dxlog_file13,
-          L: 104,
+          F: __dxlog_file12,
+          L: 107,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3899,8 +3938,8 @@ var DataSpaceManager = class {
           spaceMetadata,
           err
         }, {
-          F: __dxlog_file13,
-          L: 107,
+          F: __dxlog_file12,
+          L: 110,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3916,16 +3955,16 @@ var DataSpaceManager = class {
     log10.trace("dxos.echo.data-space-manager.open", trace7.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file13,
-      L: 120,
+      F: __dxlog_file12,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
     log10("close", void 0, {
-      F: __dxlog_file13,
-      L: 125,
+      F: __dxlog_file12,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3939,9 +3978,9 @@ var DataSpaceManager = class {
   * Creates a new space writing the genesis credentials to the control feed.
   */
   async createSpace() {
-    invariant12(this._isOpen, "Not open.", {
-      F: __dxlog_file13,
-      L: 138,
+    invariant11(this._isOpen, "Not open.", {
+      F: __dxlog_file12,
+      L: 141,
       S: this,
       A: [
         "this._isOpen",
@@ -3961,8 +4000,8 @@ var DataSpaceManager = class {
     log10("creating space...", {
       spaceKey
     }, {
-      F: __dxlog_file13,
-      L: 150,
+      F: __dxlog_file12,
+      L: 153,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3976,9 +4015,9 @@ var DataSpaceManager = class {
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRoot.url);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    invariant12(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file13,
-      L: 163,
+    invariant11(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file12,
+      L: 166,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3995,23 +4034,23 @@ var DataSpaceManager = class {
     log10("accept space", {
       opts
     }, {
-      F: __dxlog_file13,
-      L: 175,
+      F: __dxlog_file12,
+      L: 178,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant12(this._isOpen, "Not open.", {
-      F: __dxlog_file13,
-      L: 176,
+    invariant11(this._isOpen, "Not open.", {
+      F: __dxlog_file12,
+      L: 179,
       S: this,
       A: [
         "this._isOpen",
         "'Not open.'"
       ]
     });
-    invariant12(!this._spaces.has(opts.spaceKey), "Space already exists.", {
-      F: __dxlog_file13,
-      L: 177,
+    invariant11(!this._spaces.has(opts.spaceKey), "Space already exists.", {
+      F: __dxlog_file12,
+      L: 180,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -4045,8 +4084,8 @@ var DataSpaceManager = class {
     log10("construct space", {
       metadata
     }, {
-      F: __dxlog_file13,
-      L: 210,
+      F: __dxlog_file12,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4083,13 +4122,16 @@ var DataSpaceManager = class {
       },
       onAuthFailure: () => {
         log10.warn("auth failure", void 0, {
-          F: __dxlog_file13,
-          L: 247,
+          F: __dxlog_file12,
+          L: 250,
           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);
@@ -4107,8 +4149,8 @@ var DataSpaceManager = class {
           log10("before space ready", {
             space: space.key
           }, {
-            F: __dxlog_file13,
-            L: 265,
+            F: __dxlog_file12,
+            L: 271,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4118,12 +4160,15 @@ var DataSpaceManager = class {
             space: space.key,
             open: this._isOpen
           }, {
-            F: __dxlog_file13,
-            L: 268,
+            F: __dxlog_file12,
+            L: 274,
             S: this,
             C: (f, a) => f(...a)
           });
           if (this._isOpen) {
+            await this._createDelegatedInvitations(dataSpace, [
+              ...space.spaceState.invitations.entries()
+            ]);
             this.updated.emit();
           }
         },
@@ -4131,8 +4176,8 @@ var DataSpaceManager = class {
           log10("before space close", {
             space: space.key
           }, {
-            F: __dxlog_file13,
-            L: 274,
+            F: __dxlog_file12,
+            L: 281,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4150,6 +4195,41 @@ var DataSpaceManager = class {
     this._spaces.set(metadata.key, dataSpace);
     return dataSpace;
   }
+  async _handleInvitationStatusChange(dataSpace, delegatedInvitation, isActive) {
+    if (dataSpace?.state !== SpaceState2.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: Invitation6.Type.DELEGATED,
+        kind: Invitation6.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([
   synchronized2
@@ -4168,14 +4248,14 @@ DataSpaceManager = _ts_decorate5([
 ], DataSpaceManager);
 
 // packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
-import { EventSubscriptions as EventSubscriptions2, UpdateScheduler, scheduleTask as scheduleTask6 } from "@dxos/async";
+import { EventSubscriptions as EventSubscriptions2, UpdateScheduler, scheduleTask as scheduleTask5 } from "@dxos/async";
 import { Stream as Stream10 } from "@dxos/codec-protobuf";
 import { raise as raise2 } from "@dxos/debug";
-import { invariant as invariant13 } from "@dxos/invariant";
+import { invariant as invariant12 } from "@dxos/invariant";
 import { log as log11 } from "@dxos/log";
 import { ApiError, SpaceNotFoundError, encodeError } from "@dxos/protocols";
 import { SpaceMember as SpaceMember3, SpaceState as SpaceState3 } from "@dxos/protocols/proto/dxos/client/services";
-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;
@@ -4214,7 +4294,7 @@ var SpacesServiceImpl = class {
         log11("update", {
           spaces
         }, {
-          F: __dxlog_file14,
+          F: __dxlog_file13,
           L: 77,
           S: this,
           C: (f, a) => f(...a)
@@ -4225,7 +4305,7 @@ var SpacesServiceImpl = class {
       }, {
         maxFrequency: false ? void 0 : 2
       });
-      scheduleTask6(ctx, async () => {
+      scheduleTask5(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const subscriptions = new EventSubscriptions2();
         ctx.onDispose(() => subscriptions.clear());
@@ -4259,7 +4339,7 @@ var SpacesServiceImpl = class {
   }
   subscribeMessages({ spaceKey, channel }) {
     return new Stream10(({ ctx, next }) => {
-      scheduleTask6(ctx, async () => {
+      scheduleTask5(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const space = dataSpaceManager.spaces.get(spaceKey) ?? raise2(new SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
@@ -4278,7 +4358,7 @@ var SpacesServiceImpl = class {
         }
       };
       ctx.onDispose(() => space.spaceState.removeCredentialProcessor(processor));
-      scheduleTask6(ctx, async () => {
+      scheduleTask5(ctx, async () => {
         await space.spaceState.addCredentialProcessor(processor);
         if (noTail) {
           close();
@@ -4296,8 +4376,8 @@ var SpacesServiceImpl = class {
           }
         });
       } else {
-        invariant13(!credential.id, "Id on unsigned credentials is not allowed", {
-          F: __dxlog_file14,
+        invariant12(!credential.id, "Id on unsigned credentials is not allowed", {
+          F: __dxlog_file13,
           L: 164,
           S: this,
           A: [
@@ -4305,8 +4385,8 @@ var SpacesServiceImpl = class {
             "'Id on unsigned credentials is not allowed'"
           ]
         });
-        invariant13(this._identityManager.identity, "Identity is not available", {
-          F: __dxlog_file14,
+        invariant12(this._identityManager.identity, "Identity is not available", {
+          F: __dxlog_file13,
           L: 165,
           S: this,
           A: [
@@ -4315,8 +4395,8 @@ var SpacesServiceImpl = class {
           ]
         });
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
-        invariant13(credential.issuer.equals(signer.getIssuer()), void 0, {
-          F: __dxlog_file14,
+        invariant12(credential.issuer.equals(signer.getIssuer()), void 0, {
+          F: __dxlog_file13,
           L: 167,
           S: this,
           A: [
@@ -4391,20 +4471,19 @@ import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credent
 import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { AutomergeHost, MetadataStore, SnapshotStore, SpaceManager, valueEncoding } from "@dxos/echo-pipeline";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
-import { IndexMetadataStore, IndexStore, Indexer } from "@dxos/indexing";
-import { invariant as invariant14 } from "@dxos/invariant";
+import { IndexMetadataStore, IndexStore, Indexer, createStorageCallbacks } from "@dxos/indexing";
+import { invariant as invariant13 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
-import { PublicKey as PublicKey10 } from "@dxos/keys";
+import { PublicKey as PublicKey11 } from "@dxos/keys";
 import { log as log12 } from "@dxos/log";
-import { InvalidStorageVersionError, STORAGE_VERSION as STORAGE_VERSION2, trace as trace8 } from "@dxos/protocols";
-import { Invitation as Invitation6 } from "@dxos/protocols/proto/dxos/client/services";
+import { InvalidStorageVersionError, STORAGE_VERSION, trace as trace8 } from "@dxos/protocols";
+import { Invitation as Invitation7 } from "@dxos/protocols/proto/dxos/client/services";
 import { BlobStore } from "@dxos/teleport-extension-object-sync";
 import { trace as Trace2 } from "@dxos/tracing";
 import { safeInstanceof } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/indexing/util.ts
 import { getHeads } from "@dxos/automerge/automerge";
-import { warnAfterTimeout as warnAfterTimeout2 } from "@dxos/debug";
 import { idCodec } from "@dxos/protocols";
 var createSelectedDocumentsIterator = (automergeHost) => (
   /**
@@ -4415,8 +4494,10 @@ var createSelectedDocumentsIterator = (automergeHost) => (
   async function* loadDocuments(ids) {
     for (const id of ids) {
       const { documentId, objectId } = idCodec.decode(id);
-      const handle = automergeHost.repo.find(documentId);
-      await warnAfterTimeout2(5e3, "to long to load doc", () => handle.whenReady());
+      const handle = automergeHost.repo.handles[documentId] ?? automergeHost.repo.find(documentId);
+      if (!handle.isReady()) {
+        await handle.whenReady();
+      }
       const doc = handle.docSync();
       const hash = getHeads(doc).join("");
       yield doc.objects?.[objectId] ? [
@@ -4429,57 +4510,6 @@ var createSelectedDocumentsIterator = (automergeHost) => (
     }
   }
 );
-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 warnAfterTimeout2(5e3, "to long to load doc", () => handle.whenReady());
-      const doc = handle.docSync();
-      const heads = getHeads(doc);
-      if (doc.objects) {
-        yield Object.entries(doc.objects).map(([objectId, object]) => {
-          return {
-            id: 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);
-    }
-  }
-);
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
 function _ts_decorate6(decorators, target, key, desc) {
@@ -4492,7 +4522,7 @@ 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 __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends Resource {
   constructor(storage, level, networkManager, signalManager, _runtimeParams) {
     super();
@@ -4503,7 +4533,7 @@ var ServiceContext = class extends Resource {
     this._runtimeParams = _runtimeParams;
     this.initialized = new Trigger5();
     this._handlerFactories = /* @__PURE__ */ new Map();
-    this._instanceId = PublicKey10.random().toHex();
+    this._instanceId = PublicKey11.random().toHex();
     this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
     this.snapshotStore = new SnapshotStore(storage.createDirectory("snapshots"));
     this.blobStore = new BlobStore(storage.createDirectory("blobs"));
@@ -4531,62 +4561,77 @@ var ServiceContext = class extends Resource {
     });
     this.automergeHost = new AutomergeHost({
       directory: storage.createDirectory("automerge"),
-      metadata: this.indexMetadata
+      db: level.sublevel("automerge"),
+      storageCallbacks: createStorageCallbacks({
+        host: () => this.automergeHost,
+        metadata: this.indexMetadata
+      })
     });
     this.indexer = new Indexer({
+      db: this.level,
       indexStore: new IndexStore({
-        directory: storage.createDirectory("index-store")
+        db: level.sublevel("index-storage")
       }),
       metadataStore: this.indexMetadata,
-      loadDocuments: createSelectedDocumentsIterator(this.automergeHost),
-      getAllDocuments: createDocumentsIterator(this.automergeHost)
+      loadDocuments: createSelectedDocumentsIterator(this.automergeHost)
     });
     this.invitations = new InvitationsHandler(this.networkManager);
-    this._handlerFactories.set(Invitation6.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined2(), this._acceptIdentity.bind(this)));
+    this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
+    this._handlerFactories.set(Invitation7.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined2(), this._acceptIdentity.bind(this)));
   }
   async _open(ctx) {
     await this._checkStorageVersion();
     log12("opening...", void 0, {
-      F: __dxlog_file15,
-      L: 156,
+      F: __dxlog_file14,
+      L: 164,
       S: this,
       C: (f, a) => f(...a)
     });
     log12.trace("dxos.sdk.service-context.open", trace8.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file15,
-      L: 157,
+      F: __dxlog_file14,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
     await this.signalManager.open();
     await this.networkManager.open();
+    await this.automergeHost.open();
     await this.metadataStore.load();
     await this.spaceManager.open();
     await this.identityManager.open(ctx);
     if (this.identityManager.identity) {
       await this._initialize(ctx);
     }
+    const loadedInvitations = await this.invitationsManager.loadPersistentInvitations();
+    log12("loaded persistent invitations", {
+      count: loadedInvitations.invitations?.length
+    }, {
+      F: __dxlog_file14,
+      L: 178,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     log12.trace("dxos.sdk.service-context.open", trace8.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file15,
-      L: 167,
+      F: __dxlog_file14,
+      L: 180,
       S: this,
       C: (f, a) => f(...a)
     });
     log12("opened", void 0, {
-      F: __dxlog_file15,
-      L: 168,
+      F: __dxlog_file14,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close() {
     log12("closing...", void 0, {
-      F: __dxlog_file15,
-      L: 172,
+      F: __dxlog_file14,
+      L: 185,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4603,8 +4648,8 @@ var ServiceContext = class extends Resource {
     await this.metadataStore.close();
     await this.indexer.destroy();
     log12("closed", void 0, {
-      F: __dxlog_file15,
-      L: 185,
+      F: __dxlog_file14,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4616,9 +4661,9 @@ var ServiceContext = class extends Resource {
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    invariant14(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file15,
-      L: 196,
+    invariant13(factory, `Unknown invitation kind: ${invitation.kind}`, {
+      F: __dxlog_file14,
+      L: 209,
       S: this,
       A: [
         "factory",
@@ -4642,15 +4687,15 @@ var ServiceContext = class extends Resource {
   }
   async _checkStorageVersion() {
     await this.metadataStore.load();
-    if (this.metadataStore.version !== STORAGE_VERSION2) {
-      throw new InvalidStorageVersionError(STORAGE_VERSION2, this.metadataStore.version);
+    if (this.metadataStore.version !== STORAGE_VERSION) {
+      throw new InvalidStorageVersionError(STORAGE_VERSION, this.metadataStore.version);
     }
   }
   // Called when identity is created.
   async _initialize(ctx) {
     log12("initializing spaces...", void 0, {
-      F: __dxlog_file15,
-      L: 227,
+      F: __dxlog_file14,
+      L: 240,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4668,12 +4713,12 @@ var ServiceContext = class extends Resource {
         });
       }
     };
-    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.automergeHost, this.invitationsManager, this._runtimeParams);
     await this.dataSpaceManager.open();
-    this._handlerFactories.set(Invitation6.Kind.SPACE, (invitation) => {
-      invariant14(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file15,
-        L: 251,
+    this._handlerFactories.set(Invitation7.Kind.SPACE, (invitation) => {
+      invariant13(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+        F: __dxlog_file14,
+        L: 265,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4696,8 +4741,8 @@ var ServiceContext = class extends Resource {
           log12("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file15,
-            L: 267,
+            F: __dxlog_file14,
+            L: 281,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4707,8 +4752,8 @@ var ServiceContext = class extends Resource {
           log12("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file15,
-            L: 271,
+            F: __dxlog_file14,
+            L: 285,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4718,8 +4763,8 @@ var ServiceContext = class extends Resource {
           log12("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file15,
-            L: 276,
+            F: __dxlog_file14,
+            L: 290,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4729,8 +4774,8 @@ var ServiceContext = class extends Resource {
           });
         } catch (err) {
           log12.catch(err, void 0, {
-            F: __dxlog_file15,
-            L: 282,
+            F: __dxlog_file14,
+            L: 296,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4775,214 +4820,265 @@ var ServiceRegistry = class {
   }
 };
 
-// packages/sdk/client-services/src/packlets/locks/browser.ts
-import { asyncTimeout as asyncTimeout2, Trigger as Trigger6 } from "@dxos/async";
-import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
-import { log as log13, logInfo } from "@dxos/log";
-function _ts_decorate7(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
-    r = Reflect.decorate(decorators, target, key, desc);
-  else
-    for (var i = decorators.length - 1; i >= 0; i--)
-      if (d = decorators[i])
-        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/browser.ts";
-var Message;
-(function(Message2) {
-  Message2["ACQUIRING"] = "acquiring";
-})(Message || (Message = {}));
-var Lock = class {
-  constructor({ lockKey, onAcquire, onRelease }) {
-    this._broadcastChannel = new BroadcastChannel("vault-resource-lock");
-    this._releaseTrigger = new Trigger6();
-    this._lockKey = lockKey;
-    this._onAcquire = onAcquire;
-    this._onRelease = onRelease;
-    this._broadcastChannel.onmessage = this._onMessage.bind(this);
-  }
-  get lockKey() {
-    return this._lockKey;
-  }
-  async acquire() {
-    this._broadcastChannel.postMessage({
-      message: "acquiring"
-    });
-    try {
-      log13("aquiring lock...", void 0, {
-        F: __dxlog_file16,
-        L: 42,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await asyncTimeout2(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
-      log13("acquired lock", void 0, {
-        F: __dxlog_file16,
-        L: 44,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    } catch {
-      log13("stealing lock...", void 0, {
-        F: __dxlog_file16,
-        L: 46,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await this._requestLock(true);
-      log13("stolen lock", void 0, {
-        F: __dxlog_file16,
-        L: 48,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+// packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts
+import { getFirstStreamValue } from "@dxos/codec-protobuf";
+import { credentialTypeFilter } from "@dxos/credentials";
+import { invariant as invariant14 } from "@dxos/invariant";
+import { STORAGE_VERSION as STORAGE_VERSION2 } from "@dxos/protocols";
+import { SpaceMember as SpaceMember4 } from "@dxos/protocols/proto/dxos/client/services";
+import { TRACE_PROCESSOR } from "@dxos/tracing";
+
+// packages/sdk/client-services/src/version.ts
+var DXOS_VERSION = "0.4.10-main.fd8ea31";
+
+// packages/sdk/client-services/src/packlets/services/platform.ts
+import { Platform } from "@dxos/protocols/proto/dxos/client/services";
+var getPlatform = () => {
+  if (process.browser) {
+    if (typeof window !== "undefined") {
+      const { userAgent } = window.navigator;
+      return {
+        type: Platform.PLATFORM_TYPE.BROWSER,
+        userAgent,
+        uptime: Math.floor((Date.now() - window.performance.timeOrigin) / 1e3)
+      };
+    } else {
+      return {
+        type: Platform.PLATFORM_TYPE.SHARED_WORKER,
+        uptime: Math.floor((Date.now() - performance.timeOrigin) / 1e3)
+      };
     }
+  } else {
+    const { platform: platform2, version, arch } = process;
+    return {
+      type: Platform.PLATFORM_TYPE.NODE,
+      platform: platform2,
+      arch,
+      runtime: version,
+      uptime: Math.floor(process.uptime()),
+      memory: process.memoryUsage()
+    };
   }
-  async release() {
-    this._releaseTrigger.wake();
+};
+
+// packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts
+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: STORAGE_VERSION2
+      }
+    },
+    trace: TRACE_PROCESSOR.getDiagnostics()
+  };
+  {
+    invariant14(clientServices.LoggingService, "SystemService is not available.", {
+      F: __dxlog_file15,
+      L: 108,
+      S: void 0,
+      A: [
+        "clientServices.LoggingService",
+        "'SystemService is not available.'"
+      ]
+    });
+    diagnostics.metrics = await getFirstStreamValue(clientServices.LoggingService.queryMetrics({}), {
+      timeout: DEFAULT_TIMEOUT
+    }).catch(() => void 0);
   }
-  _onMessage(event) {
-    if (event.data.message === "acquiring") {
-      this._releaseTrigger.wake();
+  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
+    }));
   }
-  async _requestLock(steal = false) {
-    log13("requesting lock...", {
-      steal
-    }, {
-      F: __dxlog_file16,
-      L: 63,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    const acquired = new Trigger6();
-    void navigator.locks.request(this._lockKey, {
-      steal
-    }, async () => {
-      await this._onAcquire?.();
-      acquired.wake();
-      this._releaseTrigger = new Trigger6();
-      await this._releaseTrigger.wait();
-      log13("releasing lock...", void 0, {
-        F: __dxlog_file16,
-        L: 72,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await this._onRelease?.();
-      log13("released lock", void 0, {
-        F: __dxlog_file16,
-        L: 74,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }).catch(async () => {
-      await this._onRelease?.();
-    });
-    await acquired.wait();
-    log13("recieved lock", {
-      steal
-    }, {
-      F: __dxlog_file16,
-      L: 81,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+  const identity = serviceContext.identityManager.identity;
+  if (identity) {
+    diagnostics.identity = {
+      identityKey: identity.identityKey,
+      spaceKey: identity.space.key,
+      profile: identity.profileDocument
+    };
+    const { devices } = await 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 getFirstStreamValue(clientServices.DevtoolsHost.subscribeToFeeds({}), {
+      timeout: DEFAULT_TIMEOUT
+    }).catch(() => void 0) ?? {};
+    diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
+      feedKey,
+      bytes,
+      length
+    }));
+    const status = await 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;
 };
-_ts_decorate7([
-  logInfo
-], Lock.prototype, "lockKey", null);
-var isLocked = (lockPath) => {
-  throw new Error("Not implemented");
-};
-
-// packages/sdk/client-services/src/packlets/storage/storage.ts
-import { InvalidConfigError } from "@dxos/protocols";
-import { Runtime as Runtime2 } from "@dxos/protocols/proto/dxos/config";
-import { createStorage, StorageType } from "@dxos/random-access-storage";
-
-// packages/sdk/client-services/src/packlets/storage/util.ts
-import { DX_DATA } from "@dxos/client-protocol";
-import { Runtime } from "@dxos/protocols/proto/dxos/config";
-import { isNode as isNode2 } from "@dxos/util";
-var getRootPath = (config) => {
-  const { dataRoot = isNode2() ? DX_DATA : "dxos/storage" } = config ?? {};
-  return `${dataRoot}/`;
-};
-var isPersistent = (config) => {
-  const { persistent = false } = config ?? {};
-  return config.dataStore !== void 0 && config.dataStore !== Runtime.Client.Storage.StorageDriver.RAM || persistent;
+var getSpaceStats = async (space) => {
+  const stats = {
+    key: space.key,
+    metrics: space.metrics,
+    epochs: space.inner.spaceState.credentials.filter(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 ? SpaceMember4.PresenceState.ONLINE : SpaceMember4.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;
 };
 
-// packages/sdk/client-services/src/packlets/storage/storage.ts
-var StorageDriver = Runtime2.Client.Storage.StorageDriver;
-var createStorageObjects = (config) => {
-  const { persistent = false, keyStore, dataStore } = config ?? {};
-  if (persistent && dataStore === StorageDriver.RAM) {
-    throw new InvalidConfigError("RAM storage cannot be used in persistent mode.");
-  }
-  if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
-    throw new InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
-  }
-  if (persistent && keyStore === StorageDriver.RAM) {
-    throw new InvalidConfigError("RAM key storage cannot be used in persistent mode.");
-  }
-  if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
-    throw new InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
-  }
+// packages/sdk/client-services/src/packlets/diagnostics/browser-diagnostics-broadcast.ts
+import { Trigger as Trigger6 } from "@dxos/async";
+import { log as log13 } from "@dxos/log";
+var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/diagnostics/browser-diagnostics-broadcast.ts";
+var CHANNEL_NAME = "dxos.diagnostics.broadcast";
+var MessageType;
+(function(MessageType2) {
+  MessageType2["PROBE"] = "probe";
+  MessageType2["PROBE_ACK"] = "probe-ack";
+  MessageType2["REQUEST_DIAGNOSTICS"] = "request-diagnostics";
+  MessageType2["RECEIVE_DIAGNOSTICS"] = "receive-diagnostics";
+})(MessageType || (MessageType = {}));
+var createCollectDiagnosticsBroadcastSender = () => {
   return {
-    storage: createStorage({
-      type: persistent ? toStorageType(dataStore) : StorageType.RAM,
-      root: getRootPath(config)
-    })
+    broadcastDiagnosticsRequest: async () => {
+      let expectedResponse = "probe-ack";
+      let channel;
+      try {
+        const trigger = new Trigger6();
+        channel = new BroadcastChannel(CHANNEL_NAME);
+        channel.onmessage = (msg) => {
+          if (expectedResponse === msg.data.type) {
+            trigger.wake(msg.data);
+          }
+        };
+        channel.postMessage({
+          type: "probe"
+        });
+        await trigger.wait({
+          timeout: 200
+        });
+        expectedResponse = "receive-diagnostics";
+        trigger.reset();
+        channel.postMessage({
+          type: "request-diagnostics"
+        });
+        const diagnostics = await trigger.wait({
+          timeout: 5e3
+        });
+        return diagnostics.payload;
+      } catch (e) {
+        const errorDescription = e instanceof Error ? e.message : JSON.stringify(e);
+        return {
+          expectedResponse,
+          errorDescription
+        };
+      } finally {
+        safeClose(channel);
+      }
+    }
   };
 };
-var toStorageType = (type) => {
-  switch (type) {
-    case void 0:
-      return void 0;
-    case StorageDriver.RAM:
-      return StorageType.RAM;
-    case StorageDriver.CHROME:
-      return StorageType.CHROME;
-    case StorageDriver.FIREFOX:
-      return StorageType.FIREFOX;
-    case StorageDriver.IDB:
-      return StorageType.IDB;
-    case StorageDriver.NODE:
-      return StorageType.NODE;
-    case StorageDriver.WEBFS:
-      return StorageType.WEBFS;
-    default:
-      throw new Error(`Invalid storage type: ${StorageDriver[type]}`);
+var createCollectDiagnosticsBroadcastHandler = (systemService) => {
+  let channel;
+  return {
+    start: () => {
+      channel = new BroadcastChannel(CHANNEL_NAME);
+      channel.onmessage = async (message) => {
+        try {
+          if (message.data.type === "probe") {
+            channel?.postMessage({
+              type: "probe-ack"
+            });
+          } else if (message.data.type === "request-diagnostics") {
+            const diagnostics = await systemService.getDiagnostics({});
+            channel?.postMessage({
+              type: "receive-diagnostics",
+              payload: diagnostics
+            });
+          }
+        } catch (error) {
+          log13.catch(error, void 0, {
+            F: __dxlog_file16,
+            L: 77,
+            S: void 0,
+            C: (f, a) => f(...a)
+          });
+        }
+      };
+    },
+    stop: () => {
+      safeClose(channel);
+      channel = void 0;
+    }
+  };
+};
+var safeClose = (channel) => {
+  try {
+    channel?.close();
+  } catch (e) {
   }
 };
 
-// packages/sdk/client-services/src/packlets/storage/level.ts
-import { Level } from "level";
-import path from "@dxos/node-std/path";
-import { PublicKey as PublicKey11 } from "@dxos/keys";
-var createLevel = async (config) => {
-  const persistent = isPersistent(config);
-  const storagePath = persistent ? getRootPath(config) : path.join("tmp", "level", PublicKey11.random().toHex());
-  const level = new Level(storagePath);
-  await level.open();
-  return level;
-};
+// packages/sdk/client-services/src/packlets/diagnostics/diagnostics-collector.ts
+import { ConfigResource } from "@dxos/config";
+import { GetDiagnosticsRequest as GetDiagnosticsRequest2 } from "@dxos/protocols/proto/dxos/client/services";
+import { TRACE_PROCESSOR as TRACE_PROCESSOR3 } from "@dxos/tracing";
+import { jsonKeyReplacer as jsonKeyReplacer2, nonNullable } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
 import { Event as Event9, synchronized as synchronized3 } from "@dxos/async";
 import { clientServiceBundle, defaultKey, Properties } from "@dxos/client-protocol";
 import { Context as Context11 } from "@dxos/context";
 import { DataServiceImpl, encodeReference } from "@dxos/echo-pipeline";
-import * as E from "@dxos/echo-schema";
-import { IndexServiceImpl } from "@dxos/indexing";
+import { getTypeReference } from "@dxos/echo-schema";
+import { QueryServiceImpl } from "@dxos/indexing";
 import { invariant as invariant16 } from "@dxos/invariant";
-import { PublicKey as PublicKey13 } from "@dxos/keys";
-import { log as log15 } from "@dxos/log";
+import { PublicKey as PublicKey14 } from "@dxos/keys";
+import { log as log16 } from "@dxos/log";
 import { WebsocketSignalManager } from "@dxos/messaging";
 import { NetworkManager, createSimplePeerTransportFactory } from "@dxos/network-manager";
 import { trace as trace9 } from "@dxos/protocols";
@@ -5073,11 +5169,135 @@ var DevicesServiceImpl = class {
   }
 };
 
+// packages/sdk/client-services/src/packlets/locks/browser.ts
+import { asyncTimeout as asyncTimeout2, Trigger as Trigger7 } from "@dxos/async";
+import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
+import { log as log14, logInfo } from "@dxos/log";
+function _ts_decorate7(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/browser.ts";
+var Message;
+(function(Message2) {
+  Message2["ACQUIRING"] = "acquiring";
+})(Message || (Message = {}));
+var Lock = class {
+  constructor({ lockKey, onAcquire, onRelease }) {
+    this._broadcastChannel = new BroadcastChannel("vault-resource-lock");
+    this._releaseTrigger = new Trigger7();
+    this._lockKey = lockKey;
+    this._onAcquire = onAcquire;
+    this._onRelease = onRelease;
+    this._broadcastChannel.onmessage = this._onMessage.bind(this);
+  }
+  get lockKey() {
+    return this._lockKey;
+  }
+  async acquire() {
+    this._broadcastChannel.postMessage({
+      message: "acquiring"
+    });
+    try {
+      log14("aquiring lock...", void 0, {
+        F: __dxlog_file18,
+        L: 42,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await asyncTimeout2(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
+      log14("acquired lock", void 0, {
+        F: __dxlog_file18,
+        L: 44,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    } catch {
+      log14("stealing lock...", void 0, {
+        F: __dxlog_file18,
+        L: 46,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await this._requestLock(true);
+      log14("stolen lock", void 0, {
+        F: __dxlog_file18,
+        L: 48,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  async release() {
+    this._releaseTrigger.wake();
+  }
+  _onMessage(event) {
+    if (event.data.message === "acquiring") {
+      this._releaseTrigger.wake();
+    }
+  }
+  async _requestLock(steal = false) {
+    log14("requesting lock...", {
+      steal
+    }, {
+      F: __dxlog_file18,
+      L: 63,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const acquired = new Trigger7();
+    void navigator.locks.request(this._lockKey, {
+      steal
+    }, async () => {
+      await this._onAcquire?.();
+      acquired.wake();
+      this._releaseTrigger = new Trigger7();
+      await this._releaseTrigger.wait();
+      log14("releasing lock...", void 0, {
+        F: __dxlog_file18,
+        L: 72,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await this._onRelease?.();
+      log14("released lock", void 0, {
+        F: __dxlog_file18,
+        L: 74,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }).catch(async () => {
+      await this._onRelease?.();
+    });
+    await acquired.wait();
+    log14("recieved lock", {
+      steal
+    }, {
+      F: __dxlog_file18,
+      L: 81,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
+};
+_ts_decorate7([
+  logInfo
+], Lock.prototype, "lockKey", null);
+var isLocked = (lockPath) => {
+  throw new Error("Not implemented");
+};
+
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
 import { Event as Event8 } from "@dxos/async";
 import { Stream as Stream12 } from "@dxos/codec-protobuf";
 import { PublicKey as PublicKey12 } from "@dxos/keys";
-import { getContextFromEntry, log as log14 } from "@dxos/log";
+import { getContextFromEntry, log as log15 } from "@dxos/log";
 import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { getDebugName, jsonify, numericalValues, tracer } from "@dxos/util";
 var LoggingServiceImpl = class {
@@ -5090,11 +5310,11 @@ var LoggingServiceImpl = class {
     };
   }
   async open() {
-    log14.runtimeConfig.processors.push(this._logProcessor);
+    log15.runtimeConfig.processors.push(this._logProcessor);
   }
   async close() {
-    const index = log14.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
-    log14.runtimeConfig.processors.splice(index, 1);
+    const index = log15.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    log15.runtimeConfig.processors.splice(index, 1);
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
@@ -5230,6 +5450,80 @@ var NetworkServiceImpl = class {
   }
 };
 
+// packages/sdk/client-services/src/packlets/storage/storage.ts
+import { InvalidConfigError } from "@dxos/protocols";
+import { Runtime as Runtime2 } from "@dxos/protocols/proto/dxos/config";
+import { createStorage, StorageType } from "@dxos/random-access-storage";
+
+// packages/sdk/client-services/src/packlets/storage/util.ts
+import { DX_DATA } from "@dxos/client-protocol";
+import { Runtime } from "@dxos/protocols/proto/dxos/config";
+import { isNode as isNode2 } from "@dxos/util";
+var getRootPath = (config) => {
+  const { dataRoot = isNode2() ? DX_DATA : "dxos/storage" } = config ?? {};
+  return `${dataRoot}/`;
+};
+var isPersistent = (config) => {
+  const { persistent = false } = config ?? {};
+  return config.dataStore !== void 0 && config.dataStore !== Runtime.Client.Storage.StorageDriver.RAM || persistent;
+};
+
+// packages/sdk/client-services/src/packlets/storage/storage.ts
+var StorageDriver = Runtime2.Client.Storage.StorageDriver;
+var createStorageObjects = (config) => {
+  const { persistent = false, keyStore, dataStore } = config ?? {};
+  if (persistent && dataStore === StorageDriver.RAM) {
+    throw new InvalidConfigError("RAM storage cannot be used in persistent mode.");
+  }
+  if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
+    throw new InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
+  }
+  if (persistent && keyStore === StorageDriver.RAM) {
+    throw new InvalidConfigError("RAM key storage cannot be used in persistent mode.");
+  }
+  if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
+    throw new InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+  }
+  return {
+    storage: createStorage({
+      type: persistent ? toStorageType(dataStore) : StorageType.RAM,
+      root: getRootPath(config)
+    })
+  };
+};
+var toStorageType = (type) => {
+  switch (type) {
+    case void 0:
+      return void 0;
+    case StorageDriver.RAM:
+      return StorageType.RAM;
+    case StorageDriver.CHROME:
+      return StorageType.CHROME;
+    case StorageDriver.FIREFOX:
+      return StorageType.FIREFOX;
+    case StorageDriver.IDB:
+      return StorageType.IDB;
+    case StorageDriver.NODE:
+      return StorageType.NODE;
+    case StorageDriver.WEBFS:
+      return StorageType.WEBFS;
+    default:
+      throw new Error(`Invalid storage type: ${StorageDriver[type]}`);
+  }
+};
+
+// packages/sdk/client-services/src/packlets/storage/level.ts
+import { Level } from "level";
+import path from "@dxos/node-std/path";
+import { PublicKey as PublicKey13 } from "@dxos/keys";
+var createLevel = async (config) => {
+  const persistent = isPersistent(config);
+  const storagePath = persistent ? path.join(getRootPath(config), "level") : `/tmp/dxos-${PublicKey13.random().toHex()}`;
+  const level = new Level(storagePath);
+  await level.open();
+  return level;
+};
+
 // packages/sdk/client-services/src/packlets/system/system-service.ts
 import { Stream as Stream14 } from "@dxos/codec-protobuf";
 import { GetDiagnosticsRequest } from "@dxos/protocols/proto/dxos/client/services";
@@ -5298,13 +5592,14 @@ function _ts_decorate8(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_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var ClientServicesHost = class {
   constructor({
     config,
     transportFactory,
     signalManager,
     storage,
+    level,
     // TODO(wittjosiah): Turn this on by default.
     lockKey,
     callbacks,
@@ -5315,6 +5610,7 @@ var ClientServicesHost = class {
     this._opening = false;
     this._open = false;
     this._storage = storage;
+    this._level = level;
     this._callbacks = callbacks;
     this._runtimeParams = runtimeParams;
     if (config) {
@@ -5353,6 +5649,7 @@ var ClientServicesHost = class {
         await this.reset();
       }
     });
+    this.diagnosticsBroadcastHandler = createCollectDiagnosticsBroadcastHandler(this._systemService);
     this._loggingService = new LoggingServiceImpl();
     this._serviceRegistry = new ServiceRegistry(clientServiceBundle, {
       SystemService: this._systemService,
@@ -5384,24 +5681,24 @@ var ClientServicesHost = class {
   */
   initialize({ config, ...options }) {
     invariant16(!this._open, "service host is open", {
-      F: __dxlog_file18,
-      L: 182,
+      F: __dxlog_file19,
+      L: 198,
       S: this,
       A: [
         "!this._open",
         "'service host is open'"
       ]
     });
-    log15("initializing...", void 0, {
-      F: __dxlog_file18,
-      L: 183,
+    log16("initializing...", void 0, {
+      F: __dxlog_file19,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       invariant16(!this._config, "config already set", {
-        F: __dxlog_file18,
-        L: 186,
+        F: __dxlog_file19,
+        L: 202,
         S: this,
         A: [
           "!this._config",
@@ -5414,9 +5711,9 @@ var ClientServicesHost = class {
       }
     }
     if (!options.signalManager) {
-      log15.warn("running signaling without telemetry metadata.", void 0, {
-        F: __dxlog_file18,
-        L: 194,
+      log16.warn("running signaling without telemetry metadata.", void 0, {
+        F: __dxlog_file19,
+        L: 210,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5426,8 +5723,8 @@ var ClientServicesHost = class {
     }), signalManager = new WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
     invariant16(!this._networkManager, "network manager already set", {
-      F: __dxlog_file18,
-      L: 205,
+      F: __dxlog_file19,
+      L: 221,
       S: this,
       A: [
         "!this._networkManager",
@@ -5439,9 +5736,9 @@ var ClientServicesHost = class {
       transportFactory,
       signalManager
     });
-    log15("initialized", void 0, {
-      F: __dxlog_file18,
-      L: 212,
+    log16("initialized", void 0, {
+      F: __dxlog_file19,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5450,18 +5747,18 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    const traceId = PublicKey13.random().toHex();
-    log15.trace("dxos.client-services.host.open", trace9.begin({
+    const traceId = PublicKey14.random().toHex();
+    log16.trace("dxos.client-services.host.open", trace9.begin({
       id: traceId
     }), {
-      F: __dxlog_file18,
-      L: 223,
+      F: __dxlog_file19,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant16(this._config, "config not set", {
-      F: __dxlog_file18,
-      L: 225,
+      F: __dxlog_file19,
+      L: 241,
       S: this,
       A: [
         "this._config",
@@ -5469,8 +5766,8 @@ var ClientServicesHost = class {
       ]
     });
     invariant16(this._storage, "storage not set", {
-      F: __dxlog_file18,
-      L: 226,
+      F: __dxlog_file19,
+      L: 242,
       S: this,
       A: [
         "this._storage",
@@ -5478,8 +5775,8 @@ var ClientServicesHost = class {
       ]
     });
     invariant16(this._signalManager, "signal manager not set", {
-      F: __dxlog_file18,
-      L: 227,
+      F: __dxlog_file19,
+      L: 243,
       S: this,
       A: [
         "this._signalManager",
@@ -5487,8 +5784,8 @@ var ClientServicesHost = class {
       ]
     });
     invariant16(this._networkManager, "network manager not set", {
-      F: __dxlog_file18,
-      L: 228,
+      F: __dxlog_file19,
+      L: 244,
       S: this,
       A: [
         "this._networkManager",
@@ -5496,34 +5793,37 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    log15("opening...", {
+    log16("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file18,
-      L: 231,
+      F: __dxlog_file19,
+      L: 247,
       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._level, this._networkManager, this._signalManager, this._runtimeParams);
+    this._queryService = new QueryServiceImpl({
+      indexer: this._serviceContext.indexer,
+      automergeHost: this._serviceContext.automergeHost
+    });
+    await this._queryService.open(ctx);
     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 DataServiceImpl(this._serviceContext.automergeHost),
-      IndexService: new IndexServiceImpl({
-        indexer: this._serviceContext.indexer,
-        automergeHost: this._serviceContext.automergeHost
-      }),
+      QueryService: this._queryService,
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
       LoggingService: this._loggingService,
       TracingService: this._tracingService,
@@ -5535,24 +5835,6 @@ var ClientServicesHost = class {
       })
     });
     await this._serviceContext.open(ctx);
-    invariant16(this.serviceRegistry.services.InvitationsService, void 0, {
-      F: __dxlog_file18,
-      L: 297,
-      S: this,
-      A: [
-        "this.serviceRegistry.services.InvitationsService",
-        ""
-      ]
-    });
-    const loadedInvitations = await this.serviceRegistry.services.InvitationsService.loadPersistentInvitations();
-    log15("loaded persistent invitations", {
-      count: loadedInvitations.invitations?.length
-    }, {
-      F: __dxlog_file18,
-      L: 300,
-      S: this,
-      C: (f, a) => f(...a)
-    });
     const devtoolsProxy = this._config?.get("runtime.client.devtoolsProxy");
     if (devtoolsProxy) {
       this._devtoolsProxy = new WebsocketRpcClient({
@@ -5563,23 +5845,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;
-    log15("opened", {
+    log16("opened", {
       deviceKey
     }, {
-      F: __dxlog_file18,
-      L: 317,
+      F: __dxlog_file19,
+      L: 330,
       S: this,
       C: (f, a) => f(...a)
     });
-    log15.trace("dxos.client-services.host.open", trace9.end({
+    log16.trace("dxos.client-services.host.open", trace9.end({
       id: traceId
     }), {
-      F: __dxlog_file18,
-      L: 318,
+      F: __dxlog_file19,
+      L: 331,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5589,61 +5872,63 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    log15("closing...", {
+    log16("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file18,
-      L: 329,
+      F: __dxlog_file19,
+      L: 342,
       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._queryService.close();
     await this._serviceContext.close();
     await this._level?.close();
     this._open = false;
     this._statusUpdate.emit();
-    log15("closed", {
+    log16("closed", {
       deviceKey
     }, {
-      F: __dxlog_file18,
-      L: 337,
+      F: __dxlog_file19,
+      L: 352,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
-    const traceId = PublicKey13.random().toHex();
-    log15.trace("dxos.sdk.client-services-host.reset", trace9.begin({
+    const traceId = PublicKey14.random().toHex();
+    log16.trace("dxos.sdk.client-services-host.reset", trace9.begin({
       id: traceId
     }), {
-      F: __dxlog_file18,
-      L: 342,
+      F: __dxlog_file19,
+      L: 357,
       S: this,
       C: (f, a) => f(...a)
     });
-    log15("resetting...", void 0, {
-      F: __dxlog_file18,
-      L: 344,
+    log16("resetting...", void 0, {
+      F: __dxlog_file19,
+      L: 359,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
-    log15("reset", void 0, {
-      F: __dxlog_file18,
-      L: 347,
+    log16("reset", void 0, {
+      F: __dxlog_file19,
+      L: 362,
       S: this,
       C: (f, a) => f(...a)
     });
-    log15.trace("dxos.sdk.client-services-host.reset", trace9.end({
+    log16.trace("dxos.sdk.client-services-host.reset", trace9.end({
       id: traceId
     }), {
-      F: __dxlog_file18,
-      L: 348,
+      F: __dxlog_file19,
+      L: 363,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5655,8 +5940,8 @@ var ClientServicesHost = class {
     const space = await this._serviceContext.dataSpaceManager.createSpace();
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant16(automergeIndex, void 0, {
-      F: __dxlog_file18,
-      L: 360,
+      F: __dxlog_file19,
+      L: 375,
       S: this,
       A: [
         "automergeIndex",
@@ -5667,7 +5952,7 @@ var ClientServicesHost = class {
     await document.whenReady();
     const properties = {
       system: {
-        type: encodeReference(E.getTypeReference(Properties))
+        type: encodeReference(getTypeReference(Properties))
       },
       data: {
         [defaultKey]: identity.identityKey.toHex()
@@ -5676,7 +5961,7 @@ var ClientServicesHost = class {
         keys: []
       }
     };
-    const propertiesId = PublicKey13.random().toHex();
+    const propertiesId = PublicKey14.random().toHex();
     document.change((doc) => {
       assignDeep2(doc, [
         "objects",
@@ -5705,6 +5990,44 @@ ClientServicesHost = _ts_decorate8([
   Trace3.resource()
 ], ClientServicesHost);
 
+// packages/sdk/client-services/src/packlets/services/util.ts
+import { PublicKey as PublicKey15 } from "@dxos/keys";
+import { humanize } from "@dxos/util";
+var ClientServicesProviderResource = Symbol.for("dxos.resource.ClientServices");
+
+// packages/sdk/client-services/src/packlets/diagnostics/diagnostics-collector.ts
+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 ? GetDiagnosticsRequest2.KEY_OPTION.HUMANIZE : options.truncate ? GetDiagnosticsRequest2.KEY_OPTION.TRUNCATE : void 0
+    });
+    const clientDiagnostics = {
+      config,
+      trace: TRACE_PROCESSOR3.getDiagnostics()
+    };
+    const diagnostics = serviceDiagnostics != null ? {
+      client: clientDiagnostics,
+      services: serviceDiagnostics
+    } : {
+      client: clientDiagnostics,
+      broadcast: await this.broadcastSender.broadcastDiagnosticsRequest()
+    };
+    return JSON.parse(JSON.stringify(diagnostics, jsonKeyReplacer2(options)));
+  }
+};
+var findSystemServiceProvider = () => {
+  const serviceProviders = TRACE_PROCESSOR3.findByAnnotation(ClientServicesProviderResource);
+  const providerResource = serviceProviders.find((r) => r.instance.deref()?.services?.SystemService != null);
+  return providerResource?.instance?.deref() ?? null;
+};
+var findConfigs = () => {
+  const configs = TRACE_PROCESSOR3.findByAnnotation(ConfigResource);
+  return configs.map((r) => r.instance.deref()).filter(nonNullable);
+};
+
 export {
   Buffer,
   subscribeToFeeds,
@@ -5724,20 +6047,25 @@ export {
   IdentityServiceImpl,
   DeviceInvitationProtocol,
   InvitationsHandler,
-  invitationExpired,
+  createAdmissionKeypair,
   InvitationsServiceImpl,
   SpaceInvitationProtocol,
+  InvitationsManager,
   ClientRpcServer,
-  createDiagnostics,
   DataSpace,
   DataSpaceManager,
   SpacesServiceImpl,
   ServiceContext,
   ServiceRegistry,
+  createDiagnostics,
+  createCollectDiagnosticsBroadcastSender,
+  createCollectDiagnosticsBroadcastHandler,
+  DiagnosticsCollector,
   Lock,
   isLocked,
   createStorageObjects,
   createLevel,
-  ClientServicesHost
+  ClientServicesHost,
+  ClientServicesProviderResource
 };
-//# sourceMappingURL=chunk-V2ALN47T.mjs.map
+//# sourceMappingURL=chunk-WLE7E36I.mjs.map