@dxos/client-services 0.1.58-main.cbf3753 → 0.1.58-main.d483d07

package/dist/lib/node/index.cjs

@@ -416,7 +416,6 @@ var createAuthProvider = (signer) => async (nonce) => {
   return Credential.encode(credential);
 };
 var TrustedKeySetAuthVerifier = class {
-  // prettier-ignore
   constructor(_params) {
     this._params = _params;
     this._ctx = new import_context2.Context();
@@ -431,7 +430,7 @@ var TrustedKeySetAuthVerifier = class {
         credential
       }, {
         F: __dxlog_file,
-        L: 59,
+        L: 56,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -441,7 +440,7 @@ var TrustedKeySetAuthVerifier = class {
           result
         }, {
           F: __dxlog_file,
-          L: 63,
+          L: 60,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -453,7 +452,7 @@ var TrustedKeySetAuthVerifier = class {
           credential
         }, {
           F: __dxlog_file,
-          L: 68,
+          L: 65,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -464,7 +463,7 @@ var TrustedKeySetAuthVerifier = class {
           key: credential.issuer
         }, {
           F: __dxlog_file,
-          L: 73,
+          L: 70,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -480,7 +479,7 @@ var TrustedKeySetAuthVerifier = class {
             key: credential.issuer
           }, {
             F: __dxlog_file,
-            L: 84,
+            L: 81,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -490,7 +489,7 @@ var TrustedKeySetAuthVerifier = class {
             key: credential.issuer
           }, {
             F: __dxlog_file,
-            L: 87,
+            L: 84,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1220,7 +1219,6 @@ var import_async8 = require("@dxos/async");
 var import_client_protocol2 = require("@dxos/client-protocol");
 var import_context5 = require("@dxos/context");
 var import_credentials7 = require("@dxos/credentials");
-var import_errors2 = require("@dxos/errors");
 var import_invariant6 = require("@dxos/invariant");
 var import_keys6 = require("@dxos/keys");
 var import_log5 = require("@dxos/log");
@@ -1232,7 +1230,6 @@ var import_invitations2 = require("@dxos/protocols/proto/dxos/halo/invitations")
 // packages/sdk/client-services/src/packlets/invitations/invitation-extension.ts
 var import_async7 = require("@dxos/async");
 var import_context4 = require("@dxos/context");
-var import_errors = require("@dxos/errors");
 var import_invariant5 = require("@dxos/invariant");
 var import_keys5 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
@@ -1270,7 +1267,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         options: async (options) => {
           (0, import_invariant5.invariant)(!this._remoteOptions, "Remote options already set.", {
             F: __dxlog_file6,
-            L: 88,
+            L: 87,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -1287,7 +1284,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 97,
+            L: 96,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1297,7 +1294,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
               invitationId
             }, {
               F: __dxlog_file6,
-              L: 101,
+              L: 100,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1311,7 +1308,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             guestProfile: profile
           }, {
             F: __dxlog_file6,
-            L: 110,
+            L: 109,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1324,7 +1321,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 117,
+            L: 116,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1339,7 +1336,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 126,
+            L: 125,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1347,14 +1344,14 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             authCode: code
           }, {
             F: __dxlog_file6,
-            L: 127,
+            L: 126,
             S: this,
             C: (f, a) => f(...a)
           });
           let status = import_invitations.AuthenticationResponse.Status.OK;
           (0, import_invariant5.invariant)(this.invitation, "Invitation is not set.", {
             F: __dxlog_file6,
-            L: 130,
+            L: 129,
             S: this,
             A: [
               "this.invitation",
@@ -1365,7 +1362,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             case import_services2.Invitation.AuthMethod.NONE: {
               (0, import_log4.log)("authentication not required", void 0, {
                 F: __dxlog_file6,
-                L: 133,
+                L: 132,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1390,7 +1387,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
                 authMethod: this.invitation.authMethod
               }, {
                 F: __dxlog_file6,
-                L: 151,
+                L: 150,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1405,7 +1402,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             }
           }), {
             F: __dxlog_file6,
-            L: 157,
+            L: 156,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1419,14 +1416,14 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 163,
+            L: 162,
             S: this,
             C: (f, a) => f(...a)
           });
           try {
             (0, import_invariant5.invariant)(this.invitation, "Invitation is not set.", {
               F: __dxlog_file6,
-              L: 166,
+              L: 165,
               S: this,
               A: [
                 "this.invitation",
@@ -1441,7 +1438,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
               id: traceId
             }), {
               F: __dxlog_file6,
-              L: 174,
+              L: 173,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1464,7 +1461,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         timeout: OPTIONS_TIMEOUT
       }));
       if (this._remoteOptions?.role !== import_invitations.Options.Role.GUEST) {
-        throw new import_errors.InvalidInvitationExtensionRoleError(void 0, {
+        throw new import_protocols3.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations.Options.Role.GUEST,
           remoteOptions: this._remoteOptions
         });
@@ -1498,7 +1495,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
         options: async (options) => {
           (0, import_invariant5.invariant)(!this._remoteOptions, "Remote options already set.", {
             F: __dxlog_file6,
-            L: 241,
+            L: 240,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -1525,7 +1522,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     try {
       (0, import_log4.log)("begin options", void 0, {
         F: __dxlog_file6,
-        L: 262,
+        L: 261,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1537,12 +1534,12 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
       }));
       (0, import_log4.log)("end options", void 0, {
         F: __dxlog_file6,
-        L: 265,
+        L: 264,
         S: this,
         C: (f, a) => f(...a)
       });
       if (this._remoteOptions?.role !== import_invitations.Options.Role.HOST) {
-        throw new import_errors.InvalidInvitationExtensionRoleError(void 0, {
+        throw new import_protocols3.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations.Options.Role.HOST,
           remoteOptions: this._remoteOptions
         });
@@ -1551,7 +1548,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     } catch (err) {
       (0, import_log4.log)("openError", err, {
         F: __dxlog_file6,
-        L: 275,
+        L: 274,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1561,7 +1558,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
   async onClose() {
     (0, import_log4.log)("onClose", void 0, {
       F: __dxlog_file6,
-      L: 281,
+      L: 280,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1584,7 +1581,7 @@ var InvitationsHandler = class {
     const authCode = options?.authCode ?? (authMethod === import_services3.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials7.generatePasscode)(import_client_protocol2.AUTHENTICATION_CODE_LENGTH) : void 0);
     (0, import_invariant6.invariant)(protocol, void 0, {
       F: __dxlog_file7,
-      L: 76,
+      L: 75,
       S: this,
       A: [
         "protocol",
@@ -1613,7 +1610,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 98,
+        L: 97,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1638,7 +1635,7 @@ var InvitationsHandler = class {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             (0, import_invariant6.invariant)(deviceKey, void 0, {
               F: __dxlog_file7,
-              L: 119,
+              L: 118,
               S: this,
               A: [
                 "deviceKey",
@@ -1661,7 +1658,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 137,
+                L: 136,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1669,7 +1666,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 138,
+                L: 137,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1685,7 +1682,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 141,
+                L: 140,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1697,7 +1694,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 143,
+                L: 142,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1707,7 +1704,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 146,
+                  L: 145,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1718,7 +1715,7 @@ var InvitationsHandler = class {
               } else {
                 import_log5.log.error("failed", err, {
                   F: __dxlog_file7,
-                  L: 149,
+                  L: 148,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1729,7 +1726,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 152,
+                L: 151,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1742,7 +1739,7 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
-          if (err instanceof import_errors2.InvalidInvitationExtensionRoleError) {
+          if (err instanceof import_protocols4.InvalidInvitationExtensionRoleError) {
             return;
           }
           if (err instanceof import_async8.TimeoutError) {
@@ -1750,7 +1747,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 167,
+              L: 166,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1761,7 +1758,7 @@ var InvitationsHandler = class {
           } else {
             import_log5.log.error("failed", err, {
               F: __dxlog_file7,
-              L: 170,
+              L: 169,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1789,7 +1786,7 @@ var InvitationsHandler = class {
         state: import_services3.Invitation.State.CONNECTING
       });
     });
-    const observable = new import_client_protocol2.CancellableInvitationObservable({
+    const observable = new import_client_protocol2.CancellableInvitation({
       initialInvitation: invitation,
       subscriber: stream.observable,
       onCancel: async () => {
@@ -1806,7 +1803,7 @@ var InvitationsHandler = class {
     const { timeout = import_client_protocol2.INVITATION_TIMEOUT } = invitation;
     (0, import_invariant6.invariant)(protocol, void 0, {
       F: __dxlog_file7,
-      L: 211,
+      L: 210,
       S: this,
       A: [
         "protocol",
@@ -1820,7 +1817,7 @@ var InvitationsHandler = class {
     const setState = (newData) => {
       (0, import_invariant6.invariant)(newData.state !== void 0, void 0, {
         F: __dxlog_file7,
-        L: 222,
+        L: 221,
         S: this,
         A: [
           "newData.state !== undefined",
@@ -1840,7 +1837,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             F: __dxlog_file7,
-            L: 230,
+            L: 229,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1850,7 +1847,7 @@ var InvitationsHandler = class {
         } else {
           import_log5.log.warn("auth failed", err, {
             F: __dxlog_file7,
-            L: 233,
+            L: 232,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1864,7 +1861,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 241,
+        L: 240,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1879,7 +1876,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               F: __dxlog_file7,
-              L: 251,
+              L: 250,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1894,7 +1891,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 260,
+                L: 259,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1906,7 +1903,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 268,
+                L: 267,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1917,7 +1914,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 272,
+                L: 271,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1927,7 +1924,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file7,
-                L: 276,
+                L: 275,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1939,7 +1936,7 @@ var InvitationsHandler = class {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
                   (0, import_log5.log)("guest waiting for authentication code...", void 0, {
                     F: __dxlog_file7,
-                    L: 285,
+                    L: 284,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -1951,7 +1948,7 @@ var InvitationsHandler = class {
                   });
                   (0, import_log5.log)("sending authentication request", void 0, {
                     F: __dxlog_file7,
-                    L: 289,
+                    L: 288,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -1972,7 +1969,7 @@ var InvitationsHandler = class {
                         attempt
                       }, {
                         F: __dxlog_file7,
-                        L: 300,
+                        L: 299,
                         S: this,
                         C: (f, a) => f(...a)
                       });
@@ -1989,7 +1986,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 311,
+                L: 310,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2001,7 +1998,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 322,
+                L: 321,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2013,7 +2010,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 324,
+                L: 323,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2023,7 +2020,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 327,
+                  L: 326,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2033,7 +2030,7 @@ var InvitationsHandler = class {
               } else {
                 (0, import_log5.log)("auth failed", err, {
                   F: __dxlog_file7,
-                  L: 330,
+                  L: 329,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2044,7 +2041,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 333,
+                L: 332,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2054,7 +2051,7 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
-          if (err instanceof import_errors2.InvalidInvitationExtensionRoleError) {
+          if (err instanceof import_protocols4.InvalidInvitationExtensionRoleError) {
             return;
           }
           if (err instanceof import_async8.TimeoutError) {
@@ -2062,7 +2059,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 344,
+              L: 343,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2072,7 +2069,7 @@ var InvitationsHandler = class {
           } else {
             (0, import_log5.log)("auth failed", err, {
               F: __dxlog_file7,
-              L: 347,
+              L: 346,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2085,7 +2082,7 @@ var InvitationsHandler = class {
     (0, import_async8.scheduleTask)(ctx, async () => {
       (0, import_invariant6.invariant)(invitation.swarmKey, void 0, {
         F: __dxlog_file7,
-        L: 357,
+        L: 356,
         S: this,
         A: [
           "invitation.swarmKey",
@@ -2107,7 +2104,7 @@ var InvitationsHandler = class {
         state: import_services3.Invitation.State.CONNECTING
       });
     });
-    const observable = new import_client_protocol2.AuthenticatingInvitationObservable({
+    const observable = new import_client_protocol2.AuthenticatingInvitation({
       initialInvitation: invitation,
       subscriber: stream.observable,
       onCancel: async () => {
@@ -2531,9 +2528,6 @@ var import_log8 = require("@dxos/log");
 var import_protocols5 = require("@dxos/protocols");
 var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
 
-// packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.1.58-main.cbf3753";
-
 // packages/sdk/client-services/src/packlets/services/platform.ts
 var getPlatform = () => {
   if (process.browser) {
@@ -2562,6 +2556,9 @@ var getPlatform = () => {
   }
 };
 
+// packages/sdk/client-services/src/version.ts
+var DXOS_VERSION = "0.1.58-main.d483d07";
+
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
 var DEFAULT_TIMEOUT = 1e3;
@@ -2685,13 +2682,13 @@ var import_async14 = require("@dxos/async");
 var import_context9 = require("@dxos/context");
 var import_credentials14 = require("@dxos/credentials");
 var import_debug7 = require("@dxos/debug");
-var import_echo_pipeline3 = require("@dxos/echo-pipeline");
+var import_echo_pipeline2 = require("@dxos/echo-pipeline");
 var import_feed_store4 = require("@dxos/feed-store");
-var import_invariant12 = require("@dxos/invariant");
+var import_invariant13 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
 var import_keys10 = require("@dxos/keys");
 var import_log13 = require("@dxos/log");
-var import_protocols9 = require("@dxos/protocols");
+var import_protocols10 = require("@dxos/protocols");
 var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_tracing4 = require("@dxos/tracing");
@@ -2704,7 +2701,7 @@ var import_credentials13 = require("@dxos/credentials");
 var import_invariant11 = require("@dxos/invariant");
 var import_keys9 = require("@dxos/keys");
 var import_log11 = require("@dxos/log");
-var import_protocols7 = require("@dxos/protocols");
+var import_protocols8 = require("@dxos/protocols");
 var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
 var import_util5 = require("@dxos/util");
@@ -2715,9 +2712,9 @@ var import_client_protocol3 = require("@dxos/client-protocol");
 var import_context7 = require("@dxos/context");
 var import_debug4 = require("@dxos/debug");
 var import_echo_pipeline = require("@dxos/echo-pipeline");
-var import_errors3 = require("@dxos/errors");
 var import_keys8 = require("@dxos/keys");
 var import_log10 = require("@dxos/log");
+var import_protocols7 = require("@dxos/protocols");
 var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe2 = require("@dxos/timeframe");
@@ -3026,7 +3023,7 @@ var DataSpace = class DataSpace2 {
     this._signingContext = params.signingContext;
     this._callbacks = params.callbacks ?? {};
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new import_util4.ComplexSet(import_keys8.PublicKey.hash, Array.from(this._inner.spaceState.members.keys())),
+      trustedKeysProvider: () => new import_util4.ComplexSet(import_keys8.PublicKey.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
       update: this._inner.stateUpdate,
       authTimeout: import_client_protocol3.AUTH_TIMEOUT
     });
@@ -3036,7 +3033,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 112,
+      L: 118,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3070,6 +3067,7 @@ var DataSpace = class DataSpace2 {
     await this._open();
   }
   async _open() {
+    await this._gossip.open();
     await this._notarizationPlugin.open();
     await this._inner.spaceState.addCredentialProcessor(this._notarizationPlugin);
     await this._inner.open(new import_context7.Context());
@@ -3078,7 +3076,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 158,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3096,7 +3094,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 172,
+      L: 179,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3107,6 +3105,7 @@ var DataSpace = class DataSpace2 {
     await this._inner.spaceState.removeCredentialProcessor(this._notarizationPlugin);
     await this._notarizationPlugin.close();
     await this._presence.destroy();
+    await this._gossip.close();
   }
   async postMessage(channel, message) {
     return this._gossip.postMessage(channel, message);
@@ -3123,10 +3122,10 @@ var DataSpace = class DataSpace2 {
         this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
       } catch (err) {
-        if (err instanceof import_errors3.CancelledError) {
+        if (err instanceof import_protocols7.CancelledError) {
           (0, import_log10.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 203,
+            L: 211,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3134,7 +3133,7 @@ var DataSpace = class DataSpace2 {
         }
         import_log10.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 207,
+          L: 215,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3143,7 +3142,7 @@ var DataSpace = class DataSpace2 {
           state: import_services7.SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 209,
+          L: 217,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3156,14 +3155,14 @@ var DataSpace = class DataSpace2 {
   }
   async initializeDataPipeline() {
     if (this._state !== import_services7.SpaceState.CONTROL_ONLY) {
-      throw new import_errors3.SystemError("Invalid operation");
+      throw new import_protocols7.SystemError("Invalid operation");
     }
     this._state = import_services7.SpaceState.INITIALIZING;
     (0, import_log10.log)("new state", {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 225,
+      L: 233,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3174,7 +3173,7 @@ var DataSpace = class DataSpace2 {
     await (0, import_context7.cancelWithContext)(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
     (0, import_log10.log)("waiting for data pipeline to reach target timeframe", void 0, {
       F: __dxlog_file12,
-      L: 239,
+      L: 247,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3185,7 +3184,7 @@ var DataSpace = class DataSpace2 {
     this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     (0, import_log10.log)("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 248,
+      L: 256,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3195,7 +3194,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 252,
+      L: 260,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3211,7 +3210,7 @@ var DataSpace = class DataSpace2 {
     await this._createWritableFeeds();
     (0, import_log10.log)("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 268,
+      L: 276,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3316,7 +3315,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 384,
+      L: 392,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3458,7 +3457,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols7.trace.begin({
+    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols8.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
@@ -3504,7 +3503,7 @@ var DataSpaceManager = class DataSpaceManager2 {
         space.initializeDataPipelineAsync();
       }
     }
-    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols7.trace.end({
+    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols8.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
@@ -3758,10 +3757,9 @@ DataSpaceManager = _ts_decorate4([
 var import_async13 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_debug6 = require("@dxos/debug");
-var import_echo_pipeline2 = require("@dxos/echo-pipeline");
-var import_errors4 = require("@dxos/errors");
+var import_invariant12 = require("@dxos/invariant");
 var import_log12 = require("@dxos/log");
-var import_protocols8 = require("@dxos/protocols");
+var import_protocols9 = require("@dxos/protocols");
 var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
@@ -3781,7 +3779,7 @@ var SpacesServiceImpl = class {
   }
   async updateSpace({ spaceKey, state }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
     if (state) {
       switch (state) {
         case import_services9.SpaceState.ACTIVE:
@@ -3791,7 +3789,7 @@ var SpacesServiceImpl = class {
           await space.deactivate();
           break;
         default:
-          throw new import_errors4.ApiError("Invalid space state");
+          throw new import_protocols9.ApiError("Invalid space state");
       }
     }
   }
@@ -3824,7 +3822,7 @@ var SpacesServiceImpl = class {
             subscriptions.add(space.stateUpdate.on(ctx, () => scheduler.forceTrigger()));
             subscriptions.add(space.presence.updated.on(ctx, () => scheduler.trigger()));
             subscriptions.add(space.dataPipeline.onNewEpoch.on(ctx, () => scheduler.trigger()));
-            space.inner.controlPipeline.state.timeframeUpdate.on(ctx, () => scheduler.trigger());
+            subscriptions.add(space.inner.controlPipeline.state.timeframeUpdate.on(ctx, () => scheduler.trigger()));
             if (space.dataPipeline.pipelineState) {
               subscriptions.add(space.dataPipeline.pipelineState.timeframeUpdate.on(ctx, () => scheduler.trigger()));
             }
@@ -3846,14 +3844,14 @@ var SpacesServiceImpl = class {
   }
   async postMessage({ spaceKey, channel, message }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
     await space.postMessage(getChannelId(channel), message);
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
       (0, import_async13.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
           next(message);
         });
@@ -3861,38 +3859,83 @@ var SpacesServiceImpl = class {
       });
     });
   }
-  queryCredentials({ spaceKey }) {
-    return new import_codec_protobuf11.Stream(({ ctx, next }) => {
-      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+  queryCredentials({ spaceKey, noTail }) {
+    return new import_codec_protobuf11.Stream(({ ctx, next, close }) => {
+      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
       const processor = {
         processCredential: async (credential) => {
           next(credential);
         }
       };
       ctx.onDispose(() => space.spaceState.removeCredentialProcessor(processor));
-      (0, import_async13.scheduleTask)(ctx, () => space.spaceState.addCredentialProcessor(processor));
+      (0, import_async13.scheduleTask)(ctx, async () => {
+        await space.spaceState.addCredentialProcessor(processor);
+        if (noTail) {
+          close();
+        }
+      });
     });
   }
   async writeCredentials({ spaceKey, credentials }) {
-    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
     for (const credential of credentials ?? []) {
-      await space.controlPipeline.writer.write({
-        credential: {
-          credential
-        }
-      });
+      if (credential.proof) {
+        await space.controlPipeline.writer.write({
+          credential: {
+            credential
+          }
+        });
+      } else {
+        (0, import_invariant12.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
+          F: __dxlog_file14,
+          L: 168,
+          S: this,
+          A: [
+            "!credential.id",
+            "'Id on unsigned credentials is not allowed'"
+          ]
+        });
+        (0, import_invariant12.invariant)(this._identityManager.identity, "Identity is not available", {
+          F: __dxlog_file14,
+          L: 169,
+          S: this,
+          A: [
+            "this._identityManager.identity",
+            "'Identity is not available'"
+          ]
+        });
+        const signer = this._identityManager.identity.getIdentityCredentialSigner();
+        (0, import_invariant12.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
+          F: __dxlog_file14,
+          L: 171,
+          S: this,
+          A: [
+            "credential.issuer.equals(signer.getIssuer())",
+            ""
+          ]
+        });
+        const signedCredential = await signer.createCredential({
+          subject: credential.subject.id,
+          assertion: credential.subject.assertion
+        });
+        await space.controlPipeline.writer.write({
+          credential: {
+            credential: signedCredential
+          }
+        });
+      }
     }
   }
   async createEpoch({ spaceKey }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
     await space.createEpoch();
   }
   _serializeSpace(space) {
     return {
       spaceKey: space.key,
       state: space.state,
-      error: space.error ? (0, import_protocols8.encodeError)(space.error) : void 0,
+      error: space.error ? (0, import_protocols9.encodeError)(space.error) : void 0,
       pipeline: {
         currentEpoch: space.dataPipeline.currentEpoch,
         appliedEpoch: space.dataPipeline.appliedEpoch,
@@ -3919,7 +3962,7 @@ var SpacesServiceImpl = class {
               displayName: member.assertion.profile?.displayName
             }
           },
-          presence: isMe || peers.length > 0 ? import_services9.SpaceMember.PresenceState.ONLINE : import_services9.SpaceMember.PresenceState.OFFLINE,
+          presence: member.removed ? import_services9.SpaceMember.PresenceState.REMOVED : isMe || peers.length > 0 ? import_services9.SpaceMember.PresenceState.ONLINE : import_services9.SpaceMember.PresenceState.OFFLINE,
           peerStates: peers
         };
       }),
@@ -3944,18 +3987,17 @@ function _ts_decorate5(decorators, target, key, desc) {
 }
 var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class ServiceContext2 {
-  // prettier-ignore
   constructor(storage, networkManager, signalManager, modelFactory) {
     this.storage = storage;
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this.modelFactory = modelFactory;
     this.initialized = new import_async14.Trigger();
-    this.dataServiceSubscriptions = new import_echo_pipeline3.DataServiceSubscriptions();
+    this.dataServiceSubscriptions = new import_echo_pipeline2.DataServiceSubscriptions();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = import_keys10.PublicKey.random().toHex();
-    this.metadataStore = new import_echo_pipeline3.MetadataStore(storage.createDirectory("metadata"));
-    this.snapshotStore = new import_echo_pipeline3.SnapshotStore(storage.createDirectory("snapshots"));
+    this.metadataStore = new import_echo_pipeline2.MetadataStore(storage.createDirectory("metadata"));
+    this.snapshotStore = new import_echo_pipeline2.SnapshotStore(storage.createDirectory("snapshots"));
     this.blobStore = new import_teleport_extension_object_sync.BlobStore(storage.createDirectory("blobs"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
     this.feedStore = new import_feed_store4.FeedStore({
@@ -3963,12 +4005,12 @@ var ServiceContext = class ServiceContext2 {
         root: storage.createDirectory("feeds"),
         signer: this.keyring,
         hypercore: {
-          valueEncoding: import_echo_pipeline3.valueEncoding,
+          valueEncoding: import_echo_pipeline2.valueEncoding,
           stats: true
         }
       })
     });
-    this.spaceManager = new import_echo_pipeline3.SpaceManager({
+    this.spaceManager = new import_echo_pipeline2.SpaceManager({
       feedStore: this.feedStore,
       networkManager: this.networkManager,
       blobStore: this.blobStore,
@@ -3984,15 +4026,15 @@ var ServiceContext = class ServiceContext2 {
     await this._checkStorageVersion();
     (0, import_log13.log)("opening...", void 0, {
       F: __dxlog_file15,
-      L: 135,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols9.trace.begin({
+    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols10.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 136,
+      L: 130,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4004,17 +4046,17 @@ var ServiceContext = class ServiceContext2 {
     if (this.identityManager.identity) {
       await this._initialize(ctx);
     }
-    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols9.trace.end({
+    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols10.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 146,
+      L: 140,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log13.log)("opened", void 0, {
       F: __dxlog_file15,
-      L: 147,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4022,7 +4064,7 @@ var ServiceContext = class ServiceContext2 {
   async close() {
     (0, import_log13.log)("closing...", void 0, {
       F: __dxlog_file15,
-      L: 151,
+      L: 145,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4039,7 +4081,7 @@ var ServiceContext = class ServiceContext2 {
     await this.metadataStore.close();
     (0, import_log13.log)("closed", void 0, {
       F: __dxlog_file15,
-      L: 163,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4051,9 +4093,9 @@ var ServiceContext = class ServiceContext2 {
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    (0, import_invariant12.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
+    (0, import_invariant13.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 174,
+      L: 168,
       S: this,
       A: [
         "factory",
@@ -4069,15 +4111,15 @@ var ServiceContext = class ServiceContext2 {
   }
   async _checkStorageVersion() {
     await this.metadataStore.load();
-    if (this.metadataStore.version !== import_protocols9.STORAGE_VERSION) {
-      throw new Error(`Invalid storage version: current=${this.metadataStore.version}, expected=${import_protocols9.STORAGE_VERSION}`);
+    if (this.metadataStore.version !== import_protocols10.STORAGE_VERSION) {
+      throw new import_protocols10.InvalidStorageVersionError(import_protocols10.STORAGE_VERSION, this.metadataStore.version);
     }
   }
   // Called when identity is created.
   async _initialize(ctx) {
     (0, import_log13.log)("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 195,
+      L: 189,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4098,9 +4140,9 @@ var ServiceContext = class ServiceContext2 {
     this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore);
     await this.dataSpaceManager.open();
     this._handlerFactories.set(import_services10.Invitation.Kind.SPACE, (invitation) => {
-      (0, import_invariant12.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+      (0, import_invariant13.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 218,
+        L: 212,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4124,7 +4166,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 234,
+            L: 228,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4135,7 +4177,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 238,
+            L: 232,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4146,7 +4188,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 243,
+            L: 237,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4157,7 +4199,7 @@ var ServiceContext = class ServiceContext2 {
         } catch (err) {
           import_log13.log.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 249,
+            L: 243,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4183,19 +4225,44 @@ var import_async17 = require("@dxos/async");
 var import_client_protocol5 = require("@dxos/client-protocol");
 var import_context10 = require("@dxos/context");
 var import_document_model2 = require("@dxos/document-model");
-var import_echo_pipeline4 = require("@dxos/echo-pipeline");
-var import_invariant14 = require("@dxos/invariant");
+var import_echo_pipeline3 = require("@dxos/echo-pipeline");
+var import_echo_schema = require("@dxos/echo-schema");
+var import_invariant15 = require("@dxos/invariant");
 var import_keys11 = require("@dxos/keys");
 var import_log16 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_model_factory = require("@dxos/model-factory");
 var import_network_manager2 = require("@dxos/network-manager");
-var import_protocols10 = require("@dxos/protocols");
+var import_protocols12 = require("@dxos/protocols");
 var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
 var import_text_model = require("@dxos/text-model");
 var import_tracing5 = require("@dxos/tracing");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
 
+// packages/sdk/client-services/src/packlets/services/service-registry.ts
+var ServiceRegistry = class {
+  // prettier-ignore
+  constructor(_serviceBundle, _handlers = {}) {
+    this._serviceBundle = _serviceBundle;
+    this._handlers = _handlers;
+  }
+  get descriptors() {
+    return this._serviceBundle;
+  }
+  get services() {
+    return this._handlers;
+  }
+  setServices(services) {
+    this._handlers = services;
+  }
+  addService(name, service) {
+    this._handlers[name] = service;
+  }
+  removeService(name) {
+    delete this._handlers[name];
+  }
+};
+
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
 var import_async15 = require("@dxos/async");
 var import_codec_protobuf12 = require("@dxos/codec-protobuf");
@@ -4240,7 +4307,7 @@ var DevicesServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/locks/node.ts
-var import_invariant13 = require("@dxos/invariant");
+var import_invariant14 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
 var import_log14 = require("@dxos/log");
 function _ts_decorate6(decorators, target, key, desc) {
@@ -4281,7 +4348,7 @@ var Lock = class {
   }
   async release() {
     await this._onRelease?.();
-    (0, import_invariant13.invariant)(this._fileHandle, "Lock is not acquired", {
+    (0, import_invariant14.invariant)(this._fileHandle, "Lock is not acquired", {
       F: __dxlog_file16,
       L: 42,
       S: this,
@@ -4449,29 +4516,29 @@ var NetworkServiceImpl = class {
 
 // packages/sdk/client-services/src/packlets/storage/storage.ts
 var import_client_protocol4 = require("@dxos/client-protocol");
-var import_errors5 = require("@dxos/errors");
+var import_protocols11 = require("@dxos/protocols");
 var import_config = require("@dxos/protocols/proto/dxos/config");
 var import_random_access_storage = require("@dxos/random-access-storage");
 var import_util8 = require("@dxos/util");
 var StorageDriver = import_config.Runtime.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
-  const { path = (0, import_util8.isNode)() ? import_client_protocol4.DX_DATA : "dxos/storage", storageType, keyStorage, persistent = false } = config ?? {};
-  if (persistent && storageType === StorageDriver.RAM) {
-    throw new import_errors5.InvalidConfigError("RAM storage cannot be used in persistent mode.");
+  const { persistent = false, keyStore, dataStore, dataRoot = (0, import_util8.isNode)() ? import_client_protocol4.DX_DATA : "dxos/storage" } = config ?? {};
+  if (persistent && dataStore === StorageDriver.RAM) {
+    throw new import_protocols11.InvalidConfigError("RAM storage cannot be used in persistent mode.");
   }
-  if (!persistent && storageType !== void 0 && storageType !== StorageDriver.RAM) {
-    throw new import_errors5.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
+  if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
+    throw new import_protocols11.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
   }
-  if (persistent && keyStorage === StorageDriver.RAM) {
-    throw new import_errors5.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
+  if (persistent && keyStore === StorageDriver.RAM) {
+    throw new import_protocols11.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
   }
-  if (!persistent && keyStorage !== StorageDriver.RAM && keyStorage !== void 0) {
-    throw new import_errors5.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+  if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
+    throw new import_protocols11.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
   }
   return {
     storage: (0, import_random_access_storage.createStorage)({
-      type: persistent ? toStorageType(storageType) : import_random_access_storage.StorageType.RAM,
-      root: `${path}/`
+      type: persistent ? toStorageType(dataStore) : import_random_access_storage.StorageType.RAM,
+      root: `${dataRoot}/`
     })
   };
 };
@@ -4550,30 +4617,6 @@ var SystemServiceImpl = class {
   }
 };
 
-// packages/sdk/client-services/src/packlets/services/service-registry.ts
-var ServiceRegistry = class {
-  // prettier-ignore
-  constructor(_serviceBundle, _handlers = {}) {
-    this._serviceBundle = _serviceBundle;
-    this._handlers = _handlers;
-  }
-  get descriptors() {
-    return this._serviceBundle;
-  }
-  get services() {
-    return this._handlers;
-  }
-  setServices(services) {
-    this._handlers = services;
-  }
-  addService(name, service) {
-    this._handlers[name] = service;
-  }
-  removeService(name) {
-    delete this._handlers[name];
-  }
-};
-
 // packages/sdk/client-services/src/packlets/services/service-host.ts
 function _ts_decorate7(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -4589,6 +4632,18 @@ var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var createDefaultModelFactory = () => {
   return new import_model_factory.ModelFactory().registerModel(import_document_model2.DocumentModel).registerModel(import_text_model.TextModel);
 };
+var createGenesisMutationFromTypedObject = (obj) => {
+  const snapshot = obj[import_echo_schema.base]._createSnapshot();
+  return {
+    objectId: obj[import_echo_schema.base]._id,
+    genesis: {
+      modelType: obj[import_echo_schema.base]._modelConstructor.meta.type
+    },
+    snapshot: {
+      model: snapshot
+    }
+  };
+};
 var ClientServicesHost = class ClientServicesHost2 {
   constructor({
     config,
@@ -4673,9 +4728,9 @@ var ClientServicesHost = class ClientServicesHost2 {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    (0, import_invariant14.invariant)(!this._open, "service host is open", {
+    (0, import_invariant15.invariant)(!this._open, "service host is open", {
       F: __dxlog_file17,
-      L: 184,
+      L: 201,
       S: this,
       A: [
         "!this._open",
@@ -4684,14 +4739,14 @@ var ClientServicesHost = class ClientServicesHost2 {
     });
     (0, import_log16.log)("initializing...", void 0, {
       F: __dxlog_file17,
-      L: 185,
+      L: 202,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
-      (0, import_invariant14.invariant)(!this._config, "config already set", {
+      (0, import_invariant15.invariant)(!this._config, "config already set", {
         F: __dxlog_file17,
-        L: 188,
+        L: 205,
         S: this,
         A: [
           "!this._config",
@@ -4707,9 +4762,9 @@ var ClientServicesHost = class ClientServicesHost2 {
       iceServers: this._config?.get("runtime.services.ice")
     }), signalManager = new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
-    (0, import_invariant14.invariant)(!this._networkManager, "network manager already set", {
+    (0, import_invariant15.invariant)(!this._networkManager, "network manager already set", {
       F: __dxlog_file17,
-      L: 204,
+      L: 221,
       S: this,
       A: [
         "!this._networkManager",
@@ -4723,7 +4778,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     });
     (0, import_log16.log)("initialized", void 0, {
       F: __dxlog_file17,
-      L: 211,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4733,44 +4788,44 @@ var ClientServicesHost = class ClientServicesHost2 {
       return;
     }
     const traceId = import_keys11.PublicKey.random().toHex();
-    import_log16.log.trace("dxos.client-services.host.open", import_protocols10.trace.begin({
+    import_log16.log.trace("dxos.client-services.host.open", import_protocols12.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 222,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant14.invariant)(this._config, "config not set", {
+    (0, import_invariant15.invariant)(this._config, "config not set", {
       F: __dxlog_file17,
-      L: 224,
+      L: 241,
       S: this,
       A: [
         "this._config",
         "'config not set'"
       ]
     });
-    (0, import_invariant14.invariant)(this._storage, "storage not set", {
+    (0, import_invariant15.invariant)(this._storage, "storage not set", {
       F: __dxlog_file17,
-      L: 225,
+      L: 242,
       S: this,
       A: [
         "this._storage",
         "'storage not set'"
       ]
     });
-    (0, import_invariant14.invariant)(this._signalManager, "signal manager not set", {
+    (0, import_invariant15.invariant)(this._signalManager, "signal manager not set", {
       F: __dxlog_file17,
-      L: 226,
+      L: 243,
       S: this,
       A: [
         "this._signalManager",
         "'signal manager not set'"
       ]
     });
-    (0, import_invariant14.invariant)(this._networkManager, "network manager not set", {
+    (0, import_invariant15.invariant)(this._networkManager, "network manager not set", {
       F: __dxlog_file17,
-      L: 227,
+      L: 244,
       S: this,
       A: [
         "this._networkManager",
@@ -4782,7 +4837,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file17,
-      L: 230,
+      L: 247,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4791,14 +4846,14 @@ var ClientServicesHost = class ClientServicesHost2 {
     this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._signalManager, this._modelFactory);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
-      IdentityService: new IdentityServiceImpl((params) => this._serviceContext.createIdentity(params), this._serviceContext.identityManager, this._serviceContext.keyring),
+      IdentityService: new IdentityServiceImpl((params) => this._createIdentity(params), this._serviceContext.identityManager, this._serviceContext.keyring),
       InvitationsService: new InvitationsServiceImpl(this._serviceContext.invitations, (invitation) => this._serviceContext.getInvitationHandler(invitation)),
       DevicesService: new DevicesServiceImpl(this._serviceContext.identityManager),
       SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, this._serviceContext.dataServiceSubscriptions, async () => {
         await this._serviceContext.initialized.wait();
         return this._serviceContext.dataSpaceManager;
       }),
-      DataService: new import_echo_pipeline4.DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
+      DataService: new import_echo_pipeline3.DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
       LoggingService: this._loggingService,
       TracingService: this._tracingService,
@@ -4828,15 +4883,15 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 299,
+      L: 316,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log16.log.trace("dxos.client-services.host.open", import_protocols10.trace.end({
+    import_log16.log.trace("dxos.client-services.host.open", import_protocols12.trace.end({
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 300,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4850,7 +4905,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 311,
+      L: 328,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4866,24 +4921,24 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 318,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
     const traceId = import_keys11.PublicKey.random().toHex();
-    import_log16.log.trace("dxos.sdk.client-services-host.reset", import_protocols10.trace.begin({
+    import_log16.log.trace("dxos.sdk.client-services-host.reset", import_protocols12.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 323,
+      L: 340,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log16.log)("resetting...", void 0, {
       F: __dxlog_file17,
-      L: 325,
+      L: 342,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4891,20 +4946,39 @@ var ClientServicesHost = class ClientServicesHost2 {
     await this._storage.reset();
     (0, import_log16.log)("reset", void 0, {
       F: __dxlog_file17,
-      L: 328,
+      L: 345,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log16.log.trace("dxos.sdk.client-services-host.reset", import_protocols10.trace.end({
+    import_log16.log.trace("dxos.sdk.client-services-host.reset", import_protocols12.trace.end({
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 329,
+      L: 346,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._callbacks?.onReset?.();
   }
+  async _createIdentity(params) {
+    const identity = await this._serviceContext.createIdentity(params);
+    await this._serviceContext.initialized.wait();
+    const space = await this._serviceContext.dataSpaceManager.createSpace();
+    const obj = new import_client_protocol5.Properties();
+    obj[import_client_protocol5.defaultKey] = identity.identityKey.toHex();
+    await this._serviceRegistry.services.DataService.write({
+      spaceKey: space.key,
+      batch: {
+        objects: [
+          createGenesisMutationFromTypedObject(obj)
+        ]
+      }
+    });
+    await this._serviceRegistry.services.DataService.flush({
+      spaceKey: space.key
+    });
+    return identity;
+  }
 };
 _ts_decorate7([
   import_tracing5.trace.info()
@@ -4936,7 +5010,7 @@ var import_util10 = require("@dxos/util");
 // packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
 var import_async18 = require("@dxos/async");
 var import_client_protocol6 = require("@dxos/client-protocol");
-var import_invariant15 = require("@dxos/invariant");
+var import_invariant16 = require("@dxos/invariant");
 var import_iframe = require("@dxos/protocols/proto/dxos/iframe");
 var import_rpc2 = require("@dxos/rpc");
 var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/shell-runtime.ts";
@@ -4955,17 +5029,18 @@ var ShellRuntimeImpl = class {
   get spaceKey() {
     return this._spaceKey;
   }
-  setLayout(layout, options = {}) {
+  setLayout({ layout, invitationCode, spaceKey }) {
     this._layout = layout;
-    this._invitationCode = options.invitationCode;
-    this._spaceKey = options.spaceKey;
+    this._invitationCode = invitationCode;
+    this._spaceKey = spaceKey;
     this.layoutUpdate.emit({
       layout,
-      ...options
+      invitationCode,
+      spaceKey
     });
   }
   async setAppContext(context) {
-    (0, import_invariant15.invariant)(this._appRpc, "runtime not open", {
+    (0, import_invariant16.invariant)(this._appRpc, "runtime not open", {
       F: __dxlog_file18,
       L: 44,
       S: this,
@@ -5121,9 +5196,9 @@ _ts_decorate8([
 // packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts
 var import_async20 = require("@dxos/async");
 var import_client_protocol8 = require("@dxos/client-protocol");
-var import_errors6 = require("@dxos/errors");
 var import_log18 = require("@dxos/log");
 var import_network_manager4 = require("@dxos/network-manager");
+var import_protocols13 = require("@dxos/protocols");
 var import_rpc3 = require("@dxos/rpc");
 var import_util11 = require("@dxos/util");
 var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts";
@@ -5179,7 +5254,7 @@ var IFrameProxyRuntime = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      throw new import_errors6.RemoteServiceConnectionError("Failed to connect to worker");
+      throw new import_protocols13.RemoteServiceConnectionError("Failed to connect to worker");
     }
     await this._shellRuntime?.open();
   }
@@ -5204,7 +5279,7 @@ var import_network_manager5 = require("@dxos/network-manager");
 // packages/sdk/client-services/src/packlets/vault/worker-session.ts
 var import_async21 = require("@dxos/async");
 var import_client_protocol9 = require("@dxos/client-protocol");
-var import_invariant16 = require("@dxos/invariant");
+var import_invariant17 = require("@dxos/invariant");
 var import_log19 = require("@dxos/log");
 var import_rpc4 = require("@dxos/rpc");
 var import_util12 = require("@dxos/util");
@@ -5223,7 +5298,7 @@ var WorkerSession = class {
   constructor({ serviceHost, systemPort, appPort, shellPort, readySignal }) {
     this._startTrigger = new import_async21.Trigger();
     this.onClose = new import_util12.Callback();
-    (0, import_invariant16.invariant)(serviceHost, void 0, {
+    (0, import_invariant17.invariant)(serviceHost, void 0, {
       F: __dxlog_file21,
       L: 49,
       S: this,
@@ -5374,7 +5449,6 @@ _ts_decorate9([
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
 var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/worker-runtime.ts";
 var WorkerRuntime = class {
-  // prettier-ignore
   constructor(_configProvider) {
     this._configProvider = _configProvider;
     this._transportFactory = new import_network_manager5.SimplePeerTransportProxyFactory();
@@ -5394,7 +5468,7 @@ var WorkerRuntime = class {
   async start() {
     (0, import_log20.log)("starting...", void 0, {
       F: __dxlog_file22,
-      L: 49,
+      L: 52,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5410,7 +5484,7 @@ var WorkerRuntime = class {
       this._ready.wake(void 0);
       (0, import_log20.log)("started", void 0, {
         F: __dxlog_file22,
-        L: 63,
+        L: 66,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5418,7 +5492,7 @@ var WorkerRuntime = class {
       this._ready.wake(err);
       import_log20.log.error("starting", err, {
         F: __dxlog_file22,
-        L: 66,
+        L: 69,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5452,7 +5526,7 @@ var WorkerRuntime = class {
   _reconnectWebrtc() {
     (0, import_log20.log)("reconnecting webrtc...", void 0, {
       F: __dxlog_file22,
-      L: 103,
+      L: 106,
       S: this,
       C: (f, a) => f(...a)
     });