@dxos/client-services 0.4.10-main.fe71b4c → 0.4.10-next.71cec10

package/dist/lib/node/{chunk-DQMGKBOV.cjs → chunk-Y3ADPF24.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_DQMGKBOV_exports = {};
-__export(chunk_DQMGKBOV_exports, {
+var chunk_Y3ADPF24_exports = {};
+__export(chunk_Y3ADPF24_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   ClientServicesProviderResource: () => ClientServicesProviderResource,
@@ -41,6 +41,7 @@ __export(chunk_DQMGKBOV_exports, {
   IdentityManager: () => IdentityManager,
   IdentityServiceImpl: () => IdentityServiceImpl,
   InvitationsHandler: () => InvitationsHandler,
+  InvitationsManager: () => InvitationsManager,
   InvitationsServiceImpl: () => InvitationsServiceImpl,
   Lock: () => Lock,
   ServiceContext: () => ServiceContext,
@@ -65,7 +66,7 @@ __export(chunk_DQMGKBOV_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_DQMGKBOV_exports);
+module.exports = __toCommonJS(chunk_Y3ADPF24_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -138,30 +139,29 @@ var import_protocols5 = require("@dxos/protocols");
 var import_services4 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations2 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_teleport = require("@dxos/teleport");
-var import_async9 = require("@dxos/async");
 var import_codec_protobuf8 = require("@dxos/codec-protobuf");
-var import_context6 = require("@dxos/context");
-var import_echo_pipeline = require("@dxos/echo-pipeline");
-var import_invariant7 = require("@dxos/invariant");
-var import_log6 = require("@dxos/log");
 var import_services5 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials8 = require("@dxos/credentials");
 var import_feed_store3 = require("@dxos/feed-store");
-var import_invariant8 = require("@dxos/invariant");
-var import_log7 = require("@dxos/log");
+var import_invariant7 = require("@dxos/invariant");
+var import_log6 = require("@dxos/log");
 var import_protocols6 = require("@dxos/protocols");
 var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
+var import_async9 = require("@dxos/async");
+var import_echo_pipeline = require("@dxos/echo-pipeline");
+var import_invariant8 = require("@dxos/invariant");
+var import_log7 = require("@dxos/log");
 var import_codec_protobuf9 = require("@dxos/codec-protobuf");
 var import_debug2 = require("@dxos/debug");
 var import_rpc = require("@dxos/rpc");
 var import_tracing3 = require("@dxos/tracing");
 var import_async10 = require("@dxos/async");
 var import_client_protocol3 = require("@dxos/client-protocol");
-var import_context7 = require("@dxos/context");
+var import_context6 = require("@dxos/context");
 var import_debug3 = require("@dxos/debug");
-var import_echo_db = require("@dxos/echo-db");
 var import_echo_pipeline2 = require("@dxos/echo-pipeline");
 var import_echo_pipeline3 = require("@dxos/echo-pipeline");
+var import_echo_schema = require("@dxos/echo-schema");
 var import_invariant9 = require("@dxos/invariant");
 var import_keys7 = require("@dxos/keys");
 var import_log8 = require("@dxos/log");
@@ -174,7 +174,7 @@ var import_util4 = require("@dxos/util");
 var import_async11 = require("@dxos/async");
 var import_credentials10 = require("@dxos/credentials");
 var import_async12 = require("@dxos/async");
-var import_context8 = require("@dxos/context");
+var import_context7 = require("@dxos/context");
 var import_invariant10 = require("@dxos/invariant");
 var import_keys8 = require("@dxos/keys");
 var import_log9 = require("@dxos/log");
@@ -182,7 +182,7 @@ var import_protocols8 = require("@dxos/protocols");
 var import_teleport2 = require("@dxos/teleport");
 var import_util5 = require("@dxos/util");
 var import_async13 = require("@dxos/async");
-var import_context9 = require("@dxos/context");
+var import_context8 = require("@dxos/context");
 var import_credentials11 = require("@dxos/credentials");
 var import_invariant11 = require("@dxos/invariant");
 var import_keys9 = require("@dxos/keys");
@@ -203,7 +203,7 @@ var import_log11 = require("@dxos/log");
 var import_protocols10 = require("@dxos/protocols");
 var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async15 = require("@dxos/async");
-var import_context10 = require("@dxos/context");
+var import_context9 = require("@dxos/context");
 var import_credentials14 = require("@dxos/credentials");
 var import_debug6 = require("@dxos/debug");
 var import_echo_pipeline4 = require("@dxos/echo-pipeline");
@@ -219,7 +219,6 @@ var import_teleport_extension_object_sync = require("@dxos/teleport-extension-ob
 var import_tracing5 = require("@dxos/tracing");
 var import_util7 = require("@dxos/util");
 var import_automerge = require("@dxos/automerge/automerge");
-var import_debug7 = require("@dxos/debug");
 var import_protocols12 = require("@dxos/protocols");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_credentials15 = require("@dxos/credentials");
@@ -234,9 +233,9 @@ var import_tracing7 = require("@dxos/tracing");
 var import_util8 = require("@dxos/util");
 var import_async16 = require("@dxos/async");
 var import_client_protocol4 = require("@dxos/client-protocol");
-var import_context11 = require("@dxos/context");
+var import_context10 = require("@dxos/context");
 var import_echo_pipeline5 = require("@dxos/echo-pipeline");
-var import_echo_schema = require("@dxos/echo-schema");
+var import_echo_schema2 = require("@dxos/echo-schema");
 var import_indexing2 = require("@dxos/indexing");
 var import_invariant15 = require("@dxos/invariant");
 var import_keys11 = require("@dxos/keys");
@@ -2021,7 +2020,7 @@ var InvitationsHandler = class {
       });
       return extension;
     };
-    if (invitation.lifetime && invitation.created && invitation.lifetime !== 0) {
+    if (invitation.lifetime && invitation.created) {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
         import_log4.log.warn("invitation has already expired", void 0, {
           F: __dxlog_file7,
@@ -2086,7 +2085,7 @@ var InvitationsHandler = class {
     if (deviceProfile) {
       (0, import_invariant5.invariant)(invitation.kind === import_services3.Invitation.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file7,
-        L: 256,
+        L: 255,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -2101,7 +2100,7 @@ var InvitationsHandler = class {
     const setState = (newData) => {
       (0, import_invariant5.invariant)(newData.state !== void 0, void 0, {
         F: __dxlog_file7,
-        L: 267,
+        L: 266,
         S: this,
         A: [
           "newData.state !== undefined",
@@ -2121,7 +2120,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             F: __dxlog_file7,
-            L: 275,
+            L: 274,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2131,7 +2130,7 @@ var InvitationsHandler = class {
         } else {
           import_log4.log.warn("auth failed", err, {
             F: __dxlog_file7,
-            L: 278,
+            L: 277,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2145,7 +2144,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 286,
+        L: 285,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2160,7 +2159,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               F: __dxlog_file7,
-              L: 296,
+              L: 295,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2175,7 +2174,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 305,
+                L: 304,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2187,7 +2186,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 313,
+                L: 312,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2198,7 +2197,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 317,
+                L: 316,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2208,7 +2207,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file7,
-                L: 321,
+                L: 320,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2229,7 +2228,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 337,
+                L: 336,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2241,7 +2240,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 348,
+                L: 347,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2254,7 +2253,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 350,
+                L: 349,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2264,7 +2263,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 353,
+                  L: 352,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2274,7 +2273,7 @@ var InvitationsHandler = class {
               } else {
                 (0, import_log4.log)("auth failed", err, {
                   F: __dxlog_file7,
-                  L: 356,
+                  L: 355,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2285,7 +2284,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 359,
+                L: 358,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2303,7 +2302,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 370,
+              L: 369,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2313,7 +2312,7 @@ var InvitationsHandler = class {
           } else {
             (0, import_log4.log)("auth failed", err, {
               F: __dxlog_file7,
-              L: 373,
+              L: 372,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2330,7 +2329,7 @@ var InvitationsHandler = class {
       } else {
         (0, import_invariant5.invariant)(invitation.swarmKey, void 0, {
           F: __dxlog_file7,
-          L: 387,
+          L: 386,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -2372,7 +2371,7 @@ var InvitationsHandler = class {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       (0, import_log4.log)("guest waiting for authentication code...", void 0, {
         F: __dxlog_file7,
-        L: 427,
+        L: 426,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2382,7 +2381,7 @@ var InvitationsHandler = class {
       const authCode = await authenticated.wait(options);
       (0, import_log4.log)("sending authentication request", void 0, {
         F: __dxlog_file7,
-        L: 431,
+        L: 430,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2403,7 +2402,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file7,
-            L: 442,
+            L: 441,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2421,7 +2420,7 @@ var InvitationsHandler = class {
     }
     (0, import_log4.log)("sending authentication request", void 0, {
       F: __dxlog_file7,
-      L: 461,
+      L: 460,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2444,194 +2443,35 @@ var createAdmissionKeypair = () => {
     privateKey: keypair.secretKey
   };
 };
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-service.ts";
 var InvitationsServiceImpl = class {
-  constructor(_invitationsHandler, _getHandler, _metadataStore) {
-    this._invitationsHandler = _invitationsHandler;
-    this._getHandler = _getHandler;
-    this._metadataStore = _metadataStore;
-    this._createInvitations = /* @__PURE__ */ new Map();
-    this._acceptInvitations = /* @__PURE__ */ new Map();
-    this._invitationCreated = new import_async9.Event();
-    this._invitationAccepted = new import_async9.Event();
-    this._removedCreated = new import_async9.Event();
-    this._removedAccepted = new import_async9.Event();
-    this._saved = new import_async9.Event();
-    this._persistentInvitationsLoadedEvent = new import_async9.Event();
-    this._persistentInvitationsLoaded = false;
+  constructor(_invitationsManager) {
+    this._invitationsManager = _invitationsManager;
   }
   // TODO(burdon): Guest/host label.
   getLoggingContext() {
     return {};
   }
   createInvitation(options) {
-    let invitation;
-    const savePersistentInvitationCtx = new import_context6.Context();
-    const existingInvitation = this._createInvitations.get(options.invitationId);
-    if (existingInvitation) {
-      invitation = existingInvitation;
-    } else {
-      const handler = this._getHandler(options);
-      invitation = this._invitationsHandler.createInvitation(handler, options);
-      this._createInvitations.set(invitation.get().invitationId, invitation);
-      this._invitationCreated.emit(invitation.get());
-    }
+    const invitation = this._invitationsManager.createInvitation(options);
     return new import_codec_protobuf8.Stream(({ next, close }) => {
-      if (invitation.get().persistent) {
-        (0, import_async9.scheduleTask)(savePersistentInvitationCtx, async () => {
-          try {
-            await this._metadataStore.addInvitation(invitation.get());
-            this._saved.emit(invitation.get());
-          } catch (err) {
-            close(err);
-          }
-        });
-      }
-      invitation.subscribe((invitation2) => {
-        next(invitation2);
-      }, async (err) => {
-        await savePersistentInvitationCtx.dispose();
-        close(err);
-      }, async () => {
-        close();
-        if (invitation.get().persistent) {
-          await savePersistentInvitationCtx.dispose();
-          await this._metadataStore.removeInvitation(invitation.get().invitationId);
-        }
-        this._createInvitations.delete(invitation.get().invitationId);
-        if (!invitation.get().multiUse) {
-          this._removedCreated.emit(invitation.get());
-        }
-      });
+      invitation.subscribe(next, close, close);
     });
   }
-  async loadPersistentInvitations() {
-    const persistentInvitations = this._metadataStore.getInvitations();
-    const freshInvitations = persistentInvitations.filter(async (invitation) => !(0, import_echo_pipeline.hasInvitationExpired)(invitation));
-    const cInvitations = freshInvitations.map((persistentInvitation) => {
-      (0, import_invariant7.invariant)(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
-        F: __dxlog_file8,
-        L: 109,
-        S: this,
-        A: [
-          "!this._createInvitations.get(persistentInvitation.invitationId)",
-          "'invitation already exists'"
-        ]
-      });
-      const handler = this._getHandler(persistentInvitation);
-      const invitation = this._invitationsHandler.createInvitation(handler, persistentInvitation);
-      this._createInvitations.set(invitation.get().invitationId, invitation);
-      this._invitationCreated.emit(invitation.get());
-      return persistentInvitation;
-    });
-    this._persistentInvitationsLoadedEvent.emit();
-    this._persistentInvitationsLoaded = true;
-    return {
-      invitations: cInvitations
-    };
-  }
-  acceptInvitation({ invitation: options, deviceProfile }) {
-    let invitation;
-    if (deviceProfile) {
-      (0, import_invariant7.invariant)(options.kind === import_services5.Invitation.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
-        F: __dxlog_file8,
-        L: 127,
-        S: this,
-        A: [
-          "options.kind === Invitation.Kind.DEVICE",
-          "'deviceProfile provided for non-device invitation'"
-        ]
-      });
-    }
-    const existingInvitation = this._acceptInvitations.get(options.invitationId);
-    if (existingInvitation) {
-      invitation = existingInvitation;
-    } else {
-      const handler = this._getHandler(options);
-      invitation = this._invitationsHandler.acceptInvitation(handler, options, deviceProfile);
-      this._acceptInvitations.set(invitation.get().invitationId, invitation);
-      this._invitationAccepted.emit(invitation.get());
-    }
+  acceptInvitation(request) {
+    const invitation = this._invitationsManager.acceptInvitation(request);
     return new import_codec_protobuf8.Stream(({ next, close }) => {
-      invitation.subscribe((invitation2) => {
-        next(invitation2);
-      }, (err) => {
-        close(err);
-      }, () => {
-        close();
-        this._acceptInvitations.delete(invitation.get().invitationId);
-        if (!invitation.get().multiUse) {
-          this._removedAccepted.emit(invitation.get());
-        }
-      });
+      invitation.subscribe(next, close, close);
     });
   }
-  async authenticate({ invitationId, authCode }) {
-    (0, import_log6.log)("authenticating...", void 0, {
-      F: __dxlog_file8,
-      L: 160,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    (0, import_invariant7.invariant)(invitationId, void 0, {
-      F: __dxlog_file8,
-      L: 161,
-      S: this,
-      A: [
-        "invitationId",
-        ""
-      ]
-    });
-    const observable = this._acceptInvitations.get(invitationId);
-    if (!observable) {
-      import_log6.log.warn("invalid invitation", {
-        invitationId
-      }, {
-        F: __dxlog_file8,
-        L: 164,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    } else {
-      await observable.authenticate(authCode);
-    }
+  async authenticate(request) {
+    return this._invitationsManager.authenticate(request);
   }
-  async cancelInvitation({ invitationId }) {
-    (0, import_log6.log)("cancelInvitation...", {
-      invitationId
-    }, {
-      F: __dxlog_file8,
-      L: 171,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    (0, import_invariant7.invariant)(invitationId, void 0, {
-      F: __dxlog_file8,
-      L: 172,
-      S: this,
-      A: [
-        "invitationId",
-        ""
-      ]
-    });
-    const created = this._createInvitations.get(invitationId);
-    const accepted = this._acceptInvitations.get(invitationId);
-    if (created) {
-      await created.cancel();
-      this._createInvitations.delete(invitationId);
-      this._removedCreated.emit(created.get());
-      if (created.get().persistent) {
-        await this._metadataStore.removeInvitation(created.get().invitationId);
-      }
-    } else if (accepted) {
-      await accepted.cancel();
-      this._acceptInvitations.delete(invitationId);
-      this._removedAccepted.emit(accepted.get());
-    }
+  async cancelInvitation(request) {
+    return this._invitationsManager.cancelInvitation(request);
   }
   queryInvitations() {
     return new import_codec_protobuf8.Stream(({ next, ctx }) => {
-      this._invitationCreated.on(ctx, (invitation) => {
+      this._invitationsManager.invitationCreated.on(ctx, (invitation) => {
         next({
           action: import_services5.QueryInvitationsResponse.Action.ADDED,
           type: import_services5.QueryInvitationsResponse.Type.CREATED,
@@ -2640,7 +2480,7 @@ var InvitationsServiceImpl = class {
           ]
         });
       });
-      this._invitationAccepted.on(ctx, (invitation) => {
+      this._invitationsManager.invitationAccepted.on(ctx, (invitation) => {
         next({
           action: import_services5.QueryInvitationsResponse.Action.ADDED,
           type: import_services5.QueryInvitationsResponse.Type.ACCEPTED,
@@ -2649,7 +2489,7 @@ var InvitationsServiceImpl = class {
           ]
         });
       });
-      this._removedCreated.on(ctx, (invitation) => {
+      this._invitationsManager.removedCreated.on(ctx, (invitation) => {
         next({
           action: import_services5.QueryInvitationsResponse.Action.REMOVED,
           type: import_services5.QueryInvitationsResponse.Type.CREATED,
@@ -2658,7 +2498,7 @@ var InvitationsServiceImpl = class {
           ]
         });
       });
-      this._removedAccepted.on(ctx, (invitation) => {
+      this._invitationsManager.removedAccepted.on(ctx, (invitation) => {
         next({
           action: import_services5.QueryInvitationsResponse.Action.REMOVED,
           type: import_services5.QueryInvitationsResponse.Type.ACCEPTED,
@@ -2667,7 +2507,7 @@ var InvitationsServiceImpl = class {
           ]
         });
       });
-      this._saved.on(ctx, (invitation) => {
+      this._invitationsManager.saved.on(ctx, (invitation) => {
         next({
           action: import_services5.QueryInvitationsResponse.Action.SAVED,
           type: import_services5.QueryInvitationsResponse.Type.CREATED,
@@ -2679,32 +2519,25 @@ var InvitationsServiceImpl = class {
       next({
         action: import_services5.QueryInvitationsResponse.Action.ADDED,
         type: import_services5.QueryInvitationsResponse.Type.CREATED,
-        invitations: Array.from(this._createInvitations.values()).map((invitation) => invitation.get()),
+        invitations: this._invitationsManager.getCreatedInvitations(),
         existing: true
       });
       next({
         action: import_services5.QueryInvitationsResponse.Action.ADDED,
         type: import_services5.QueryInvitationsResponse.Type.ACCEPTED,
-        invitations: Array.from(this._acceptInvitations.values()).map((invitation) => invitation.get()),
+        invitations: this._invitationsManager.getAcceptedInvitations(),
         existing: true
       });
-      if (this._persistentInvitationsLoaded) {
+      this._invitationsManager.onPersistentInvitationsLoaded(ctx, () => {
         next({
           action: import_services5.QueryInvitationsResponse.Action.LOAD_COMPLETE,
           type: import_services5.QueryInvitationsResponse.Type.CREATED
         });
-      } else {
-        this._persistentInvitationsLoadedEvent.on(ctx, () => {
-          next({
-            action: import_services5.QueryInvitationsResponse.Action.LOAD_COMPLETE,
-            type: import_services5.QueryInvitationsResponse.Type.CREATED
-          });
-        });
-      }
+      });
     });
   }
 };
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
 var SpaceInvitationProtocol = class {
   constructor(_spaceManager, _signingContext, _keyring, _spaceKey) {
     this._spaceManager = _spaceManager;
@@ -2725,8 +2558,8 @@ var SpaceInvitationProtocol = class {
     };
   }
   async admit(request, guestProfile) {
-    (0, import_invariant8.invariant)(this._spaceKey, void 0, {
-      F: __dxlog_file9,
+    (0, import_invariant7.invariant)(this._spaceKey, void 0, {
+      F: __dxlog_file8,
       L: 47,
       S: this,
       A: [
@@ -2735,8 +2568,8 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const space = await this._spaceManager.spaces.get(this._spaceKey);
-    (0, import_invariant8.invariant)(space, void 0, {
-      F: __dxlog_file9,
+    (0, import_invariant7.invariant)(space, void 0, {
+      F: __dxlog_file8,
       L: 49,
       S: this,
       A: [
@@ -2744,8 +2577,8 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    (0, import_invariant8.invariant)(request.space, void 0, {
-      F: __dxlog_file9,
+    (0, import_invariant7.invariant)(request.space, void 0, {
+      F: __dxlog_file8,
       L: 51,
       S: this,
       A: [
@@ -2754,18 +2587,18 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const { identityKey, deviceKey } = request.space;
-    (0, import_log7.log)("writing guest credentials", {
+    (0, import_log6.log)("writing guest credentials", {
       host: this._signingContext.deviceKey,
       guest: deviceKey
     }, {
-      F: __dxlog_file9,
+      F: __dxlog_file8,
       L: 54,
       S: this,
       C: (f, a) => f(...a)
     });
     const credentials = await (0, import_credentials8.createAdmissionCredentials)(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, guestProfile);
-    (0, import_invariant8.invariant)(credentials[0].credential, void 0, {
-      F: __dxlog_file9,
+    (0, import_invariant7.invariant)(credentials[0].credential, void 0, {
+      F: __dxlog_file8,
       L: 65,
       S: this,
       A: [
@@ -2774,8 +2607,8 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const spaceMemberCredential = credentials[0].credential.credential;
-    (0, import_invariant8.invariant)((0, import_credentials8.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file9,
+    (0, import_invariant7.invariant)((0, import_credentials8.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file8,
       L: 67,
       S: this,
       A: [
@@ -2814,8 +2647,8 @@ var SpaceInvitationProtocol = class {
     };
   }
   async accept(response) {
-    (0, import_invariant8.invariant)(response.space, void 0, {
-      F: __dxlog_file9,
+    (0, import_invariant7.invariant)(response.space, void 0, {
+      F: __dxlog_file8,
       L: 107,
       S: this,
       A: [
@@ -2825,8 +2658,8 @@ var SpaceInvitationProtocol = class {
     });
     const { credential, controlTimeframe, dataTimeframe } = response.space;
     const assertion = (0, import_credentials8.getCredentialAssertion)(credential);
-    (0, import_invariant8.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
-      F: __dxlog_file9,
+    (0, import_invariant7.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
+      F: __dxlog_file8,
       L: 110,
       S: this,
       A: [
@@ -2834,8 +2667,8 @@ var SpaceInvitationProtocol = class {
         "'Invalid credential'"
       ]
     });
-    (0, import_invariant8.invariant)(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
-      F: __dxlog_file9,
+    (0, import_invariant7.invariant)(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
+      F: __dxlog_file8,
       L: 111,
       S: this,
       A: [
@@ -2858,6 +2691,221 @@ var SpaceInvitationProtocol = class {
     };
   }
 };
+var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
+var InvitationsManager = class {
+  constructor(_invitationsHandler, _getHandler, _metadataStore) {
+    this._invitationsHandler = _invitationsHandler;
+    this._getHandler = _getHandler;
+    this._metadataStore = _metadataStore;
+    this._createInvitations = /* @__PURE__ */ new Map();
+    this._acceptInvitations = /* @__PURE__ */ new Map();
+    this.invitationCreated = new import_async9.Event();
+    this.invitationAccepted = new import_async9.Event();
+    this.removedCreated = new import_async9.Event();
+    this.removedAccepted = new import_async9.Event();
+    this.saved = new import_async9.Event();
+    this._persistentInvitationsLoadedEvent = new import_async9.Event();
+    this._persistentInvitationsLoaded = false;
+  }
+  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) => !(0, import_echo_pipeline.hasInvitationExpired)(invitation));
+      const cInvitations = freshInvitations.map((persistentInvitation) => {
+        (0, import_invariant8.invariant)(!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) {
+      import_log7.log.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 }) {
+    (0, import_log7.log)("authenticating...", void 0, {
+      F: __dxlog_file9,
+      L: 117,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    (0, import_invariant8.invariant)(invitationId, void 0, {
+      F: __dxlog_file9,
+      L: 118,
+      S: this,
+      A: [
+        "invitationId",
+        ""
+      ]
+    });
+    const observable = this._acceptInvitations.get(invitationId);
+    if (!observable) {
+      import_log7.log.warn("invalid invitation", {
+        invitationId
+      }, {
+        F: __dxlog_file9,
+        L: 121,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    } else {
+      await observable.authenticate(authCode);
+    }
+  }
+  async cancelInvitation({ invitationId }) {
+    (0, import_log7.log)("cancelInvitation...", {
+      invitationId
+    }, {
+      F: __dxlog_file9,
+      L: 128,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    (0, import_invariant8.invariant)(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) {
+          import_log7.log.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) {
+      import_log7.log.catch(err, void 0, {
+        F: __dxlog_file9,
+        L: 186,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  _onInvitationComplete(invitation, callback) {
+    invitation.subscribe(() => {
+    }, () => {
+    }, callback);
+  }
+};
 function _ts_decorate3(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -2974,7 +3022,7 @@ var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
 var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var NotarizationPlugin = class {
   constructor() {
-    this._ctx = new import_context8.Context();
+    this._ctx = new import_context7.Context();
     this._extensionOpened = new import_async12.Event();
     this._extensions = /* @__PURE__ */ new Set();
     this._processedCredentials = new import_util5.ComplexSet(import_keys8.PublicKey.hash);
@@ -3099,7 +3147,7 @@ var NotarizationPlugin = class {
     this._extensionOpened.on(ctx, () => notarizeTask.schedule());
     try {
       await Promise.race([
-        (0, import_context8.rejectOnDispose)(ctx),
+        (0, import_context7.rejectOnDispose)(ctx),
         allNotarized,
         errors.wait()
       ]);
@@ -3238,7 +3286,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 import_context7.Context();
+    this._ctx = new import_context6.Context();
     this._notarizationPlugin = new NotarizationPlugin();
     this._cache = void 0;
     this._automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
@@ -3311,7 +3359,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 import_context7.Context());
+    await this._inner.open(new import_context6.Context());
     this._state = import_services7.SpaceState.CONTROL_ONLY;
     (0, import_log8.log)("new state", {
       state: import_services7.SpaceState[this._state]
@@ -3340,7 +3388,7 @@ var DataSpace = class {
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
-    this._ctx = new import_context7.Context();
+    this._ctx = new import_context6.Context();
     await this.authVerifier.close();
     await this._inner.close();
     await this._inner.spaceState.removeCredentialProcessor(this._automergeSpaceState);
@@ -3364,7 +3412,7 @@ var DataSpace = class {
         this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
       } catch (err) {
-        if (err instanceof import_protocols7.CancelledError || err instanceof import_context7.ContextDisposedError) {
+        if (err instanceof import_protocols7.CancelledError || err instanceof import_context6.ContextDisposedError) {
           (0, import_log8.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file11,
             L: 245,
@@ -3411,7 +3459,7 @@ var DataSpace = class {
     await this._initializeAndReadControlPipeline();
     await (0, import_async10.sleep)(1);
     this._automergeSpaceState.startProcessingRootDocs();
-    await (0, import_context7.cancelWithContext)(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
+    await (0, import_context6.cancelWithContext)(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
     (0, import_log8.log)("data pipeline ready", void 0, {
       F: __dxlog_file11,
       L: 279,
@@ -3512,7 +3560,7 @@ var DataSpace = class {
     queueMicrotask(async () => {
       try {
         await (0, import_debug3.warnAfterTimeout)(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
-          await (0, import_context7.cancelWithContext)(this._ctx, handle.whenReady());
+          await (0, import_context6.cancelWithContext)(this._ctx, handle.whenReady());
         });
         if (this._ctx.disposed) {
           return;
@@ -3526,7 +3574,7 @@ var DataSpace = class {
           });
         }
       } catch (err) {
-        if (err instanceof import_context7.ContextDisposedError) {
+        if (err instanceof import_context6.ContextDisposedError) {
           return;
         }
         import_log8.log.warn("error loading automerge root doc", {
@@ -3586,7 +3634,7 @@ var DataSpace = class {
         {
           const currentRootUrl = this._automergeSpaceState.rootUrl;
           const rootHandle = this._automergeHost.repo.find(currentRootUrl);
-          await (0, import_context7.cancelWithContext)(this._ctx, (0, import_async10.asyncTimeout)(rootHandle.whenReady(), 1e4));
+          await (0, import_context6.cancelWithContext)(this._ctx, (0, import_async10.asyncTimeout)(rootHandle.whenReady(), 1e4));
           const newRoot = this._automergeHost.repo.create(rootHandle.docSync());
           (0, import_invariant9.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
             F: __dxlog_file11,
@@ -3615,9 +3663,9 @@ var DataSpace = class {
           });
           const currentRootUrl = this._automergeSpaceState.rootUrl;
           const rootHandle = this._automergeHost.repo.find(currentRootUrl);
-          await (0, import_context7.cancelWithContext)(this._ctx, (0, import_async10.asyncTimeout)(rootHandle.whenReady(), 1e4));
+          await (0, import_context6.cancelWithContext)(this._ctx, (0, import_async10.asyncTimeout)(rootHandle.whenReady(), 1e4));
           const objects = Object.entries(rootHandle.docSync().objects);
-          const properties = objects.find(([_, value]) => value.system.type?.itemId === import_echo_db.TYPE_PROPERTIES);
+          const properties = objects.find(([_, value]) => value.system.type?.itemId === import_echo_schema.TYPE_PROPERTIES);
           const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
           (0, import_invariant9.invariant)(properties, "Properties not found", {
             F: __dxlog_file11,
@@ -3843,7 +3891,7 @@ var DataSpaceManager = class {
     this._signingContext = _signingContext;
     this._feedStore = _feedStore;
     this._automergeHost = _automergeHost;
-    this._ctx = new import_context9.Context();
+    this._ctx = new import_context8.Context();
     this.updated = new import_async13.Event();
     this._spaces = new import_util6.ComplexMap(import_keys9.PublicKey.hash);
     this._isOpen = false;
@@ -4032,7 +4080,7 @@ var DataSpaceManager = class {
   * TODO(dmaretskyi): Consider removing.
   */
   async waitUntilSpaceReady(spaceKey) {
-    await (0, import_context9.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
+    await (0, import_context8.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
       return !!space && space.state === import_services8.SpaceState.READY;
     }));
@@ -4379,8 +4427,10 @@ var createSelectedDocumentsIterator = (automergeHost) => (
   async function* loadDocuments(ids) {
     for (const id of ids) {
       const { documentId, objectId } = import_protocols12.idCodec.decode(id);
-      const handle = automergeHost.repo.find(documentId);
-      await (0, import_debug7.warnAfterTimeout)(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 = (0, import_automerge.getHeads)(doc).join("");
       yield doc.objects?.[objectId] ? [
@@ -4405,7 +4455,9 @@ var createDocumentsIterator = (automergeHost) => (
       if (visited.has(handle.documentId)) {
         return;
       }
-      await (0, import_debug7.warnAfterTimeout)(5e3, "to long to load doc", () => handle.whenReady());
+      if (!handle.isReady()) {
+        await handle.whenReady();
+      }
       const doc = handle.docSync();
       const heads = (0, import_automerge.getHeads)(doc);
       if (doc.objects) {
@@ -4425,7 +4477,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;
           }
@@ -4455,7 +4507,7 @@ function _ts_decorate6(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
-var ServiceContext = class extends import_context10.Resource {
+var ServiceContext = class extends import_context9.Resource {
   constructor(storage, level, networkManager, signalManager, _runtimeParams) {
     super();
     this.storage = storage;
@@ -4508,13 +4560,14 @@ var ServiceContext = class extends import_context10.Resource {
       getAllDocuments: createDocumentsIterator(this.automergeHost)
     });
     this.invitations = new InvitationsHandler(this.networkManager);
+    this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
     this._handlerFactories.set(import_services10.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug6.failUndefined)(), this._acceptIdentity.bind(this)));
   }
   async _open(ctx) {
     await this._checkStorageVersion();
     (0, import_log12.log)("opening...", void 0, {
       F: __dxlog_file14,
-      L: 157,
+      L: 164,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4522,7 +4575,7 @@ var ServiceContext = class extends import_context10.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file14,
-      L: 158,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4535,17 +4588,26 @@ var ServiceContext = class extends import_context10.Resource {
     if (this.identityManager.identity) {
       await this._initialize(ctx);
     }
+    const loadedInvitations = await this.invitationsManager.loadPersistentInvitations();
+    (0, import_log12.log)("loaded persistent invitations", {
+      count: loadedInvitations.invitations?.length
+    }, {
+      F: __dxlog_file14,
+      L: 178,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     import_log12.log.trace("dxos.sdk.service-context.open", import_protocols11.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file14,
-      L: 169,
+      L: 180,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log12.log)("opened", void 0, {
       F: __dxlog_file14,
-      L: 170,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4553,7 +4615,7 @@ var ServiceContext = class extends import_context10.Resource {
   async _close() {
     (0, import_log12.log)("closing...", void 0, {
       F: __dxlog_file14,
-      L: 174,
+      L: 185,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4571,21 +4633,21 @@ var ServiceContext = class extends import_context10.Resource {
     await this.indexer.destroy();
     (0, import_log12.log)("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 import_context10.Context());
+    await this._initialize(new import_context9.Context());
     return identity;
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant13.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file14,
-      L: 198,
+      L: 209,
       S: this,
       A: [
         "factory",
@@ -4604,7 +4666,7 @@ var ServiceContext = class extends import_context10.Resource {
   }
   async _acceptIdentity(params) {
     const identity = await this.identityManager.acceptIdentity(params);
-    await this._initialize(new import_context10.Context());
+    await this._initialize(new import_context9.Context());
     return identity;
   }
   async _checkStorageVersion() {
@@ -4617,7 +4679,7 @@ var ServiceContext = class extends import_context10.Resource {
   async _initialize(ctx) {
     (0, import_log12.log)("initializing spaces...", void 0, {
       F: __dxlog_file14,
-      L: 229,
+      L: 240,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4640,7 +4702,7 @@ var ServiceContext = class extends import_context10.Resource {
     this._handlerFactories.set(import_services10.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant13.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file14,
-        L: 253,
+        L: 264,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4664,7 +4726,7 @@ var ServiceContext = class extends import_context10.Resource {
             details: assertion
           }, {
             F: __dxlog_file14,
-            L: 269,
+            L: 280,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4675,7 +4737,7 @@ var ServiceContext = class extends import_context10.Resource {
             details: assertion
           }, {
             F: __dxlog_file14,
-            L: 273,
+            L: 284,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4686,7 +4748,7 @@ var ServiceContext = class extends import_context10.Resource {
             details: assertion
           }, {
             F: __dxlog_file14,
-            L: 278,
+            L: 289,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4697,7 +4759,7 @@ var ServiceContext = class extends import_context10.Resource {
         } catch (err) {
           import_log12.log.catch(err, void 0, {
             F: __dxlog_file14,
-            L: 284,
+            L: 295,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4739,7 +4801,7 @@ var ServiceRegistry = class {
     delete this._handlers[name];
   }
 };
-var DXOS_VERSION = "0.4.10-main.fe71b4c";
+var DXOS_VERSION = "0.4.10-next.71cec10";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -5315,7 +5377,7 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open(new import_context11.Context());
+            void this.open(new import_context10.Context());
           }
         },
         onRelease: () => this.close()
@@ -5372,7 +5434,7 @@ var ClientServicesHost = class {
   initialize({ config, ...options }) {
     (0, import_invariant15.invariant)(!this._open, "service host is open", {
       F: __dxlog_file18,
-      L: 197,
+      L: 198,
       S: this,
       A: [
         "!this._open",
@@ -5381,14 +5443,14 @@ var ClientServicesHost = class {
     });
     (0, import_log13.log)("initializing...", void 0, {
       F: __dxlog_file18,
-      L: 198,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       (0, import_invariant15.invariant)(!this._config, "config already set", {
         F: __dxlog_file18,
-        L: 201,
+        L: 202,
         S: this,
         A: [
           "!this._config",
@@ -5403,7 +5465,7 @@ var ClientServicesHost = class {
     if (!options.signalManager) {
       import_log13.log.warn("running signaling without telemetry metadata.", void 0, {
         F: __dxlog_file18,
-        L: 209,
+        L: 210,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5414,7 +5476,7 @@ var ClientServicesHost = class {
     this._signalManager = signalManager;
     (0, import_invariant15.invariant)(!this._networkManager, "network manager already set", {
       F: __dxlog_file18,
-      L: 220,
+      L: 221,
       S: this,
       A: [
         "!this._networkManager",
@@ -5428,7 +5490,7 @@ var ClientServicesHost = class {
     });
     (0, import_log13.log)("initialized", void 0, {
       F: __dxlog_file18,
-      L: 227,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5442,13 +5504,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 238,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant15.invariant)(this._config, "config not set", {
       F: __dxlog_file18,
-      L: 240,
+      L: 241,
       S: this,
       A: [
         "this._config",
@@ -5457,7 +5519,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant15.invariant)(this._storage, "storage not set", {
       F: __dxlog_file18,
-      L: 241,
+      L: 242,
       S: this,
       A: [
         "this._storage",
@@ -5466,7 +5528,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant15.invariant)(this._signalManager, "signal manager not set", {
       F: __dxlog_file18,
-      L: 242,
+      L: 243,
       S: this,
       A: [
         "this._signalManager",
@@ -5475,7 +5537,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant15.invariant)(this._networkManager, "network manager not set", {
       F: __dxlog_file18,
-      L: 243,
+      L: 244,
       S: this,
       A: [
         "this._networkManager",
@@ -5487,7 +5549,7 @@ var ClientServicesHost = class {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file18,
-      L: 246,
+      L: 247,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5498,20 +5560,22 @@ var ClientServicesHost = class {
     await this._resourceLock?.acquire();
     await this._loggingService.open();
     this._serviceContext = new ServiceContext(this._storage, this._level, this._networkManager, this._signalManager, this._runtimeParams);
+    this._queryService = new import_indexing2.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 import_echo_pipeline5.DataServiceImpl(this._serviceContext.automergeHost),
-      IndexService: new import_indexing2.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,
@@ -5523,24 +5587,6 @@ var ClientServicesHost = class {
       })
     });
     await this._serviceContext.open(ctx);
-    (0, import_invariant15.invariant)(this.serviceRegistry.services.InvitationsService, void 0, {
-      F: __dxlog_file18,
-      L: 314,
-      S: this,
-      A: [
-        "this.serviceRegistry.services.InvitationsService",
-        ""
-      ]
-    });
-    const loadedInvitations = await this.serviceRegistry.services.InvitationsService.loadPersistentInvitations();
-    (0, import_log13.log)("loaded persistent invitations", {
-      count: loadedInvitations.invitations?.length
-    }, {
-      F: __dxlog_file18,
-      L: 317,
-      S: this,
-      C: (f, a) => f(...a)
-    });
     const devtoolsProxy = this._config?.get("runtime.client.devtoolsProxy");
     if (devtoolsProxy) {
       this._devtoolsProxy = new import_websocket_rpc.WebsocketRpcClient({
@@ -5560,7 +5606,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 335,
+      L: 330,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5568,7 +5614,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 336,
+      L: 331,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5582,7 +5628,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 347,
+      L: 342,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5592,6 +5638,7 @@ var ClientServicesHost = class {
       SystemService: this._systemService
     });
     await this._loggingService.close();
+    await this._queryService.close();
     await this._serviceContext.close();
     await this._level?.close();
     this._open = false;
@@ -5600,7 +5647,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 356,
+      L: 352,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5611,13 +5658,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 361,
+      L: 357,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log13.log)("resetting...", void 0, {
       F: __dxlog_file18,
-      L: 363,
+      L: 359,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5625,7 +5672,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     (0, import_log13.log)("reset", void 0, {
       F: __dxlog_file18,
-      L: 366,
+      L: 362,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5633,7 +5680,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 367,
+      L: 363,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5646,7 +5693,7 @@ var ClientServicesHost = class {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     (0, import_invariant15.invariant)(automergeIndex, void 0, {
       F: __dxlog_file18,
-      L: 379,
+      L: 375,
       S: this,
       A: [
         "automergeIndex",
@@ -5657,7 +5704,7 @@ var ClientServicesHost = class {
     await document.whenReady();
     const properties = {
       system: {
-        type: (0, import_echo_pipeline5.encodeReference)((0, import_echo_schema.getTypeReference)(import_client_protocol4.Properties))
+        type: (0, import_echo_pipeline5.encodeReference)((0, import_echo_schema2.getTypeReference)(import_client_protocol4.Properties))
       },
       data: {
         [import_client_protocol4.defaultKey]: identity.identityKey.toHex()
@@ -5741,6 +5788,7 @@ var findConfigs = () => {
   IdentityManager,
   IdentityServiceImpl,
   InvitationsHandler,
+  InvitationsManager,
   InvitationsServiceImpl,
   Lock,
   ServiceContext,
@@ -5765,4 +5813,4 @@ var findConfigs = () => {
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-DQMGKBOV.cjs.map
+//# sourceMappingURL=chunk-Y3ADPF24.cjs.map