@dxos/client-services 0.4.10-main.8583d5a → 0.4.10-main.85f8e19

package/dist/lib/browser/{chunk-ZBQ4LQQX.mjs → chunk-GVJIB6RK.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, multiUse = false } = 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: 85,
+      L: 87,
       S: this,
       A: [
         "protocol",
@@ -1658,7 +1676,8 @@ var InvitationsHandler = class {
       swarmKey,
       authCode,
       timeout,
-      persistent: persistent && type !== Invitation3.Type.OFFLINE,
+      persistent: persistent && type !== Invitation3.Type.DELEGATED,
+      guestKeypair: guestKeypair ?? (authMethod === Invitation3.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
       created,
       lifetime,
       multiUse,
@@ -1676,7 +1695,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 111,
+        L: 115,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1701,7 +1720,7 @@ var InvitationsHandler = class {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             invariant6(deviceKey, void 0, {
               F: __dxlog_file7,
-              L: 132,
+              L: 136,
               S: this,
               A: [
                 "deviceKey",
@@ -1724,7 +1743,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 150,
+                L: 154,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1732,7 +1751,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 151,
+                L: 155,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1748,7 +1767,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 154,
+                L: 158,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1760,7 +1779,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 156,
+                L: 160,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1770,7 +1789,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 159,
+                  L: 163,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1781,7 +1800,7 @@ var InvitationsHandler = class {
               } else {
                 log5.error("failed", err, {
                   F: __dxlog_file7,
-                  L: 162,
+                  L: 166,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1792,7 +1811,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 165,
+                L: 169,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1813,7 +1832,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 180,
+              L: 184,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1824,7 +1843,7 @@ var InvitationsHandler = class {
           } else {
             log5.error("failed", err, {
               F: __dxlog_file7,
-              L: 183,
+              L: 187,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1834,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: 194,
+          L: 198,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1889,7 +1908,7 @@ var InvitationsHandler = class {
     const { timeout = INVITATION_TIMEOUT } = invitation;
     invariant6(protocol, void 0, {
       F: __dxlog_file7,
-      L: 248,
+      L: 252,
       S: this,
       A: [
         "protocol",
@@ -1899,7 +1918,7 @@ var InvitationsHandler = class {
     if (deviceProfile) {
       invariant6(invitation.kind === Invitation3.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file7,
-        L: 252,
+        L: 255,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -1914,7 +1933,7 @@ var InvitationsHandler = class {
     const setState = (newData) => {
       invariant6(newData.state !== void 0, void 0, {
         F: __dxlog_file7,
-        L: 263,
+        L: 266,
         S: this,
         A: [
           "newData.state !== undefined",
@@ -1934,7 +1953,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             F: __dxlog_file7,
-            L: 271,
+            L: 274,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1944,7 +1963,7 @@ var InvitationsHandler = class {
         } else {
           log5.warn("auth failed", err, {
             F: __dxlog_file7,
-            L: 274,
+            L: 277,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1958,7 +1977,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 282,
+        L: 285,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1973,7 +1992,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               F: __dxlog_file7,
-              L: 292,
+              L: 295,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1988,7 +2007,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 301,
+                L: 304,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2000,7 +2019,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 309,
+                L: 312,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2011,7 +2030,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 313,
+                L: 316,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2021,62 +2040,28 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file7,
-                L: 317,
+                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: 323,
-                    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: 327,
-                    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: 338,
-                        S: this,
-                        C: (f, a) => f(...a)
-                      });
-                      authenticated.reset();
-                    }
-                  }
                 }
               }
               log5("request admission", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 346,
+                L: 336,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2088,7 +2073,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 357,
+                L: 347,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2101,7 +2086,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 359,
+                L: 349,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2111,7 +2096,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 362,
+                  L: 352,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2121,7 +2106,7 @@ var InvitationsHandler = class {
               } else {
                 log5("auth failed", err, {
                   F: __dxlog_file7,
-                  L: 365,
+                  L: 355,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2132,7 +2117,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 368,
+                L: 358,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2150,7 +2135,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 379,
+              L: 369,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2160,7 +2145,7 @@ var InvitationsHandler = class {
           } else {
             log5("auth failed", err, {
               F: __dxlog_file7,
-              L: 382,
+              L: 372,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2177,7 +2162,7 @@ var InvitationsHandler = class {
       } else {
         invariant6(invitation.swarmKey, void 0, {
           F: __dxlog_file7,
-          L: 396,
+          L: 386,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -2215,204 +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 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 { hasInvitationExpired } from "@dxos/echo-pipeline";
-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().multiUse) {
-          this._removedCreated.emit(invitation.get());
-        }
-      });
+      invitation.subscribe(next, close, close);
     });
   }
-  async loadPersistentInvitations() {
-    const persistentInvitations = this._metadataStore.getInvitations();
-    const freshInvitations = persistentInvitations.filter(async (invitation) => !hasInvitationExpired(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().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,
@@ -2421,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,
@@ -2430,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,
@@ -2439,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,
@@ -2448,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,
@@ -2460,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
-          });
-        });
-      }
+      });
     });
   }
 };
@@ -2489,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;
@@ -2509,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: [
@@ -2524,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: [
@@ -2533,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: [
@@ -2543,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: [
@@ -2563,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: [
@@ -2603,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: [
@@ -2614,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: [
@@ -2623,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: [
@@ -2648,6 +2537,227 @@ var SpaceInvitationProtocol = class {
   }
 };
 
+// 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;
+  }
+  async loadPersistentInvitations() {
+    if (this._persistentInvitationsLoaded) {
+      const invitations = this.getCreatedInvitations().filter((i) => i.persistent);
+      return {
+        invitations
+      };
+    }
+    try {
+      const persistentInvitations = this._metadataStore.getInvitations();
+      const freshInvitations = persistentInvitations.filter((invitation) => !hasInvitationExpired(invitation));
+      const 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 {
+        invitations: cInvitations
+      };
+    } catch (err) {
+      log7.catch(err, void 0, {
+        F: __dxlog_file9,
+        L: 88,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return {
+        invitations: []
+      };
+    } finally {
+      this._persistentInvitationsLoadedEvent.emit();
+      this._persistentInvitationsLoaded = true;
+    }
+  }
+  acceptInvitation(request) {
+    const options = request.invitation;
+    const existingInvitation = this._acceptInvitations.get(options.invitationId);
+    if (existingInvitation) {
+      return existingInvitation;
+    }
+    const handler = this._getHandler(options);
+    const invitation = this._invitationsHandler.acceptInvitation(handler, options, request.deviceProfile);
+    this._acceptInvitations.set(invitation.get().invitationId, invitation);
+    this.invitationAccepted.emit(invitation.get());
+    this._onInvitationComplete(invitation, () => {
+      this._acceptInvitations.delete(invitation.get().invitationId);
+      this.removedAccepted.emit(invitation.get());
+    });
+    return invitation;
+  }
+  async authenticate({ invitationId, authCode }) {
+    log7("authenticating...", void 0, {
+      F: __dxlog_file9,
+      L: 117,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    invariant8(invitationId, void 0, {
+      F: __dxlog_file9,
+      L: 118,
+      S: this,
+      A: [
+        "invitationId",
+        ""
+      ]
+    });
+    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);
+    }
+  }
+  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);
+      }
+      await created.cancel();
+      this._createInvitations.delete(invitationId);
+      this.removedCreated.emit(created.get());
+      return;
+    }
+    const accepted = this._acceptInvitations.get(invitationId);
+    if (accepted) {
+      await accepted.cancel();
+      this._acceptInvitations.delete(invitationId);
+      this.removedAccepted.emit(accepted.get());
+    }
+  }
+  getCreatedInvitations() {
+    return [
+      ...this._createInvitations.values()
+    ].map((i) => i.get());
+  }
+  getAcceptedInvitations() {
+    return [
+      ...this._acceptInvitations.values()
+    ].map((i) => i.get());
+  }
+  onPersistentInvitationsLoaded(ctx, callback) {
+    if (this._persistentInvitationsLoaded) {
+      callback();
+    } else {
+      this._persistentInvitationsLoadedEvent.once(ctx, () => callback());
+    }
+  }
+  _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)
+      });
+    }
+  }
+  _onInvitationComplete(invitation, callback) {
+    invitation.subscribe(() => {
+    }, () => {
+    }, callback);
+  }
+};
+
 // packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
 import { Stream as Stream9 } from "@dxos/codec-protobuf";
 import { raise } from "@dxos/debug";
@@ -2730,9 +2840,9 @@ ClientRpcServer = _ts_decorate3([
 ], ClientRpcServer);
 
 // 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 { Event as Event6, asyncTimeout, scheduleTask as scheduleTask4, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
 import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
-import { cancelWithContext as cancelWithContext2, Context as Context8, ContextDisposedError } from "@dxos/context";
+import { cancelWithContext as cancelWithContext2, Context as Context7, ContextDisposedError } from "@dxos/context";
 import { timed, warnAfterTimeout } from "@dxos/debug";
 import { TYPE_PROPERTIES } from "@dxos/echo-db";
 import { createMappedFeedWriter } from "@dxos/echo-pipeline";
@@ -2786,8 +2896,8 @@ var AutomergeSpaceState = class {
 };
 
 // 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 { 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";
@@ -2801,7 +2911,7 @@ 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);
@@ -2853,7 +2963,7 @@ 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)
@@ -2887,7 +2997,7 @@ var NotarizationPlugin = class {
             C: (f, a) => f(...a)
           });
           peersTried.clear();
-          scheduleTask4(ctx, () => notarizeTask.schedule(), retryTimeout);
+          scheduleTask3(ctx, () => notarizeTask.schedule(), retryTimeout);
           return;
         }
         peersTried.add(peer);
@@ -3067,7 +3177,7 @@ function _ts_decorate4(decorators, target, key, desc) {
 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?
@@ -3144,7 +3254,7 @@ 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]
@@ -3173,7 +3283,7 @@ var DataSpace = class {
       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);
@@ -3192,7 +3302,7 @@ 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();
@@ -3594,7 +3704,7 @@ 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 invariant11 } from "@dxos/invariant";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
@@ -3696,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;
@@ -4017,7 +4127,7 @@ 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 invariant12 } from "@dxos/invariant";
@@ -4074,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());
@@ -4108,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) => {
@@ -4127,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();
@@ -4235,18 +4345,18 @@ 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, Resource } 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 { 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, trace as trace8 } from "@dxos/protocols";
-import { Invitation as Invitation6 } from "@dxos/protocols/proto/dxos/client/services";
+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";
@@ -4381,24 +4491,28 @@ var ServiceContext = class extends Resource {
     this.automergeHost = new AutomergeHost({
       directory: storage.createDirectory("automerge"),
       db: level.sublevel("automerge"),
-      metadata: this.indexMetadata
+      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) {
     await this._checkStorageVersion();
     log12("opening...", void 0, {
       F: __dxlog_file14,
-      L: 157,
+      L: 164,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4406,7 +4520,7 @@ var ServiceContext = class extends Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file14,
-      L: 158,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4419,17 +4533,26 @@ var ServiceContext = class extends Resource {
     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_file14,
-      L: 169,
+      L: 180,
       S: this,
       C: (f, a) => f(...a)
     });
     log12("opened", void 0, {
       F: __dxlog_file14,
-      L: 170,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4437,7 +4560,7 @@ var ServiceContext = class extends Resource {
   async _close() {
     log12("closing...", void 0, {
       F: __dxlog_file14,
-      L: 174,
+      L: 185,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4455,21 +4578,21 @@ var ServiceContext = class extends Resource {
     await this.indexer.destroy();
     log12("closed", void 0, {
       F: __dxlog_file14,
-      L: 187,
+      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);
     invariant13(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file14,
-      L: 198,
+      L: 209,
       S: this,
       A: [
         "factory",
@@ -4488,7 +4611,7 @@ var ServiceContext = class extends Resource {
   }
   async _acceptIdentity(params) {
     const identity = await this.identityManager.acceptIdentity(params);
-    await this._initialize(new Context10());
+    await this._initialize(new Context9());
     return identity;
   }
   async _checkStorageVersion() {
@@ -4501,7 +4624,7 @@ var ServiceContext = class extends Resource {
   async _initialize(ctx) {
     log12("initializing spaces...", void 0, {
       F: __dxlog_file14,
-      L: 229,
+      L: 240,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4521,10 +4644,10 @@ var ServiceContext = class extends Resource {
     };
     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) => {
+    this._handlerFactories.set(Invitation5.Kind.SPACE, (invitation) => {
       invariant13(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file14,
-        L: 253,
+        L: 264,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4548,7 +4671,7 @@ var ServiceContext = class extends Resource {
             details: assertion
           }, {
             F: __dxlog_file14,
-            L: 269,
+            L: 280,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4559,7 +4682,7 @@ var ServiceContext = class extends Resource {
             details: assertion
           }, {
             F: __dxlog_file14,
-            L: 273,
+            L: 284,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4570,7 +4693,7 @@ var ServiceContext = class extends Resource {
             details: assertion
           }, {
             F: __dxlog_file14,
-            L: 278,
+            L: 289,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4581,7 +4704,7 @@ var ServiceContext = class extends Resource {
         } catch (err) {
           log12.catch(err, void 0, {
             F: __dxlog_file14,
-            L: 284,
+            L: 295,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4635,7 +4758,7 @@ import { SpaceMember as SpaceMember3 } from "@dxos/protocols/proto/dxos/client/s
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.4.10-main.8583d5a";
+var DXOS_VERSION = "0.4.10-main.85f8e19";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -4878,9 +5001,9 @@ import { jsonKeyReplacer as jsonKeyReplacer2, nonNullable } from "@dxos/util";
 // packages/sdk/client-services/src/packlets/services/service-host.ts
 import { Event as Event9, synchronized as synchronized3 } from "@dxos/async";
 import { clientServiceBundle, defaultKey, Properties } from "@dxos/client-protocol";
-import { Context as Context11 } from "@dxos/context";
+import { Context as Context10 } from "@dxos/context";
 import { DataServiceImpl, encodeReference } from "@dxos/echo-pipeline";
-import * as E from "@dxos/echo-schema";
+import { getTypeReference } from "@dxos/echo-schema";
 import { IndexServiceImpl } from "@dxos/indexing";
 import { invariant as invariant16 } from "@dxos/invariant";
 import { PublicKey as PublicKey13 } from "@dxos/keys";
@@ -5431,7 +5554,7 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open(new Context11());
+            void this.open(new Context10());
           }
         },
         onRelease: () => this.close()
@@ -5617,7 +5740,7 @@ var ClientServicesHost = class {
     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();
@@ -5639,24 +5762,6 @@ var ClientServicesHost = class {
       })
     });
     await this._serviceContext.open(ctx);
-    invariant16(this.serviceRegistry.services.InvitationsService, void 0, {
-      F: __dxlog_file19,
-      L: 314,
-      S: this,
-      A: [
-        "this.serviceRegistry.services.InvitationsService",
-        ""
-      ]
-    });
-    const loadedInvitations = await this.serviceRegistry.services.InvitationsService.loadPersistentInvitations();
-    log16("loaded persistent invitations", {
-      count: loadedInvitations.invitations?.length
-    }, {
-      F: __dxlog_file19,
-      L: 317,
-      S: this,
-      C: (f, a) => f(...a)
-    });
     const devtoolsProxy = this._config?.get("runtime.client.devtoolsProxy");
     if (devtoolsProxy) {
       this._devtoolsProxy = new WebsocketRpcClient({
@@ -5676,7 +5781,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file19,
-      L: 335,
+      L: 326,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5684,7 +5789,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file19,
-      L: 336,
+      L: 327,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5698,7 +5803,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file19,
-      L: 347,
+      L: 338,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5716,7 +5821,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file19,
-      L: 356,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5727,13 +5832,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file19,
-      L: 361,
+      L: 352,
       S: this,
       C: (f, a) => f(...a)
     });
     log16("resetting...", void 0, {
       F: __dxlog_file19,
-      L: 363,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5741,7 +5846,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     log16("reset", void 0, {
       F: __dxlog_file19,
-      L: 366,
+      L: 357,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5749,7 +5854,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file19,
-      L: 367,
+      L: 358,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5762,7 +5867,7 @@ var ClientServicesHost = class {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant16(automergeIndex, void 0, {
       F: __dxlog_file19,
-      L: 379,
+      L: 370,
       S: this,
       A: [
         "automergeIndex",
@@ -5773,7 +5878,7 @@ var ClientServicesHost = class {
     await document.whenReady();
     const properties = {
       system: {
-        type: encodeReference(E.getTypeReference(Properties))
+        type: encodeReference(getTypeReference(Properties))
       },
       data: {
         [defaultKey]: identity.identityKey.toHex()
@@ -5868,8 +5973,10 @@ export {
   IdentityServiceImpl,
   DeviceInvitationProtocol,
   InvitationsHandler,
+  createAdmissionKeypair,
   InvitationsServiceImpl,
   SpaceInvitationProtocol,
+  InvitationsManager,
   ClientRpcServer,
   DataSpace,
   DataSpaceManager,
@@ -5887,4 +5994,4 @@ export {
   ClientServicesHost,
   ClientServicesProviderResource
 };
-//# sourceMappingURL=chunk-ZBQ4LQQX.mjs.map
+//# sourceMappingURL=chunk-GVJIB6RK.mjs.map