@dxos/client-services 0.1.56-main.d9d1c3e → 0.1.56-main.da2eab1

package/dist/lib/node/index.cjs

@@ -75,7 +75,7 @@ var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
     const feedMap = new import_util.ComplexMap(import_keys.PublicKey.hash);
     const update = () => {
       const { feeds } = feedStore;
-      feeds.filter((feed) => !(feedKeys == null ? void 0 : feedKeys.length) || feedKeys.some((feedKey) => feedKey.equals(feed.key))).forEach((feed) => {
+      feeds.filter((feed) => !feedKeys?.length || feedKeys.some((feedKey) => feedKey.equals(feed.key))).forEach((feed) => {
         if (!feedMap.has(feed.key)) {
           feedMap.set(feed.key, feed);
           feed.on("close", update);
@@ -83,15 +83,12 @@ var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
         }
       });
       next({
-        feeds: Array.from(feedMap.values()).map((feed) => {
-          var _a, _b;
-          return {
-            feedKey: feed.key,
-            length: feed.properties.length,
-            bytes: feed.core.byteLength,
-            downloaded: (_b = (_a = feed.core.bitfield) == null ? void 0 : _a.data.toBuffer()) != null ? _b : new Uint8Array()
-          };
-        })
+        feeds: Array.from(feedMap.values()).map((feed) => ({
+          feedKey: feed.key,
+          length: feed.properties.length,
+          bytes: feed.core.byteLength,
+          downloaded: feed.core.bitfield?.data.toBuffer() ?? new Uint8Array()
+        }))
       });
     };
     subscriptions.add(feedStore.feedOpened.on(update));
@@ -191,13 +188,13 @@ var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf4.Stream
         recipient: message.recipient.asUint8Array(),
         payload: message.payload
       },
-      receivedAt: new Date()
+      receivedAt: /* @__PURE__ */ new Date()
     });
   });
   signalManager.swarmEvent.on(ctx, (swarmEvent) => {
     next({
       swarmEvent: swarmEvent.swarmEvent,
-      receivedAt: new Date()
+      receivedAt: /* @__PURE__ */ new Date()
     });
   });
   return () => {
@@ -208,13 +205,10 @@ var subscribeToNetworkTopics = ({ networkManager }) => new import_codec_protobuf
   const update = () => {
     try {
       const topics = networkManager.topics;
-      const labeledTopics = topics.map((topic) => {
-        var _a, _b;
-        return {
-          topic,
-          label: (_b = (_a = networkManager.getSwarm(topic)) == null ? void 0 : _a.label) != null ? _b : topic.toHex()
-        };
-      });
+      const labeledTopics = topics.map((topic) => ({
+        topic,
+        label: networkManager.getSwarm(topic)?.label ?? topic.toHex()
+      }));
       next({
         topics: labeledTopics
       });
@@ -226,17 +220,15 @@ var subscribeToNetworkTopics = ({ networkManager }) => new import_codec_protobuf
   update();
 });
 var subscribeToSwarmInfo = ({ networkManager }) => new import_codec_protobuf4.Stream(({ next }) => {
-  var _a;
   const update = () => {
-    var _a2;
-    const info = (_a2 = networkManager.connectionLog) == null ? void 0 : _a2.swarms;
+    const info = networkManager.connectionLog?.swarms;
     if (info) {
       next({
         data: info
       });
     }
   };
-  (_a = networkManager.connectionLog) == null ? void 0 : _a.update.on(update);
+  networkManager.connectionLog?.update.on(update);
   update();
 });
 var getNetworkPeers = ({ networkManager }, request) => {
@@ -245,7 +237,7 @@ var getNetworkPeers = ({ networkManager }, request) => {
   }
   const map = networkManager.getSwarmMap(import_keys2.PublicKey.from(request.topic));
   return {
-    peers: map == null ? void 0 : map.peers.map((peer) => ({
+    peers: map?.peers.map((peer) => ({
       ...peer,
       connections: peer.connections.map((connection) => connection.asUint8Array())
     }))
@@ -261,14 +253,14 @@ var subscribeToSpaces = (context, { spaceKeys = [] }) => {
       const spaces = [
         ...context.spaceManager.spaces.values()
       ];
-      const filteredSpaces = spaces.filter((space) => !(spaceKeys == null ? void 0 : spaceKeys.length) || spaceKeys.some((spaceKey) => spaceKey.equals(space.key)));
+      const filteredSpaces = spaces.filter((space) => !spaceKeys?.length || spaceKeys.some((spaceKey) => spaceKey.equals(space.key)));
       next({
         spaces: filteredSpaces.map((space) => {
           const spaceMetadata = context.metadataStore.spaces.find((spaceMetadata2) => spaceMetadata2.key.equals(space.key));
           return {
             key: space.key,
             isOpen: space.isOpen,
-            timeframe: spaceMetadata == null ? void 0 : spaceMetadata.dataTimeframe,
+            timeframe: spaceMetadata?.dataTimeframe,
             genesisFeed: space.genesisFeedKey,
             controlFeed: space.controlFeedKey,
             dataFeed: space.dataFeedKey
@@ -282,7 +274,7 @@ var subscribeToSpaces = (context, { spaceKeys = [] }) => {
       await update();
     });
     return () => {
-      unsubscribe == null ? void 0 : unsubscribe();
+      unsubscribe?.();
       clearTimeout(timeout);
     };
   });
@@ -313,16 +305,15 @@ var DevtoolsServiceImpl = class {
     };
   }
   async getStorageInfo() {
-    var _a, _b, _c, _d, _e;
-    const storageUsage = (_c = await ((_b = (_a = this.params.context.storage).getDiskInfo) == null ? void 0 : _b.call(_a))) != null ? _c : {
+    const storageUsage = await this.params.context.storage.getDiskInfo?.() ?? {
       used: 0
     };
     const navigatorInfo = typeof navigator === "object" ? await navigator.storage.estimate() : void 0;
     return {
       type: this.params.context.storage.type,
       storageUsage: storageUsage.used,
-      originUsage: (_d = navigatorInfo == null ? void 0 : navigatorInfo.usage) != null ? _d : 0,
-      usageQuota: (_e = navigatorInfo == null ? void 0 : navigatorInfo.quota) != null ? _e : 0
+      originUsage: navigatorInfo?.usage ?? 0,
+      usageQuota: navigatorInfo?.quota ?? 0
     };
   }
   async getBlobs() {
@@ -508,7 +499,7 @@ var TrustedKeySetAuthVerifier = class {
         return await trigger.wait({
           timeout: this._params.authTimeout
         });
-      } catch (e) {
+      } catch {
         return false;
       } finally {
         clear();
@@ -604,11 +595,10 @@ var Identity = class Identity2 {
     return this._deviceStateMachine.deviceCredentialChain;
   }
   getAdmissionCredentials() {
-    var _a, _b;
     return {
       deviceKey: this.deviceKey,
-      controlFeedKey: (_a = this.space.controlFeedKey) != null ? _a : (0, import_debug.failUndefined)(),
-      dataFeedKey: (_b = this.space.dataFeedKey) != null ? _b : (0, import_debug.failUndefined)()
+      controlFeedKey: this.space.controlFeedKey ?? (0, import_debug.failUndefined)(),
+      dataFeedKey: this.space.dataFeedKey ?? (0, import_debug.failUndefined)()
     };
   }
   /**
@@ -702,6 +692,7 @@ var import_keys4 = require("@dxos/keys");
 var import_log3 = require("@dxos/log");
 var import_protocols2 = require("@dxos/protocols");
 var import_credentials5 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_timeframe = require("@dxos/timeframe");
 var import_tracing2 = require("@dxos/tracing");
 var import_util2 = require("@dxos/util");
 function _ts_decorate2(decorators, target, key, desc) {
@@ -729,7 +720,6 @@ var IdentityManager = class IdentityManager2 {
     return this._identity;
   }
   async open(ctx) {
-    var _a;
     const traceId = import_keys4.PublicKey.random().toHex();
     import_log3.log.trace("dxos.halo.identity-manager.open", import_protocols2.trace.begin({
       id: traceId
@@ -755,7 +745,7 @@ var IdentityManager = class IdentityManager2 {
       await this._identity.ready();
       import_log3.log.trace("dxos.halo.identity", {
         identityKey: identityRecord.identityKey,
-        displayName: (_a = this._identity.profileDocument) == null ? void 0 : _a.displayName
+        displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file3,
         L: 82,
@@ -774,11 +764,9 @@ var IdentityManager = class IdentityManager2 {
     });
   }
   async close() {
-    var _a;
-    await ((_a = this._identity) == null ? void 0 : _a.close(new import_context3.Context()));
+    await this._identity?.close(new import_context3.Context());
   }
   async createIdentity({ displayName } = {}) {
-    var _a;
     (0, import_invariant2.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file3,
       L: 96,
@@ -852,7 +840,7 @@ var IdentityManager = class IdentityManager2 {
     await this._identity.ready();
     import_log3.log.trace("dxos.halo.identity", {
       identityKey: identityRecord.identityKey,
-      displayName: (_a = this._identity.profileDocument) == null ? void 0 : _a.displayName
+      displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file3,
       L: 152,
@@ -875,7 +863,6 @@ var IdentityManager = class IdentityManager2 {
   * Accept an existing identity. Expects it's device key to be authorized (now or later).
   */
   async acceptIdentity(params) {
-    var _a;
     (0, import_log3.log)("accepting identity", {
       params
     }, {
@@ -911,7 +898,7 @@ var IdentityManager = class IdentityManager2 {
     await this._identity.ready();
     import_log3.log.trace("dxos.halo.identity", {
       identityKey: identityRecord.identityKey,
-      displayName: (_a = this._identity.profileDocument) == null ? void 0 : _a.displayName
+      displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file3,
       L: 186,
@@ -930,10 +917,42 @@ var IdentityManager = class IdentityManager2 {
     });
     return identity;
   }
+  /**
+  * Update the profile document of an existing identity.
+  */
+  async updateProfile(profile) {
+    (0, import_invariant2.invariant)(this._identity, "Identity not initialized.", {
+      F: __dxlog_file3,
+      L: 200,
+      S: this,
+      A: [
+        "this._identity",
+        "'Identity not initialized.'"
+      ]
+    });
+    const credential = await this._identity.getIdentityCredentialSigner().createCredential({
+      subject: this._identity.identityKey,
+      assertion: {
+        "@type": "dxos.halo.credentials.IdentityProfile",
+        profile
+      }
+    });
+    const receipt = await this._identity.controlPipeline.writer.write({
+      credential: {
+        credential
+      }
+    });
+    await this._identity.controlPipeline.state.waitUntilTimeframe(new import_timeframe.Timeframe([
+      [
+        receipt.feedKey,
+        receipt.seq
+      ]
+    ]));
+  }
   async _constructIdentity(identityRecord) {
     (0, import_invariant2.invariant)(!this._identity, void 0, {
       F: __dxlog_file3,
-      L: 197,
+      L: 214,
       S: this,
       A: [
         "!this._identity",
@@ -944,13 +963,13 @@ var IdentityManager = class IdentityManager2 {
       identityRecord
     }, {
       F: __dxlog_file3,
-      L: 198,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant2.invariant)(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file3,
-      L: 201,
+      L: 218,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -962,7 +981,7 @@ var IdentityManager = class IdentityManager2 {
     });
     (0, import_invariant2.invariant)(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file3,
-      L: 205,
+      L: 222,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -994,7 +1013,7 @@ var IdentityManager = class IdentityManager2 {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file3,
-      L: 229,
+      L: 246,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1015,7 +1034,7 @@ var IdentityManager = class IdentityManager2 {
       onAuthFailure: () => {
         import_log3.log.warn("auth failure", void 0, {
           F: __dxlog_file3,
-          L: 248,
+          L: 265,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1038,12 +1057,13 @@ var import_debug2 = require("@dxos/debug");
 var import_invariant3 = require("@dxos/invariant");
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-service.ts";
 var IdentityServiceImpl = class {
-  // TODO(wittjosiah): Remove dependency on service context.
-  constructor(_serviceContext) {
-    this._serviceContext = _serviceContext;
+  constructor(_createIdentity, _identityManager, _keyring) {
+    this._createIdentity = _createIdentity;
+    this._identityManager = _identityManager;
+    this._keyring = _keyring;
   }
   async createIdentity(request) {
-    await this._serviceContext.createIdentity(request);
+    await this._createIdentity(request);
     return this._getIdentity();
   }
   async recoverIdentity(request) {
@@ -1055,34 +1075,47 @@ var IdentityServiceImpl = class {
         identity: this._getIdentity()
       });
       emitNext();
-      return this._serviceContext.identityManager.stateUpdate.on(emitNext);
+      return this._identityManager.stateUpdate.on(emitNext);
     });
   }
   _getIdentity() {
-    if (!this._serviceContext.identityManager.identity) {
+    if (!this._identityManager.identity) {
       return void 0;
     }
     return {
-      identityKey: this._serviceContext.identityManager.identity.identityKey,
-      spaceKey: this._serviceContext.identityManager.identity.space.key,
-      profile: this._serviceContext.identityManager.identity.profileDocument
+      identityKey: this._identityManager.identity.identityKey,
+      spaceKey: this._identityManager.identity.space.key,
+      profile: this._identityManager.identity.profileDocument
     };
   }
+  async updateProfile(profile) {
+    (0, import_invariant3.invariant)(this._identityManager.identity, "Identity not initialized.", {
+      F: __dxlog_file4,
+      L: 59,
+      S: this,
+      A: [
+        "this._identityManager.identity",
+        "'Identity not initialized.'"
+      ]
+    });
+    await this._identityManager.updateProfile(profile);
+    return this._getIdentity();
+  }
   async signPresentation({ presentation, nonce }) {
-    (0, import_invariant3.invariant)(this._serviceContext.identityManager.identity, "Identity not initialized.", {
+    (0, import_invariant3.invariant)(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file4,
-      L: 56,
+      L: 65,
       S: this,
       A: [
-        "this._serviceContext.identityManager.identity",
+        "this._identityManager.identity",
         "'Identity not initialized.'"
       ]
     });
     return await (0, import_credentials6.signPresentation)({
       presentation,
-      signer: this._serviceContext.keyring,
-      signerKey: this._serviceContext.identityManager.identity.deviceKey,
-      chain: this._serviceContext.identityManager.identity.deviceCredentialChain,
+      signer: this._keyring,
+      signerKey: this._identityManager.identity.deviceKey,
+      chain: this._identityManager.identity.deviceCredentialChain,
       nonce
     });
   }
@@ -1418,7 +1451,6 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
     };
   }
   async onOpen(context) {
-    var _a;
     await super.onOpen(context);
     try {
       await this.rpc.InvitationHostService.options({
@@ -1427,7 +1459,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
       await (0, import_context4.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT
       }));
-      if (((_a = this._remoteOptions) == null ? void 0 : _a.role) !== import_invitations.Options.Role.GUEST) {
+      if (this._remoteOptions?.role !== import_invitations.Options.Role.GUEST) {
         throw new import_errors.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations.Options.Role.GUEST,
           remoteOptions: this._remoteOptions
@@ -1485,7 +1517,6 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     };
   }
   async onOpen(context) {
-    var _a;
     await super.onOpen(context);
     try {
       (0, import_log4.log)("begin options", void 0, {
@@ -1506,7 +1537,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
         S: this,
         C: (f, a) => f(...a)
       });
-      if (((_a = this._remoteOptions) == null ? void 0 : _a.role) !== import_invitations.Options.Role.HOST) {
+      if (this._remoteOptions?.role !== import_invitations.Options.Role.HOST) {
         throw new import_errors.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations.Options.Role.HOST,
           remoteOptions: this._remoteOptions
@@ -1545,9 +1576,8 @@ var InvitationsHandler = class {
     this._networkManager = _networkManager;
   }
   createInvitation(protocol, options) {
-    var _a;
-    const { invitationId = import_keys6.PublicKey.random().toHex(), type = import_services3.Invitation.Type.INTERACTIVE, authMethod = import_services3.Invitation.AuthMethod.SHARED_SECRET, state = import_services3.Invitation.State.INIT, timeout = import_client_protocol2.INVITATION_TIMEOUT, swarmKey = import_keys6.PublicKey.random() } = options != null ? options : {};
-    const authCode = (_a = options == null ? void 0 : options.authCode) != null ? _a : authMethod === import_services3.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials7.generatePasscode)(import_client_protocol2.AUTHENTICATION_CODE_LENGTH) : void 0;
+    const { invitationId = import_keys6.PublicKey.random().toHex(), type = import_services3.Invitation.Type.INTERACTIVE, authMethod = import_services3.Invitation.AuthMethod.SHARED_SECRET, state = import_services3.Invitation.State.INIT, timeout = import_client_protocol2.INVITATION_TIMEOUT, swarmKey = import_keys6.PublicKey.random() } = options ?? {};
+    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,
@@ -1600,9 +1630,8 @@ var InvitationsHandler = class {
           return invitation;
         },
         admit: async (admissionRequest) => {
-          var _a2, _b, _c;
           try {
-            const deviceKey = (_c = (_a2 = admissionRequest.device) == null ? void 0 : _a2.deviceKey) != null ? _c : (_b = admissionRequest.space) == null ? void 0 : _b.deviceKey;
+            const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             (0, import_invariant6.invariant)(deviceKey, void 0, {
               F: __dxlog_file7,
               L: 119,
@@ -1747,7 +1776,8 @@ var InvitationsHandler = class {
         protocolProvider: (0, import_network_manager.createTeleportProtocolFactory)(async (teleport) => {
           teleport.addExtension("dxos.halo.invitations", createExtension());
         }),
-        topology: new import_network_manager.StarTopology(topic)
+        topology: new import_network_manager.StarTopology(topic),
+        label: "invitation host"
       });
       ctx.onDispose(() => swarmConnection.close());
       stream.next({
@@ -1772,7 +1802,7 @@ var InvitationsHandler = class {
     const { timeout = import_client_protocol2.INVITATION_TIMEOUT } = invitation;
     (0, import_invariant6.invariant)(protocol, void 0, {
       F: __dxlog_file7,
-      L: 210,
+      L: 211,
       S: this,
       A: [
         "protocol",
@@ -1786,7 +1816,7 @@ var InvitationsHandler = class {
     const setState = (newData) => {
       (0, import_invariant6.invariant)(newData.state !== void 0, void 0, {
         F: __dxlog_file7,
-        L: 221,
+        L: 222,
         S: this,
         A: [
           "newData.state !== undefined",
@@ -1806,7 +1836,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             F: __dxlog_file7,
-            L: 229,
+            L: 230,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1816,7 +1846,7 @@ var InvitationsHandler = class {
         } else {
           import_log5.log.warn("auth failed", err, {
             F: __dxlog_file7,
-            L: 232,
+            L: 233,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1830,7 +1860,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 240,
+        L: 241,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1845,7 +1875,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               F: __dxlog_file7,
-              L: 250,
+              L: 251,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1860,7 +1890,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 259,
+                L: 260,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1872,7 +1902,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 267,
+                L: 268,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1883,7 +1913,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 271,
+                L: 272,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1893,7 +1923,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file7,
-                L: 275,
+                L: 276,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1905,7 +1935,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: 284,
+                    L: 285,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -1917,7 +1947,7 @@ var InvitationsHandler = class {
                   });
                   (0, import_log5.log)("sending authentication request", void 0, {
                     F: __dxlog_file7,
-                    L: 288,
+                    L: 289,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -1938,7 +1968,7 @@ var InvitationsHandler = class {
                         attempt
                       }, {
                         F: __dxlog_file7,
-                        L: 299,
+                        L: 300,
                         S: this,
                         C: (f, a) => f(...a)
                       });
@@ -1955,7 +1985,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 310,
+                L: 311,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1967,7 +1997,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 321,
+                L: 322,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1979,7 +2009,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 323,
+                L: 324,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1989,7 +2019,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 326,
+                  L: 327,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1999,7 +2029,7 @@ var InvitationsHandler = class {
               } else {
                 (0, import_log5.log)("auth failed", err, {
                   F: __dxlog_file7,
-                  L: 329,
+                  L: 330,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2010,7 +2040,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 332,
+                L: 333,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2028,7 +2058,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 343,
+              L: 344,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2038,7 +2068,7 @@ var InvitationsHandler = class {
           } else {
             (0, import_log5.log)("auth failed", err, {
               F: __dxlog_file7,
-              L: 346,
+              L: 347,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2051,7 +2081,7 @@ var InvitationsHandler = class {
     (0, import_async8.scheduleTask)(ctx, async () => {
       (0, import_invariant6.invariant)(invitation.swarmKey, void 0, {
         F: __dxlog_file7,
-        L: 356,
+        L: 357,
         S: this,
         A: [
           "invitation.swarmKey",
@@ -2065,7 +2095,8 @@ var InvitationsHandler = class {
         protocolProvider: (0, import_network_manager.createTeleportProtocolFactory)(async (teleport) => {
           teleport.addExtension("dxos.halo.invitations", createExtension());
         }),
-        topology: new import_network_manager.StarTopology(topic)
+        topology: new import_network_manager.StarTopology(topic),
+        label: "invitation guest"
       });
       ctx.onDispose(() => swarmConnection.close());
       setState({
@@ -2301,7 +2332,6 @@ var SpaceInvitationProtocol = class {
     };
   }
   async admit(request, guestProfile) {
-    var _a;
     (0, import_invariant8.invariant)(this._spaceKey, void 0, {
       F: __dxlog_file9,
       L: 42,
@@ -2365,7 +2395,7 @@ var SpaceInvitationProtocol = class {
       space: {
         credential: spaceMemberCredential,
         controlTimeframe: space.inner.controlPipeline.state.timeframe,
-        dataTimeframe: (_a = space.dataPipeline.pipelineState) == null ? void 0 : _a.timeframe
+        dataTimeframe: space.dataPipeline.pipelineState?.timeframe
       }
     };
   }
@@ -2469,9 +2499,8 @@ var ClientRpcServer = class {
     await this._rpcPeer.close();
   }
   _getServiceHandler(serviceName) {
-    var _a;
     if (!this._handlerCache.has(serviceName)) {
-      const [key, descriptor] = (_a = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName)) != null ? _a : (0, import_debug3.raise)(new Error(`Service not available: ${serviceName}`));
+      const [key, descriptor] = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName) ?? (0, import_debug3.raise)(new Error(`Service not available: ${serviceName}`));
       const service = this._serviceRegistry.services[key];
       if (!service) {
         throw new Error(`Service not available: ${serviceName}`);
@@ -2486,13 +2515,14 @@ var ClientRpcServer = class {
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
 var import_credentials9 = require("@dxos/credentials");
 var import_document_model = require("@dxos/document-model");
+var import_echo_db = require("@dxos/echo-db");
 var import_invariant9 = require("@dxos/invariant");
 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.56-main.d9d1c3e";
+var DXOS_VERSION = "0.1.56-main.da2eab1";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 var getPlatform = () => {
@@ -2526,9 +2556,8 @@ var getPlatform = () => {
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
 var DEFAULT_TIMEOUT = 1e3;
 var createDiagnostics = async (clientServices, serviceContext, config) => {
-  var _a, _b, _c;
   const diagnostics = {
-    created: new Date().toISOString(),
+    created: (/* @__PURE__ */ new Date()).toISOString(),
     platform: getPlatform(),
     client: {
       version: DXOS_VERSION,
@@ -2540,7 +2569,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
   {
     (0, import_invariant9.invariant)(clientServices.LoggingService, "SystemService is not available.", {
       F: __dxlog_file10,
-      L: 87,
+      L: 88,
       S: void 0,
       A: [
         "clientServices.LoggingService",
@@ -2558,16 +2587,16 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
       spaceKey: identity.space.key,
       profile: identity.profileDocument
     };
-    const { devices } = (_a = await (0, import_codec_protobuf10.getFirstStreamValue)(clientServices.DevicesService.queryDevices(), {
+    const { devices } = await (0, import_codec_protobuf10.getFirstStreamValue)(clientServices.DevicesService.queryDevices(), {
       timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0)) != null ? _a : {};
+    }).catch(() => void 0) ?? {};
     diagnostics.devices = devices;
     if (serviceContext.dataSpaceManager) {
-      diagnostics.spaces = await Promise.all((_b = Array.from(serviceContext.dataSpaceManager.spaces.values()).map((space) => getSpaceStats(space))) != null ? _b : []);
+      diagnostics.spaces = await Promise.all(Array.from(serviceContext.dataSpaceManager.spaces.values()).map((space) => getSpaceStats(space)) ?? []);
     }
-    const { feeds = [] } = (_c = await (0, import_codec_protobuf10.getFirstStreamValue)(clientServices.DevtoolsHost.subscribeToFeeds({}), {
+    const { feeds = [] } = await (0, import_codec_protobuf10.getFirstStreamValue)(clientServices.DevtoolsHost.subscribeToFeeds({}), {
       timeout: DEFAULT_TIMEOUT
-    }).catch(() => void 0)) != null ? _c : {};
+    }).catch(() => void 0) ?? {};
     diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
       feedKey,
       bytes,
@@ -2580,16 +2609,13 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
 var getProperties = (space) => {
   let properties = {};
   try {
-    const propertiesItem = space.dataPipeline.itemManager.items.find((item) => {
-      var _a, _b;
-      return ((_a = item.modelMeta) == null ? void 0 : _a.type) === import_document_model.DocumentModel.meta.type && ((_b = item.state) == null ? void 0 : _b.type) === "dxos.sdk.client.Properties";
-    });
-    const state = propertiesItem == null ? void 0 : propertiesItem.state;
-    properties = state == null ? void 0 : state.data;
+    const propertiesItem = space.dataPipeline.itemManager.items.find((item) => item.modelMeta?.type === import_document_model.DocumentModel.meta.type && item.state?.type === import_echo_db.TYPE_PROPERTIES);
+    const state = propertiesItem?.state;
+    properties = state?.data;
   } catch (err) {
     import_log8.log.warn(err.message, void 0, {
       F: __dxlog_file10,
-      L: 144,
+      L: 145,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2597,7 +2623,6 @@ var getProperties = (space) => {
   return properties;
 };
 var getSpaceStats = async (space) => {
-  var _a, _b, _c, _d, _e, _f;
   const stats = {
     key: space.key,
     metrics: space.metrics,
@@ -2605,18 +2630,15 @@ var getSpaceStats = async (space) => {
       ...credential.subject.assertion,
       id: credential.id
     })),
-    members: Array.from(space.inner.spaceState.members.values()).map((member) => {
-      var _a2;
-      return {
-        identity: {
-          identityKey: member.key,
-          profile: {
-            displayName: (_a2 = member.assertion.profile) == null ? void 0 : _a2.displayName
-          }
-        },
-        presence: space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? import_services6.SpaceMember.PresenceState.ONLINE : import_services6.SpaceMember.PresenceState.OFFLINE
-      };
-    }),
+    members: Array.from(space.inner.spaceState.members.values()).map((member) => ({
+      identity: {
+        identityKey: member.key,
+        profile: {
+          displayName: member.assertion.profile?.displayName
+        }
+      },
+      presence: space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? import_services6.SpaceMember.PresenceState.ONLINE : import_services6.SpaceMember.PresenceState.OFFLINE
+    })),
     pipeline: {
       // TODO(burdon): Pick properties from credentials if needed.
       // currentEpoch: space.dataPipeline.currentEpoch,
@@ -2626,11 +2648,11 @@ var getSpaceStats = async (space) => {
       targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
       totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe,
       // TODO(burdon): Empty?
-      dataFeeds: (_b = (_a = space.dataPipeline.pipelineState) == null ? void 0 : _a.feeds.map((feed) => feed.key)) != null ? _b : [],
-      startDataTimeframe: (_c = space.dataPipeline.pipelineState) == null ? void 0 : _c.startTimeframe,
-      currentDataTimeframe: (_d = space.dataPipeline.pipelineState) == null ? void 0 : _d.timeframe,
-      targetDataTimeframe: (_e = space.dataPipeline.pipelineState) == null ? void 0 : _e.targetTimeframe,
-      totalDataTimeframe: (_f = space.dataPipeline.pipelineState) == null ? void 0 : _f.endTimeframe
+      dataFeeds: space.dataPipeline.pipelineState?.feeds.map((feed) => feed.key) ?? [],
+      startDataTimeframe: space.dataPipeline.pipelineState?.startTimeframe,
+      currentDataTimeframe: space.dataPipeline.pipelineState?.timeframe,
+      targetDataTimeframe: space.dataPipeline.pipelineState?.targetTimeframe,
+      totalDataTimeframe: space.dataPipeline.pipelineState?.endTimeframe
     }
   };
   if (space.dataPipeline.itemManager) {
@@ -2663,6 +2685,7 @@ var import_protocols9 = 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_tracing3 = require("@dxos/tracing");
+var import_util7 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
 var import_async12 = require("@dxos/async");
@@ -2687,7 +2710,7 @@ var import_keys8 = require("@dxos/keys");
 var import_log10 = require("@dxos/log");
 var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
-var import_timeframe = require("@dxos/timeframe");
+var import_timeframe2 = require("@dxos/timeframe");
 var import_util4 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
@@ -2756,7 +2779,7 @@ var NotarizationPlugin = class {
         errors.throw(err);
       }
     });
-    opCtx == null ? void 0 : opCtx.onDispose(() => ctx.dispose());
+    opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
       (0, import_async10.scheduleTask)(ctx, () => {
         import_log9.log.warn("Notarization timeout", {
@@ -2849,11 +2872,10 @@ var NotarizationPlugin = class {
   * Called with credentials arriving from the control pipeline.
   */
   async processCredential(credential) {
-    var _a;
     if (!credential.id) {
       return;
     }
-    (_a = this._processCredentialsTriggers.get(credential.id)) == null ? void 0 : _a.wake();
+    this._processCredentialsTriggers.get(credential.id)?.wake();
     this._processedCredentials.add(credential.id);
     this._processCredentialsTriggers.delete(credential.id);
   }
@@ -2879,11 +2901,10 @@ var NotarizationPlugin = class {
   * Requests from other peers to notarize credentials.
   */
   async _onNotarize(request) {
-    var _a;
     if (!this._writer) {
       throw new Error(WRITER_NOT_SET_ERROR_CODE);
     }
-    for (const credential of (_a = request.credentials) != null ? _a : []) {
+    for (const credential of request.credentials ?? []) {
       (0, import_invariant10.invariant)(credential.id, "Credential must have an id", {
         F: __dxlog_file11,
         L: 200,
@@ -2972,6 +2993,7 @@ function _ts_decorate3(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
+var ENABLE_FEED_PURGE = false;
 var DataSpace = class DataSpace2 {
   constructor(params) {
     this._ctx = new import_context7.Context();
@@ -2983,7 +3005,6 @@ var DataSpace = class DataSpace2 {
     this.error = void 0;
     this.stateUpdate = new import_async11.Event();
     this.metrics = {};
-    var _a;
     this._inner = params.inner;
     this._inner.stateUpdate.on(this._ctx, () => this.stateUpdate.emit());
     this._gossip = params.gossip;
@@ -2992,7 +3013,7 @@ var DataSpace = class DataSpace2 {
     this._feedStore = params.feedStore;
     this._metadataStore = params.metadataStore;
     this._signingContext = params.signingContext;
-    this._callbacks = (_a = params.callbacks) != null ? _a : {};
+    this._callbacks = params.callbacks ?? {};
     this.authVerifier = new TrustedKeySetAuthVerifier({
       trustedKeysProvider: () => new import_util4.ComplexSet(import_keys8.PublicKey.hash, Array.from(this._inner.spaceState.members.keys())),
       update: this._inner.stateUpdate,
@@ -3036,14 +3057,13 @@ var DataSpace = class DataSpace2 {
     this._state = import_services7.SpaceState.CONTROL_ONLY;
     this.stateUpdate.emit();
     this.metrics = {};
-    this.metrics.open = new Date();
+    this.metrics.open = /* @__PURE__ */ new Date();
   }
   async close() {
     await this._close();
   }
   async _close() {
-    var _a, _b;
-    await ((_b = (_a = this._callbacks).beforeClose) == null ? void 0 : _b.call(_a));
+    await this._callbacks.beforeClose?.();
     this._state = import_services7.SpaceState.CLOSED;
     await this._ctx.dispose();
     this._ctx = new import_context7.Context();
@@ -3065,13 +3085,13 @@ var DataSpace = class DataSpace2 {
   initializeDataPipelineAsync() {
     (0, import_async11.scheduleTask)(this._ctx, async () => {
       try {
-        this.metrics.pipelineInitBegin = new Date();
+        this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
       } catch (err) {
         if (err instanceof import_errors3.CancelledError) {
           (0, import_log10.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 193,
+            L: 199,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3079,7 +3099,7 @@ var DataSpace = class DataSpace2 {
         }
         import_log10.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 197,
+          L: 203,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3087,12 +3107,11 @@ var DataSpace = class DataSpace2 {
         this.error = err;
         this.stateUpdate.emit();
       } finally {
-        this.metrics.ready = new Date();
+        this.metrics.ready = /* @__PURE__ */ new Date();
       }
     });
   }
   async initializeDataPipeline() {
-    var _a, _b, _c, _d;
     if (this._state !== import_services7.SpaceState.CONTROL_ONLY) {
       throw new import_errors3.SystemError("Invalid operation");
     }
@@ -3101,11 +3120,11 @@ var DataSpace = class DataSpace2 {
       ctx: this._ctx,
       breakOnStall: false
     });
-    this.metrics.controlPipelineReady = new Date();
+    this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
     (0, import_log10.log)("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 221,
+      L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3118,11 +3137,11 @@ var DataSpace = class DataSpace2 {
       }), this._inner.controlPipeline.writer));
     }
     await this._inner.initializeDataPipeline();
-    this.metrics.dataPipelineOpen = new Date();
+    this.metrics.dataPipelineOpen = /* @__PURE__ */ new Date();
     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: 242,
+      L: 248,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3130,17 +3149,17 @@ var DataSpace = class DataSpace2 {
       ctx: this._ctx,
       breakOnStall: false
     });
-    this.metrics.dataPipelineReady = new Date();
+    this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     (0, import_log10.log)("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 251,
+      L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
-    await ((_b = (_a = this._callbacks).beforeReady) == null ? void 0 : _b.call(_a));
+    await this._callbacks.beforeReady?.();
     this._state = import_services7.SpaceState.READY;
     this.stateUpdate.emit();
-    await ((_d = (_c = this._callbacks).afterReady) == null ? void 0 : _d.call(_c));
+    await this._callbacks.afterReady?.();
   }
   async _createWritableFeeds() {
     const credentials = [];
@@ -3187,7 +3206,6 @@ var DataSpace = class DataSpace2 {
     await this._metadataStore.setWritableFeedKeys(this.key, this.inner.controlFeedKey, this.inner.dataFeedKey);
   }
   async createEpoch() {
-    var _a, _b;
     const epoch = await this.dataPipeline.createEpoch();
     const receipt = await this.inner.controlPipeline.writer.write({
       credential: {
@@ -3200,16 +3218,19 @@ var DataSpace = class DataSpace2 {
         })
       }
     });
-    await this.inner.controlPipeline.state.waitUntilTimeframe(new import_timeframe.Timeframe([
+    await this.inner.controlPipeline.state.waitUntilTimeframe(new import_timeframe2.Timeframe([
       [
         receipt.feedKey,
         receipt.seq
       ]
     ]));
-    for (const feed of (_b = (_a = this.inner.dataPipeline.pipelineState) == null ? void 0 : _a.feeds) != null ? _b : []) {
-      const indexBeforeEpoch = epoch.timeframe.get(feed.key);
-      if (indexBeforeEpoch) {
-        await feed.clear(0, indexBeforeEpoch + 1);
+    if (ENABLE_FEED_PURGE) {
+      for (const feed of this.inner.dataPipeline.pipelineState?.feeds ?? []) {
+        const indexBeforeEpoch = epoch.timeframe.get(feed.key);
+        if (indexBeforeEpoch === void 0) {
+          continue;
+        }
+        await feed.safeClear(0, indexBeforeEpoch + 1);
       }
     }
   }
@@ -3254,9 +3275,8 @@ DataSpace = _ts_decorate3([
 var import_credentials11 = require("@dxos/credentials");
 var import_debug5 = require("@dxos/debug");
 var import_credentials12 = require("@dxos/protocols/proto/dxos/halo/credentials");
-var import_timeframe2 = require("@dxos/timeframe");
+var import_timeframe3 = require("@dxos/timeframe");
 var spaceGenesis = async (keyring, signingContext, space) => {
-  var _a, _b, _c, _d;
   const credentials = [
     await (0, import_credentials11.createCredential)({
       signer: keyring,
@@ -3276,11 +3296,11 @@ var spaceGenesis = async (keyring, signingContext, space) => {
         spaceKey: space.key,
         role: import_credentials12.SpaceMember.Role.ADMIN,
         profile: signingContext.profile,
-        genesisFeedKey: (_a = space.controlFeedKey) != null ? _a : (0, import_debug5.failUndefined)()
+        genesisFeedKey: space.controlFeedKey ?? (0, import_debug5.failUndefined)()
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: (_b = space.controlFeedKey) != null ? _b : (0, import_debug5.failUndefined)(),
+      subject: space.controlFeedKey ?? (0, import_debug5.failUndefined)(),
       assertion: {
         "@type": "dxos.halo.credentials.AdmittedFeed",
         spaceKey: space.key,
@@ -3290,7 +3310,7 @@ var spaceGenesis = async (keyring, signingContext, space) => {
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: (_c = space.dataFeedKey) != null ? _c : (0, import_debug5.failUndefined)(),
+      subject: space.dataFeedKey ?? (0, import_debug5.failUndefined)(),
       assertion: {
         "@type": "dxos.halo.credentials.AdmittedFeed",
         spaceKey: space.key,
@@ -3300,12 +3320,12 @@ var spaceGenesis = async (keyring, signingContext, space) => {
       }
     }),
     await signingContext.credentialSigner.createCredential({
-      subject: (_d = space.key) != null ? _d : (0, import_debug5.failUndefined)(),
+      subject: space.key ?? (0, import_debug5.failUndefined)(),
       assertion: {
         "@type": "dxos.halo.credentials.Epoch",
         number: 0,
         previousId: void 0,
-        timeframe: new import_timeframe2.Timeframe(),
+        timeframe: new import_timeframe3.Timeframe(),
         snapshotCid: void 0
       }
     })
@@ -3565,7 +3585,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       onAuthFailure: () => {
         import_log11.log.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 213,
+          L: 217,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3589,7 +3609,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 231,
+            L: 235,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3601,7 +3621,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 238,
+            L: 242,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3614,7 +3634,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 244,
+            L: 248,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3679,9 +3699,8 @@ var SpacesServiceImpl = class {
     return this._serializeSpace(space);
   }
   async updateSpace({ spaceKey, state }) {
-    var _a;
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     if (state) {
       switch (state) {
         case import_services9.SpaceState.ACTIVE:
@@ -3745,17 +3764,15 @@ var SpacesServiceImpl = class {
     });
   }
   async postMessage({ spaceKey, channel, message }) {
-    var _a;
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.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 () => {
-        var _a;
         const dataSpaceManager = await this._getDataSpaceManager();
-        const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
           next(message);
         });
@@ -3765,8 +3782,7 @@ var SpacesServiceImpl = class {
   }
   queryCredentials({ spaceKey }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
-      var _a;
-      const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
       const processor = {
         processCredential: async (credential) => {
           next(credential);
@@ -3777,9 +3793,8 @@ var SpacesServiceImpl = class {
     });
   }
   async writeCredentials({ spaceKey, credentials }) {
-    var _a;
-    const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
-    for (const credential of credentials != null ? credentials : []) {
+    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    for (const credential of credentials ?? []) {
       await space.controlPipeline.writer.write({
         credential: {
           credential
@@ -3788,13 +3803,11 @@ var SpacesServiceImpl = class {
     }
   }
   async createEpoch({ spaceKey }) {
-    var _a;
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     await space.createEpoch();
   }
   _serializeSpace(space) {
-    var _a, _b, _c, _d, _e, _f, _g;
     return {
       spaceKey: space.key,
       state: space.state,
@@ -3806,16 +3819,15 @@ var SpacesServiceImpl = class {
         currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
         targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
         totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe,
-        dataFeeds: (_b = (_a = space.dataPipeline.pipelineState) == null ? void 0 : _a.feeds.map((feed) => feed.key)) != null ? _b : [],
-        startDataTimeframe: (_c = space.dataPipeline.pipelineState) == null ? void 0 : _c.startTimeframe,
-        currentDataTimeframe: (_d = space.dataPipeline.pipelineState) == null ? void 0 : _d.timeframe,
-        targetDataTimeframe: (_e = space.dataPipeline.pipelineState) == null ? void 0 : _e.targetTimeframe,
-        totalDataTimeframe: (_f = space.dataPipeline.pipelineState) == null ? void 0 : _f.endTimeframe
+        dataFeeds: space.dataPipeline.pipelineState?.feeds.map((feed) => feed.key) ?? [],
+        startDataTimeframe: space.dataPipeline.pipelineState?.startTimeframe,
+        currentDataTimeframe: space.dataPipeline.pipelineState?.timeframe,
+        targetDataTimeframe: space.dataPipeline.pipelineState?.targetTimeframe,
+        totalDataTimeframe: space.dataPipeline.pipelineState?.endTimeframe
       },
       members: Array.from(space.inner.spaceState.members.values()).map((member) => {
-        var _a2, _b2, _c2;
         const peers = space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key));
-        const isMe = (_a2 = this._identityManager.identity) == null ? void 0 : _a2.identityKey.equals(member.key);
+        const isMe = this._identityManager.identity?.identityKey.equals(member.key);
         if (isMe) {
           peers.push(space.presence.getLocalState());
         }
@@ -3823,14 +3835,14 @@ var SpacesServiceImpl = class {
           identity: {
             identityKey: member.key,
             profile: {
-              displayName: (_c2 = (_b2 = member.assertion.profile) == null ? void 0 : _b2.displayName) != null ? _c2 : (0, import_util6.humanize)(member.key)
+              displayName: member.assertion.profile?.displayName ?? (0, import_util6.humanize)(member.key)
             }
           },
           presence: isMe || peers.length > 0 ? import_services9.SpaceMember.PresenceState.ONLINE : import_services9.SpaceMember.PresenceState.OFFLINE,
           peerStates: peers
         };
       }),
-      creator: (_g = space.inner.spaceState.creator) == null ? void 0 : _g.key,
+      creator: space.inner.spaceState.creator?.key,
       cache: space.cache,
       metrics: space.metrics
     };
@@ -3870,7 +3882,8 @@ var ServiceContext = class ServiceContext2 {
         root: storage.createDirectory("feeds"),
         signer: this.keyring,
         hypercore: {
-          valueEncoding: import_echo_pipeline3.valueEncoding
+          valueEncoding: import_echo_pipeline3.valueEncoding,
+          stats: true
         }
       })
     });
@@ -3884,16 +3897,13 @@ var ServiceContext = class ServiceContext2 {
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
     this.invitations = new InvitationsHandler(this.networkManager);
-    this._handlerFactories.set(import_services10.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => {
-      var _a;
-      return (_a = this.identityManager.identity) != null ? _a : (0, import_debug7.failUndefined)();
-    }, this._acceptIdentity.bind(this)));
+    this._handlerFactories.set(import_services10.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug7.failUndefined)(), this._acceptIdentity.bind(this)));
   }
   async open(ctx) {
     await this._checkStorageVersion();
     (0, import_log13.log)("opening...", void 0, {
       F: __dxlog_file15,
-      L: 131,
+      L: 135,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3901,7 +3911,7 @@ var ServiceContext = class ServiceContext2 {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 132,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3916,29 +3926,28 @@ var ServiceContext = class ServiceContext2 {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 140,
+      L: 144,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log13.log)("opened", void 0, {
       F: __dxlog_file15,
-      L: 141,
+      L: 145,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    var _a;
     (0, import_log13.log)("closing...", void 0, {
       F: __dxlog_file15,
-      L: 145,
+      L: 149,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._deviceSpaceSync && this.identityManager.identity) {
       await this.identityManager.identity.space.spaceState.removeCredentialProcessor(this._deviceSpaceSync);
     }
-    await ((_a = this.dataSpaceManager) == null ? void 0 : _a.close());
+    await this.dataSpaceManager?.close();
     await this.identityManager.close();
     await this.spaceManager.close();
     await this.feedStore.close();
@@ -3947,7 +3956,7 @@ var ServiceContext = class ServiceContext2 {
     this.dataServiceSubscriptions.clear();
     (0, import_log13.log)("closed", void 0, {
       F: __dxlog_file15,
-      L: 156,
+      L: 160,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3961,7 +3970,7 @@ var ServiceContext = class ServiceContext2 {
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant12.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 168,
+      L: 171,
       S: this,
       A: [
         "factory",
@@ -3983,14 +3992,13 @@ var ServiceContext = class ServiceContext2 {
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    var _a;
     (0, import_log13.log)("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 190,
+      L: 192,
       S: this,
       C: (f, a) => f(...a)
     });
-    const identity = (_a = this.identityManager.identity) != null ? _a : (0, import_debug7.failUndefined)();
+    const identity = this.identityManager.identity ?? (0, import_debug7.failUndefined)();
     const signingContext = {
       credentialSigner: identity.getIdentityCredentialSigner(),
       identityKey: identity.identityKey,
@@ -4009,7 +4017,7 @@ var ServiceContext = class ServiceContext2 {
     this._handlerFactories.set(import_services10.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant12.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 213,
+        L: 215,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4033,7 +4041,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 229,
+            L: 231,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4044,7 +4052,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 233,
+            L: 235,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4055,7 +4063,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 238,
+            L: 240,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4066,7 +4074,7 @@ var ServiceContext = class ServiceContext2 {
         } catch (err) {
           import_log13.log.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 244,
+            L: 246,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4083,6 +4091,7 @@ _ts_decorate5([
   import_tracing3.trace.span()
 ], ServiceContext.prototype, "_initialize", null);
 ServiceContext = _ts_decorate5([
+  (0, import_util7.safeInstanceof)("dxos.client-services.ServiceContext"),
   import_tracing3.trace.resource()
 ], ServiceContext);
 
@@ -4117,21 +4126,17 @@ var DevicesServiceImpl = class {
   queryDevices() {
     return new import_codec_protobuf12.Stream(({ next }) => {
       const update = () => {
-        var _a;
-        const deviceKeys = (_a = this._identityManager.identity) == null ? void 0 : _a.authorizedDeviceKeys;
+        const deviceKeys = this._identityManager.identity?.authorizedDeviceKeys;
         if (!deviceKeys) {
           next({
             devices: []
           });
         } else {
           next({
-            devices: Array.from(deviceKeys.values()).map((key) => {
-              var _a2;
-              return {
-                deviceKey: key,
-                kind: ((_a2 = this._identityManager.identity) == null ? void 0 : _a2.deviceKey.equals(key)) ? import_services11.DeviceKind.CURRENT : import_services11.DeviceKind.TRUSTED
-              };
-            })
+            devices: Array.from(deviceKeys.values()).map((key) => ({
+              deviceKey: key,
+              kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services11.DeviceKind.CURRENT : import_services11.DeviceKind.TRUSTED
+            }))
           });
         }
       };
@@ -4175,7 +4180,6 @@ var Lock = class {
     return this._lockPath;
   }
   async acquire() {
-    var _a;
     (0, import_log14.log)("acquiring lock...", void 0, {
       F: __dxlog_file16,
       L: 32,
@@ -4183,7 +4187,7 @@ var Lock = class {
       C: (f, a) => f(...a)
     });
     this._fileHandle = await import_lock_file.LockFile.acquire(this._lockPath);
-    await ((_a = this._onAcquire) == null ? void 0 : _a.call(this));
+    await this._onAcquire?.();
     (0, import_log14.log)("acquired lock", void 0, {
       F: __dxlog_file16,
       L: 37,
@@ -4192,8 +4196,7 @@ var Lock = class {
     });
   }
   async release() {
-    var _a;
-    await ((_a = this._onRelease) == null ? void 0 : _a.call(this));
+    await this._onRelease?.();
     (0, import_invariant13.invariant)(this._fileHandle, "Lock is not acquired", {
       F: __dxlog_file16,
       L: 42,
@@ -4216,11 +4219,11 @@ var import_async16 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
 var import_log15 = require("@dxos/log");
 var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util7 = require("@dxos/util");
+var import_util8 = require("@dxos/util");
 var LoggingServiceImpl = class {
   constructor() {
     this._logs = new import_async16.Event();
-    this._started = new Date();
+    this._started = /* @__PURE__ */ new Date();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
@@ -4234,15 +4237,15 @@ var LoggingServiceImpl = class {
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
-      import_util7.tracer.clear();
+      import_util8.tracer.clear();
     }
     if (record === true) {
-      import_util7.tracer.start();
+      import_util8.tracer.start();
     } else if (record === false) {
-      import_util7.tracer.stop();
+      import_util8.tracer.stop();
     }
     return {
-      recording: import_util7.tracer.recording
+      recording: import_util8.tracer.recording
     };
   }
   /**
@@ -4250,24 +4253,23 @@ var LoggingServiceImpl = class {
   */
   queryMetrics({ interval = 5e3 }) {
     const getNumericalValues = (key) => {
-      var _a;
-      const events = (_a = import_util7.tracer.get(key)) != null ? _a : [];
+      const events = import_util8.tracer.get(key) ?? [];
       return {
         key,
-        stats: (0, import_util7.numericalValues)(events, "duration")
+        stats: (0, import_util8.numericalValues)(events, "duration")
       };
     };
     return new import_codec_protobuf13.Stream(({ next }) => {
       const update = () => {
         const metrics = {
-          timestamp: new Date(),
+          timestamp: /* @__PURE__ */ new Date(),
           values: [
             getNumericalValues("dxos.echo.pipeline.control"),
             getNumericalValues("dxos.echo.pipeline.data")
           ].filter(Boolean)
         };
         next({
-          timestamp: new Date(),
+          timestamp: /* @__PURE__ */ new Date(),
           metrics
         });
       };
@@ -4281,11 +4283,10 @@ var LoggingServiceImpl = class {
   queryLogs(request) {
     return new import_codec_protobuf13.Stream(({ ctx, next }) => {
       const handler = (entry2) => {
-        var _a, _b, _c, _d, _e;
         if (LOG_PROCESSING > 0) {
           return;
         }
-        if (((_a = entry2.meta) == null ? void 0 : _a.F.includes("logging-service")) || entry2.context && Object.values(entry2.context).some((value) => typeof value === "string" && value.includes("LoggingService"))) {
+        if (entry2.meta?.F.includes("logging-service") || entry2.context && Object.values(entry2.context).some((value) => typeof value === "string" && value.includes("LoggingService"))) {
           return;
         }
         if (!shouldLog(entry2, request)) {
@@ -4293,12 +4294,12 @@ var LoggingServiceImpl = class {
         }
         const record = {
           ...entry2,
-          context: (0, import_util7.jsonify)((0, import_log15.getContextFromEntry)(entry2)),
-          timestamp: new Date(),
+          context: (0, import_util8.jsonify)((0, import_log15.getContextFromEntry)(entry2)),
+          timestamp: /* @__PURE__ */ new Date(),
           meta: {
             // TODO(dmaretskyi): Fix proto.
-            file: (_c = (_b = entry2.meta) == null ? void 0 : _b.F) != null ? _c : "",
-            line: (_e = (_d = entry2.meta) == null ? void 0 : _d.L) != null ? _e : 0
+            file: entry2.meta?.F ?? "",
+            line: entry2.meta?.L ?? 0
           }
         };
         try {
@@ -4321,15 +4322,11 @@ var matchFilter = (filter, level, path, options) => {
   }
 };
 var shouldLog = (entry2, request) => {
-  var _a;
-  const options = (_a = request.options) != null ? _a : import_services12.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  const options = request.options ?? import_services12.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   if (request.filters === void 0) {
     return options === import_services12.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   } else {
-    return request.filters.some((filter) => {
-      var _a2, _b;
-      return matchFilter(filter, entry2.level, (_b = (_a2 = entry2.meta) == null ? void 0 : _a2.F) != null ? _b : "", options);
-    });
+    return request.filters.some((filter) => matchFilter(filter, entry2.level, entry2.meta?.F ?? "", options));
   }
 };
 var LOG_PROCESSING = 0;
@@ -4371,10 +4368,10 @@ var import_client_protocol4 = require("@dxos/client-protocol");
 var import_errors5 = require("@dxos/errors");
 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 import_util9 = 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 != null ? config : {};
+  const { path = (0, import_util9.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.");
   }
@@ -4418,7 +4415,7 @@ var toStorageType = (type) => {
 // packages/sdk/client-services/src/packlets/system/system-service.ts
 var import_codec_protobuf15 = require("@dxos/codec-protobuf");
 var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util9 = require("@dxos/util");
+var import_util10 = require("@dxos/util");
 var SystemServiceImpl = class {
   constructor({ config, statusUpdate, getDiagnostics, onUpdateStatus, getCurrentStatus, onReset }) {
     this._config = config;
@@ -4429,8 +4426,7 @@ var SystemServiceImpl = class {
     this._onReset = onReset;
   }
   async getConfig() {
-    var _a, _b;
-    return (_b = (_a = this._config) == null ? void 0 : _a.values) != null ? _b : {};
+    return this._config?.values ?? {};
   }
   /**
   * NOTE: Since this is serialized as a JSON object, we allow the option to serialize keys.
@@ -4438,8 +4434,8 @@ var SystemServiceImpl = class {
   async getDiagnostics({ keys } = {}) {
     const diagnostics = await this._getDiagnostics();
     return {
-      timestamp: new Date(),
-      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util9.jsonKeyReplacer)({
+      timestamp: /* @__PURE__ */ new Date(),
+      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util10.jsonKeyReplacer)({
         truncate: keys === import_services13.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
         humanize: keys === import_services13.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
       })))
@@ -4553,11 +4549,10 @@ var ClientServicesHost = class ClientServicesHost2 {
         return createDiagnostics(this._serviceRegistry.services, this._serviceContext, this._config);
       },
       onUpdateStatus: async (status) => {
-        var _a, _b;
         if (!this.isOpen && status === import_services14.SystemStatus.ACTIVE) {
-          await ((_a = this._resourceLock) == null ? void 0 : _a.acquire());
+          await this._resourceLock?.acquire();
         } else if (this.isOpen && status === import_services14.SystemStatus.INACTIVE) {
-          await ((_b = this._resourceLock) == null ? void 0 : _b.release());
+          await this._resourceLock?.release();
         }
       },
       onReset: async () => {
@@ -4594,7 +4589,6 @@ var ClientServicesHost = class ClientServicesHost2 {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    var _a, _b, _c;
     (0, import_invariant14.invariant)(!this._open, "service host is open", {
       F: __dxlog_file17,
       L: 181,
@@ -4604,7 +4598,7 @@ var ClientServicesHost = class ClientServicesHost2 {
         "'service host is open'"
       ]
     });
-    import_log16.log.info("initializing...", void 0, {
+    (0, import_log16.log)("initializing...", void 0, {
       F: __dxlog_file17,
       L: 182,
       S: this,
@@ -4626,8 +4620,8 @@ var ClientServicesHost = class ClientServicesHost2 {
       }
     }
     const { connectionLog = true, transportFactory = (0, import_network_manager2.createWebRTCTransportFactory)({
-      iceServers: (_a = this._config) == null ? void 0 : _a.get("runtime.services.ice")
-    }), signalManager = new import_messaging.WebsocketSignalManager((_c = (_b = this._config) == null ? void 0 : _b.get("runtime.services.signaling")) != null ? _c : []) } = options;
+      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", {
       F: __dxlog_file17,
@@ -4643,7 +4637,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       transportFactory,
       signalManager
     });
-    import_log16.log.info("initialized", void 0, {
+    (0, import_log16.log)("initialized", void 0, {
       F: __dxlog_file17,
       L: 208,
       S: this,
@@ -4651,7 +4645,6 @@ var ClientServicesHost = class ClientServicesHost2 {
     });
   }
   async open(ctx) {
-    var _a, _b, _c;
     if (this._open) {
       return;
     }
@@ -4701,20 +4694,20 @@ var ClientServicesHost = class ClientServicesHost2 {
       ]
     });
     this._opening = true;
-    import_log16.log.info("opening...", {
-      lockKey: (_a = this._resourceLock) == null ? void 0 : _a.lockKey
+    (0, import_log16.log)("opening...", {
+      lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file17,
       L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
-    await ((_b = this._resourceLock) == null ? void 0 : _b.acquire());
+    await this._resourceLock?.acquire();
     await this._loggingService.open();
     this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._signalManager, this._modelFactory);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
-      IdentityService: new IdentityServiceImpl(this._serviceContext),
+      IdentityService: new IdentityServiceImpl((params) => this._serviceContext.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 () => {
@@ -4736,12 +4729,12 @@ var ClientServicesHost = class ClientServicesHost2 {
     this._opening = false;
     this._open = true;
     this._statusUpdate.emit();
-    const deviceKey = (_c = this._serviceContext.identityManager.identity) == null ? void 0 : _c.deviceKey;
-    import_log16.log.info("opened", {
+    const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
+    (0, import_log16.log)("opened", {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 280,
+      L: 284,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4749,22 +4742,21 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 281,
+      L: 285,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    var _a;
     if (!this._open) {
       return;
     }
-    const deviceKey = (_a = this._serviceContext.identityManager.identity) == null ? void 0 : _a.deviceKey;
-    import_log16.log.info("closing...", {
+    const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
+    (0, import_log16.log)("closing...", {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 292,
+      L: 296,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4775,37 +4767,36 @@ var ClientServicesHost = class ClientServicesHost2 {
     await this._serviceContext.close();
     this._open = false;
     this._statusUpdate.emit();
-    import_log16.log.info("closed", {
+    (0, import_log16.log)("closed", {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 298,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
-    var _a, _b, _c;
     const traceId = import_keys11.PublicKey.random().toHex();
     import_log16.log.trace("dxos.sdk.client-services-host.reset", import_protocols10.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 303,
+      L: 307,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log16.log)("resetting...", void 0, {
       F: __dxlog_file17,
-      L: 305,
+      L: 309,
       S: this,
       C: (f, a) => f(...a)
     });
-    await ((_a = this._serviceContext) == null ? void 0 : _a.close());
+    await this._serviceContext?.close();
     await this._storage.reset();
     (0, import_log16.log)("reset", void 0, {
       F: __dxlog_file17,
-      L: 308,
+      L: 312,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4813,11 +4804,11 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 309,
+      L: 313,
       S: this,
       C: (f, a) => f(...a)
     });
-    await ((_c = (_b = this._callbacks) == null ? void 0 : _b.onReset) == null ? void 0 : _c.call(_b));
+    await this._callbacks?.onReset?.();
   }
 };
 _ts_decorate7([
@@ -4845,7 +4836,7 @@ var import_context11 = require("@dxos/context");
 var import_log17 = require("@dxos/log");
 var import_messaging2 = require("@dxos/messaging");
 var import_network_manager3 = require("@dxos/network-manager");
-var import_util10 = require("@dxos/util");
+var import_util11 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
 var import_async18 = require("@dxos/async");
@@ -4909,8 +4900,7 @@ var ShellRuntimeImpl = class {
     await this._appRpc.open();
   }
   async close() {
-    var _a;
-    await ((_a = this._appRpc) == null ? void 0 : _a.close());
+    await this._appRpc?.close();
     this._appRpc = void 0;
   }
 };
@@ -4946,7 +4936,6 @@ var IFrameHostRuntime = class {
     return this._shellRuntime;
   }
   async start() {
-    var _a;
     (0, import_log17.log)("starting...", void 0, {
       F: __dxlog_file19,
       L: 71,
@@ -4954,7 +4943,7 @@ var IFrameHostRuntime = class {
       C: (f, a) => f(...a)
     });
     try {
-      this._config = await (0, import_util10.getAsyncValue)(this._configProvider);
+      this._config = await (0, import_util11.getAsyncValue)(this._configProvider);
       this._transportFactory = (0, import_network_manager3.createWebRTCTransportFactory)({
         iceServers: this._config.get("runtime.services.ice")
       });
@@ -4993,7 +4982,7 @@ var IFrameHostRuntime = class {
       await Promise.all([
         this._clientServices.open(new import_context11.Context()),
         this._clientRpc.open(),
-        (_a = this._shellRuntime) == null ? void 0 : _a.open()
+        this._shellRuntime?.open()
       ]);
       this._ready.wake(void 0);
       (0, import_log17.log)("started", void 0, {
@@ -5013,7 +5002,6 @@ var IFrameHostRuntime = class {
     }
   }
   async stop() {
-    var _a;
     (0, import_log17.log)("stopping...", void 0, {
       F: __dxlog_file19,
       L: 122,
@@ -5022,7 +5010,7 @@ var IFrameHostRuntime = class {
     });
     await this._clientRpc.close();
     await this._clientServices.close();
-    await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
+    await this._shellRuntime?.close();
     (0, import_log17.log)("stopped", void 0, {
       F: __dxlog_file19,
       L: 126,
@@ -5042,7 +5030,7 @@ var import_errors6 = require("@dxos/errors");
 var import_log18 = require("@dxos/log");
 var import_network_manager4 = require("@dxos/network-manager");
 var import_rpc3 = require("@dxos/rpc");
-var import_util11 = require("@dxos/util");
+var import_util12 = require("@dxos/util");
 var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts";
 var IFrameProxyRuntime = class {
   constructor({ config, systemPort, shellPort }) {
@@ -5059,8 +5047,7 @@ var IFrameProxyRuntime = class {
     return this._shellRuntime;
   }
   async open(origin) {
-    var _a;
-    this._config = await (0, import_util11.getAsyncValue)(this._configProvider);
+    this._config = await (0, import_util12.getAsyncValue)(this._configProvider);
     this._transportService = new import_network_manager4.WebRTCTransportService({
       iceServers: this._config.get("runtime.services.ice")
     });
@@ -5099,12 +5086,11 @@ var IFrameProxyRuntime = class {
       });
       throw new import_errors6.RemoteServiceConnectionError("Failed to connect to worker");
     }
-    await ((_a = this._shellRuntime) == null ? void 0 : _a.open());
+    await this._shellRuntime?.open();
   }
   async close() {
-    var _a;
     this._release.wake();
-    await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
+    await this._shellRuntime?.close();
     await this._systemRpc.rpc.WorkerService.stop();
     await this._systemRpc.close();
   }
@@ -5126,7 +5112,7 @@ var import_client_protocol9 = require("@dxos/client-protocol");
 var import_invariant16 = require("@dxos/invariant");
 var import_log19 = require("@dxos/log");
 var import_rpc4 = require("@dxos/rpc");
-var import_util12 = require("@dxos/util");
+var import_util13 = require("@dxos/util");
 function _ts_decorate9(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -5141,7 +5127,7 @@ var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var WorkerSession = class {
   constructor({ serviceHost, systemPort, appPort, shellPort, readySignal }) {
     this._startTrigger = new import_async21.Trigger();
-    this.onClose = new import_util12.Callback();
+    this.onClose = new import_util13.Callback();
     (0, import_invariant16.invariant)(serviceHost, void 0, {
       F: __dxlog_file21,
       L: 49,
@@ -5269,7 +5255,7 @@ var WorkerSession = class {
   async _maybeOpenShell() {
     try {
       await (0, import_async21.asyncTimeout)(this._shellClientRpc.open(), 1e3);
-    } catch (e) {
+    } catch {
       import_log19.log.info("No shell connected.", void 0, {
         F: __dxlog_file21,
         L: 143,
@@ -5335,7 +5321,7 @@ var WorkerRuntime = class {
       });
     } catch (err) {
       this._ready.wake(err);
-      import_log20.log.catch(err, void 0, {
+      import_log20.log.catch("starting", err, {
         F: __dxlog_file22,
         L: 66,
         S: this,