@dxos/client-services 0.1.58-next.3349da8 → 0.1.58-next.ffb4cc4

package/dist/lib/node/packlets/testing/index.cjs

@@ -52,7 +52,7 @@ var createMockCredential = async ({ signer, issuer }) => (0, import_credentials.
 
 // packages/sdk/client-services/src/packlets/testing/invitation-utils.ts
 var import_async18 = require("@dxos/async");
-var import_invariant15 = require("@dxos/invariant");
+var import_invariant16 = require("@dxos/invariant");
 var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
 
 // packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
@@ -70,9 +70,6 @@ var import_log = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
 
-// packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.1.58-next.3349da8";
-
 // packages/sdk/client-services/src/packlets/services/platform.ts
 var getPlatform = () => {
   if (process.browser) {
@@ -101,6 +98,9 @@ var getPlatform = () => {
   }
 };
 
+// packages/sdk/client-services/src/version.ts
+var DXOS_VERSION = "0.1.58-next.ffb4cc4";
+
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
 var DEFAULT_TIMEOUT = 1e3;
@@ -224,13 +224,13 @@ var import_async11 = require("@dxos/async");
 var import_context8 = require("@dxos/context");
 var import_credentials15 = 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_store3 = require("@dxos/feed-store");
-var import_invariant12 = require("@dxos/invariant");
+var import_invariant13 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
 var import_keys8 = 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");
@@ -255,7 +255,6 @@ var createAuthProvider = (signer) => async (nonce) => {
   return Credential.encode(credential);
 };
 var TrustedKeySetAuthVerifier = class {
-  // prettier-ignore
   constructor(_params) {
     this._params = _params;
     this._ctx = new import_context.Context();
@@ -270,7 +269,7 @@ var TrustedKeySetAuthVerifier = class {
         credential
       }, {
         F: __dxlog_file2,
-        L: 59,
+        L: 56,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -280,7 +279,7 @@ var TrustedKeySetAuthVerifier = class {
           result
         }, {
           F: __dxlog_file2,
-          L: 63,
+          L: 60,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -292,7 +291,7 @@ var TrustedKeySetAuthVerifier = class {
           credential
         }, {
           F: __dxlog_file2,
-          L: 68,
+          L: 65,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -303,7 +302,7 @@ var TrustedKeySetAuthVerifier = class {
           key: credential.issuer
         }, {
           F: __dxlog_file2,
-          L: 73,
+          L: 70,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -319,7 +318,7 @@ var TrustedKeySetAuthVerifier = class {
             key: credential.issuer
           }, {
             F: __dxlog_file2,
-            L: 84,
+            L: 81,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -329,7 +328,7 @@ var TrustedKeySetAuthVerifier = class {
             key: credential.issuer
           }, {
             F: __dxlog_file2,
-            L: 87,
+            L: 84,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1059,7 +1058,6 @@ var import_async5 = require("@dxos/async");
 var import_client_protocol2 = require("@dxos/client-protocol");
 var import_context4 = require("@dxos/context");
 var import_credentials9 = require("@dxos/credentials");
-var import_errors2 = require("@dxos/errors");
 var import_invariant7 = require("@dxos/invariant");
 var import_keys4 = require("@dxos/keys");
 var import_log6 = require("@dxos/log");
@@ -1071,7 +1069,6 @@ var import_invitations2 = require("@dxos/protocols/proto/dxos/halo/invitations")
 // packages/sdk/client-services/src/packlets/invitations/invitation-extension.ts
 var import_async4 = require("@dxos/async");
 var import_context3 = require("@dxos/context");
-var import_errors = require("@dxos/errors");
 var import_invariant6 = require("@dxos/invariant");
 var import_keys3 = require("@dxos/keys");
 var import_log5 = require("@dxos/log");
@@ -1109,7 +1106,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         options: async (options) => {
           (0, import_invariant6.invariant)(!this._remoteOptions, "Remote options already set.", {
             F: __dxlog_file7,
-            L: 88,
+            L: 87,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -1126,7 +1123,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file7,
-            L: 97,
+            L: 96,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1136,7 +1133,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
               invitationId
             }, {
               F: __dxlog_file7,
-              L: 101,
+              L: 100,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1150,7 +1147,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             guestProfile: profile
           }, {
             F: __dxlog_file7,
-            L: 110,
+            L: 109,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1163,7 +1160,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file7,
-            L: 117,
+            L: 116,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1178,7 +1175,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file7,
-            L: 126,
+            L: 125,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1186,14 +1183,14 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             authCode: code
           }, {
             F: __dxlog_file7,
-            L: 127,
+            L: 126,
             S: this,
             C: (f, a) => f(...a)
           });
           let status = import_invitations.AuthenticationResponse.Status.OK;
           (0, import_invariant6.invariant)(this.invitation, "Invitation is not set.", {
             F: __dxlog_file7,
-            L: 130,
+            L: 129,
             S: this,
             A: [
               "this.invitation",
@@ -1204,7 +1201,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             case import_services3.Invitation.AuthMethod.NONE: {
               (0, import_log5.log)("authentication not required", void 0, {
                 F: __dxlog_file7,
-                L: 133,
+                L: 132,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1229,7 +1226,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
                 authMethod: this.invitation.authMethod
               }, {
                 F: __dxlog_file7,
-                L: 151,
+                L: 150,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1244,7 +1241,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             }
           }), {
             F: __dxlog_file7,
-            L: 157,
+            L: 156,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1258,14 +1255,14 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file7,
-            L: 163,
+            L: 162,
             S: this,
             C: (f, a) => f(...a)
           });
           try {
             (0, import_invariant6.invariant)(this.invitation, "Invitation is not set.", {
               F: __dxlog_file7,
-              L: 166,
+              L: 165,
               S: this,
               A: [
                 "this.invitation",
@@ -1280,7 +1277,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
               id: traceId
             }), {
               F: __dxlog_file7,
-              L: 174,
+              L: 173,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1303,7 +1300,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_protocols4.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations.Options.Role.GUEST,
           remoteOptions: this._remoteOptions
         });
@@ -1337,7 +1334,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
         options: async (options) => {
           (0, import_invariant6.invariant)(!this._remoteOptions, "Remote options already set.", {
             F: __dxlog_file7,
-            L: 241,
+            L: 240,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -1364,7 +1361,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     try {
       (0, import_log5.log)("begin options", void 0, {
         F: __dxlog_file7,
-        L: 262,
+        L: 261,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1376,12 +1373,12 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
       }));
       (0, import_log5.log)("end options", void 0, {
         F: __dxlog_file7,
-        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_protocols4.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations.Options.Role.HOST,
           remoteOptions: this._remoteOptions
         });
@@ -1390,7 +1387,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     } catch (err) {
       (0, import_log5.log)("openError", err, {
         F: __dxlog_file7,
-        L: 275,
+        L: 274,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1400,7 +1397,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
   async onClose() {
     (0, import_log5.log)("onClose", void 0, {
       F: __dxlog_file7,
-      L: 281,
+      L: 280,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1423,7 +1420,7 @@ var InvitationsHandler = class {
     const authCode = options?.authCode ?? (authMethod === import_services4.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials9.generatePasscode)(import_client_protocol2.AUTHENTICATION_CODE_LENGTH) : void 0);
     (0, import_invariant7.invariant)(protocol, void 0, {
       F: __dxlog_file8,
-      L: 76,
+      L: 75,
       S: this,
       A: [
         "protocol",
@@ -1452,7 +1449,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file8,
-        L: 98,
+        L: 97,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1477,7 +1474,7 @@ var InvitationsHandler = class {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             (0, import_invariant7.invariant)(deviceKey, void 0, {
               F: __dxlog_file8,
-              L: 119,
+              L: 118,
               S: this,
               A: [
                 "deviceKey",
@@ -1500,7 +1497,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file8,
-                L: 137,
+                L: 136,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1508,7 +1505,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file8,
-                L: 138,
+                L: 137,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1524,7 +1521,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file8,
-                L: 141,
+                L: 140,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1536,7 +1533,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file8,
-                L: 143,
+                L: 142,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1546,7 +1543,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file8,
-                  L: 146,
+                  L: 145,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1557,7 +1554,7 @@ var InvitationsHandler = class {
               } else {
                 import_log6.log.error("failed", err, {
                   F: __dxlog_file8,
-                  L: 149,
+                  L: 148,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1568,7 +1565,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file8,
-                L: 152,
+                L: 151,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1581,7 +1578,7 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
-          if (err instanceof import_errors2.InvalidInvitationExtensionRoleError) {
+          if (err instanceof import_protocols5.InvalidInvitationExtensionRoleError) {
             return;
           }
           if (err instanceof import_async5.TimeoutError) {
@@ -1589,7 +1586,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file8,
-              L: 167,
+              L: 166,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1600,7 +1597,7 @@ var InvitationsHandler = class {
           } else {
             import_log6.log.error("failed", err, {
               F: __dxlog_file8,
-              L: 170,
+              L: 169,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1628,7 +1625,7 @@ var InvitationsHandler = class {
         state: import_services4.Invitation.State.CONNECTING
       });
     });
-    const observable = new import_client_protocol2.CancellableInvitationObservable({
+    const observable = new import_client_protocol2.CancellableInvitation({
       initialInvitation: invitation,
       subscriber: stream.observable,
       onCancel: async () => {
@@ -1645,7 +1642,7 @@ var InvitationsHandler = class {
     const { timeout = import_client_protocol2.INVITATION_TIMEOUT } = invitation;
     (0, import_invariant7.invariant)(protocol, void 0, {
       F: __dxlog_file8,
-      L: 211,
+      L: 210,
       S: this,
       A: [
         "protocol",
@@ -1659,7 +1656,7 @@ var InvitationsHandler = class {
     const setState = (newData) => {
       (0, import_invariant7.invariant)(newData.state !== void 0, void 0, {
         F: __dxlog_file8,
-        L: 222,
+        L: 221,
         S: this,
         A: [
           "newData.state !== undefined",
@@ -1679,7 +1676,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             F: __dxlog_file8,
-            L: 230,
+            L: 229,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1689,7 +1686,7 @@ var InvitationsHandler = class {
         } else {
           import_log6.log.warn("auth failed", err, {
             F: __dxlog_file8,
-            L: 233,
+            L: 232,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1703,7 +1700,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file8,
-        L: 241,
+        L: 240,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1718,7 +1715,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               F: __dxlog_file8,
-              L: 251,
+              L: 250,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1733,7 +1730,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file8,
-                L: 260,
+                L: 259,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1745,7 +1742,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file8,
-                L: 268,
+                L: 267,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1756,7 +1753,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file8,
-                L: 272,
+                L: 271,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1766,7 +1763,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file8,
-                L: 276,
+                L: 275,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1778,7 +1775,7 @@ var InvitationsHandler = class {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
                   (0, import_log6.log)("guest waiting for authentication code...", void 0, {
                     F: __dxlog_file8,
-                    L: 285,
+                    L: 284,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -1790,7 +1787,7 @@ var InvitationsHandler = class {
                   });
                   (0, import_log6.log)("sending authentication request", void 0, {
                     F: __dxlog_file8,
-                    L: 289,
+                    L: 288,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -1811,7 +1808,7 @@ var InvitationsHandler = class {
                         attempt
                       }, {
                         F: __dxlog_file8,
-                        L: 300,
+                        L: 299,
                         S: this,
                         C: (f, a) => f(...a)
                       });
@@ -1828,7 +1825,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file8,
-                L: 311,
+                L: 310,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1840,7 +1837,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file8,
-                L: 322,
+                L: 321,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1852,7 +1849,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file8,
-                L: 324,
+                L: 323,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1862,7 +1859,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file8,
-                  L: 327,
+                  L: 326,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1872,7 +1869,7 @@ var InvitationsHandler = class {
               } else {
                 (0, import_log6.log)("auth failed", err, {
                   F: __dxlog_file8,
-                  L: 330,
+                  L: 329,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1883,7 +1880,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file8,
-                L: 333,
+                L: 332,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1893,7 +1890,7 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
-          if (err instanceof import_errors2.InvalidInvitationExtensionRoleError) {
+          if (err instanceof import_protocols5.InvalidInvitationExtensionRoleError) {
             return;
           }
           if (err instanceof import_async5.TimeoutError) {
@@ -1901,7 +1898,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file8,
-              L: 344,
+              L: 343,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1911,7 +1908,7 @@ var InvitationsHandler = class {
           } else {
             (0, import_log6.log)("auth failed", err, {
               F: __dxlog_file8,
-              L: 347,
+              L: 346,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1924,7 +1921,7 @@ var InvitationsHandler = class {
     (0, import_async5.scheduleTask)(ctx, async () => {
       (0, import_invariant7.invariant)(invitation.swarmKey, void 0, {
         F: __dxlog_file8,
-        L: 357,
+        L: 356,
         S: this,
         A: [
           "invitation.swarmKey",
@@ -1946,7 +1943,7 @@ var InvitationsHandler = class {
         state: import_services4.Invitation.State.CONNECTING
       });
     });
-    const observable = new import_client_protocol2.AuthenticatingInvitationObservable({
+    const observable = new import_client_protocol2.AuthenticatingInvitation({
       initialInvitation: invitation,
       subscriber: stream.observable,
       onCancel: async () => {
@@ -2315,7 +2312,7 @@ var import_credentials14 = require("@dxos/credentials");
 var import_invariant11 = require("@dxos/invariant");
 var import_keys7 = 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_util4 = require("@dxos/util");
@@ -2326,9 +2323,9 @@ var import_client_protocol3 = require("@dxos/client-protocol");
 var import_context6 = 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_keys6 = 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_credentials11 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe2 = require("@dxos/timeframe");
@@ -2637,7 +2634,7 @@ var DataSpace = class DataSpace2 {
     this._signingContext = params.signingContext;
     this._callbacks = params.callbacks ?? {};
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new import_util3.ComplexSet(import_keys6.PublicKey.hash, Array.from(this._inner.spaceState.members.keys())),
+      trustedKeysProvider: () => new import_util3.ComplexSet(import_keys6.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
     });
@@ -2647,7 +2644,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)
     });
@@ -2690,7 +2687,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 159,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2708,7 +2705,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 173,
+      L: 179,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2736,10 +2733,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: 205,
+            L: 211,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2747,7 +2744,7 @@ var DataSpace = class DataSpace2 {
         }
         import_log10.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 209,
+          L: 215,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2756,7 +2753,7 @@ var DataSpace = class DataSpace2 {
           state: import_services7.SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 211,
+          L: 217,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2769,14 +2766,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: 227,
+      L: 233,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2787,7 +2784,7 @@ var DataSpace = class DataSpace2 {
     await (0, import_context6.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: 241,
+      L: 247,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2798,7 +2795,7 @@ var DataSpace = class DataSpace2 {
     this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     (0, import_log10.log)("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 250,
+      L: 256,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2808,7 +2805,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 254,
+      L: 260,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2824,7 +2821,7 @@ var DataSpace = class DataSpace2 {
     await this._createWritableFeeds();
     (0, import_log10.log)("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 270,
+      L: 276,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2929,7 +2926,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 386,
+      L: 392,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3071,7 +3068,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,
@@ -3117,7 +3114,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,
@@ -3371,10 +3368,9 @@ DataSpaceManager = _ts_decorate4([
 var import_async10 = require("@dxos/async");
 var import_codec_protobuf5 = 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 {
@@ -3394,7 +3390,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:
@@ -3404,7 +3400,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");
       }
     }
   }
@@ -3437,7 +3433,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()));
             }
@@ -3459,14 +3455,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_protobuf5.Stream(({ ctx, next }) => {
       (0, import_async10.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);
         });
@@ -3474,38 +3470,83 @@ var SpacesServiceImpl = class {
       });
     });
   }
-  queryCredentials({ spaceKey }) {
-    return new import_codec_protobuf5.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_protobuf5.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_async10.scheduleTask)(ctx, () => space.spaceState.addCredentialProcessor(processor));
+      (0, import_async10.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,
@@ -3532,7 +3573,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
         };
       }),
@@ -3557,18 +3598,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_async11.Trigger();
-    this.dataServiceSubscriptions = new import_echo_pipeline3.DataServiceSubscriptions();
+    this.dataServiceSubscriptions = new import_echo_pipeline2.DataServiceSubscriptions();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = import_keys8.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_store3.FeedStore({
@@ -3576,12 +3616,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,
@@ -3597,15 +3637,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)
     });
@@ -3617,17 +3657,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)
     });
@@ -3635,7 +3675,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)
     });
@@ -3652,7 +3692,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)
     });
@@ -3664,9 +3704,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",
@@ -3682,15 +3722,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)
     });
@@ -3711,9 +3751,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",
@@ -3737,7 +3777,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 234,
+            L: 228,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3748,7 +3788,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 238,
+            L: 232,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3759,7 +3799,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 243,
+            L: 237,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3770,7 +3810,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)
           });
@@ -3796,19 +3836,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_keys12 = 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_async12 = require("@dxos/async");
 var import_codec_protobuf6 = require("@dxos/codec-protobuf");
@@ -4161,7 +4226,7 @@ var DevtoolsServiceImpl = 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) {
@@ -4202,7 +4267,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,
@@ -4369,29 +4434,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}/`
     })
   };
 };
@@ -4470,30 +4535,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;
@@ -4509,6 +4550,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,
@@ -4593,9 +4646,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",
@@ -4604,14 +4657,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",
@@ -4627,9 +4680,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",
@@ -4643,7 +4696,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)
     });
@@ -4653,44 +4706,44 @@ var ClientServicesHost = class ClientServicesHost2 {
       return;
     }
     const traceId = import_keys12.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",
@@ -4702,7 +4755,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file17,
-      L: 230,
+      L: 247,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4711,14 +4764,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,
@@ -4748,15 +4801,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)
     });
@@ -4770,7 +4823,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 311,
+      L: 328,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4786,24 +4839,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_keys12.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)
     });
@@ -4811,20 +4864,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()
@@ -4875,7 +4947,7 @@ var performInvitation = ({ host, guest, options, hooks }) => {
               if (hooks?.guest?.onConnecting?.(guestObservable)) {
                 break;
               }
-              (0, import_invariant15.invariant)(hostInvitation.swarmKey.equals(guestInvitation.swarmKey), void 0, {
+              (0, import_invariant16.invariant)(hostInvitation.swarmKey.equals(guestInvitation.swarmKey), void 0, {
                 F: __dxlog_file18,
                 L: 84,
                 S: void 0,
@@ -5008,7 +5080,7 @@ var createInvitation = (host, options) => {
     });
     return host.invitations.createInvitation(hostHandler, options);
   }
-  return host.createInvitation(options);
+  return host.share(options);
 };
 var acceptInvitation = (guest, invitation) => {
   invitation = sanitizeInvitation(invitation);
@@ -5018,14 +5090,14 @@ var acceptInvitation = (guest, invitation) => {
     });
     return guest.invitations.acceptInvitation(guestHandler, invitation);
   }
-  return guest.acceptInvitation(invitation);
+  return guest.join(invitation);
 };
 
 // packages/sdk/client-services/src/packlets/testing/test-builder.ts
 var import_context11 = require("@dxos/context");
 var import_credentials16 = require("@dxos/credentials");
 var import_debug8 = require("@dxos/debug");
-var import_echo_pipeline5 = require("@dxos/echo-pipeline");
+var import_echo_pipeline4 = require("@dxos/echo-pipeline");
 var import_testing = require("@dxos/echo-pipeline/testing");
 var import_feed_store5 = require("@dxos/feed-store");
 var import_keyring2 = require("@dxos/keyring");
@@ -5085,7 +5157,7 @@ var TestBuilder = class {
 };
 var TestPeer = class {
   constructor(signalContext, opts = {
-    storageType: import_random_access_storage2.StorageType.RAM
+    dataStore: import_random_access_storage2.StorageType.RAM
   }) {
     this.signalContext = signalContext;
     this.opts = opts;
@@ -5096,7 +5168,7 @@ var TestPeer = class {
   }
   get storage() {
     return this._props.storage ??= (0, import_random_access_storage2.createStorage)({
-      type: this.opts.storageType
+      type: this.opts.dataStore
     });
   }
   get keyring() {
@@ -5108,19 +5180,19 @@ var TestPeer = class {
         root: this.storage.createDirectory("feeds"),
         signer: this.keyring,
         hypercore: {
-          valueEncoding: import_echo_pipeline5.valueEncoding
+          valueEncoding: import_echo_pipeline4.valueEncoding
         }
       })
     });
   }
   get metadataStore() {
-    return this._props.metadataStore ??= new import_echo_pipeline5.MetadataStore(this.storage.createDirectory("metadata"));
+    return this._props.metadataStore ??= new import_echo_pipeline4.MetadataStore(this.storage.createDirectory("metadata"));
   }
   get blobStore() {
     return this._props.blobStore ??= new import_teleport_extension_object_sync2.BlobStore(this.storage.createDirectory("blobs"));
   }
   get snapshotStore() {
-    return this._props.snapshotStore ??= new import_echo_pipeline5.SnapshotStore(this.storage.createDirectory("snapshots"));
+    return this._props.snapshotStore ??= new import_echo_pipeline4.SnapshotStore(this.storage.createDirectory("snapshots"));
   }
   get networkManager() {
     return this._props.networkManager ??= new import_network_manager3.NetworkManager({
@@ -5129,7 +5201,7 @@ var TestPeer = class {
     });
   }
   get spaceManager() {
-    return this._props.spaceManager ??= new import_echo_pipeline5.SpaceManager({
+    return this._props.spaceManager ??= new import_echo_pipeline4.SpaceManager({
       feedStore: this.feedStore,
       networkManager: this.networkManager,
       metadataStore: this.metadataStore,
@@ -5142,7 +5214,7 @@ var TestPeer = class {
     return this._props.signingContext ?? (0, import_debug8.failUndefined)();
   }
   get dataSpaceManager() {
-    return this._props.dataSpaceManager ??= new DataSpaceManager(this.spaceManager, this.metadataStore, new import_echo_pipeline5.DataServiceSubscriptions(), this.keyring, this.identity, this.feedStore);
+    return this._props.dataSpaceManager ??= new DataSpaceManager(this.spaceManager, this.metadataStore, new import_echo_pipeline4.DataServiceSubscriptions(), this.keyring, this.identity, this.feedStore);
   }
   async createIdentity() {
     this._props.signingContext ??= await createSigningContext(this.keyring);