@dxos/client-services 0.4.10-main.b1e8dec → 0.4.10-main.b30eb88

package/dist/lib/browser/{chunk-BJNDCR72.mjs → chunk-BDY63S7K.mjs}

@@ -1282,6 +1282,7 @@ import { PushStream, scheduleTask as scheduleTask2, TimeoutError, Trigger as Tri
 import { AuthenticatingInvitation, AUTHENTICATION_CODE_LENGTH, CancellableInvitation, 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 +1294,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 +1318,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 +1333,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 +1350,7 @@ var InvitationHostExtension = class extends RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 96,
+            L: 99,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1357,7 +1360,7 @@ var InvitationHostExtension = class extends RpcExtension {
               invitationId
             }, {
               F: __dxlog_file6,
-              L: 100,
+              L: 103,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1371,7 +1374,7 @@ var InvitationHostExtension = class extends RpcExtension {
             guestProfile: profile
           }, {
             F: __dxlog_file6,
-            L: 109,
+            L: 112,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1380,25 +1383,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 +1411,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 +1429,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 +1449,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 +1482,7 @@ var InvitationHostExtension = class extends RpcExtension {
             }
           }), {
             F: __dxlog_file6,
-            L: 155,
+            L: 182,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1478,14 +1496,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 +1518,7 @@ var InvitationHostExtension = class extends RpcExtension {
               id: traceId
             }), {
               F: __dxlog_file6,
-              L: 172,
+              L: 199,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1557,7 +1575,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 +1602,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 +1614,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 +1628,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 +1638,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)
     });
@@ -1639,11 +1657,11 @@ var InvitationsHandler = class {
     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 { invitationId = PublicKey6.random().toHex(), type = Invitation3.Type.INTERACTIVE, authMethod = Invitation3.AuthMethod.SHARED_SECRET, state = Invitation3.State.INIT, timeout = INVITATION_TIMEOUT, swarmKey = PublicKey6.random(), persistent = options?.authMethod !== Invitation3.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, lifetime = 86400, multiUse = false } = 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,
+      L: 87,
       S: this,
       A: [
         "protocol",
@@ -1658,9 +1676,11 @@ var InvitationsHandler = class {
       swarmKey,
       authCode,
       timeout,
-      persistent,
+      persistent: persistent && type !== Invitation3.Type.DELEGATED,
+      guestKeypair: guestKeypair ?? (authMethod === Invitation3.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
       created,
       lifetime,
+      multiUse,
       ...protocol.getInvitationContext()
     };
     const stream = new PushStream();
@@ -1675,7 +1695,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 109,
+        L: 115,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1700,7 +1720,7 @@ var InvitationsHandler = class {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             invariant6(deviceKey, void 0, {
               F: __dxlog_file7,
-              L: 130,
+              L: 136,
               S: this,
               A: [
                 "deviceKey",
@@ -1723,7 +1743,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 148,
+                L: 154,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1731,7 +1751,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 149,
+                L: 155,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1747,7 +1767,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 152,
+                L: 158,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1759,7 +1779,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 154,
+                L: 160,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1769,7 +1789,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 157,
+                  L: 163,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1780,7 +1800,7 @@ var InvitationsHandler = class {
               } else {
                 log5.error("failed", err, {
                   F: __dxlog_file7,
-                  L: 160,
+                  L: 166,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1791,12 +1811,12 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 163,
+                L: 169,
                 S: this,
                 C: (f, a) => f(...a)
               });
             } finally {
-              if (type !== Invitation3.Type.MULTIUSE) {
+              if (!multiUse) {
                 await swarmConnection.close();
                 await ctx.dispose();
               }
@@ -1812,7 +1832,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 178,
+              L: 184,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1823,7 +1843,7 @@ var InvitationsHandler = class {
           } else {
             log5.error("failed", err, {
               F: __dxlog_file7,
-              L: 181,
+              L: 187,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1833,11 +1853,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: 198,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1888,7 +1908,7 @@ var InvitationsHandler = class {
     const { timeout = INVITATION_TIMEOUT } = invitation;
     invariant6(protocol, void 0, {
       F: __dxlog_file7,
-      L: 246,
+      L: 252,
       S: this,
       A: [
         "protocol",
@@ -1898,7 +1918,7 @@ var InvitationsHandler = class {
     if (deviceProfile) {
       invariant6(invitation.kind === Invitation3.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file7,
-        L: 250,
+        L: 255,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -1913,7 +1933,7 @@ var InvitationsHandler = class {
     const setState = (newData) => {
       invariant6(newData.state !== void 0, void 0, {
         F: __dxlog_file7,
-        L: 261,
+        L: 266,
         S: this,
         A: [
           "newData.state !== undefined",
@@ -1933,7 +1953,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             F: __dxlog_file7,
-            L: 269,
+            L: 274,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1943,7 +1963,7 @@ var InvitationsHandler = class {
         } else {
           log5.warn("auth failed", err, {
             F: __dxlog_file7,
-            L: 272,
+            L: 277,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1957,7 +1977,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 280,
+        L: 285,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1972,7 +1992,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               F: __dxlog_file7,
-              L: 290,
+              L: 295,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1987,7 +2007,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 299,
+                L: 304,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1999,7 +2019,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 307,
+                L: 312,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2010,7 +2030,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 311,
+                L: 316,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2020,62 +2040,28 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file7,
-                L: 315,
+                L: 320,
                 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: 336,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2087,7 +2073,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 355,
+                L: 347,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2100,7 +2086,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 357,
+                L: 349,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2110,7 +2096,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 360,
+                  L: 352,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2120,7 +2106,7 @@ var InvitationsHandler = class {
               } else {
                 log5("auth failed", err, {
                   F: __dxlog_file7,
-                  L: 363,
+                  L: 355,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2131,7 +2117,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 366,
+                L: 358,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2149,7 +2135,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 377,
+              L: 369,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2159,7 +2145,7 @@ var InvitationsHandler = class {
           } else {
             log5("auth failed", err, {
               F: __dxlog_file7,
-              L: 380,
+              L: 372,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2176,7 +2162,7 @@ var InvitationsHandler = class {
       } else {
         invariant6(invitation.swarmKey, void 0, {
           F: __dxlog_file7,
-          L: 394,
+          L: 386,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -2214,206 +2200,115 @@ 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: 426,
+        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: 430,
+        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: 441,
+            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: 460,
+      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());
-    }
+    const invitation = this._invitationsManager.createInvitation(options);
     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());
-        }
-      });
+      invitation.subscribe(next, close, 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 +2317,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 +2326,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 +2335,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 +2344,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,28 +2356,21 @@ 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
-          });
-        });
-      }
+      });
     });
   }
 };
@@ -2490,11 +2378,11 @@ var InvitationsServiceImpl = class {
 // packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts
 import { createAdmissionCredentials, 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";
+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,13 +2398,13 @@ 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,
+    invariant7(this._spaceKey, void 0, {
+      F: __dxlog_file8,
       L: 47,
       S: this,
       A: [
@@ -2525,8 +2413,8 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const space = await this._spaceManager.spaces.get(this._spaceKey);
-    invariant8(space, void 0, {
-      F: __dxlog_file9,
+    invariant7(space, void 0, {
+      F: __dxlog_file8,
       L: 49,
       S: this,
       A: [
@@ -2534,8 +2422,8 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    invariant8(request.space, void 0, {
-      F: __dxlog_file9,
+    invariant7(request.space, void 0, {
+      F: __dxlog_file8,
       L: 51,
       S: this,
       A: [
@@ -2544,18 +2432,18 @@ 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,
+      F: __dxlog_file8,
       L: 54,
       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,
+    invariant7(credentials[0].credential, void 0, {
+      F: __dxlog_file8,
       L: 65,
       S: this,
       A: [
@@ -2564,8 +2452,8 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const spaceMemberCredential = credentials[0].credential.credential;
-    invariant8(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file9,
+    invariant7(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file8,
       L: 67,
       S: this,
       A: [
@@ -2604,8 +2492,8 @@ var SpaceInvitationProtocol = class {
     };
   }
   async accept(response) {
-    invariant8(response.space, void 0, {
-      F: __dxlog_file9,
+    invariant7(response.space, void 0, {
+      F: __dxlog_file8,
       L: 107,
       S: this,
       A: [
@@ -2615,8 +2503,8 @@ 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,
+    invariant7(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
+      F: __dxlog_file8,
       L: 110,
       S: this,
       A: [
@@ -2624,8 +2512,8 @@ var SpaceInvitationProtocol = class {
         "'Invalid credential'"
       ]
     });
-    invariant8(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
-      F: __dxlog_file9,
+    invariant7(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
+      F: __dxlog_file8,
       L: 111,
       S: this,
       A: [
@@ -2649,310 +2537,381 @@ var SpaceInvitationProtocol = class {
   }
 };
 
-// packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
-import { Stream as Stream9 } from "@dxos/codec-protobuf";
-import { raise } from "@dxos/debug";
-import { parseMethodName, RpcPeer } from "@dxos/rpc";
-import { MapCounter, trace as trace5 } from "@dxos/tracing";
-function _ts_decorate3(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
-    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 ClientRpcServer = class {
-  constructor(params) {
-    this._handlerCache = /* @__PURE__ */ new Map();
-    this._callMetrics = new MapCounter();
-    const { serviceRegistry, handleCall, handleStream, ...rpcOptions } = params;
-    this._handleCall = handleCall;
-    this._handleStream = handleStream;
-    this._serviceRegistry = serviceRegistry;
-    this._rpcPeer = new RpcPeer({
-      ...rpcOptions,
-      callHandler: (method, params2) => {
-        const [serviceName, methodName] = parseMethodName(method);
-        const handler = (method2, params3) => this._getServiceHandler(serviceName).call(method2, params3);
-        this._callMetrics.inc(`${serviceName}.${methodName} request`);
-        if (this._handleCall) {
-          return this._handleCall(methodName, params2, handler);
-        } else {
-          return handler(methodName, params2);
-        }
-      },
-      streamHandler: (method, params2) => {
-        const [serviceName, methodName] = parseMethodName(method);
-        const handler = (method2, params3) => this._getServiceHandler(serviceName).callStream(method2, params3);
-        this._callMetrics.inc(`${serviceName}.${methodName} request stream`);
-        if (this._handleStream) {
-          return Stream9.map(Stream9.unwrapPromise(this._handleStream(methodName, params2, handler)), (data) => {
-            this._callMetrics.inc(`${serviceName}.${methodName} response stream`);
-            return data;
-          });
-        } else {
-          return handler(methodName, params2);
-        }
+// packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts
+import { Event as Event3 } from "@dxos/async";
+import { hasInvitationExpired } from "@dxos/echo-pipeline";
+import { invariant as invariant8 } from "@dxos/invariant";
+import { log as log7 } from "@dxos/log";
+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;
+  }
+  createInvitation(options) {
+    const existingInvitation = this._createInvitations.get(options.invitationId);
+    if (existingInvitation) {
+      return existingInvitation;
+    }
+    const handler = this._getHandler(options);
+    const invitation = this._invitationsHandler.createInvitation(handler, options);
+    this._createInvitations.set(invitation.get().invitationId, invitation);
+    this.invitationCreated.emit(invitation.get());
+    const saveInvitationTask = invitation.get().persistent ? this._safePersistInBackground(invitation) : Promise.resolve();
+    this._onInvitationComplete(invitation, async () => {
+      this._createInvitations.delete(invitation.get().invitationId);
+      this.removedCreated.emit(invitation.get());
+      if (invitation.get().persistent) {
+        await saveInvitationTask;
+        await this._safeDeleteInvitation(invitation.get());
       }
     });
+    return invitation;
   }
-  get _services() {
-    return Object.keys(this._serviceRegistry.services);
-  }
-  async open() {
-    await this._rpcPeer.open();
-  }
-  async close() {
-    await this._rpcPeer.close();
-  }
-  _getServiceHandler(serviceName) {
-    if (!this._handlerCache.has(serviceName)) {
-      const [key, descriptor] = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName) ?? raise(new Error(`Service not available: ${serviceName}`));
-      const service = this._serviceRegistry.services[key];
-      if (!service) {
-        throw new Error(`Service not available: ${serviceName}`);
-      }
-      this._handlerCache.set(serviceName, descriptor.createServer(service));
+  async loadPersistentInvitations() {
+    if (this._persistentInvitationsLoaded) {
+      const invitations = this.getCreatedInvitations().filter((i) => i.persistent);
+      return {
+        invitations
+      };
     }
-    return this._handlerCache.get(serviceName);
-  }
-};
-_ts_decorate3([
-  trace5.metricsCounter()
-], ClientRpcServer.prototype, "_callMetrics", void 0);
-_ts_decorate3([
-  trace5.info()
-], ClientRpcServer.prototype, "_services", null);
-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/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;
+    try {
+      const persistentInvitations = this._metadataStore.getInvitations();
+      const freshInvitations = persistentInvitations.filter((invitation) => !hasInvitationExpired(invitation));
+      const cInvitations = freshInvitations.map((persistentInvitation) => {
+        invariant8(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
+          F: __dxlog_file9,
+          L: 82,
+          S: this,
+          A: [
+            "!this._createInvitations.get(persistentInvitation.invitationId)",
+            "'invitation already exists'"
+          ]
+        });
+        return this.createInvitation({
+          ...persistentInvitation,
+          persistent: false
+        }).get();
+      });
       return {
-        type: Platform.PLATFORM_TYPE.BROWSER,
-        userAgent,
-        uptime: Math.floor((Date.now() - window.performance.timeOrigin) / 1e3)
+        invitations: cInvitations
       };
-    } else {
+    } catch (err) {
+      log7.catch(err, void 0, {
+        F: __dxlog_file9,
+        L: 88,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       return {
-        type: Platform.PLATFORM_TYPE.SHARED_WORKER,
-        uptime: Math.floor((Date.now() - performance.timeOrigin) / 1e3)
+        invitations: []
       };
+    } finally {
+      this._persistentInvitationsLoadedEvent.emit();
+      this._persistentInvitationsLoaded = true;
     }
-  } 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.b1e8dec";
-
-// 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,
+  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: 117,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    invariant8(invitationId, void 0, {
+      F: __dxlog_file9,
+      L: 118,
+      S: this,
       A: [
-        "clientServices.LoggingService",
-        "'SystemService is not available.'"
+        "invitationId",
+        ""
       ]
     });
-    diagnostics.metrics = await getFirstStreamValue(clientServices.LoggingService.queryMetrics({}), {
-      timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0);
+    const observable = this._acceptInvitations.get(invitationId);
+    if (!observable) {
+      log7.warn("invalid invitation", {
+        invitationId
+      }, {
+        F: __dxlog_file9,
+        L: 121,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    } else {
+      await observable.authenticate(authCode);
+    }
   }
-  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;
+  async cancelInvitation({ invitationId }) {
+    log7("cancelInvitation...", {
+      invitationId
+    }, {
+      F: __dxlog_file9,
+      L: 128,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    invariant8(invitationId, void 0, {
+      F: __dxlog_file9,
+      L: 129,
+      S: this,
+      A: [
+        "invitationId",
+        ""
+      ]
+    });
+    const created = this._createInvitations.get(invitationId);
+    if (created) {
+      if (created.get().persistent) {
+        await this._metadataStore.removeInvitation(invitationId);
       }
-      map.set(filename.slice(0, idx), (map.get(filename.slice(0, idx)) ?? 0) + 1);
+      await created.cancel();
+      this._createInvitations.delete(invitationId);
+      this.removedCreated.emit(created.get());
+      return;
     }
-    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 accepted = this._acceptInvitations.get(invitationId);
+    if (accepted) {
+      await accepted.cancel();
+      this._acceptInvitations.delete(invitationId);
+      this.removedAccepted.emit(accepted.get());
     }
-    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();
+  getCreatedInvitations() {
+    return [
+      ...this._createInvitations.values()
+    ].map((i) => i.get());
   }
-  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;
+  getAcceptedInvitations() {
+    return [
+      ...this._acceptInvitations.values()
+    ].map((i) => i.get());
   }
-  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);
-      }
+  onPersistentInvitationsLoaded(ctx, callback) {
+    if (this._persistentInvitationsLoaded) {
+      callback();
+    } else {
+      this._persistentInvitationsLoadedEvent.once(ctx, () => callback());
     }
-    this.onNewEpoch.emit(credential);
   }
-  startProcessingRootDocs() {
-    if (this._isProcessingRootDocs) {
-      return;
-    }
-    if (this.rootUrl) {
-      this._onNewRoot(this.rootUrl);
+  _safePersistInBackground(invitation) {
+    return new Promise((resolve) => {
+      setTimeout(async () => {
+        try {
+          await this._metadataStore.addInvitation(invitation.get());
+          this.saved.emit(invitation.get());
+        } catch (err) {
+          log7.catch(err, void 0, {
+            F: __dxlog_file9,
+            L: 173,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          await invitation.cancel();
+        } finally {
+          resolve();
+        }
+      });
+    });
+  }
+  async _safeDeleteInvitation(invitation) {
+    try {
+      await this._metadataStore.removeInvitation(invitation.invitationId);
+    } catch (err) {
+      log7.catch(err, void 0, {
+        F: __dxlog_file9,
+        L: 186,
+        S: this,
+        C: (f, a) => f(...a)
+      });
     }
-    this._isProcessingRootDocs = true;
   }
-  async ensureEpochInitialized() {
-    await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
+  _onInvitationComplete(invitation, callback) {
+    invitation.subscribe(() => {
+    }, () => {
+    }, callback);
   }
 };
 
-// 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 { Context as Context7, rejectOnDispose } from "@dxos/context";
-import { invariant as invariant10 } from "@dxos/invariant";
-import { PublicKey as PublicKey7 } from "@dxos/keys";
-import { log as log8 } from "@dxos/log";
+// packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
+import { Stream as Stream9 } from "@dxos/codec-protobuf";
+import { raise } from "@dxos/debug";
+import { parseMethodName, RpcPeer } from "@dxos/rpc";
+import { MapCounter, trace as trace5 } from "@dxos/tracing";
+function _ts_decorate3(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    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 ClientRpcServer = class {
+  constructor(params) {
+    this._handlerCache = /* @__PURE__ */ new Map();
+    this._callMetrics = new MapCounter();
+    const { serviceRegistry, handleCall, handleStream, ...rpcOptions } = params;
+    this._handleCall = handleCall;
+    this._handleStream = handleStream;
+    this._serviceRegistry = serviceRegistry;
+    this._rpcPeer = new RpcPeer({
+      ...rpcOptions,
+      callHandler: (method, params2) => {
+        const [serviceName, methodName] = parseMethodName(method);
+        const handler = (method2, params3) => this._getServiceHandler(serviceName).call(method2, params3);
+        this._callMetrics.inc(`${serviceName}.${methodName} request`);
+        if (this._handleCall) {
+          return this._handleCall(methodName, params2, handler);
+        } else {
+          return handler(methodName, params2);
+        }
+      },
+      streamHandler: (method, params2) => {
+        const [serviceName, methodName] = parseMethodName(method);
+        const handler = (method2, params3) => this._getServiceHandler(serviceName).callStream(method2, params3);
+        this._callMetrics.inc(`${serviceName}.${methodName} request stream`);
+        if (this._handleStream) {
+          return Stream9.map(Stream9.unwrapPromise(this._handleStream(methodName, params2, handler)), (data) => {
+            this._callMetrics.inc(`${serviceName}.${methodName} response stream`);
+            return data;
+          });
+        } else {
+          return handler(methodName, params2);
+        }
+      }
+    });
+  }
+  get _services() {
+    return Object.keys(this._serviceRegistry.services);
+  }
+  async open() {
+    await this._rpcPeer.open();
+  }
+  async close() {
+    await this._rpcPeer.close();
+  }
+  _getServiceHandler(serviceName) {
+    if (!this._handlerCache.has(serviceName)) {
+      const [key, descriptor] = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName) ?? raise(new Error(`Service not available: ${serviceName}`));
+      const service = this._serviceRegistry.services[key];
+      if (!service) {
+        throw new Error(`Service not available: ${serviceName}`);
+      }
+      this._handlerCache.set(serviceName, descriptor.createServer(service));
+    }
+    return this._handlerCache.get(serviceName);
+  }
+};
+_ts_decorate3([
+  trace5.metricsCounter()
+], ClientRpcServer.prototype, "_callMetrics", void 0);
+_ts_decorate3([
+  trace5.info()
+], ClientRpcServer.prototype, "_services", null);
+ClientRpcServer = _ts_decorate3([
+  trace5.resource()
+], ClientRpcServer);
+
+// 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 Context7, 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 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);
+  }
+};
+
+// packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
+import { DeferredTask, Event as Event5, scheduleTask as scheduleTask3, sleep, TimeoutError as TimeoutError2, Trigger as Trigger4 } from "@dxos/async";
+import { Context as Context6, rejectOnDispose } from "@dxos/context";
+import { invariant as invariant9 } from "@dxos/invariant";
+import { PublicKey as PublicKey7 } 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;
 var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var NotarizationPlugin = class {
   constructor() {
-    this._ctx = new Context7();
+    this._ctx = new Context6();
     this._extensionOpened = new Event5();
     this._extensions = /* @__PURE__ */ new Set();
     this._processedCredentials = new ComplexSet2(PublicKey7.hash);
@@ -2973,13 +2932,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 +2952,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 +2963,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 +2991,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 +3005,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 +3014,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 +3023,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 +3041,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 +3062,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 +3087,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 +3108,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 +3120,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,10 +3174,10 @@ 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();
+    this._ctx = new Context7();
     this._notarizationPlugin = new NotarizationPlugin();
     this._cache = void 0;
     // TODO(dmaretskyi): Move into Space?
@@ -3250,7 +3209,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)
@@ -3295,12 +3254,12 @@ var DataSpace = class {
     await this._notarizationPlugin.open();
     await this._inner.spaceState.addCredentialProcessor(this._notarizationPlugin);
     await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
-    await this._inner.open(new Context8());
+    await this._inner.open(new Context7());
     this._state = SpaceState.CONTROL_ONLY;
     log9("new state", {
       state: SpaceState[this._state]
     }, {
-      F: __dxlog_file12,
+      F: __dxlog_file11,
       L: 198,
       S: this,
       C: (f, a) => f(...a)
@@ -3318,13 +3277,13 @@ 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)
     });
     await this._ctx.dispose();
-    this._ctx = new Context8();
+    this._ctx = new Context7();
     await this.authVerifier.close();
     await this._inner.close();
     await this._inner.spaceState.removeCredentialProcessor(this._automergeSpaceState);
@@ -3343,14 +3302,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 +3317,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 +3326,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 +3346,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 +3356,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 +3366,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 +3382,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 +3445,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 +3477,7 @@ var DataSpace = class {
           rootUrl,
           err
         }, {
-          F: __dxlog_file12,
+          F: __dxlog_file11,
           L: 388,
           S: this,
           C: (f, a) => f(...a)
@@ -3572,8 +3531,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 +3551,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 +3562,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 +3578,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 +3648,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)
@@ -3745,9 +3704,9 @@ DataSpace = _ts_decorate4([
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
 import { Event as Event7, synchronized as synchronized2, trackLeaks as trackLeaks2 } from "@dxos/async";
-import { Context as Context9, cancelWithContext as cancelWithContext3 } from "@dxos/context";
+import { Context as Context8, cancelWithContext as cancelWithContext3 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
-import { invariant as invariant12 } from "@dxos/invariant";
+import { invariant as invariant11 } from "@dxos/invariant";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
 import { log as log10 } from "@dxos/log";
 import { trace as trace7 } from "@dxos/protocols";
@@ -3758,7 +3717,7 @@ import { ComplexMap as ComplexMap3, deferFunction as deferFunction2, forEachAsyn
 // packages/sdk/client-services/src/packlets/spaces/genesis.ts
 import { createCredential } from "@dxos/credentials";
 import { failUndefined } from "@dxos/debug";
-import { AdmittedFeed as AdmittedFeed4, SpaceMember as SpaceMember2 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { AdmittedFeed as AdmittedFeed4, SpaceMember } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe3 } from "@dxos/timeframe";
 var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
   const credentials = [
@@ -3778,7 +3737,7 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
       assertion: {
         "@type": "dxos.halo.credentials.SpaceMember",
         spaceKey: space.key,
-        role: SpaceMember2.Role.ADMIN,
+        role: SpaceMember.Role.ADMIN,
         profile: signingContext.getProfile(),
         genesisFeedKey: space.controlFeedKey ?? failUndefined()
       }
@@ -3836,7 +3795,7 @@ 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 {
@@ -3847,7 +3806,7 @@ var DataSpaceManager = class {
     this._signingContext = _signingContext;
     this._feedStore = _feedStore;
     this._automergeHost = _automergeHost;
-    this._ctx = new Context9();
+    this._ctx = new Context8();
     this.updated = new Event7();
     this._spaces = new ComplexMap3(PublicKey9.hash);
     this._isOpen = false;
@@ -3862,7 +3821,7 @@ var DataSpaceManager = class {
   }
   async open() {
     log10("open", void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file12,
       L: 98,
       S: this,
       C: (f, a) => f(...a)
@@ -3870,7 +3829,7 @@ var DataSpaceManager = class {
     log10.trace("dxos.echo.data-space-manager.open", trace7.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file13,
+      F: __dxlog_file12,
       L: 99,
       S: this,
       C: (f, a) => f(...a)
@@ -3878,7 +3837,7 @@ var DataSpaceManager = class {
     log10("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
-      F: __dxlog_file13,
+      F: __dxlog_file12,
       L: 100,
       S: this,
       C: (f, a) => f(...a)
@@ -3888,7 +3847,7 @@ var DataSpaceManager = class {
         log10("load space", {
           spaceMetadata
         }, {
-          F: __dxlog_file13,
+          F: __dxlog_file12,
           L: 104,
           S: this,
           C: (f, a) => f(...a)
@@ -3899,7 +3858,7 @@ var DataSpaceManager = class {
           spaceMetadata,
           err
         }, {
-          F: __dxlog_file13,
+          F: __dxlog_file12,
           L: 107,
           S: this,
           C: (f, a) => f(...a)
@@ -3916,7 +3875,7 @@ var DataSpaceManager = class {
     log10.trace("dxos.echo.data-space-manager.open", trace7.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file13,
+      F: __dxlog_file12,
       L: 120,
       S: this,
       C: (f, a) => f(...a)
@@ -3924,7 +3883,7 @@ var DataSpaceManager = class {
   }
   async close() {
     log10("close", void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file12,
       L: 125,
       S: this,
       C: (f, a) => f(...a)
@@ -3939,8 +3898,8 @@ 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,
+    invariant11(this._isOpen, "Not open.", {
+      F: __dxlog_file12,
       L: 138,
       S: this,
       A: [
@@ -3961,7 +3920,7 @@ var DataSpaceManager = class {
     log10("creating space...", {
       spaceKey
     }, {
-      F: __dxlog_file13,
+      F: __dxlog_file12,
       L: 150,
       S: this,
       C: (f, a) => f(...a)
@@ -3976,8 +3935,8 @@ 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,
+    invariant11(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file12,
       L: 163,
       S: this,
       A: [
@@ -3995,13 +3954,13 @@ var DataSpaceManager = class {
     log10("accept space", {
       opts
     }, {
-      F: __dxlog_file13,
+      F: __dxlog_file12,
       L: 175,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant12(this._isOpen, "Not open.", {
-      F: __dxlog_file13,
+    invariant11(this._isOpen, "Not open.", {
+      F: __dxlog_file12,
       L: 176,
       S: this,
       A: [
@@ -4009,8 +3968,8 @@ var DataSpaceManager = class {
         "'Not open.'"
       ]
     });
-    invariant12(!this._spaces.has(opts.spaceKey), "Space already exists.", {
-      F: __dxlog_file13,
+    invariant11(!this._spaces.has(opts.spaceKey), "Space already exists.", {
+      F: __dxlog_file12,
       L: 177,
       S: this,
       A: [
@@ -4045,7 +4004,7 @@ var DataSpaceManager = class {
     log10("construct space", {
       metadata
     }, {
-      F: __dxlog_file13,
+      F: __dxlog_file12,
       L: 210,
       S: this,
       C: (f, a) => f(...a)
@@ -4083,7 +4042,7 @@ var DataSpaceManager = class {
       },
       onAuthFailure: () => {
         log10.warn("auth failure", void 0, {
-          F: __dxlog_file13,
+          F: __dxlog_file12,
           L: 247,
           S: this,
           C: (f, a) => f(...a)
@@ -4107,7 +4066,7 @@ var DataSpaceManager = class {
           log10("before space ready", {
             space: space.key
           }, {
-            F: __dxlog_file13,
+            F: __dxlog_file12,
             L: 265,
             S: this,
             C: (f, a) => f(...a)
@@ -4118,7 +4077,7 @@ var DataSpaceManager = class {
             space: space.key,
             open: this._isOpen
           }, {
-            F: __dxlog_file13,
+            F: __dxlog_file12,
             L: 268,
             S: this,
             C: (f, a) => f(...a)
@@ -4131,7 +4090,7 @@ var DataSpaceManager = class {
           log10("before space close", {
             space: space.key
           }, {
-            F: __dxlog_file13,
+            F: __dxlog_file12,
             L: 274,
             S: this,
             C: (f, a) => f(...a)
@@ -4168,14 +4127,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";
+import { SpaceMember as SpaceMember2, SpaceState as SpaceState3 } from "@dxos/protocols/proto/dxos/client/services";
+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 +4173,7 @@ var SpacesServiceImpl = class {
         log11("update", {
           spaces
         }, {
-          F: __dxlog_file14,
+          F: __dxlog_file13,
           L: 77,
           S: this,
           C: (f, a) => f(...a)
@@ -4225,7 +4184,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 +4218,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 +4237,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 +4255,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 +4264,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 +4274,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: [
@@ -4372,7 +4331,7 @@ var SpacesServiceImpl = class {
             identityKey: member.key,
             profile: member.profile ?? {}
           },
-          presence: member.removed ? SpaceMember3.PresenceState.REMOVED : isMe || peers.length > 0 ? SpaceMember3.PresenceState.ONLINE : SpaceMember3.PresenceState.OFFLINE,
+          presence: member.removed ? SpaceMember2.PresenceState.REMOVED : isMe || peers.length > 0 ? SpaceMember2.PresenceState.ONLINE : SpaceMember2.PresenceState.OFFLINE,
           peerStates: peers
         };
       }),
@@ -4386,25 +4345,24 @@ var getChannelId = (channel) => `user-channel/${channel}`;
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
 import { Trigger as Trigger5 } from "@dxos/async";
-import { Context as Context10 } from "@dxos/context";
+import { Context as Context9, Resource } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 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 { 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 Invitation5 } 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 +4373,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] ? [
@@ -4441,7 +4401,9 @@ var createDocumentsIterator = (automergeHost) => (
       if (visited.has(handle.documentId)) {
         return;
       }
-      await warnAfterTimeout2(5e3, "to long to load doc", () => handle.whenReady());
+      if (!handle.isReady()) {
+        await handle.whenReady();
+      }
       const doc = handle.docSync();
       const heads = getHeads(doc);
       if (doc.objects) {
@@ -4461,7 +4423,7 @@ var createDocumentsIterator = (automergeHost) => (
           if (visited.has(id)) {
             continue;
           }
-          const linkHandle = automergeHost.repo.find(id);
+          const linkHandle = automergeHost.repo.handles[id] ?? automergeHost.repo.find(id);
           for await (const result of getObjectsFromHandle(linkHandle)) {
             yield result;
           }
@@ -4492,10 +4454,12 @@ function _ts_decorate6(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
-var ServiceContext = class {
-  constructor(storage, networkManager, signalManager, _runtimeParams) {
+var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var ServiceContext = class extends Resource {
+  constructor(storage, level, networkManager, signalManager, _runtimeParams) {
+    super();
     this.storage = storage;
+    this.level = level;
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this._runtimeParams = _runtimeParams;
@@ -4525,66 +4489,81 @@ var ServiceContext = class {
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams);
     this.indexMetadata = new IndexMetadataStore({
-      directory: storage.createDirectory("index-metadata")
+      db: level.sublevel("index-metadata")
     });
     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({
       indexStore: new IndexStore({
-        directory: storage.createDirectory("index-store")
+        db: level.sublevel("index-storage")
       }),
       metadataStore: this.indexMetadata,
       loadDocuments: createSelectedDocumentsIterator(this.automergeHost),
       getAllDocuments: createDocumentsIterator(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(Invitation5.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined2(), this._acceptIdentity.bind(this)));
   }
-  async open(ctx) {
+  async _open(ctx) {
     await this._checkStorageVersion();
     log12("opening...", void 0, {
-      F: __dxlog_file15,
-      L: 151,
+      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: 152,
+      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: 162,
+      F: __dxlog_file14,
+      L: 180,
       S: this,
       C: (f, a) => f(...a)
     });
     log12("opened", void 0, {
-      F: __dxlog_file15,
-      L: 163,
+      F: __dxlog_file14,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async close() {
+  async _close() {
     log12("closing...", void 0, {
-      F: __dxlog_file15,
-      L: 167,
+      F: __dxlog_file14,
+      L: 185,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4601,22 +4580,22 @@ var ServiceContext = class {
     await this.metadataStore.close();
     await this.indexer.destroy();
     log12("closed", void 0, {
-      F: __dxlog_file15,
-      L: 180,
+      F: __dxlog_file14,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async createIdentity(params = {}) {
     const identity = await this.identityManager.createIdentity(params);
-    await this._initialize(new Context10());
+    await this._initialize(new Context9());
     return identity;
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    invariant14(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file15,
-      L: 191,
+    invariant13(factory, `Unknown invitation kind: ${invitation.kind}`, {
+      F: __dxlog_file14,
+      L: 209,
       S: this,
       A: [
         "factory",
@@ -4635,20 +4614,20 @@ var ServiceContext = class {
   }
   async _acceptIdentity(params) {
     const identity = await this.identityManager.acceptIdentity(params);
-    await this._initialize(new Context10());
+    await this._initialize(new Context9());
     return identity;
   }
   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: 222,
+      F: __dxlog_file14,
+      L: 240,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4668,10 +4647,10 @@ var ServiceContext = class {
     };
     this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, signingContext, this.feedStore, this.automergeHost, this._runtimeParams);
     await this.dataSpaceManager.open();
-    this._handlerFactories.set(Invitation6.Kind.SPACE, (invitation) => {
-      invariant14(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file15,
-        L: 246,
+    this._handlerFactories.set(Invitation5.Kind.SPACE, (invitation) => {
+      invariant13(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+        F: __dxlog_file14,
+        L: 264,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4694,8 +4673,8 @@ var ServiceContext = class {
           log12("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file15,
-            L: 262,
+            F: __dxlog_file14,
+            L: 280,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4705,8 +4684,8 @@ var ServiceContext = class {
           log12("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file15,
-            L: 266,
+            F: __dxlog_file14,
+            L: 284,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4716,8 +4695,8 @@ var ServiceContext = class {
           log12("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file15,
-            L: 271,
+            F: __dxlog_file14,
+            L: 289,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4727,8 +4706,8 @@ var ServiceContext = class {
           });
         } catch (err) {
           log12.catch(err, void 0, {
-            F: __dxlog_file15,
-            L: 277,
+            F: __dxlog_file14,
+            L: 295,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4740,7 +4719,7 @@ var ServiceContext = class {
 };
 _ts_decorate6([
   Trace2.span()
-], ServiceContext.prototype, "open", null);
+], ServiceContext.prototype, "_open", null);
 _ts_decorate6([
   Trace2.span()
 ], ServiceContext.prototype, "_initialize", null);
@@ -4773,190 +4752,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 SpaceMember3 } 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.b30eb88";
+
+// 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");
+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 ? SpaceMember3.PresenceState.ONLINE : SpaceMember3.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
-import { DX_DATA } from "@dxos/client-protocol";
-import { InvalidConfigError } from "@dxos/protocols";
-import { Runtime } from "@dxos/protocols/proto/dxos/config";
-import { createStorage, StorageType } from "@dxos/random-access-storage";
-import { isNode as isNode2 } from "@dxos/util";
-var StorageDriver = Runtime.Client.Storage.StorageDriver;
-var createStorageObjects = (config) => {
-  const { persistent = false, keyStore, dataStore, dataRoot = isNode2() ? DX_DATA : "dxos/storage" } = 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: `${dataRoot}/`
-    })
+    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 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 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 safeClose = (channel) => {
+  try {
+    channel?.close();
+  } catch (e) {
   }
 };
 
+// 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, sleep as sleep3, synchronized as synchronized3 } from "@dxos/async";
-import { clientServiceBundle, defaultKey, PropertiesSchema } from "@dxos/client-protocol";
-import { Context as Context11 } from "@dxos/context";
-import { DataServiceImpl } from "@dxos/echo-pipeline";
-import * as E from "@dxos/echo-schema";
-import { createRawObjectDoc } from "@dxos/echo-schema";
-import { IndexServiceImpl } from "@dxos/indexing";
+import { Event as Event9, synchronized as synchronized3 } from "@dxos/async";
+import { clientServiceBundle, defaultKey, Properties } from "@dxos/client-protocol";
+import { Context as Context10 } from "@dxos/context";
+import { DataServiceImpl, encodeReference } from "@dxos/echo-pipeline";
+import { getTypeReference } from "@dxos/echo-schema";
+import { QueryServiceImpl } from "@dxos/indexing";
 import { invariant as invariant16 } from "@dxos/invariant";
-import { PublicKey as PublicKey12 } from "@dxos/keys";
-import { log as log15 } from "@dxos/log";
+import { PublicKey as PublicKey13 } 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";
@@ -5047,11 +5101,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 PublicKey11 } 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 {
@@ -5064,11 +5242,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) {
@@ -5153,12 +5331,12 @@ var LoggingServiceImpl = class {
     });
   }
 };
-var matchFilter = (filter, level, path, options) => {
+var matchFilter = (filter, level, path2, options) => {
   switch (options) {
     case QueryLogsRequest.MatchingOptions.INCLUSIVE:
-      return level >= filter.level && (!filter.pattern || path.includes(filter.pattern));
+      return level >= filter.level && (!filter.pattern || path2.includes(filter.pattern));
     case QueryLogsRequest.MatchingOptions.EXPLICIT:
-      return level === filter.level && (!filter.pattern || path.includes(filter.pattern));
+      return level === filter.level && (!filter.pattern || path2.includes(filter.pattern));
   }
 };
 var shouldLog = (entry2, request) => {
@@ -5204,6 +5382,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 PublicKey12 } from "@dxos/keys";
+var createLevel = async (config) => {
+  const persistent = isPersistent(config);
+  const storagePath = persistent ? path.join(getRootPath(config), "level") : `/tmp/dxos-${PublicKey12.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";
@@ -5272,13 +5524,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,
@@ -5289,6 +5542,7 @@ var ClientServicesHost = class {
     this._opening = false;
     this._open = false;
     this._storage = storage;
+    this._level = level;
     this._callbacks = callbacks;
     this._runtimeParams = runtimeParams;
     if (config) {
@@ -5303,7 +5557,7 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open(new Context11());
+            void this.open(new Context10());
           }
         },
         onRelease: () => this.close()
@@ -5327,6 +5581,7 @@ var ClientServicesHost = class {
         await this.reset();
       }
     });
+    this.diagnosticsBroadcastHandler = createCollectDiagnosticsBroadcastHandler(this._systemService);
     this._loggingService = new LoggingServiceImpl();
     this._serviceRegistry = new ServiceRegistry(clientServiceBundle, {
       SystemService: this._systemService,
@@ -5358,24 +5613,24 @@ var ClientServicesHost = class {
   */
   initialize({ config, ...options }) {
     invariant16(!this._open, "service host is open", {
-      F: __dxlog_file18,
-      L: 180,
+      F: __dxlog_file19,
+      L: 198,
       S: this,
       A: [
         "!this._open",
         "'service host is open'"
       ]
     });
-    log15("initializing...", void 0, {
-      F: __dxlog_file18,
-      L: 181,
+    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: 184,
+        F: __dxlog_file19,
+        L: 202,
         S: this,
         A: [
           "!this._config",
@@ -5388,9 +5643,9 @@ var ClientServicesHost = class {
       }
     }
     if (!options.signalManager) {
-      log15.warn("running signaling without telemetry metadata.", void 0, {
-        F: __dxlog_file18,
-        L: 192,
+      log16.warn("running signaling without telemetry metadata.", void 0, {
+        F: __dxlog_file19,
+        L: 210,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5400,8 +5655,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: 203,
+      F: __dxlog_file19,
+      L: 221,
       S: this,
       A: [
         "!this._networkManager",
@@ -5413,9 +5668,9 @@ var ClientServicesHost = class {
       transportFactory,
       signalManager
     });
-    log15("initialized", void 0, {
-      F: __dxlog_file18,
-      L: 210,
+    log16("initialized", void 0, {
+      F: __dxlog_file19,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5424,18 +5679,18 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    const traceId = PublicKey12.random().toHex();
-    log15.trace("dxos.client-services.host.open", trace9.begin({
+    const traceId = PublicKey13.random().toHex();
+    log16.trace("dxos.client-services.host.open", trace9.begin({
       id: traceId
     }), {
-      F: __dxlog_file18,
-      L: 221,
+      F: __dxlog_file19,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant16(this._config, "config not set", {
-      F: __dxlog_file18,
-      L: 223,
+      F: __dxlog_file19,
+      L: 241,
       S: this,
       A: [
         "this._config",
@@ -5443,8 +5698,8 @@ var ClientServicesHost = class {
       ]
     });
     invariant16(this._storage, "storage not set", {
-      F: __dxlog_file18,
-      L: 224,
+      F: __dxlog_file19,
+      L: 242,
       S: this,
       A: [
         "this._storage",
@@ -5452,8 +5707,8 @@ var ClientServicesHost = class {
       ]
     });
     invariant16(this._signalManager, "signal manager not set", {
-      F: __dxlog_file18,
-      L: 225,
+      F: __dxlog_file19,
+      L: 243,
       S: this,
       A: [
         "this._signalManager",
@@ -5461,8 +5716,8 @@ var ClientServicesHost = class {
       ]
     });
     invariant16(this._networkManager, "network manager not set", {
-      F: __dxlog_file18,
-      L: 226,
+      F: __dxlog_file19,
+      L: 244,
       S: this,
       A: [
         "this._networkManager",
@@ -5470,31 +5725,37 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    log15("opening...", {
+    log16("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file18,
-      L: 229,
+      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._networkManager, this._signalManager, this._runtimeParams);
+    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,
@@ -5506,24 +5767,6 @@ var ClientServicesHost = class {
       })
     });
     await this._serviceContext.open(ctx);
-    invariant16(this.serviceRegistry.services.InvitationsService, void 0, {
-      F: __dxlog_file18,
-      L: 290,
-      S: this,
-      A: [
-        "this.serviceRegistry.services.InvitationsService",
-        ""
-      ]
-    });
-    const loadedInvitations = await this.serviceRegistry.services.InvitationsService.loadPersistentInvitations();
-    log15("loaded persistent invitations", {
-      count: loadedInvitations.invitations?.length
-    }, {
-      F: __dxlog_file18,
-      L: 293,
-      S: this,
-      C: (f, a) => f(...a)
-    });
     const devtoolsProxy = this._config?.get("runtime.client.devtoolsProxy");
     if (devtoolsProxy) {
       this._devtoolsProxy = new WebsocketRpcClient({
@@ -5534,23 +5777,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: 310,
+      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: 311,
+      F: __dxlog_file19,
+      L: 331,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5560,60 +5804,63 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    log15("closing...", {
+    log16("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file18,
-      L: 322,
+      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: 329,
+      F: __dxlog_file19,
+      L: 352,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
-    const traceId = PublicKey12.random().toHex();
-    log15.trace("dxos.sdk.client-services-host.reset", trace9.begin({
+    const traceId = PublicKey13.random().toHex();
+    log16.trace("dxos.sdk.client-services-host.reset", trace9.begin({
       id: traceId
     }), {
-      F: __dxlog_file18,
-      L: 334,
+      F: __dxlog_file19,
+      L: 357,
       S: this,
       C: (f, a) => f(...a)
     });
-    log15("resetting...", void 0, {
-      F: __dxlog_file18,
-      L: 336,
+    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: 339,
+    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: 340,
+      F: __dxlog_file19,
+      L: 363,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5625,8 +5872,8 @@ var ClientServicesHost = class {
     const space = await this._serviceContext.dataSpaceManager.createSpace();
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant16(automergeIndex, void 0, {
-      F: __dxlog_file18,
-      L: 352,
+      F: __dxlog_file19,
+      L: 375,
       S: this,
       A: [
         "automergeIndex",
@@ -5635,18 +5882,25 @@ var ClientServicesHost = class {
     });
     const document = await this._serviceContext.automergeHost.repo.find(automergeIndex);
     await document.whenReady();
-    const objectDocument = createRawObjectDoc({
-      [defaultKey]: identity.identityKey.toHex()
-    }, {
-      type: E.getTypeReference(PropertiesSchema)
-    });
+    const properties = {
+      system: {
+        type: encodeReference(getTypeReference(Properties))
+      },
+      data: {
+        [defaultKey]: identity.identityKey.toHex()
+      },
+      meta: {
+        keys: []
+      }
+    };
+    const propertiesId = PublicKey13.random().toHex();
     document.change((doc) => {
       assignDeep2(doc, [
         "objects",
-        objectDocument.id
-      ], objectDocument.handle.docSync());
+        propertiesId
+      ], properties);
     });
-    await sleep3(200);
+    await this._serviceContext.automergeHost.repo.flush();
     return identity;
   }
 };
@@ -5668,6 +5922,44 @@ ClientServicesHost = _ts_decorate8([
   Trace3.resource()
 ], ClientServicesHost);
 
+// packages/sdk/client-services/src/packlets/services/util.ts
+import { PublicKey as PublicKey14 } 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,
@@ -5687,19 +5979,25 @@ export {
   IdentityServiceImpl,
   DeviceInvitationProtocol,
   InvitationsHandler,
-  invitationExpired,
+  createAdmissionKeypair,
   InvitationsServiceImpl,
   SpaceInvitationProtocol,
+  InvitationsManager,
   ClientRpcServer,
-  createDiagnostics,
   DataSpace,
   DataSpaceManager,
   SpacesServiceImpl,
   ServiceContext,
   ServiceRegistry,
+  createDiagnostics,
+  createCollectDiagnosticsBroadcastSender,
+  createCollectDiagnosticsBroadcastHandler,
+  DiagnosticsCollector,
   Lock,
   isLocked,
   createStorageObjects,
-  ClientServicesHost
+  createLevel,
+  ClientServicesHost,
+  ClientServicesProviderResource
 };
-//# sourceMappingURL=chunk-BJNDCR72.mjs.map
+//# sourceMappingURL=chunk-BDY63S7K.mjs.map