@dxos/client-services 0.1.56-main.e47dfd1 → 0.1.56-main.ed2f871

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

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // packages/sdk/client-services/src/packlets/testing/index.ts
@@ -61,37 +51,198 @@ var createMockCredential = async ({ signer, issuer }) => (0, import_credentials.
 });
 
 // packages/sdk/client-services/src/packlets/testing/invitation-utils.ts
-var import_tiny_invariant14 = __toESM(require("tiny-invariant"));
 var import_async18 = require("@dxos/async");
-var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
+var import_invariant15 = require("@dxos/invariant");
+var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
 
 // packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_debug = require("@dxos/debug");
 var import_rpc = require("@dxos/rpc");
 
+// packages/sdk/client-services/src/packlets/services/diagnostics.ts
+var import_codec_protobuf2 = require("@dxos/codec-protobuf");
+var import_credentials2 = require("@dxos/credentials");
+var import_document_model = require("@dxos/document-model");
+var import_invariant = require("@dxos/invariant");
+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.56-main.ed2f871";
+
+// packages/sdk/client-services/src/packlets/services/platform.ts
+var getPlatform = () => {
+  if (process.browser) {
+    if (typeof window !== "undefined") {
+      const { userAgent } = window.navigator;
+      return {
+        type: "browser",
+        userAgent,
+        uptime: Math.floor((Date.now() - window.performance.timeOrigin) / 1e3)
+      };
+    } else {
+      return {
+        type: "shared-worker",
+        uptime: Math.floor((Date.now() - performance.timeOrigin) / 1e3)
+      };
+    }
+  } else {
+    const { platform, version, arch } = process;
+    return {
+      type: "node",
+      platform: `${platform} ${version} ${arch}`,
+      runtime: process.version,
+      uptime: Math.floor(process.uptime()),
+      memory: process.memoryUsage()
+    };
+  }
+};
+
+// 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;
+var createDiagnostics = async (clientServices, serviceContext, config) => {
+  const diagnostics = {
+    created: (/* @__PURE__ */ new Date()).toISOString(),
+    platform: getPlatform(),
+    client: {
+      version: DXOS_VERSION,
+      storage: {
+        version: import_protocols.STORAGE_VERSION
+      }
+    }
+  };
+  {
+    (0, import_invariant.invariant)(clientServices.LoggingService, "SystemService is not available.", {
+      F: __dxlog_file,
+      L: 87,
+      S: void 0,
+      A: [
+        "clientServices.LoggingService",
+        "'SystemService is not available.'"
+      ]
+    });
+    diagnostics.metrics = await (0, import_codec_protobuf2.getFirstStreamValue)(clientServices.LoggingService.queryMetrics({}), {
+      timeout: DEFAULT_TIMEOUT
+    }).catch(() => void 0);
+  }
+  const identity = serviceContext.identityManager.identity;
+  if (identity) {
+    diagnostics.identity = {
+      identityKey: identity.identityKey,
+      spaceKey: identity.space.key,
+      profile: identity.profileDocument
+    };
+    const { devices } = await (0, import_codec_protobuf2.getFirstStreamValue)(clientServices.DevicesService.queryDevices(), {
+      timeout: DEFAULT_TIMEOUT
+    }).catch(() => void 0) ?? {};
+    diagnostics.devices = devices;
+    if (serviceContext.dataSpaceManager) {
+      diagnostics.spaces = await Promise.all(Array.from(serviceContext.dataSpaceManager.spaces.values()).map((space) => getSpaceStats(space)) ?? []);
+    }
+    const { feeds = [] } = await (0, import_codec_protobuf2.getFirstStreamValue)(clientServices.DevtoolsHost.subscribeToFeeds({}), {
+      timeout: DEFAULT_TIMEOUT
+    }).catch(() => void 0) ?? {};
+    diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
+      feedKey,
+      bytes,
+      length
+    }));
+  }
+  diagnostics.config = config.values;
+  return diagnostics;
+};
+var getProperties = (space) => {
+  let properties = {};
+  try {
+    const propertiesItem = space.dataPipeline.itemManager.items.find((item) => item.modelMeta?.type === import_document_model.DocumentModel.meta.type && item.state?.type === "dxos.sdk.client.Properties");
+    const state = propertiesItem?.state;
+    properties = state?.data;
+  } catch (err) {
+    import_log.log.warn(err.message, void 0, {
+      F: __dxlog_file,
+      L: 144,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  }
+  return properties;
+};
+var getSpaceStats = async (space) => {
+  const stats = {
+    key: space.key,
+    metrics: space.metrics,
+    epochs: space.inner.spaceState.credentials.filter((0, import_credentials2.credentialTypeFilter)("dxos.halo.credentials.Epoch")).map((credential) => ({
+      ...credential.subject.assertion,
+      id: credential.id
+    })),
+    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_services.SpaceMember.PresenceState.ONLINE : import_services.SpaceMember.PresenceState.OFFLINE
+    })),
+    pipeline: {
+      // TODO(burdon): Pick properties from credentials if needed.
+      // currentEpoch: space.dataPipeline.currentEpoch,
+      // appliedEpoch: space.dataPipeline.appliedEpoch,
+      controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
+      currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
+      targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
+      totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe,
+      // TODO(burdon): Empty?
+      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) {
+    Object.assign(stats, {
+      properties: getProperties(space),
+      db: {
+        objects: space.dataPipeline.itemManager.entities.size
+      }
+    });
+  }
+  if (stats.metrics) {
+    const { open, ready } = stats.metrics;
+    stats.metrics.startupTime = open && ready && ready.getTime() - open.getTime();
+  }
+  return stats;
+};
+
 // packages/sdk/client-services/src/packlets/services/service-context.ts
-var import_tiny_invariant11 = __toESM(require("tiny-invariant"));
 var import_async11 = require("@dxos/async");
-var import_credentials14 = require("@dxos/credentials");
+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_feed_store3 = require("@dxos/feed-store");
+var import_invariant12 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
 var import_keys8 = require("@dxos/keys");
-var import_log12 = require("@dxos/log");
-var import_protocols8 = require("@dxos/protocols");
-var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
+var import_log13 = require("@dxos/log");
+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_util6 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/identity/authenticator.ts
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
-var import_credentials2 = require("@dxos/credentials");
-var import_log = require("@dxos/log");
-var import_protocols = require("@dxos/protocols");
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
-var Credential = import_protocols.schema.getCodecForType("dxos.halo.credentials.Credential");
+var import_credentials3 = require("@dxos/credentials");
+var import_log2 = require("@dxos/log");
+var import_protocols2 = require("@dxos/protocols");
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
+var Credential = import_protocols2.schema.getCodecForType("dxos.halo.credentials.Credential");
 var createAuthProvider = (signer) => async (nonce) => {
   const credential = await signer.createCredential({
     assertion: {
@@ -114,20 +265,20 @@ var TrustedKeySetAuthVerifier = class {
   get verifier() {
     return async (nonce, auth) => {
       const credential = Credential.decode(auth);
-      (0, import_log.log)("authenticating...", {
+      (0, import_log2.log)("authenticating...", {
         credential
       }, {
-        F: __dxlog_file,
+        F: __dxlog_file2,
         L: 59,
         S: this,
         C: (f, a) => f(...a)
       });
-      const result = await (0, import_credentials2.verifyCredential)(credential);
+      const result = await (0, import_credentials3.verifyCredential)(credential);
       if (result.kind === "fail") {
-        (0, import_log.log)("Invalid credential", {
+        (0, import_log2.log)("Invalid credential", {
           result
         }, {
-          F: __dxlog_file,
+          F: __dxlog_file2,
           L: 63,
           S: this,
           C: (f, a) => f(...a)
@@ -135,11 +286,11 @@ var TrustedKeySetAuthVerifier = class {
         return false;
       }
       if (!credential.proof.nonce || !Buffer.from(nonce).equals(credential.proof.nonce)) {
-        (0, import_log.log)("Invalid nonce", {
+        (0, import_log2.log)("Invalid nonce", {
           nonce,
           credential
         }, {
-          F: __dxlog_file,
+          F: __dxlog_file2,
           L: 68,
           S: this,
           C: (f, a) => f(...a)
@@ -147,10 +298,10 @@ var TrustedKeySetAuthVerifier = class {
         return false;
       }
       if (this._isTrustedKey(credential.issuer)) {
-        (0, import_log.log)("key is not currently in trusted set, waiting...", {
+        (0, import_log2.log)("key is not currently in trusted set, waiting...", {
           key: credential.issuer
         }, {
-          F: __dxlog_file,
+          F: __dxlog_file2,
           L: 73,
           S: this,
           C: (f, a) => f(...a)
@@ -163,20 +314,20 @@ var TrustedKeySetAuthVerifier = class {
       });
       const clear = this._params.update.on(this._ctx, () => {
         if (this._isTrustedKey(credential.issuer)) {
-          (0, import_log.log)("auth success", {
+          (0, import_log2.log)("auth success", {
             key: credential.issuer
           }, {
-            F: __dxlog_file,
+            F: __dxlog_file2,
             L: 84,
             S: this,
             C: (f, a) => f(...a)
           });
           trigger.wake(true);
         } else {
-          (0, import_log.log)("key is not currently in trusted set, waiting...", {
+          (0, import_log2.log)("key is not currently in trusted set, waiting...", {
             key: credential.issuer
           }, {
-            F: __dxlog_file,
+            F: __dxlog_file2,
             L: 87,
             S: this,
             C: (f, a) => f(...a)
@@ -187,7 +338,7 @@ var TrustedKeySetAuthVerifier = class {
         return await trigger.wait({
           timeout: this._params.authTimeout
         });
-      } catch (e) {
+      } catch {
         return false;
       } finally {
         clear();
@@ -201,28 +352,39 @@ var TrustedKeySetAuthVerifier = class {
 };
 
 // packages/sdk/client-services/src/packlets/identity/identity.ts
-var import_tiny_invariant = __toESM(require("tiny-invariant"));
 var import_async2 = require("@dxos/async");
 var import_client_protocol = require("@dxos/client-protocol");
-var import_credentials3 = require("@dxos/credentials");
+var import_credentials4 = require("@dxos/credentials");
 var import_debug2 = require("@dxos/debug");
 var import_feed_store = require("@dxos/feed-store");
-var import_log2 = require("@dxos/log");
-var import_credentials4 = require("@dxos/protocols/proto/dxos/halo/credentials");
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
-var Identity = class {
+var import_invariant2 = require("@dxos/invariant");
+var import_log3 = require("@dxos/log");
+var import_credentials5 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_tracing = require("@dxos/tracing");
+function _ts_decorate(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")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
+var Identity = class Identity2 {
   constructor({ space, signer, identityKey, deviceKey }) {
     this.stateUpdate = new import_async2.Event();
     this.space = space;
     this._signer = signer;
     this.identityKey = identityKey;
     this.deviceKey = deviceKey;
-    this._deviceStateMachine = new import_credentials3.DeviceStateMachine({
+    this._deviceStateMachine = new import_credentials4.DeviceStateMachine({
       identityKey: this.identityKey,
       deviceKey: this.deviceKey,
       onUpdate: () => this.stateUpdate.emit()
     });
-    this._profileStateMachine = new import_credentials3.ProfileStateMachine({
+    this._profileStateMachine = new import_credentials4.ProfileStateMachine({
       identityKey: this.identityKey,
       onUpdate: () => this.stateUpdate.emit()
     });
@@ -236,12 +398,12 @@ var Identity = class {
   get authorizedDeviceKeys() {
     return this._deviceStateMachine.authorizedDeviceKeys;
   }
-  async open() {
+  async open(ctx) {
     await this.space.spaceState.addCredentialProcessor(this._deviceStateMachine);
     await this.space.spaceState.addCredentialProcessor(this._profileStateMachine);
-    await this.space.open();
+    await this.space.open(ctx);
   }
-  async close() {
+  async close(ctx) {
     await this.authVerifier.close();
     await this.space.spaceState.removeCredentialProcessor(this._profileStateMachine);
     await this.space.spaceState.removeCredentialProcessor(this._deviceStateMachine);
@@ -272,11 +434,10 @@ var Identity = class {
     return this._deviceStateMachine.deviceCredentialChain;
   }
   getAdmissionCredentials() {
-    var _a, _b;
     return {
       deviceKey: this.deviceKey,
-      controlFeedKey: (_a = this.space.controlFeedKey) != null ? _a : (0, import_debug2.failUndefined)(),
-      dataFeedKey: (_b = this.space.dataFeedKey) != null ? _b : (0, import_debug2.failUndefined)()
+      controlFeedKey: this.space.controlFeedKey ?? (0, import_debug2.failUndefined)(),
+      dataFeedKey: this.space.dataFeedKey ?? (0, import_debug2.failUndefined)()
     };
   }
   /**
@@ -284,25 +445,33 @@ var Identity = class {
   * Requires identity to be ready.
   */
   getIdentityCredentialSigner() {
-    (0, import_tiny_invariant.default)(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.");
-    return (0, import_credentials3.createCredentialSignerWithChain)(this._signer, this._deviceStateMachine.deviceCredentialChain, this.deviceKey);
+    (0, import_invariant2.invariant)(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
+      F: __dxlog_file3,
+      L: 139,
+      S: this,
+      A: [
+        "this._deviceStateMachine.deviceCredentialChain",
+        "'Device credential chain is not ready.'"
+      ]
+    });
+    return (0, import_credentials4.createCredentialSignerWithChain)(this._signer, this._deviceStateMachine.deviceCredentialChain, this.deviceKey);
   }
   /**
   * Issues credentials as device.
   */
   getDeviceCredentialSigner() {
-    return (0, import_credentials3.createCredentialSignerWithKey)(this._signer, this.deviceKey);
+    return (0, import_credentials4.createCredentialSignerWithKey)(this._signer, this.deviceKey);
   }
   async admitDevice({ deviceKey, controlFeedKey, dataFeedKey }) {
-    (0, import_log2.log)("Admitting device:", {
+    (0, import_log3.log)("Admitting device:", {
       identityKey: this.identityKey,
       hostDevice: this.deviceKey,
       deviceKey,
       controlFeedKey,
       dataFeedKey
     }, {
-      F: __dxlog_file2,
-      L: 151,
+      F: __dxlog_file3,
+      L: 155,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -323,7 +492,7 @@ var Identity = class {
           spaceKey: this.haloSpaceKey,
           deviceKey,
           identityKey: this.identityKey,
-          designation: import_credentials4.AdmittedFeed.Designation.CONTROL
+          designation: import_credentials5.AdmittedFeed.Designation.CONTROL
         }
       }),
       await signer.createCredential({
@@ -333,7 +502,7 @@ var Identity = class {
           spaceKey: this.haloSpaceKey,
           deviceKey,
           identityKey: this.identityKey,
-          designation: import_credentials4.AdmittedFeed.Designation.DATA
+          designation: import_credentials5.AdmittedFeed.Designation.DATA
         }
       })
     ].map((credential) => ({
@@ -343,18 +512,40 @@ var Identity = class {
     })));
   }
 };
+_ts_decorate([
+  import_tracing.trace.span()
+], Identity.prototype, "open", null);
+_ts_decorate([
+  import_tracing.trace.span()
+], Identity.prototype, "close", null);
+Identity = _ts_decorate([
+  import_tracing.trace.resource()
+], Identity);
 
 // packages/sdk/client-services/src/packlets/identity/identity-manager.ts
-var import_tiny_invariant2 = __toESM(require("tiny-invariant"));
 var import_async3 = require("@dxos/async");
-var import_credentials5 = require("@dxos/credentials");
+var import_context2 = require("@dxos/context");
+var import_credentials6 = require("@dxos/credentials");
+var import_invariant3 = require("@dxos/invariant");
 var import_keys2 = require("@dxos/keys");
-var import_log3 = require("@dxos/log");
-var import_protocols2 = require("@dxos/protocols");
-var import_credentials6 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_log4 = require("@dxos/log");
+var import_protocols3 = require("@dxos/protocols");
+var import_credentials7 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_timeframe = require("@dxos/timeframe");
+var import_tracing2 = require("@dxos/tracing");
 var import_util = require("@dxos/util");
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-manager.ts";
-var IdentityManager = class {
+function _ts_decorate2(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")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-manager.ts";
+var IdentityManager = class IdentityManager2 {
   // TODO(burdon): IdentityManagerParams.
   // TODO(dmaretskyi): Perhaps this should take/generate the peerKey outside of an initialized identity.
   constructor(_metadataStore, _keyring, _feedStore, _spaceManager) {
@@ -367,61 +558,66 @@ var IdentityManager = class {
   get identity() {
     return this._identity;
   }
-  async open() {
-    var _a;
+  async open(ctx) {
     const traceId = import_keys2.PublicKey.random().toHex();
-    import_log3.log.trace("dxos.halo.identity-manager.open", import_protocols2.trace.begin({
+    import_log4.log.trace("dxos.halo.identity-manager.open", import_protocols3.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file3,
-      L: 70,
+      F: __dxlog_file4,
+      L: 73,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._metadataStore.load();
     const identityRecord = this._metadataStore.getIdentityRecord();
-    (0, import_log3.log)("identity record", {
+    (0, import_log4.log)("identity record", {
       identityRecord
     }, {
-      F: __dxlog_file3,
-      L: 74,
+      F: __dxlog_file4,
+      L: 77,
       S: this,
       C: (f, a) => f(...a)
     });
     if (identityRecord) {
       this._identity = await this._constructIdentity(identityRecord);
-      await this._identity.open();
+      await this._identity.open(ctx);
       await this._identity.ready();
-      import_log3.log.trace("dxos.halo.identity", {
+      import_log4.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: 79,
+        F: __dxlog_file4,
+        L: 82,
         S: this,
         C: (f, a) => f(...a)
       });
       this.stateUpdate.emit();
     }
-    import_log3.log.trace("dxos.halo.identity-manager.open", import_protocols2.trace.end({
+    import_log4.log.trace("dxos.halo.identity-manager.open", import_protocols3.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file3,
-      L: 85,
+      F: __dxlog_file4,
+      L: 88,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    var _a;
-    await ((_a = this._identity) == null ? void 0 : _a.close());
+    await this._identity?.close(new import_context2.Context());
   }
   async createIdentity({ displayName } = {}) {
-    var _a;
-    (0, import_tiny_invariant2.default)(!this._identity, "Identity already exists.");
-    (0, import_log3.log)("creating identity...", void 0, {
-      F: __dxlog_file3,
-      L: 94,
+    (0, import_invariant3.invariant)(!this._identity, "Identity already exists.", {
+      F: __dxlog_file4,
+      L: 96,
+      S: this,
+      A: [
+        "!this._identity",
+        "'Identity already exists.'"
+      ]
+    });
+    (0, import_log4.log)("creating identity...", void 0, {
+      F: __dxlog_file4,
+      L: 97,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -437,16 +633,32 @@ var IdentityManager = class {
       }
     };
     const identity = await this._constructIdentity(identityRecord);
-    await identity.open();
+    await identity.open(new import_context2.Context());
     {
-      const generator = new import_credentials5.CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
-      (0, import_tiny_invariant2.default)(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.");
-      (0, import_tiny_invariant2.default)(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.");
+      const generator = new import_credentials6.CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
+      (0, import_invariant3.invariant)(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
+        F: __dxlog_file4,
+        L: 116,
+        S: this,
+        A: [
+          "identityRecord.haloSpace.genesisFeedKey",
+          "'Genesis feed key is required.'"
+        ]
+      });
+      (0, import_invariant3.invariant)(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
+        F: __dxlog_file4,
+        L: 117,
+        S: this,
+        A: [
+          "identityRecord.haloSpace.dataFeedKey",
+          "'Data feed key is required.'"
+        ]
+      });
       const credentials = [
         // Space genesis.
         ...await generator.createSpaceGenesis(identityRecord.haloSpace.key, identityRecord.haloSpace.genesisFeedKey),
         // Feed admission.
-        await generator.createFeedAdmission(identityRecord.haloSpace.key, identityRecord.haloSpace.dataFeedKey, import_credentials6.AdmittedFeed.Designation.DATA)
+        await generator.createFeedAdmission(identityRecord.haloSpace.key, identityRecord.haloSpace.dataFeedKey, import_credentials7.AdmittedFeed.Designation.DATA)
       ];
       if (displayName) {
         credentials.push(await generator.createProfileCredential({
@@ -465,22 +677,22 @@ var IdentityManager = class {
     await this._metadataStore.setIdentityRecord(identityRecord);
     this._identity = identity;
     await this._identity.ready();
-    import_log3.log.trace("dxos.halo.identity", {
+    import_log4.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: 149,
+      F: __dxlog_file4,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdate.emit();
-    (0, import_log3.log)("created identity", {
+    (0, import_log4.log)("created identity", {
       identityKey: identity.identityKey,
       deviceKey: identity.deviceKey
     }, {
-      F: __dxlog_file3,
-      L: 155,
+      F: __dxlog_file4,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -490,16 +702,23 @@ var IdentityManager = class {
   * 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", {
+    (0, import_log4.log)("accepting identity", {
       params
     }, {
-      F: __dxlog_file3,
-      L: 163,
+      F: __dxlog_file4,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_tiny_invariant2.default)(!this._identity, "Identity already exists.");
+    (0, import_invariant3.invariant)(!this._identity, "Identity already exists.", {
+      F: __dxlog_file4,
+      L: 167,
+      S: this,
+      A: [
+        "!this._identity",
+        "'Identity already exists.'"
+      ]
+    });
     const identityRecord = {
       identityKey: params.identityKey,
       deviceKey: params.deviceKey,
@@ -512,46 +731,102 @@ var IdentityManager = class {
       }
     };
     const identity = await this._constructIdentity(identityRecord);
-    await identity.open();
+    await identity.open(new import_context2.Context());
     this._identity = identity;
     await this._metadataStore.setIdentityRecord(identityRecord);
     await this._identity.ready();
-    import_log3.log.trace("dxos.halo.identity", {
+    import_log4.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: 183,
+      F: __dxlog_file4,
+      L: 186,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdate.emit();
-    (0, import_log3.log)("accepted identity", {
+    (0, import_log4.log)("accepted identity", {
       identityKey: identity.identityKey,
       deviceKey: identity.deviceKey
     }, {
-      F: __dxlog_file3,
-      L: 189,
+      F: __dxlog_file4,
+      L: 192,
       S: this,
       C: (f, a) => f(...a)
     });
     return identity;
   }
+  /**
+  * Update the profile document of an existing identity.
+  */
+  async updateProfile(profile) {
+    (0, import_invariant3.invariant)(this._identity, "Identity not initialized.", {
+      F: __dxlog_file4,
+      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_tiny_invariant2.default)(!this._identity);
-    (0, import_log3.log)("constructing identity", {
+    (0, import_invariant3.invariant)(!this._identity, void 0, {
+      F: __dxlog_file4,
+      L: 214,
+      S: this,
+      A: [
+        "!this._identity",
+        ""
+      ]
+    });
+    (0, import_log4.log)("constructing identity", {
       identityRecord
     }, {
-      F: __dxlog_file3,
-      L: 195,
+      F: __dxlog_file4,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_tiny_invariant2.default)(identityRecord.haloSpace.controlFeedKey);
+    (0, import_invariant3.invariant)(identityRecord.haloSpace.controlFeedKey, void 0, {
+      F: __dxlog_file4,
+      L: 218,
+      S: this,
+      A: [
+        "identityRecord.haloSpace.controlFeedKey",
+        ""
+      ]
+    });
     const controlFeed = await this._feedStore.openFeed(identityRecord.haloSpace.controlFeedKey, {
       writable: true
     });
-    (0, import_tiny_invariant2.default)(identityRecord.haloSpace.dataFeedKey);
+    (0, import_invariant3.invariant)(identityRecord.haloSpace.dataFeedKey, void 0, {
+      F: __dxlog_file4,
+      L: 222,
+      S: this,
+      A: [
+        "identityRecord.haloSpace.dataFeedKey",
+        ""
+      ]
+    });
     const dataFeed = await this._feedStore.openFeed(identityRecord.haloSpace.dataFeedKey, {
       writable: true,
       sparse: true
@@ -560,7 +835,7 @@ var IdentityManager = class {
       spaceRecord: identityRecord.haloSpace,
       swarmIdentity: {
         peerKey: identityRecord.deviceKey,
-        credentialProvider: createAuthProvider((0, import_credentials5.createCredentialSignerWithKey)(this._keyring, identityRecord.deviceKey)),
+        credentialProvider: createAuthProvider((0, import_credentials6.createCredentialSignerWithKey)(this._keyring, identityRecord.deviceKey)),
         credentialAuthenticator: (0, import_util.deferFunction)(() => identity.authVerifier.verifier)
       },
       identityKey: identityRecord.identityKey
@@ -573,11 +848,11 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey,
       deviceKey: identityRecord.deviceKey
     });
-    (0, import_log3.log)("done", {
+    (0, import_log4.log)("done", {
       identityKey: identityRecord.identityKey
     }, {
-      F: __dxlog_file3,
-      L: 226,
+      F: __dxlog_file4,
+      L: 246,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -596,9 +871,9 @@ var IdentityManager = class {
       onNetworkConnection: () => {
       },
       onAuthFailure: () => {
-        import_log3.log.warn("auth failure", void 0, {
-          F: __dxlog_file3,
-          L: 245,
+        import_log4.log.warn("auth failure", void 0, {
+          F: __dxlog_file4,
+          L: 265,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -607,58 +882,88 @@ var IdentityManager = class {
     });
   }
 };
+_ts_decorate2([
+  import_tracing2.trace.span()
+], IdentityManager.prototype, "open", null);
+IdentityManager = _ts_decorate2([
+  import_tracing2.trace.resource()
+], IdentityManager);
 
 // packages/sdk/client-services/src/packlets/identity/identity-service.ts
-var import_tiny_invariant3 = __toESM(require("tiny-invariant"));
-var import_codec_protobuf2 = require("@dxos/codec-protobuf");
-var import_credentials7 = require("@dxos/credentials");
+var import_codec_protobuf3 = require("@dxos/codec-protobuf");
+var import_credentials8 = require("@dxos/credentials");
 var import_debug3 = require("@dxos/debug");
+var import_invariant4 = require("@dxos/invariant");
+var __dxlog_file5 = "/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) {
     return (0, import_debug3.todo)();
   }
   queryIdentity() {
-    return new import_codec_protobuf2.Stream(({ next }) => {
+    return new import_codec_protobuf3.Stream(({ next }) => {
       const emitNext = () => next({
         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_invariant4.invariant)(this._identityManager.identity, "Identity not initialized.", {
+      F: __dxlog_file5,
+      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_tiny_invariant3.default)(this._serviceContext.identityManager.identity, "Identity not initialized.");
-    return await (0, import_credentials7.signPresentation)({
+    (0, import_invariant4.invariant)(this._identityManager.identity, "Identity not initialized.", {
+      F: __dxlog_file5,
+      L: 65,
+      S: this,
+      A: [
+        "this._identityManager.identity",
+        "'Identity not initialized.'"
+      ]
+    });
+    return await (0, import_credentials8.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
     });
   }
 };
 
 // packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts
-var import_tiny_invariant4 = __toESM(require("tiny-invariant"));
-var import_services = require("@dxos/protocols/proto/dxos/client/services");
+var import_invariant5 = require("@dxos/invariant");
+var import_services2 = require("@dxos/protocols/proto/dxos/client/services");
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts";
 var DeviceInvitationProtocol = class {
   constructor(_keyring, _getIdentity, _acceptIdentity) {
     this._keyring = _keyring;
@@ -670,11 +975,19 @@ var DeviceInvitationProtocol = class {
   }
   getInvitationContext() {
     return {
-      kind: import_services.Invitation.Kind.DEVICE
+      kind: import_services2.Invitation.Kind.DEVICE
     };
   }
   async admit(request) {
-    (0, import_tiny_invariant4.default)(request.device);
+    (0, import_invariant5.invariant)(request.device, void 0, {
+      F: __dxlog_file6,
+      L: 31,
+      S: this,
+      A: [
+        "request.device",
+        ""
+      ]
+    });
     const identity = this._getIdentity();
     await identity.admitDevice(request.device);
     return {
@@ -702,9 +1015,25 @@ var DeviceInvitationProtocol = class {
     };
   }
   async accept(response, request) {
-    (0, import_tiny_invariant4.default)(response.device);
+    (0, import_invariant5.invariant)(response.device, void 0, {
+      F: __dxlog_file6,
+      L: 64,
+      S: this,
+      A: [
+        "response.device",
+        ""
+      ]
+    });
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
-    (0, import_tiny_invariant4.default)(request.device);
+    (0, import_invariant5.invariant)(request.device, void 0, {
+      F: __dxlog_file6,
+      L: 67,
+      S: this,
+      A: [
+        "request.device",
+        ""
+      ]
+    });
     const { deviceKey, controlFeedKey, dataFeedKey } = request.device;
     await this._acceptIdentity({
       identityKey,
@@ -722,45 +1051,45 @@ var DeviceInvitationProtocol = class {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
-var import_tiny_invariant6 = __toESM(require("tiny-invariant"));
 var import_async5 = require("@dxos/async");
 var import_client_protocol2 = require("@dxos/client-protocol");
-var import_context3 = require("@dxos/context");
-var import_credentials8 = require("@dxos/credentials");
+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_log5 = require("@dxos/log");
+var import_log6 = require("@dxos/log");
 var import_network_manager = require("@dxos/network-manager");
-var import_protocols4 = require("@dxos/protocols");
-var import_services3 = require("@dxos/protocols/proto/dxos/client/services");
+var import_protocols5 = require("@dxos/protocols");
+var import_services4 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations2 = require("@dxos/protocols/proto/dxos/halo/invitations");
 
 // packages/sdk/client-services/src/packlets/invitations/invitation-extension.ts
-var import_tiny_invariant5 = __toESM(require("tiny-invariant"));
 var import_async4 = require("@dxos/async");
-var import_context2 = require("@dxos/context");
+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_log4 = require("@dxos/log");
-var import_protocols3 = require("@dxos/protocols");
-var import_services2 = require("@dxos/protocols/proto/dxos/client/services");
+var import_log5 = require("@dxos/log");
+var import_protocols4 = require("@dxos/protocols");
+var import_services3 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_teleport = require("@dxos/teleport");
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-extension.ts";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-extension.ts";
 var OPTIONS_TIMEOUT = 1e4;
 var MAX_OTP_ATTEMPTS = 3;
 var InvitationHostExtension = class extends import_teleport.RpcExtension {
   constructor(_callbacks) {
     super({
       requested: {
-        InvitationHostService: import_protocols3.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_protocols4.schema.getService("dxos.halo.invitations.InvitationHostService")
       },
       exposed: {
-        InvitationHostService: import_protocols3.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_protocols4.schema.getService("dxos.halo.invitations.InvitationHostService")
       }
     });
     this._callbacks = _callbacks;
-    this._ctx = new import_context2.Context();
+    this._ctx = new import_context3.Context();
     this._remoteOptionsTrigger = new import_async4.Trigger();
     this.invitation = void 0;
     this.guestProfile = void 0;
@@ -774,88 +1103,104 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
       // Perhaps in the future we will have more complex logic here.
       InvitationHostService: {
         options: async (options) => {
-          (0, import_tiny_invariant5.default)(!this._remoteOptions, "Remote options already set.");
+          (0, import_invariant6.invariant)(!this._remoteOptions, "Remote options already set.", {
+            F: __dxlog_file7,
+            L: 88,
+            S: this,
+            A: [
+              "!this._remoteOptions",
+              "'Remote options already set.'"
+            ]
+          });
           this._remoteOptions = options;
           this._remoteOptionsTrigger.wake();
         },
         introduce: async (request) => {
           const { profile, invitationId } = request;
           const traceId = import_keys3.PublicKey.random().toHex();
-          import_log4.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols3.trace.begin({
+          import_log5.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols4.trace.begin({
             id: traceId
           }), {
-            F: __dxlog_file4,
-            L: 98,
+            F: __dxlog_file7,
+            L: 97,
             S: this,
             C: (f, a) => f(...a)
           });
           const invitation = await this._callbacks.resolveInvitation(request);
           if (!invitation) {
-            import_log4.log.warn("invitation not found", {
+            import_log5.log.warn("invitation not found", {
               invitationId
             }, {
-              F: __dxlog_file4,
-              L: 102,
+              F: __dxlog_file7,
+              L: 101,
               S: this,
               C: (f, a) => f(...a)
             });
             this._callbacks.onError(new Error("Invitation not found."));
             return {
-              authMethod: import_services2.Invitation.AuthMethod.NONE
+              authMethod: import_services3.Invitation.AuthMethod.NONE
             };
           }
           this.invitation = invitation;
-          (0, import_log4.log)("guest introduced itself", {
+          (0, import_log5.log)("guest introduced itself", {
             guestProfile: profile
           }, {
-            F: __dxlog_file4,
-            L: 111,
+            F: __dxlog_file7,
+            L: 110,
             S: this,
             C: (f, a) => f(...a)
           });
           this.guestProfile = profile;
           this._callbacks.onStateUpdate({
             ...this.invitation,
-            state: import_services2.Invitation.State.READY_FOR_AUTHENTICATION
+            state: import_services3.Invitation.State.READY_FOR_AUTHENTICATION
           });
-          import_log4.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols3.trace.end({
+          import_log5.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols4.trace.end({
             id: traceId
           }), {
-            F: __dxlog_file4,
-            L: 118,
+            F: __dxlog_file7,
+            L: 117,
             S: this,
             C: (f, a) => f(...a)
           });
           return {
-            spaceKey: this.invitation.authMethod === import_services2.Invitation.AuthMethod.NONE ? this.invitation.spaceKey : void 0,
+            spaceKey: this.invitation.authMethod === import_services3.Invitation.AuthMethod.NONE ? this.invitation.spaceKey : void 0,
             authMethod: this.invitation.authMethod
           };
         },
         authenticate: async ({ authCode: code }) => {
           const traceId = import_keys3.PublicKey.random().toHex();
-          import_log4.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols3.trace.begin({
+          import_log5.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols4.trace.begin({
             id: traceId
           }), {
-            F: __dxlog_file4,
-            L: 127,
+            F: __dxlog_file7,
+            L: 126,
             S: this,
             C: (f, a) => f(...a)
           });
-          (0, import_log4.log)("received authentication request", {
+          (0, import_log5.log)("received authentication request", {
             authCode: code
           }, {
-            F: __dxlog_file4,
-            L: 128,
+            F: __dxlog_file7,
+            L: 127,
             S: this,
             C: (f, a) => f(...a)
           });
           let status = import_invitations.AuthenticationResponse.Status.OK;
-          (0, import_tiny_invariant5.default)(this.invitation, "Invitation is not set.");
+          (0, import_invariant6.invariant)(this.invitation, "Invitation is not set.", {
+            F: __dxlog_file7,
+            L: 130,
+            S: this,
+            A: [
+              "this.invitation",
+              "'Invitation is not set.'"
+            ]
+          });
           switch (this.invitation.authMethod) {
-            case import_services2.Invitation.AuthMethod.NONE: {
-              (0, import_log4.log)("authentication not required", void 0, {
-                F: __dxlog_file4,
-                L: 134,
+            case import_services3.Invitation.AuthMethod.NONE: {
+              (0, import_log5.log)("authentication not required", void 0, {
+                F: __dxlog_file7,
+                L: 133,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -863,7 +1208,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
                 status: import_invitations.AuthenticationResponse.Status.OK
               };
             }
-            case import_services2.Invitation.AuthMethod.SHARED_SECRET: {
+            case import_services3.Invitation.AuthMethod.SHARED_SECRET: {
               if (this.invitation.authCode) {
                 if (this.authenticationRetry++ > MAX_OTP_ATTEMPTS) {
                   status = import_invitations.AuthenticationResponse.Status.INVALID_OPT_ATTEMPTS;
@@ -876,11 +1221,11 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
               break;
             }
             default: {
-              import_log4.log.error("invalid authentication method", {
+              import_log5.log.error("invalid authentication method", {
                 authMethod: this.invitation.authMethod
               }, {
-                F: __dxlog_file4,
-                L: 152,
+                F: __dxlog_file7,
+                L: 151,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -888,14 +1233,14 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
               break;
             }
           }
-          import_log4.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols3.trace.end({
+          import_log5.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols4.trace.end({
             id: traceId,
             data: {
               status
             }
           }), {
-            F: __dxlog_file4,
-            L: 158,
+            F: __dxlog_file7,
+            L: 157,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -905,25 +1250,33 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         },
         admit: async (request) => {
           const traceId = import_keys3.PublicKey.random().toHex();
-          import_log4.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols3.trace.begin({
+          import_log5.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols4.trace.begin({
             id: traceId
           }), {
-            F: __dxlog_file4,
-            L: 164,
+            F: __dxlog_file7,
+            L: 163,
             S: this,
             C: (f, a) => f(...a)
           });
           try {
-            (0, import_tiny_invariant5.default)(this.invitation, "Invitation is not set.");
+            (0, import_invariant6.invariant)(this.invitation, "Invitation is not set.", {
+              F: __dxlog_file7,
+              L: 166,
+              S: this,
+              A: [
+                "this.invitation",
+                "'Invitation is not set.'"
+              ]
+            });
             if (isAuthenticationRequired(this.invitation) && !this.authenticationPassed) {
               throw new Error("Not authenticated");
             }
             const response = await this._callbacks.admit(request);
-            import_log4.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols3.trace.end({
+            import_log5.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols4.trace.end({
               id: traceId
             }), {
-              F: __dxlog_file4,
-              L: 175,
+              F: __dxlog_file7,
+              L: 174,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -937,16 +1290,15 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
     };
   }
   async onOpen(context) {
-    var _a;
     await super.onOpen(context);
     try {
       await this.rpc.InvitationHostService.options({
         role: import_invitations.Options.Role.HOST
       });
-      await (0, import_context2.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
+      await (0, import_context3.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
@@ -965,21 +1317,29 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
   constructor(_callbacks) {
     super({
       requested: {
-        InvitationHostService: import_protocols3.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_protocols4.schema.getService("dxos.halo.invitations.InvitationHostService")
       },
       exposed: {
-        InvitationHostService: import_protocols3.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_protocols4.schema.getService("dxos.halo.invitations.InvitationHostService")
       }
     });
     this._callbacks = _callbacks;
-    this._ctx = new import_context2.Context();
+    this._ctx = new import_context3.Context();
     this._remoteOptionsTrigger = new import_async4.Trigger();
   }
   async getHandlers() {
     return {
       InvitationHostService: {
         options: async (options) => {
-          (0, import_tiny_invariant5.default)(!this._remoteOptions, "Remote options already set.");
+          (0, import_invariant6.invariant)(!this._remoteOptions, "Remote options already set.", {
+            F: __dxlog_file7,
+            L: 241,
+            S: this,
+            A: [
+              "!this._remoteOptions",
+              "'Remote options already set.'"
+            ]
+          });
           this._remoteOptions = options;
           this._remoteOptionsTrigger.wake();
         },
@@ -996,28 +1356,27 @@ 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, {
-        F: __dxlog_file4,
-        L: 263,
+      (0, import_log5.log)("begin options", void 0, {
+        F: __dxlog_file7,
+        L: 262,
         S: this,
         C: (f, a) => f(...a)
       });
-      await (0, import_context2.cancelWithContext)(this._ctx, this.rpc.InvitationHostService.options({
+      await (0, import_context3.cancelWithContext)(this._ctx, this.rpc.InvitationHostService.options({
         role: import_invitations.Options.Role.GUEST
       }));
-      await (0, import_context2.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
+      await (0, import_context3.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT
       }));
-      (0, import_log4.log)("end options", void 0, {
-        F: __dxlog_file4,
-        L: 266,
+      (0, import_log5.log)("end options", void 0, {
+        F: __dxlog_file7,
+        L: 265,
         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
@@ -1025,9 +1384,9 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
       }
       this._callbacks.onOpen(this._ctx);
     } catch (err) {
-      (0, import_log4.log)("openError", err, {
-        F: __dxlog_file4,
-        L: 276,
+      (0, import_log5.log)("openError", err, {
+        F: __dxlog_file7,
+        L: 275,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1035,19 +1394,19 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     }
   }
   async onClose() {
-    (0, import_log4.log)("onClose", void 0, {
-      F: __dxlog_file4,
-      L: 282,
+    (0, import_log5.log)("onClose", void 0, {
+      F: __dxlog_file7,
+      L: 281,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
   }
 };
-var isAuthenticationRequired = (invitation) => invitation.authMethod !== import_services2.Invitation.AuthMethod.NONE;
+var isAuthenticationRequired = (invitation) => invitation.authMethod !== import_services3.Invitation.AuthMethod.NONE;
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
 var InvitationsHandler = class {
   /**
   * @internal
@@ -1056,10 +1415,17 @@ var InvitationsHandler = class {
     this._networkManager = _networkManager;
   }
   createInvitation(protocol, options) {
-    var _a;
-    const { invitationId = import_keys4.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_keys4.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_credentials8.generatePasscode)(import_client_protocol2.AUTHENTICATION_CODE_LENGTH) : void 0;
-    (0, import_tiny_invariant6.default)(protocol);
+    const { invitationId = import_keys4.PublicKey.random().toHex(), type = import_services4.Invitation.Type.INTERACTIVE, authMethod = import_services4.Invitation.AuthMethod.SHARED_SECRET, state = import_services4.Invitation.State.INIT, timeout = import_client_protocol2.INVITATION_TIMEOUT, swarmKey = import_keys4.PublicKey.random() } = options ?? {};
+    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,
+      S: this,
+      A: [
+        "protocol",
+        ""
+      ]
+    });
     const invitation = {
       invitationId,
       type,
@@ -1071,18 +1437,18 @@ var InvitationsHandler = class {
       ...protocol.getInvitationContext()
     };
     const stream = new import_async5.PushStream();
-    const ctx = new import_context3.Context({
+    const ctx = new import_context4.Context({
       onError: (err) => {
         void ctx.dispose();
         stream.error(err);
       }
     });
     ctx.onDispose(() => {
-      (0, import_log5.log)("complete", {
+      (0, import_log6.log)("complete", {
         ...protocol.toJSON()
       }, {
-        F: __dxlog_file5,
-        L: 99,
+        F: __dxlog_file8,
+        L: 98,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1093,7 +1459,7 @@ var InvitationsHandler = class {
         onStateUpdate: (invitation2) => {
           stream.next({
             ...invitation2,
-            state: import_services3.Invitation.State.READY_FOR_AUTHENTICATION
+            state: import_services4.Invitation.State.READY_FOR_AUTHENTICATION
           });
         },
         resolveInvitation: async ({ invitationId: invitationId2 }) => {
@@ -1103,10 +1469,17 @@ 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;
-            (0, import_tiny_invariant6.default)(deviceKey);
+            const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
+            (0, import_invariant7.invariant)(deviceKey, void 0, {
+              F: __dxlog_file8,
+              L: 119,
+              S: this,
+              A: [
+                "deviceKey",
+                ""
+              ]
+            });
             const admissionResponse = await protocol.admit(admissionRequest, extension.guestProfile);
             extension.completedTrigger.wake(deviceKey);
             return admissionResponse;
@@ -1119,84 +1492,84 @@ var InvitationsHandler = class {
           (0, import_async5.scheduleTask)(ctx, async () => {
             const traceId = import_keys4.PublicKey.random().toHex();
             try {
-              import_log5.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols4.trace.begin({
+              import_log6.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.begin({
                 id: traceId
               }), {
-                F: __dxlog_file5,
-                L: 138,
+                F: __dxlog_file8,
+                L: 137,
                 S: this,
                 C: (f, a) => f(...a)
               });
-              (0, import_log5.log)("connected", {
+              (0, import_log6.log)("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file5,
-                L: 139,
+                F: __dxlog_file8,
+                L: 138,
                 S: this,
                 C: (f, a) => f(...a)
               });
               stream.next({
                 ...invitation,
-                state: import_services3.Invitation.State.CONNECTED
+                state: import_services4.Invitation.State.CONNECTED
               });
               const deviceKey = await extension.completedTrigger.wait({
                 timeout
               });
-              (0, import_log5.log)("admitted guest", {
+              (0, import_log6.log)("admitted guest", {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file5,
-                L: 142,
+                F: __dxlog_file8,
+                L: 141,
                 S: this,
                 C: (f, a) => f(...a)
               });
               stream.next({
                 ...invitation,
-                state: import_services3.Invitation.State.SUCCESS
+                state: import_services4.Invitation.State.SUCCESS
               });
-              import_log5.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols4.trace.end({
+              import_log6.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.end({
                 id: traceId
               }), {
-                F: __dxlog_file5,
-                L: 144,
+                F: __dxlog_file8,
+                L: 143,
                 S: this,
                 C: (f, a) => f(...a)
               });
             } catch (err) {
               if (err instanceof import_async5.TimeoutError) {
-                (0, import_log5.log)("timeout", {
+                (0, import_log6.log)("timeout", {
                   ...protocol.toJSON()
                 }, {
-                  F: __dxlog_file5,
-                  L: 147,
+                  F: __dxlog_file8,
+                  L: 146,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 stream.next({
                   ...invitation,
-                  state: import_services3.Invitation.State.TIMEOUT
+                  state: import_services4.Invitation.State.TIMEOUT
                 });
               } else {
-                import_log5.log.error("failed", err, {
-                  F: __dxlog_file5,
-                  L: 150,
+                import_log6.log.error("failed", err, {
+                  F: __dxlog_file8,
+                  L: 149,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 stream.error(err);
               }
-              import_log5.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols4.trace.error({
+              import_log6.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.error({
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file5,
-                L: 153,
+                F: __dxlog_file8,
+                L: 152,
                 S: this,
                 C: (f, a) => f(...a)
               });
             } finally {
-              if (type !== import_services3.Invitation.Type.MULTIUSE) {
+              if (type !== import_services4.Invitation.Type.MULTIUSE) {
                 await swarmConnection.close();
                 await ctx.dispose();
               }
@@ -1208,22 +1581,22 @@ var InvitationsHandler = class {
             return;
           }
           if (err instanceof import_async5.TimeoutError) {
-            (0, import_log5.log)("timeout", {
+            (0, import_log6.log)("timeout", {
               ...protocol.toJSON()
             }, {
-              F: __dxlog_file5,
-              L: 168,
+              F: __dxlog_file8,
+              L: 167,
               S: this,
               C: (f, a) => f(...a)
             });
             stream.next({
               ...invitation,
-              state: import_services3.Invitation.State.TIMEOUT
+              state: import_services4.Invitation.State.TIMEOUT
             });
           } else {
-            import_log5.log.error("failed", err, {
-              F: __dxlog_file5,
-              L: 171,
+            import_log6.log.error("failed", err, {
+              F: __dxlog_file8,
+              L: 170,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1247,7 +1620,7 @@ var InvitationsHandler = class {
       ctx.onDispose(() => swarmConnection.close());
       stream.next({
         ...invitation,
-        state: import_services3.Invitation.State.CONNECTING
+        state: import_services4.Invitation.State.CONNECTING
       });
     });
     const observable = new import_client_protocol2.CancellableInvitationObservable({
@@ -1256,7 +1629,7 @@ var InvitationsHandler = class {
       onCancel: async () => {
         stream.next({
           ...invitation,
-          state: import_services3.Invitation.State.CANCELLED
+          state: import_services4.Invitation.State.CANCELLED
         });
         await ctx.dispose();
       }
@@ -1265,37 +1638,53 @@ var InvitationsHandler = class {
   }
   acceptInvitation(protocol, invitation) {
     const { timeout = import_client_protocol2.INVITATION_TIMEOUT } = invitation;
-    (0, import_tiny_invariant6.default)(protocol);
+    (0, import_invariant7.invariant)(protocol, void 0, {
+      F: __dxlog_file8,
+      L: 210,
+      S: this,
+      A: [
+        "protocol",
+        ""
+      ]
+    });
     const authenticated = new import_async5.Trigger();
     let admitted = false;
     let currentState;
     const stream = new import_async5.PushStream();
     const setState = (newData) => {
-      (0, import_tiny_invariant6.default)(newData.state !== void 0);
+      (0, import_invariant7.invariant)(newData.state !== void 0, void 0, {
+        F: __dxlog_file8,
+        L: 221,
+        S: this,
+        A: [
+          "newData.state !== undefined",
+          ""
+        ]
+      });
       currentState = newData.state;
       stream.next({
         ...invitation,
         ...newData
       });
     };
-    const ctx = new import_context3.Context({
+    const ctx = new import_context4.Context({
       onError: (err) => {
         if (err instanceof import_async5.TimeoutError) {
-          (0, import_log5.log)("timeout", {
+          (0, import_log6.log)("timeout", {
             ...protocol.toJSON()
           }, {
-            F: __dxlog_file5,
-            L: 230,
+            F: __dxlog_file8,
+            L: 229,
             S: this,
             C: (f, a) => f(...a)
           });
           setState({
-            state: import_services3.Invitation.State.TIMEOUT
+            state: import_services4.Invitation.State.TIMEOUT
           });
         } else {
-          import_log5.log.warn("auth failed", err, {
-            F: __dxlog_file5,
-            L: 233,
+          import_log6.log.warn("auth failed", err, {
+            F: __dxlog_file8,
+            L: 232,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1305,11 +1694,11 @@ var InvitationsHandler = class {
       }
     });
     ctx.onDispose(() => {
-      (0, import_log5.log)("complete", {
+      (0, import_log6.log)("complete", {
         ...protocol.toJSON()
       }, {
-        F: __dxlog_file5,
-        L: 241,
+        F: __dxlog_file8,
+        L: 240,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1320,11 +1709,11 @@ var InvitationsHandler = class {
       const extension = new InvitationGuestExtension({
         onOpen: (extensionCtx) => {
           extensionCtx.onDispose(async () => {
-            (0, import_log5.log)("extension disposed", {
+            (0, import_log6.log)("extension disposed", {
               currentState
             }, {
-              F: __dxlog_file5,
-              L: 251,
+              F: __dxlog_file8,
+              L: 250,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1335,11 +1724,11 @@ var InvitationsHandler = class {
           (0, import_async5.scheduleTask)(ctx, async () => {
             const traceId = import_keys4.PublicKey.random().toHex();
             try {
-              import_log5.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols4.trace.begin({
+              import_log6.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols5.trace.begin({
                 id: traceId
               }), {
-                F: __dxlog_file5,
-                L: 260,
+                F: __dxlog_file8,
+                L: 259,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1347,32 +1736,32 @@ var InvitationsHandler = class {
                 throw new Error(`multiple connections detected: ${connectionCount}`);
               }
               (0, import_async5.scheduleTask)(ctx, () => ctx.raise(new import_async5.TimeoutError(timeout)), timeout);
-              (0, import_log5.log)("connected", {
+              (0, import_log6.log)("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file5,
-                L: 268,
+                F: __dxlog_file8,
+                L: 267,
                 S: this,
                 C: (f, a) => f(...a)
               });
               setState({
-                state: import_services3.Invitation.State.CONNECTED
+                state: import_services4.Invitation.State.CONNECTED
               });
-              (0, import_log5.log)("introduce", {
+              (0, import_log6.log)("introduce", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file5,
-                L: 272,
+                F: __dxlog_file8,
+                L: 271,
                 S: this,
                 C: (f, a) => f(...a)
               });
               const introductionResponse = await extension.rpc.InvitationHostService.introduce(protocol.createIntroduction());
-              (0, import_log5.log)("introduce response", {
+              (0, import_log6.log)("introduce response", {
                 ...protocol.toJSON(),
                 response: introductionResponse
               }, {
-                F: __dxlog_file5,
-                L: 276,
+                F: __dxlog_file8,
+                L: 275,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1382,26 +1771,26 @@ var InvitationsHandler = class {
               }
               if (isAuthenticationRequired(invitation)) {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
-                  (0, import_log5.log)("guest waiting for authentication code...", void 0, {
-                    F: __dxlog_file5,
-                    L: 285,
+                  (0, import_log6.log)("guest waiting for authentication code...", void 0, {
+                    F: __dxlog_file8,
+                    L: 284,
                     S: this,
                     C: (f, a) => f(...a)
                   });
                   setState({
-                    state: import_services3.Invitation.State.READY_FOR_AUTHENTICATION
+                    state: import_services4.Invitation.State.READY_FOR_AUTHENTICATION
                   });
                   const authCode = await authenticated.wait({
                     timeout
                   });
-                  (0, import_log5.log)("sending authentication request", void 0, {
-                    F: __dxlog_file5,
-                    L: 289,
+                  (0, import_log6.log)("sending authentication request", void 0, {
+                    F: __dxlog_file8,
+                    L: 288,
                     S: this,
                     C: (f, a) => f(...a)
                   });
                   setState({
-                    state: import_services3.Invitation.State.AUTHENTICATING
+                    state: import_services4.Invitation.State.AUTHENTICATING
                   });
                   const response = await extension.rpc.InvitationHostService.authenticate({
                     authCode
@@ -1413,11 +1802,11 @@ var InvitationsHandler = class {
                     if (attempt === MAX_OTP_ATTEMPTS) {
                       throw new Error(`Maximum retry attempts: ${MAX_OTP_ATTEMPTS}`);
                     } else {
-                      (0, import_log5.log)("retrying invalid code", {
+                      (0, import_log6.log)("retrying invalid code", {
                         attempt
                       }, {
-                        F: __dxlog_file5,
-                        L: 300,
+                        F: __dxlog_file8,
+                        L: 299,
                         S: this,
                         C: (f, a) => f(...a)
                       });
@@ -1427,14 +1816,14 @@ var InvitationsHandler = class {
                 }
               } else {
                 setState({
-                  state: import_services3.Invitation.State.READY_FOR_AUTHENTICATION
+                  state: import_services4.Invitation.State.READY_FOR_AUTHENTICATION
                 });
               }
-              (0, import_log5.log)("request admission", {
+              (0, import_log6.log)("request admission", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file5,
-                L: 311,
+                F: __dxlog_file8,
+                L: 310,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1442,54 +1831,54 @@ var InvitationsHandler = class {
               const admissionResponse = await extension.rpc.InvitationHostService.admit(admissionRequest);
               admitted = true;
               const result = await protocol.accept(admissionResponse, admissionRequest);
-              (0, import_log5.log)("admitted by host", {
+              (0, import_log6.log)("admitted by host", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file5,
-                L: 322,
+                F: __dxlog_file8,
+                L: 321,
                 S: this,
                 C: (f, a) => f(...a)
               });
               setState({
                 ...result,
-                state: import_services3.Invitation.State.SUCCESS
+                state: import_services4.Invitation.State.SUCCESS
               });
-              import_log5.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols4.trace.end({
+              import_log6.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols5.trace.end({
                 id: traceId
               }), {
-                F: __dxlog_file5,
-                L: 324,
+                F: __dxlog_file8,
+                L: 323,
                 S: this,
                 C: (f, a) => f(...a)
               });
             } catch (err) {
               if (err instanceof import_async5.TimeoutError) {
-                (0, import_log5.log)("timeout", {
+                (0, import_log6.log)("timeout", {
                   ...protocol.toJSON()
                 }, {
-                  F: __dxlog_file5,
-                  L: 327,
+                  F: __dxlog_file8,
+                  L: 326,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 setState({
-                  state: import_services3.Invitation.State.TIMEOUT
+                  state: import_services4.Invitation.State.TIMEOUT
                 });
               } else {
-                (0, import_log5.log)("auth failed", err, {
-                  F: __dxlog_file5,
-                  L: 330,
+                (0, import_log6.log)("auth failed", err, {
+                  F: __dxlog_file8,
+                  L: 329,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 stream.error(err);
               }
-              import_log5.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols4.trace.error({
+              import_log6.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols5.trace.error({
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file5,
-                L: 333,
+                F: __dxlog_file8,
+                L: 332,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1503,21 +1892,21 @@ var InvitationsHandler = class {
             return;
           }
           if (err instanceof import_async5.TimeoutError) {
-            (0, import_log5.log)("timeout", {
+            (0, import_log6.log)("timeout", {
               ...protocol.toJSON()
             }, {
-              F: __dxlog_file5,
-              L: 344,
+              F: __dxlog_file8,
+              L: 343,
               S: this,
               C: (f, a) => f(...a)
             });
             setState({
-              state: import_services3.Invitation.State.TIMEOUT
+              state: import_services4.Invitation.State.TIMEOUT
             });
           } else {
-            (0, import_log5.log)("auth failed", err, {
-              F: __dxlog_file5,
-              L: 347,
+            (0, import_log6.log)("auth failed", err, {
+              F: __dxlog_file8,
+              L: 346,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1528,7 +1917,15 @@ var InvitationsHandler = class {
       return extension;
     };
     (0, import_async5.scheduleTask)(ctx, async () => {
-      (0, import_tiny_invariant6.default)(invitation.swarmKey);
+      (0, import_invariant7.invariant)(invitation.swarmKey, void 0, {
+        F: __dxlog_file8,
+        L: 356,
+        S: this,
+        A: [
+          "invitation.swarmKey",
+          ""
+        ]
+      });
       const topic = invitation.swarmKey;
       const swarmConnection = await this._networkManager.joinSwarm({
         topic,
@@ -1540,7 +1937,7 @@ var InvitationsHandler = class {
       });
       ctx.onDispose(() => swarmConnection.close());
       setState({
-        state: import_services3.Invitation.State.CONNECTING
+        state: import_services4.Invitation.State.CONNECTING
       });
     });
     const observable = new import_client_protocol2.AuthenticatingInvitationObservable({
@@ -1548,7 +1945,7 @@ var InvitationsHandler = class {
       subscriber: stream.observable,
       onCancel: async () => {
         setState({
-          state: import_services3.Invitation.State.CANCELLED
+          state: import_services4.Invitation.State.CANCELLED
         });
         await ctx.dispose();
       },
@@ -1561,12 +1958,12 @@ var InvitationsHandler = class {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-service.ts
-var import_tiny_invariant7 = __toESM(require("tiny-invariant"));
 var import_async6 = require("@dxos/async");
-var import_codec_protobuf3 = require("@dxos/codec-protobuf");
-var import_log6 = require("@dxos/log");
-var import_services4 = require("@dxos/protocols/proto/dxos/client/services");
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-service.ts";
+var import_codec_protobuf4 = require("@dxos/codec-protobuf");
+var import_invariant8 = require("@dxos/invariant");
+var import_log7 = require("@dxos/log");
+var import_services5 = require("@dxos/protocols/proto/dxos/client/services");
+var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-service.ts";
 var InvitationsServiceImpl = class {
   constructor(_invitationsHandler, _getHandler) {
     this._invitationsHandler = _invitationsHandler;
@@ -1593,7 +1990,7 @@ var InvitationsServiceImpl = class {
       this._createInvitations.set(invitation.get().invitationId, invitation);
       this._invitationCreated.emit(invitation.get());
     }
-    return new import_codec_protobuf3.Stream(({ next, close }) => {
+    return new import_codec_protobuf4.Stream(({ next, close }) => {
       invitation.subscribe((invitation2) => {
         next(invitation2);
       }, (err) => {
@@ -1615,7 +2012,7 @@ var InvitationsServiceImpl = class {
       this._acceptInvitations.set(invitation.get().invitationId, invitation);
       this._invitationAccepted.emit(invitation.get());
     }
-    return new import_codec_protobuf3.Stream(({ next, close }) => {
+    return new import_codec_protobuf4.Stream(({ next, close }) => {
       invitation.subscribe((invitation2) => {
         next(invitation2);
       }, (err) => {
@@ -1627,20 +2024,28 @@ var InvitationsServiceImpl = class {
     });
   }
   async authenticate({ invitationId, authCode }) {
-    (0, import_log6.log)("authenticating...", void 0, {
-      F: __dxlog_file6,
-      L: 103,
+    (0, import_log7.log)("authenticating...", void 0, {
+      F: __dxlog_file9,
+      L: 102,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_tiny_invariant7.default)(invitationId);
+    (0, import_invariant8.invariant)(invitationId, void 0, {
+      F: __dxlog_file9,
+      L: 103,
+      S: this,
+      A: [
+        "invitationId",
+        ""
+      ]
+    });
     const observable = this._acceptInvitations.get(invitationId);
     if (!observable) {
-      import_log6.log.warn("invalid invitation", {
+      import_log7.log.warn("invalid invitation", {
         invitationId
       }, {
-        F: __dxlog_file6,
-        L: 107,
+        F: __dxlog_file9,
+        L: 106,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1649,13 +2054,21 @@ var InvitationsServiceImpl = class {
     }
   }
   async cancelInvitation({ invitationId }) {
-    (0, import_log6.log)("deleting...", void 0, {
-      F: __dxlog_file6,
-      L: 114,
+    (0, import_log7.log)("deleting...", void 0, {
+      F: __dxlog_file9,
+      L: 113,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_tiny_invariant7.default)(invitationId);
+    (0, import_invariant8.invariant)(invitationId, void 0, {
+      F: __dxlog_file9,
+      L: 114,
+      S: this,
+      A: [
+        "invitationId",
+        ""
+      ]
+    });
     const created = this._createInvitations.get(invitationId);
     const accepted = this._acceptInvitations.get(invitationId);
     if (created) {
@@ -1667,22 +2080,22 @@ var InvitationsServiceImpl = class {
       this._acceptInvitations.delete(invitationId);
       this._removedAccepted.emit(accepted.get());
     } else {
-      import_log6.log.warn("invalid invitation", {
+      import_log7.log.warn("invalid invitation", {
         invitationId
       }, {
-        F: __dxlog_file6,
-        L: 127,
+        F: __dxlog_file9,
+        L: 126,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
   queryInvitations() {
-    return new import_codec_protobuf3.Stream(({ next, ctx }) => {
+    return new import_codec_protobuf4.Stream(({ next, ctx }) => {
       this._invitationCreated.on(ctx, (invitation) => {
         next({
-          action: import_services4.QueryInvitationsResponse.Action.ADDED,
-          type: import_services4.QueryInvitationsResponse.Type.CREATED,
+          action: import_services5.QueryInvitationsResponse.Action.ADDED,
+          type: import_services5.QueryInvitationsResponse.Type.CREATED,
           invitations: [
             invitation
           ]
@@ -1690,8 +2103,8 @@ var InvitationsServiceImpl = class {
       });
       this._invitationAccepted.on(ctx, (invitation) => {
         next({
-          action: import_services4.QueryInvitationsResponse.Action.ADDED,
-          type: import_services4.QueryInvitationsResponse.Type.ACCEPTED,
+          action: import_services5.QueryInvitationsResponse.Action.ADDED,
+          type: import_services5.QueryInvitationsResponse.Type.ACCEPTED,
           invitations: [
             invitation
           ]
@@ -1699,8 +2112,8 @@ var InvitationsServiceImpl = class {
       });
       this._removedCreated.on(ctx, (invitation) => {
         next({
-          action: import_services4.QueryInvitationsResponse.Action.REMOVED,
-          type: import_services4.QueryInvitationsResponse.Type.CREATED,
+          action: import_services5.QueryInvitationsResponse.Action.REMOVED,
+          type: import_services5.QueryInvitationsResponse.Type.CREATED,
           invitations: [
             invitation
           ]
@@ -1708,21 +2121,21 @@ var InvitationsServiceImpl = class {
       });
       this._removedAccepted.on(ctx, (invitation) => {
         next({
-          action: import_services4.QueryInvitationsResponse.Action.REMOVED,
-          type: import_services4.QueryInvitationsResponse.Type.ACCEPTED,
+          action: import_services5.QueryInvitationsResponse.Action.REMOVED,
+          type: import_services5.QueryInvitationsResponse.Type.ACCEPTED,
           invitations: [
             invitation
           ]
         });
       });
       next({
-        action: import_services4.QueryInvitationsResponse.Action.ADDED,
-        type: import_services4.QueryInvitationsResponse.Type.CREATED,
+        action: import_services5.QueryInvitationsResponse.Action.ADDED,
+        type: import_services5.QueryInvitationsResponse.Type.CREATED,
         invitations: Array.from(this._createInvitations.values()).map((invitation) => invitation.get())
       });
       next({
-        action: import_services4.QueryInvitationsResponse.Action.ADDED,
-        type: import_services4.QueryInvitationsResponse.Type.ACCEPTED,
+        action: import_services5.QueryInvitationsResponse.Action.ADDED,
+        type: import_services5.QueryInvitationsResponse.Type.ACCEPTED,
         invitations: Array.from(this._acceptInvitations.values()).map((invitation) => invitation.get())
       });
     });
@@ -1730,12 +2143,12 @@ var InvitationsServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts
-var import_tiny_invariant8 = __toESM(require("tiny-invariant"));
-var import_credentials9 = require("@dxos/credentials");
+var import_credentials10 = require("@dxos/credentials");
 var import_feed_store2 = require("@dxos/feed-store");
-var import_log7 = require("@dxos/log");
-var import_services5 = require("@dxos/protocols/proto/dxos/client/services");
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
+var import_invariant9 = require("@dxos/invariant");
+var import_log8 = require("@dxos/log");
+var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
+var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
 var SpaceInvitationProtocol = class {
   constructor(_spaceManager, _signingContext, _keyring, _spaceKey) {
     this._spaceManager = _spaceManager;
@@ -1751,36 +2164,75 @@ var SpaceInvitationProtocol = class {
   }
   getInvitationContext() {
     return {
-      kind: import_services5.Invitation.Kind.SPACE,
+      kind: import_services6.Invitation.Kind.SPACE,
       spaceKey: this._spaceKey
     };
   }
   async admit(request, guestProfile) {
-    var _a;
-    (0, import_tiny_invariant8.default)(this._spaceKey);
+    (0, import_invariant9.invariant)(this._spaceKey, void 0, {
+      F: __dxlog_file10,
+      L: 42,
+      S: this,
+      A: [
+        "this._spaceKey",
+        ""
+      ]
+    });
     const space = await this._spaceManager.spaces.get(this._spaceKey);
-    (0, import_tiny_invariant8.default)(space);
-    (0, import_tiny_invariant8.default)(request.space);
+    (0, import_invariant9.invariant)(space, void 0, {
+      F: __dxlog_file10,
+      L: 44,
+      S: this,
+      A: [
+        "space",
+        ""
+      ]
+    });
+    (0, import_invariant9.invariant)(request.space, void 0, {
+      F: __dxlog_file10,
+      L: 46,
+      S: this,
+      A: [
+        "request.space",
+        ""
+      ]
+    });
     const { identityKey, deviceKey } = request.space;
-    (0, import_log7.log)("writing guest credentials", {
+    (0, import_log8.log)("writing guest credentials", {
       host: this._signingContext.deviceKey,
       guest: deviceKey
     }, {
-      F: __dxlog_file7,
-      L: 50,
+      F: __dxlog_file10,
+      L: 49,
       S: this,
       C: (f, a) => f(...a)
     });
-    const credentials = await (0, import_credentials9.createAdmissionCredentials)(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, guestProfile);
-    (0, import_tiny_invariant8.default)(credentials[0].credential);
+    const credentials = await (0, import_credentials10.createAdmissionCredentials)(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, guestProfile);
+    (0, import_invariant9.invariant)(credentials[0].credential, void 0, {
+      F: __dxlog_file10,
+      L: 60,
+      S: this,
+      A: [
+        "credentials[0].credential",
+        ""
+      ]
+    });
     const spaceMemberCredential = credentials[0].credential.credential;
-    (0, import_tiny_invariant8.default)((0, import_credentials9.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
+    (0, import_invariant9.invariant)((0, import_credentials10.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file10,
+      L: 62,
+      S: this,
+      A: [
+        "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
+        ""
+      ]
+    });
     await (0, import_feed_store2.writeMessages)(space.inner.controlPipeline.writer, credentials);
     return {
       space: {
         credential: spaceMemberCredential,
         controlTimeframe: space.inner.controlPipeline.state.timeframe,
-        dataTimeframe: (_a = space.dataPipeline.pipelineState) == null ? void 0 : _a.timeframe
+        dataTimeframe: space.dataPipeline.pipelineState?.timeframe
       }
     };
   }
@@ -1802,11 +2254,35 @@ var SpaceInvitationProtocol = class {
     };
   }
   async accept(response) {
-    (0, import_tiny_invariant8.default)(response.space);
+    (0, import_invariant9.invariant)(response.space, void 0, {
+      F: __dxlog_file10,
+      L: 97,
+      S: this,
+      A: [
+        "response.space",
+        ""
+      ]
+    });
     const { credential, controlTimeframe, dataTimeframe } = response.space;
-    const assertion = (0, import_credentials9.getCredentialAssertion)(credential);
-    (0, import_tiny_invariant8.default)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential");
-    (0, import_tiny_invariant8.default)(credential.subject.id.equals(this._signingContext.identityKey));
+    const assertion = (0, import_credentials10.getCredentialAssertion)(credential);
+    (0, import_invariant9.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
+      F: __dxlog_file10,
+      L: 100,
+      S: this,
+      A: [
+        "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
+        "'Invalid credential'"
+      ]
+    });
+    (0, import_invariant9.invariant)(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
+      F: __dxlog_file10,
+      L: 101,
+      S: this,
+      A: [
+        "credential.subject.id.equals(this._signingContext.identityKey)",
+        ""
+      ]
+    });
     await this._spaceManager.acceptSpace({
       spaceKey: assertion.spaceKey,
       genesisFeedKey: assertion.genesisFeedKey,
@@ -1821,48 +2297,48 @@ var SpaceInvitationProtocol = class {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
-var import_tiny_invariant10 = __toESM(require("tiny-invariant"));
 var import_async9 = require("@dxos/async");
-var import_context6 = require("@dxos/context");
-var import_credentials13 = require("@dxos/credentials");
+var import_context7 = require("@dxos/context");
+var import_credentials14 = require("@dxos/credentials");
+var import_invariant11 = require("@dxos/invariant");
 var import_keys7 = require("@dxos/keys");
-var import_log10 = require("@dxos/log");
-var import_protocols6 = require("@dxos/protocols");
-var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
+var import_log11 = require("@dxos/log");
+var import_protocols7 = 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");
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
 var import_async8 = require("@dxos/async");
 var import_client_protocol3 = require("@dxos/client-protocol");
-var import_context5 = require("@dxos/context");
+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_log9 = require("@dxos/log");
-var import_services6 = 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_log10 = require("@dxos/log");
+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");
 var import_util3 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
-var import_tiny_invariant9 = __toESM(require("tiny-invariant"));
 var import_async7 = require("@dxos/async");
-var import_context4 = require("@dxos/context");
+var import_context5 = require("@dxos/context");
+var import_invariant10 = require("@dxos/invariant");
 var import_keys5 = require("@dxos/keys");
-var import_log8 = require("@dxos/log");
-var import_protocols5 = require("@dxos/protocols");
+var import_log9 = require("@dxos/log");
+var import_protocols6 = require("@dxos/protocols");
 var import_teleport2 = require("@dxos/teleport");
 var import_util2 = require("@dxos/util");
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
+var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
 var DEFAULT_RETRY_TIMEOUT = 1e3;
 var DEFAULT_SUCCESS_DELAY = 1e3;
 var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
 var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var NotarizationPlugin = class {
   constructor() {
-    this._ctx = new import_context4.Context();
+    this._ctx = new import_context5.Context();
     this._extensionOpened = new import_async7.Event();
     this._extensions = /* @__PURE__ */ new Set();
     this._processedCredentials = new import_util2.ComplexSet(import_keys5.PublicKey.hash);
@@ -1880,23 +2356,31 @@ var NotarizationPlugin = class {
   * Request credentials to be notarized.
   */
   async notarize({ ctx: opCtx, credentials, timeout = DEFAULT_NOTARIZE_TIMEOUT, retryTimeout = DEFAULT_RETRY_TIMEOUT, successDelay = DEFAULT_SUCCESS_DELAY }) {
-    (0, import_log8.log)("notarize", {
+    (0, import_log9.log)("notarize", {
       credentials
-    }, {
-      F: __dxlog_file8,
-      L: 91,
+    }, {
+      F: __dxlog_file11,
+      L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_tiny_invariant9.default)(credentials.every((credential) => credential.id), "Credentials must have an id");
+    (0, import_invariant10.invariant)(credentials.every((credential) => credential.id), "Credentials must have an id", {
+      F: __dxlog_file11,
+      L: 91,
+      S: this,
+      A: [
+        "credentials.every((credential) => credential.id)",
+        "'Credentials must have an id'"
+      ]
+    });
     const errors = new import_async7.Trigger();
     const ctx = this._ctx.derive({
       onError: (err) => {
-        import_log8.log.warn("Notarization error", {
+        import_log9.log.warn("Notarization error", {
           err
         }, {
-          F: __dxlog_file8,
-          L: 100,
+          F: __dxlog_file11,
+          L: 99,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1904,15 +2388,15 @@ var NotarizationPlugin = class {
         errors.throw(err);
       }
     });
-    opCtx == null ? void 0 : opCtx.onDispose(() => ctx.dispose());
+    opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
       (0, import_async7.scheduleTask)(ctx, () => {
-        import_log8.log.warn("Notarization timeout", {
+        import_log9.log.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
-          F: __dxlog_file8,
-          L: 112,
+          F: __dxlog_file11,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1931,11 +2415,11 @@ var NotarizationPlugin = class {
           ...this._extensions
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
-          import_log8.log.warn("Exhausted all peers to notarize with", {
+          import_log9.log.warn("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
-            F: __dxlog_file8,
-            L: 137,
+            F: __dxlog_file11,
+            L: 136,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1944,30 +2428,30 @@ var NotarizationPlugin = class {
           return;
         }
         peersTried.add(peer);
-        (0, import_log8.log)("try notarizing", {
+        (0, import_log9.log)("try notarizing", {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
-          F: __dxlog_file8,
-          L: 144,
+          F: __dxlog_file11,
+          L: 143,
           S: this,
           C: (f, a) => f(...a)
         });
         await peer.rpc.NotarizationService.notarize({
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
-        (0, import_log8.log)("success", void 0, {
-          F: __dxlog_file8,
-          L: 148,
+        (0, import_log9.log)("success", void 0, {
+          F: __dxlog_file11,
+          L: 147,
           S: this,
           C: (f, a) => f(...a)
         });
         await (0, import_async7.sleep)(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
-          import_log8.log.warn("error notarizing (recoverable)", err, {
-            F: __dxlog_file8,
-            L: 152,
+          import_log9.log.warn("error notarizing (recoverable)", err, {
+            F: __dxlog_file11,
+            L: 151,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1979,13 +2463,13 @@ var NotarizationPlugin = class {
     this._extensionOpened.on(ctx, () => notarizeTask.schedule());
     try {
       await Promise.race([
-        (0, import_context4.rejectOnDispose)(ctx),
+        (0, import_context5.rejectOnDispose)(ctx),
         allNotarized,
         errors.wait()
       ]);
-      (0, import_log8.log)("done", void 0, {
-        F: __dxlog_file8,
-        L: 163,
+      (0, import_log9.log)("done", void 0, {
+        F: __dxlog_file11,
+        L: 162,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1997,16 +2481,23 @@ 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);
   }
   setWriter(writer) {
-    (0, import_tiny_invariant9.default)(!this._writer, "Writer already set.");
+    (0, import_invariant10.invariant)(!this._writer, "Writer already set.", {
+      F: __dxlog_file11,
+      L: 181,
+      S: this,
+      A: [
+        "!this._writer",
+        "'Writer already set.'"
+      ]
+    });
     this._writer = writer;
   }
   async _waitUntilProcessed(id) {
@@ -2019,12 +2510,19 @@ 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 : []) {
-      (0, import_tiny_invariant9.default)(credential.id, "Credential must have an id");
+    for (const credential of request.credentials ?? []) {
+      (0, import_invariant10.invariant)(credential.id, "Credential must have an id", {
+        F: __dxlog_file11,
+        L: 200,
+        S: this,
+        A: [
+          "credential.id",
+          "'Credential must have an id'"
+        ]
+      });
       if (this._processedCredentials.has(credential.id)) {
         continue;
       }
@@ -2034,11 +2532,11 @@ var NotarizationPlugin = class {
   createExtension() {
     const extension = new NotarizationTeleportExtension({
       onOpen: async () => {
-        (0, import_log8.log)("extension opened", {
+        (0, import_log9.log)("extension opened", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file8,
-          L: 212,
+          F: __dxlog_file11,
+          L: 211,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2046,11 +2544,11 @@ var NotarizationPlugin = class {
         this._extensionOpened.emit();
       },
       onClose: async () => {
-        (0, import_log8.log)("extension closed", {
+        (0, import_log9.log)("extension closed", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file8,
-          L: 217,
+          F: __dxlog_file11,
+          L: 216,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2065,10 +2563,10 @@ var NotarizationTeleportExtension = class extends import_teleport2.RpcExtension
   constructor(_params) {
     super({
       requested: {
-        NotarizationService: import_protocols5.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_protocols6.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       },
       exposed: {
-        NotarizationService: import_protocols5.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_protocols6.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       }
     });
     this._params = _params;
@@ -2093,7 +2591,7 @@ var NotarizationTeleportExtension = class extends import_teleport2.RpcExtension
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-function _ts_decorate(decorators, target, key, desc) {
+function _ts_decorate3(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -2103,19 +2601,19 @@ function _ts_decorate(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
+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_context5.Context();
+    this._ctx = new import_context6.Context();
     this._notarizationPlugin = new NotarizationPlugin();
-    this._state = import_services6.SpaceState.CLOSED;
+    this._state = import_services7.SpaceState.CLOSED;
     /**
     * Error for _state === SpaceState.ERROR.
     */
     this.error = void 0;
     this.stateUpdate = new import_async8.Event();
     this.metrics = {};
-    var _a;
     this._inner = params.inner;
     this._inner.stateUpdate.on(this._ctx, () => this.stateUpdate.emit());
     this._gossip = params.gossip;
@@ -2124,7 +2622,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_util3.ComplexSet(import_keys6.PublicKey.hash, Array.from(this._inner.spaceState.members.keys())),
       update: this._inner.stateUpdate,
@@ -2164,21 +2662,20 @@ var DataSpace = class DataSpace2 {
   async _open() {
     await this._notarizationPlugin.open();
     await this._inner.spaceState.addCredentialProcessor(this._notarizationPlugin);
-    await this._inner.open();
-    this._state = import_services6.SpaceState.CONTROL_ONLY;
+    await this._inner.open(new import_context6.Context());
+    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));
-    this._state = import_services6.SpaceState.CLOSED;
+    await this._callbacks.beforeClose?.();
+    this._state = import_services7.SpaceState.CLOSED;
     await this._ctx.dispose();
-    this._ctx = new import_context5.Context();
+    this._ctx = new import_context6.Context();
     await this.authVerifier.close();
     await this._inner.close();
     await this._inner.spaceState.removeCredentialProcessor(this._notarizationPlugin);
@@ -2197,47 +2694,46 @@ var DataSpace = class DataSpace2 {
   initializeDataPipelineAsync() {
     (0, import_async8.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_log9.log)("data pipeline initialization cancelled", err, {
-            F: __dxlog_file9,
-            L: 193,
+          (0, import_log10.log)("data pipeline initialization cancelled", err, {
+            F: __dxlog_file12,
+            L: 199,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
-        import_log9.log.error("Error initializing data pipeline", err, {
-          F: __dxlog_file9,
-          L: 197,
+        import_log10.log.error("Error initializing data pipeline", err, {
+          F: __dxlog_file12,
+          L: 203,
           S: this,
           C: (f, a) => f(...a)
         });
-        this._state = import_services6.SpaceState.ERROR;
+        this._state = import_services7.SpaceState.ERROR;
         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_services6.SpaceState.CONTROL_ONLY) {
+    if (this._state !== import_services7.SpaceState.CONTROL_ONLY) {
       throw new import_errors3.SystemError("Invalid operation");
     }
-    this._state = import_services6.SpaceState.INITIALIZING;
+    this._state = import_services7.SpaceState.INITIALIZING;
     await this._inner.controlPipeline.state.waitUntilReachedTargetTimeframe({
       ctx: this._ctx,
       breakOnStall: false
     });
-    this.metrics.controlPipelineReady = new Date();
+    this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
-    (0, import_log9.log)("writable feeds created", void 0, {
-      F: __dxlog_file9,
-      L: 221,
+    (0, import_log10.log)("writable feeds created", void 0, {
+      F: __dxlog_file12,
+      L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2250,11 +2746,11 @@ var DataSpace = class DataSpace2 {
       }), this._inner.controlPipeline.writer));
     }
     await this._inner.initializeDataPipeline();
-    this.metrics.dataPipelineOpen = new Date();
-    await (0, import_context5.cancelWithContext)(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
-    (0, import_log9.log)("waiting for data pipeline to reach target timeframe", void 0, {
-      F: __dxlog_file9,
-      L: 242,
+    this.metrics.dataPipelineOpen = /* @__PURE__ */ new Date();
+    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: 248,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2262,17 +2758,17 @@ var DataSpace = class DataSpace2 {
       ctx: this._ctx,
       breakOnStall: false
     });
-    this.metrics.dataPipelineReady = new Date();
-    (0, import_log9.log)("data pipeline ready", void 0, {
-      F: __dxlog_file9,
-      L: 251,
+    this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
+    (0, import_log10.log)("data pipeline ready", void 0, {
+      F: __dxlog_file12,
+      L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
-    await ((_b = (_a = this._callbacks).beforeReady) == null ? void 0 : _b.call(_a));
-    this._state = import_services6.SpaceState.READY;
+    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 = [];
@@ -2288,7 +2784,7 @@ var DataSpace = class DataSpace2 {
           spaceKey: this.key,
           deviceKey: this._signingContext.deviceKey,
           identityKey: this._signingContext.identityKey,
-          designation: import_credentials10.AdmittedFeed.Designation.CONTROL
+          designation: import_credentials11.AdmittedFeed.Designation.CONTROL
         }
       }));
     }
@@ -2305,7 +2801,7 @@ var DataSpace = class DataSpace2 {
           spaceKey: this.key,
           deviceKey: this._signingContext.deviceKey,
           identityKey: this._signingContext.identityKey,
-          designation: import_credentials10.AdmittedFeed.Designation.DATA
+          designation: import_credentials11.AdmittedFeed.Designation.DATA
         }
       }));
     }
@@ -2319,7 +2815,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: {
@@ -2332,65 +2827,67 @@ 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);
       }
     }
   }
   async activate() {
-    if (this._state !== import_services6.SpaceState.INACTIVE) {
+    if (this._state !== import_services7.SpaceState.INACTIVE) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, import_services6.SpaceState.ACTIVE);
+    await this._metadataStore.setSpaceState(this.key, import_services7.SpaceState.ACTIVE);
     await this._open();
     this.initializeDataPipelineAsync();
   }
   async deactivate() {
-    if (this._state === import_services6.SpaceState.INACTIVE) {
+    if (this._state === import_services7.SpaceState.INACTIVE) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, import_services6.SpaceState.INACTIVE);
+    await this._metadataStore.setSpaceState(this.key, import_services7.SpaceState.INACTIVE);
     await this._close();
-    this._state = import_services6.SpaceState.INACTIVE;
+    this._state = import_services7.SpaceState.INACTIVE;
     this.stateUpdate.emit();
   }
 };
-_ts_decorate([
+_ts_decorate3([
   import_async8.synchronized
 ], DataSpace.prototype, "open", null);
-_ts_decorate([
+_ts_decorate3([
   import_async8.synchronized
 ], DataSpace.prototype, "close", null);
-_ts_decorate([
+_ts_decorate3([
   (0, import_debug4.timed)(1e4)
 ], DataSpace.prototype, "_createWritableFeeds", null);
-_ts_decorate([
+_ts_decorate3([
   import_async8.synchronized
 ], DataSpace.prototype, "activate", null);
-_ts_decorate([
+_ts_decorate3([
   import_async8.synchronized
 ], DataSpace.prototype, "deactivate", null);
-DataSpace = _ts_decorate([
+DataSpace = _ts_decorate3([
   (0, import_async8.trackLeaks)("open", "close")
 ], DataSpace);
 
 // packages/sdk/client-services/src/packlets/spaces/genesis.ts
-var import_credentials11 = require("@dxos/credentials");
+var import_credentials12 = 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_credentials13 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_timeframe3 = require("@dxos/timeframe");
 var spaceGenesis = async (keyring, signingContext, space) => {
-  var _a, _b, _c, _d;
   const credentials = [
-    await (0, import_credentials11.createCredential)({
+    await (0, import_credentials12.createCredential)({
       signer: keyring,
       issuer: space.key,
       subject: space.key,
@@ -2399,45 +2896,45 @@ var spaceGenesis = async (keyring, signingContext, space) => {
         spaceKey: space.key
       }
     }),
-    await (0, import_credentials11.createCredential)({
+    await (0, import_credentials12.createCredential)({
       signer: keyring,
       issuer: space.key,
       subject: signingContext.identityKey,
       assertion: {
         "@type": "dxos.halo.credentials.SpaceMember",
         spaceKey: space.key,
-        role: import_credentials12.SpaceMember.Role.ADMIN,
+        role: import_credentials13.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,
         identityKey: signingContext.identityKey,
         deviceKey: signingContext.deviceKey,
-        designation: import_credentials12.AdmittedFeed.Designation.CONTROL
+        designation: import_credentials13.AdmittedFeed.Designation.CONTROL
       }
     }),
     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,
         identityKey: signingContext.identityKey,
         deviceKey: signingContext.deviceKey,
-        designation: import_credentials12.AdmittedFeed.Designation.DATA
+        designation: import_credentials13.AdmittedFeed.Designation.DATA
       }
     }),
     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
       }
     })
@@ -2453,7 +2950,7 @@ var spaceGenesis = async (keyring, signingContext, space) => {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
-function _ts_decorate2(decorators, target, key, desc) {
+function _ts_decorate4(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")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -2463,7 +2960,7 @@ function _ts_decorate2(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
+var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
 var DataSpaceManager = class DataSpaceManager2 {
   constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _feedStore) {
     this._spaceManager = _spaceManager;
@@ -2472,7 +2969,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     this._keyring = _keyring;
     this._signingContext = _signingContext;
     this._feedStore = _feedStore;
-    this._ctx = new import_context6.Context();
+    this._ctx = new import_context7.Context();
     this.updated = new import_async9.Event();
     this._spaces = new import_util4.ComplexMap(import_keys7.PublicKey.hash);
     this._isOpen = false;
@@ -2483,50 +2980,50 @@ var DataSpaceManager = class DataSpaceManager2 {
     return this._spaces;
   }
   async open() {
-    (0, import_log10.log)("open", void 0, {
-      F: __dxlog_file10,
-      L: 80,
+    (0, import_log11.log)("open", void 0, {
+      F: __dxlog_file13,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log10.log.trace("dxos.echo.data-space-manager.open", import_protocols6.trace.begin({
+    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols7.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file10,
-      L: 81,
+      F: __dxlog_file13,
+      L: 80,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._metadataStore.load();
-    (0, import_log10.log)("metadata loaded", {
+    (0, import_log11.log)("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
-      F: __dxlog_file10,
-      L: 83,
+      F: __dxlog_file13,
+      L: 82,
       S: this,
       C: (f, a) => f(...a)
     });
     for (const spaceMetadata of this._metadataStore.spaces) {
       try {
-        (0, import_log10.log)("load space", {
+        (0, import_log11.log)("load space", {
           spaceMetadata
         }, {
-          F: __dxlog_file10,
-          L: 87,
+          F: __dxlog_file13,
+          L: 86,
           S: this,
           C: (f, a) => f(...a)
         });
         const space = await this._constructSpace(spaceMetadata);
-        if (spaceMetadata.state !== import_services7.SpaceState.INACTIVE) {
+        if (spaceMetadata.state !== import_services8.SpaceState.INACTIVE) {
           space.initializeDataPipelineAsync();
         }
       } catch (err) {
-        import_log10.log.error("Error loading space", {
+        import_log11.log.error("Error loading space", {
           spaceMetadata,
           err
         }, {
-          F: __dxlog_file10,
-          L: 93,
+          F: __dxlog_file13,
+          L: 92,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2534,19 +3031,19 @@ var DataSpaceManager = class DataSpaceManager2 {
     }
     this._isOpen = true;
     this.updated.emit();
-    import_log10.log.trace("dxos.echo.data-space-manager.open", import_protocols6.trace.end({
+    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols7.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file10,
-      L: 99,
+      F: __dxlog_file13,
+      L: 98,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    (0, import_log10.log)("close", void 0, {
-      F: __dxlog_file10,
-      L: 104,
+    (0, import_log11.log)("close", void 0, {
+      F: __dxlog_file13,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2560,7 +3057,15 @@ var DataSpaceManager = class DataSpaceManager2 {
   * Creates a new space writing the genesis credentials to the control feed.
   */
   async createSpace() {
-    (0, import_tiny_invariant10.default)(this._isOpen, "Not open.");
+    (0, import_invariant11.invariant)(this._isOpen, "Not open.", {
+      F: __dxlog_file13,
+      L: 116,
+      S: this,
+      A: [
+        "this._isOpen",
+        "'Not open.'"
+      ]
+    });
     const spaceKey = await this._keyring.createKey();
     const controlFeedKey = await this._keyring.createKey();
     const dataFeedKey = await this._keyring.createKey();
@@ -2569,13 +3074,13 @@ var DataSpaceManager = class DataSpaceManager2 {
       genesisFeedKey: controlFeedKey,
       controlFeedKey,
       dataFeedKey,
-      state: import_services7.SpaceState.ACTIVE
+      state: import_services8.SpaceState.ACTIVE
     };
-    (0, import_log10.log)("creating space...", {
+    (0, import_log11.log)("creating space...", {
       spaceKey
     }, {
-      F: __dxlog_file10,
-      L: 129,
+      F: __dxlog_file13,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2583,7 +3088,15 @@ var DataSpaceManager = class DataSpaceManager2 {
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    (0, import_tiny_invariant10.default)((0, import_credentials13.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
+    (0, import_invariant11.invariant)((0, import_credentials14.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file13,
+      L: 135,
+      S: this,
+      A: [
+        "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
+        ""
+      ]
+    });
     await this._signingContext.recordCredential(memberCredential);
     await space.initializeDataPipeline();
     this.updated.emit();
@@ -2591,16 +3104,32 @@ var DataSpaceManager = class DataSpaceManager2 {
   }
   // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
-    (0, import_log10.log)("accept space", {
+    (0, import_log11.log)("accept space", {
       opts
     }, {
-      F: __dxlog_file10,
-      L: 148,
+      F: __dxlog_file13,
+      L: 147,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_tiny_invariant10.default)(this._isOpen, "Not open.");
-    (0, import_tiny_invariant10.default)(!this._spaces.has(opts.spaceKey), "Space already exists.");
+    (0, import_invariant11.invariant)(this._isOpen, "Not open.", {
+      F: __dxlog_file13,
+      L: 148,
+      S: this,
+      A: [
+        "this._isOpen",
+        "'Not open.'"
+      ]
+    });
+    (0, import_invariant11.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
+      F: __dxlog_file13,
+      L: 149,
+      S: this,
+      A: [
+        "!this._spaces.has(opts.spaceKey)",
+        "'Space already exists.'"
+      ]
+    });
     const metadata = {
       key: opts.spaceKey,
       genesisFeedKey: opts.genesisFeedKey,
@@ -2619,17 +3148,17 @@ var DataSpaceManager = class DataSpaceManager2 {
   * TODO(dmaretskyi): Consider removing.
   */
   async waitUntilSpaceReady(spaceKey) {
-    await (0, import_context6.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
+    await (0, import_context7.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
-      return !!space && space.state === import_services7.SpaceState.READY;
+      return !!space && space.state === import_services8.SpaceState.READY;
     }));
   }
   async _constructSpace(metadata) {
-    (0, import_log10.log)("construct space", {
+    (0, import_log11.log)("construct space", {
       metadata
     }, {
-      F: __dxlog_file10,
-      L: 183,
+      F: __dxlog_file13,
+      L: 182,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2637,7 +3166,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       localPeerId: this._signingContext.deviceKey
     });
     const presence = new import_teleport_extension_gossip.Presence({
-      announceInterval: 500,
+      announceInterval: 1e3,
       offlineTimeout: 5e3,
       identityKey: this._signingContext.identityKey,
       gossip
@@ -2663,9 +3192,9 @@ var DataSpaceManager = class DataSpaceManager2 {
         session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
       },
       onAuthFailure: () => {
-        import_log10.log.warn("auth failure", void 0, {
-          F: __dxlog_file10,
-          L: 214,
+        import_log11.log.warn("auth failure", void 0, {
+          F: __dxlog_file13,
+          L: 213,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2676,7 +3205,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     dataFeed && space.setDataFeed(dataFeed);
     const dataSpace = new DataSpace({
       inner: space,
-      initialState: metadata.state === import_services7.SpaceState.INACTIVE ? import_services7.SpaceState.INACTIVE : import_services7.SpaceState.CLOSED,
+      initialState: metadata.state === import_services8.SpaceState.INACTIVE ? import_services8.SpaceState.INACTIVE : import_services8.SpaceState.CLOSED,
       metadataStore: this._metadataStore,
       gossip,
       presence,
@@ -2685,23 +3214,23 @@ var DataSpaceManager = class DataSpaceManager2 {
       signingContext: this._signingContext,
       callbacks: {
         beforeReady: async () => {
-          (0, import_log10.log)("before space ready", {
+          (0, import_log11.log)("before space ready", {
             space: space.key
           }, {
-            F: __dxlog_file10,
-            L: 232,
+            F: __dxlog_file13,
+            L: 231,
             S: this,
             C: (f, a) => f(...a)
           });
           await this._dataServiceSubscriptions.registerSpace(space.key, dataSpace.dataPipeline.databaseHost.createDataServiceHost());
         },
         afterReady: async () => {
-          (0, import_log10.log)("after space ready", {
+          (0, import_log11.log)("after space ready", {
             space: space.key,
             open: this._isOpen
           }, {
-            F: __dxlog_file10,
-            L: 239,
+            F: __dxlog_file13,
+            L: 238,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2710,11 +3239,11 @@ var DataSpaceManager = class DataSpaceManager2 {
           }
         },
         beforeClose: async () => {
-          (0, import_log10.log)("before space close", {
+          (0, import_log11.log)("before space close", {
             space: space.key
           }, {
-            F: __dxlog_file10,
-            L: 245,
+            F: __dxlog_file13,
+            L: 244,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2723,7 +3252,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       },
       cache: metadata.cache
     });
-    if (metadata.state !== import_services7.SpaceState.INACTIVE) {
+    if (metadata.state !== import_services8.SpaceState.INACTIVE) {
       await dataSpace.open();
     }
     if (metadata.controlTimeframe) {
@@ -2736,33 +3265,33 @@ var DataSpaceManager = class DataSpaceManager2 {
     return dataSpace;
   }
 };
-_ts_decorate2([
+_ts_decorate4([
   import_async9.synchronized
 ], DataSpaceManager.prototype, "open", null);
-_ts_decorate2([
+_ts_decorate4([
   import_async9.synchronized
 ], DataSpaceManager.prototype, "close", null);
-_ts_decorate2([
+_ts_decorate4([
   import_async9.synchronized
 ], DataSpaceManager.prototype, "createSpace", null);
-_ts_decorate2([
+_ts_decorate4([
   import_async9.synchronized
 ], DataSpaceManager.prototype, "acceptSpace", null);
-DataSpaceManager = _ts_decorate2([
+DataSpaceManager = _ts_decorate4([
   (0, import_async9.trackLeaks)("open", "close")
 ], DataSpaceManager);
 
 // packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
 var import_async10 = require("@dxos/async");
-var import_codec_protobuf4 = require("@dxos/codec-protobuf");
+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_log11 = require("@dxos/log");
-var import_protocols7 = require("@dxos/protocols");
-var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
+var import_log12 = require("@dxos/log");
+var import_protocols8 = require("@dxos/protocols");
+var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util5 = require("@dxos/util");
-var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
+var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
   constructor(_identityManager, _spaceManager, _dataServiceSubscriptions, _getDataSpaceManager) {
     this._identityManager = _identityManager;
@@ -2779,15 +3308,14 @@ 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_services8.SpaceState.ACTIVE:
+        case import_services9.SpaceState.ACTIVE:
           await space.activate();
           break;
-        case import_services8.SpaceState.INACTIVE:
+        case import_services9.SpaceState.INACTIVE:
           await space.deactivate();
           break;
         default:
@@ -2796,14 +3324,14 @@ var SpacesServiceImpl = class {
     }
   }
   querySpaces() {
-    return new import_codec_protobuf4.Stream(({ next, ctx }) => {
+    return new import_codec_protobuf5.Stream(({ next, ctx }) => {
       const scheduler = new import_async10.UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
-        (0, import_log11.log)("update", {
+        (0, import_log12.log)("update", {
           spaces
         }, {
-          F: __dxlog_file11,
+          F: __dxlog_file14,
           L: 78,
           S: this,
           C: (f, a) => f(...a)
@@ -2845,17 +3373,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_protobuf4.Stream(({ ctx, next }) => {
+    return new import_codec_protobuf5.Stream(({ ctx, next }) => {
       (0, import_async10.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);
         });
@@ -2864,9 +3390,8 @@ var SpacesServiceImpl = class {
     });
   }
   queryCredentials({ spaceKey }) {
-    return new import_codec_protobuf4.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));
+    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));
       const processor = {
         processCredential: async (credential) => {
           next(credential);
@@ -2877,9 +3402,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
@@ -2888,17 +3412,15 @@ 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,
-      error: space.error ? (0, import_protocols7.encodeError)(space.error) : void 0,
+      error: space.error ? (0, import_protocols8.encodeError)(space.error) : void 0,
       pipeline: {
         currentEpoch: space.dataPipeline.currentEpoch,
         appliedEpoch: space.dataPipeline.appliedEpoch,
@@ -2906,25 +3428,30 @@ 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 = this._identityManager.identity?.identityKey.equals(member.key);
+        if (isMe) {
+          peers.push(space.presence.getLocalState());
+        }
         return {
           identity: {
             identityKey: member.key,
             profile: {
-              displayName: (_b2 = (_a2 = member.assertion.profile) == null ? void 0 : _a2.displayName) != null ? _b2 : (0, import_util5.humanize)(member.key)
+              displayName: member.assertion.profile?.displayName ?? (0, import_util5.humanize)(member.key)
             }
           },
-          presence: ((_c2 = this._identityManager.identity) == null ? void 0 : _c2.identityKey.equals(member.key)) || space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? import_services8.SpaceMember.PresenceState.ONLINE : import_services8.SpaceMember.PresenceState.OFFLINE
+          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
     };
@@ -2933,8 +3460,18 @@ var SpacesServiceImpl = class {
 var getChannelId = (channel) => `user-channel/${channel}`;
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
-var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
-var ServiceContext = class {
+function _ts_decorate5(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")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+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;
@@ -2968,105 +3505,108 @@ var ServiceContext = class {
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
     this.invitations = new InvitationsHandler(this.networkManager);
-    this._handlerFactories.set(import_services9.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() {
-    import_log12.log.trace("dxos.sdk.service-context.open", import_protocols8.trace.begin({
-      id: this._instanceId
-    }), {
-      F: __dxlog_file12,
-      L: 126,
+  async open(ctx) {
+    await this._checkStorageVersion();
+    (0, import_log13.log)("opening...", void 0, {
+      F: __dxlog_file15,
+      L: 134,
       S: this,
       C: (f, a) => f(...a)
     });
-    await this._checkStorageVersion();
-    (0, import_log12.log)("opening...", void 0, {
-      F: __dxlog_file12,
-      L: 130,
+    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols9.trace.begin({
+      id: this._instanceId
+    }), {
+      F: __dxlog_file15,
+      L: 135,
       S: this,
       C: (f, a) => f(...a)
     });
     await this.signalManager.open();
     await this.networkManager.open();
     await this.spaceManager.open();
-    await this.identityManager.open();
+    await this.identityManager.open(ctx);
     if (this.identityManager.identity) {
-      await this._initialize();
+      await this._initialize(ctx);
     }
-    (0, import_log12.log)("opened", void 0, {
-      F: __dxlog_file12,
-      L: 138,
+    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols9.trace.end({
+      id: this._instanceId
+    }), {
+      F: __dxlog_file15,
+      L: 143,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log12.log.trace("dxos.sdk.service-context.open", import_protocols8.trace.end({
-      id: this._instanceId
-    }), {
-      F: __dxlog_file12,
-      L: 139,
+    (0, import_log13.log)("opened", void 0, {
+      F: __dxlog_file15,
+      L: 144,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    var _a;
-    (0, import_log12.log)("closing...", void 0, {
-      F: __dxlog_file12,
-      L: 143,
+    (0, import_log13.log)("closing...", void 0, {
+      F: __dxlog_file15,
+      L: 148,
       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();
     await this.networkManager.close();
     await this.signalManager.close();
     this.dataServiceSubscriptions.clear();
-    (0, import_log12.log)("closed", void 0, {
-      F: __dxlog_file12,
-      L: 154,
+    (0, import_log13.log)("closed", void 0, {
+      F: __dxlog_file15,
+      L: 159,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async createIdentity(params = {}) {
     const identity = await this.identityManager.createIdentity(params);
-    await this._initialize();
+    await this._initialize(new import_context8.Context());
     return identity;
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    (0, import_tiny_invariant11.default)(factory, `Unknown invitation kind: ${invitation.kind}`);
+    (0, import_invariant12.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
+      F: __dxlog_file15,
+      L: 171,
+      S: this,
+      A: [
+        "factory",
+        "`Unknown invitation kind: ${invitation.kind}`"
+      ]
+    });
     return factory(invitation);
   }
   async _acceptIdentity(params) {
     const identity = await this.identityManager.acceptIdentity(params);
-    await this._initialize();
+    await this._initialize(new import_context8.Context());
     return identity;
   }
   async _checkStorageVersion() {
     await this.metadataStore.load();
-    if (this.metadataStore.version !== import_protocols8.STORAGE_VERSION) {
-      throw new Error(`Invalid storage version: current=${this.metadataStore.version}, expected=${import_protocols8.STORAGE_VERSION}`);
+    if (this.metadataStore.version !== import_protocols9.STORAGE_VERSION) {
+      throw new Error(`Invalid storage version: current=${this.metadataStore.version}, expected=${import_protocols9.STORAGE_VERSION}`);
     }
   }
   // Called when identity is created.
-  async _initialize() {
-    var _a;
-    (0, import_log12.log)("initializing spaces...", void 0, {
-      F: __dxlog_file12,
-      L: 187,
+  async _initialize(ctx) {
+    (0, import_log13.log)("initializing spaces...", void 0, {
+      F: __dxlog_file15,
+      L: 193,
       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,
@@ -3082,14 +3622,22 @@ var ServiceContext = class {
     };
     this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore);
     await this.dataSpaceManager.open();
-    this._handlerFactories.set(import_services9.Invitation.Kind.SPACE, (invitation) => {
-      (0, import_tiny_invariant11.default)(this.dataSpaceManager, "dataSpaceManager not initialized yet");
+    this._handlerFactories.set(import_services10.Invitation.Kind.SPACE, (invitation) => {
+      (0, import_invariant12.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+        F: __dxlog_file15,
+        L: 216,
+        S: this,
+        A: [
+          "this.dataSpaceManager",
+          "'dataSpaceManager not initialized yet'"
+        ]
+      });
       return new SpaceInvitationProtocol(this.dataSpaceManager, signingContext, this.keyring, invitation.spaceKey);
     });
     this.initialized.wake();
     this._deviceSpaceSync = {
       processCredential: async (credential) => {
-        const assertion = (0, import_credentials14.getCredentialAssertion)(credential);
+        const assertion = (0, import_credentials15.getCredentialAssertion)(credential);
         if (assertion["@type"] !== "dxos.halo.credentials.SpaceMember") {
           return;
         }
@@ -3097,33 +3645,33 @@ var ServiceContext = class {
           return;
         }
         if (!this.dataSpaceManager) {
-          (0, import_log12.log)("dataSpaceManager not initialized yet, ignoring space admission", {
+          (0, import_log13.log)("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file12,
-            L: 226,
+            F: __dxlog_file15,
+            L: 232,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          (0, import_log12.log)("space already exists, ignoring space admission", {
+          (0, import_log13.log)("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file12,
-            L: 230,
+            F: __dxlog_file15,
+            L: 236,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         try {
-          (0, import_log12.log)("accepting space recorded in halo", {
+          (0, import_log13.log)("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file12,
-            L: 235,
+            F: __dxlog_file15,
+            L: 241,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3132,9 +3680,9 @@ var ServiceContext = class {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          import_log12.log.catch(err, void 0, {
-            F: __dxlog_file12,
-            L: 241,
+          import_log13.log.catch(err, void 0, {
+            F: __dxlog_file15,
+            L: 247,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3144,26 +3692,38 @@ var ServiceContext = class {
     await identity.space.spaceState.addCredentialProcessor(this._deviceSpaceSync);
   }
 };
+_ts_decorate5([
+  import_tracing3.trace.span()
+], ServiceContext.prototype, "open", null);
+_ts_decorate5([
+  import_tracing3.trace.span()
+], ServiceContext.prototype, "_initialize", null);
+ServiceContext = _ts_decorate5([
+  (0, import_util6.safeInstanceof)("dxos.client-services.ServiceContext"),
+  import_tracing3.trace.resource()
+], ServiceContext);
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
-var import_tiny_invariant13 = __toESM(require("tiny-invariant"));
 var import_async17 = require("@dxos/async");
 var import_client_protocol5 = require("@dxos/client-protocol");
-var import_document_model = require("@dxos/document-model");
+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_keys12 = require("@dxos/keys");
-var import_log15 = require("@dxos/log");
+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_protocols9 = require("@dxos/protocols");
-var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
+var import_protocols10 = require("@dxos/protocols");
+var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
 var import_text_model = require("@dxos/text-model");
+var import_tracing4 = require("@dxos/tracing");
 
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
 var import_async12 = require("@dxos/async");
-var import_codec_protobuf5 = require("@dxos/codec-protobuf");
-var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
+var import_codec_protobuf6 = require("@dxos/codec-protobuf");
+var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
@@ -3172,23 +3732,19 @@ var DevicesServiceImpl = class {
     throw new Error("Method not implemented.");
   }
   queryDevices() {
-    return new import_codec_protobuf5.Stream(({ next }) => {
+    return new import_codec_protobuf6.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_services10.DeviceKind.CURRENT : import_services10.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
+            }))
           });
         }
       };
@@ -3209,21 +3765,21 @@ var DevicesServiceImpl = class {
 
 // packages/sdk/client-services/src/packlets/devtools/devtools.ts
 var import_async15 = require("@dxos/async");
-var import_codec_protobuf11 = require("@dxos/codec-protobuf");
+var import_codec_protobuf12 = require("@dxos/codec-protobuf");
 
 // packages/sdk/client-services/src/packlets/devtools/feeds.ts
 var import_async13 = require("@dxos/async");
-var import_codec_protobuf6 = require("@dxos/codec-protobuf");
+var import_codec_protobuf7 = require("@dxos/codec-protobuf");
 var import_feed_store4 = require("@dxos/feed-store");
 var import_keys9 = require("@dxos/keys");
-var import_util6 = require("@dxos/util");
+var import_util7 = require("@dxos/util");
 var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
-  return new import_codec_protobuf6.Stream(({ next }) => {
+  return new import_codec_protobuf7.Stream(({ next }) => {
     const subscriptions = new import_async13.EventSubscriptions();
-    const feedMap = new import_util6.ComplexMap(import_keys9.PublicKey.hash);
+    const feedMap = new import_util7.ComplexMap(import_keys9.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);
@@ -3231,15 +3787,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));
@@ -3250,7 +3803,7 @@ var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
   });
 };
 var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
-  return new import_codec_protobuf6.Stream(({ next }) => {
+  return new import_codec_protobuf7.Stream(({ next }) => {
     if (!feedKey) {
       return;
     }
@@ -3290,8 +3843,8 @@ var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
 
 // packages/sdk/client-services/src/packlets/devtools/keys.ts
 var import_async14 = require("@dxos/async");
-var import_codec_protobuf7 = require("@dxos/codec-protobuf");
-var subscribeToKeyringKeys = ({ keyring }) => new import_codec_protobuf7.Stream(({ next, ctx }) => {
+var import_codec_protobuf8 = require("@dxos/codec-protobuf");
+var subscribeToKeyringKeys = ({ keyring }) => new import_codec_protobuf8.Stream(({ next, ctx }) => {
   const update = async () => {
     next({
       keys: await keyring.list()
@@ -3302,8 +3855,8 @@ var subscribeToKeyringKeys = ({ keyring }) => new import_codec_protobuf7.Stream(
 });
 
 // packages/sdk/client-services/src/packlets/devtools/metadata.ts
-var import_codec_protobuf8 = require("@dxos/codec-protobuf");
-var subscribeToMetadata = ({ context }) => new import_codec_protobuf8.Stream(({ next, ctx }) => {
+var import_codec_protobuf9 = require("@dxos/codec-protobuf");
+var subscribeToMetadata = ({ context }) => new import_codec_protobuf9.Stream(({ next, ctx }) => {
   context.metadataStore.update.on(ctx, (data) => next({
     metadata: data
   }));
@@ -3313,10 +3866,10 @@ var subscribeToMetadata = ({ context }) => new import_codec_protobuf8.Stream(({
 });
 
 // packages/sdk/client-services/src/packlets/devtools/network.ts
-var import_codec_protobuf9 = require("@dxos/codec-protobuf");
-var import_context7 = require("@dxos/context");
+var import_codec_protobuf10 = require("@dxos/codec-protobuf");
+var import_context9 = require("@dxos/context");
 var import_keys10 = require("@dxos/keys");
-var subscribeToNetworkStatus = ({ signalManager }) => new import_codec_protobuf9.Stream(({ next, close }) => {
+var subscribeToNetworkStatus = ({ signalManager }) => new import_codec_protobuf10.Stream(({ next, close }) => {
   const update = () => {
     try {
       const status = signalManager.getStatus();
@@ -3330,8 +3883,8 @@ var subscribeToNetworkStatus = ({ signalManager }) => new import_codec_protobuf9
   signalManager.statusChanged.on(() => update());
   update();
 });
-var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf9.Stream(({ next }) => {
-  const ctx = new import_context7.Context();
+var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf10.Stream(({ next }) => {
+  const ctx = new import_context9.Context();
   signalManager.onMessage.on(ctx, (message) => {
     next({
       message: {
@@ -3339,51 +3892,49 @@ var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf9.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 () => {
     return ctx.dispose();
   };
 });
-var subscribeToSwarmInfo = ({ networkManager }) => new import_codec_protobuf9.Stream(({ next }) => {
-  var _a;
+var subscribeToSwarmInfo = ({ networkManager }) => new import_codec_protobuf10.Stream(({ next }) => {
   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();
 });
 
 // packages/sdk/client-services/src/packlets/devtools/spaces.ts
-var import_codec_protobuf10 = require("@dxos/codec-protobuf");
+var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var subscribeToSpaces = (context, { spaceKeys = [] }) => {
-  return new import_codec_protobuf10.Stream(({ next }) => {
+  return new import_codec_protobuf11.Stream(({ next }) => {
     let unsubscribe;
     const update = async () => {
       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
@@ -3397,7 +3948,7 @@ var subscribeToSpaces = (context, { spaceKeys = [] }) => {
       await update();
     });
     return () => {
-      unsubscribe == null ? void 0 : unsubscribe();
+      unsubscribe?.();
       clearTimeout(timeout);
     };
   });
@@ -3414,7 +3965,7 @@ var DevtoolsServiceImpl = class {
     this.params = params;
   }
   events(request) {
-    return new import_codec_protobuf11.Stream(({ next }) => {
+    return new import_codec_protobuf12.Stream(({ next }) => {
       this.params.events.ready.on(() => {
         next({
           ready: {}
@@ -3428,16 +3979,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() {
@@ -3521,10 +4071,10 @@ var DevtoolsServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/locks/node.ts
-var import_tiny_invariant12 = __toESM(require("tiny-invariant"));
+var import_invariant13 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
-var import_log13 = require("@dxos/log");
-function _ts_decorate3(decorators, target, key, desc) {
+var import_log14 = require("@dxos/log");
+function _ts_decorate6(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")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -3534,7 +4084,7 @@ function _ts_decorate3(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/node.ts";
+var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/node.ts";
 var Lock = class {
   constructor({ lockKey: lockPath, onAcquire, onRelease }) {
     this._lockPath = lockPath;
@@ -3545,101 +4095,112 @@ var Lock = class {
     return this._lockPath;
   }
   async acquire() {
-    var _a;
-    (0, import_log13.log)("acquiring lock...", void 0, {
-      F: __dxlog_file13,
+    (0, import_log14.log)("acquiring lock...", void 0, {
+      F: __dxlog_file16,
       L: 32,
       S: this,
       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));
-    (0, import_log13.log)("acquired lock", void 0, {
-      F: __dxlog_file13,
+    await this._onAcquire?.();
+    (0, import_log14.log)("acquired lock", void 0, {
+      F: __dxlog_file16,
       L: 37,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async release() {
-    var _a;
-    await ((_a = this._onRelease) == null ? void 0 : _a.call(this));
-    (0, import_tiny_invariant12.default)(this._fileHandle, "Lock is not acquired");
+    await this._onRelease?.();
+    (0, import_invariant13.invariant)(this._fileHandle, "Lock is not acquired", {
+      F: __dxlog_file16,
+      L: 42,
+      S: this,
+      A: [
+        "this._fileHandle",
+        "'Lock is not acquired'"
+      ]
+    });
     await import_lock_file.LockFile.release(this._fileHandle);
   }
 };
-_ts_decorate3([
-  import_log13.logInfo
+_ts_decorate6([
+  import_log14.logInfo
 ], Lock.prototype, "lockKey", null);
 
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
 var import_async16 = require("@dxos/async");
-var import_codec_protobuf12 = require("@dxos/codec-protobuf");
-var import_log14 = require("@dxos/log");
-var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util7 = require("@dxos/util");
+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_util8 = require("@dxos/util");
 var LoggingServiceImpl = class {
   constructor() {
     this._logs = new import_async16.Event();
+    this._started = /* @__PURE__ */ new Date();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
   }
   async open() {
-    import_log14.log.runtimeConfig.processors.push(this._logProcessor);
+    import_log15.log.runtimeConfig.processors.push(this._logProcessor);
   }
   async close() {
-    const index = import_log14.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
-    import_log14.log.runtimeConfig.processors.splice(index, 1);
+    const index = import_log15.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    import_log15.log.runtimeConfig.processors.splice(index, 1);
   }
   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
     };
   }
-  queryMetrics({ interval }) {
-    const createNumericalValues = (key) => {
-      var _a;
-      const consume = (_a = import_util7.tracer.get(key)) != null ? _a : [];
+  /**
+  * @deprecated (Move to diagnostics).
+  */
+  queryMetrics({ interval = 5e3 }) {
+    const getNumericalValues = (key) => {
+      const events = import_util8.tracer.get(key) ?? [];
       return {
         key,
-        stats: (0, import_util7.numericalValues)(consume, "duration")
+        stats: (0, import_util8.numericalValues)(events, "duration")
       };
     };
-    return new import_codec_protobuf12.Stream(({ next }) => {
+    return new import_codec_protobuf13.Stream(({ next }) => {
       const update = () => {
         const metrics = {
-          timestamp: new Date(),
+          timestamp: /* @__PURE__ */ new Date(),
           values: [
-            createNumericalValues("dxos.echo.pipeline.control"),
-            createNumericalValues("dxos.echo.pipeline.data")
-          ]
+            getNumericalValues("dxos.echo.pipeline.control"),
+            getNumericalValues("dxos.echo.pipeline.data")
+          ].filter(Boolean)
         };
-        next(metrics);
+        next({
+          timestamp: /* @__PURE__ */ new Date(),
+          metrics
+        });
       };
       update();
-      const i = setInterval(update, interval);
+      const i = setInterval(update, Math.max(interval, 1e3));
       return () => {
         clearInterval(i);
       };
     });
   }
   queryLogs(request) {
-    return new import_codec_protobuf12.Stream(({ ctx, next }) => {
+    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)) {
@@ -3647,12 +4208,12 @@ var LoggingServiceImpl = class {
         }
         const record = {
           ...entry2,
-          context: (0, import_util7.jsonify)((0, import_log14.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 {
@@ -3668,35 +4229,31 @@ var LoggingServiceImpl = class {
 };
 var matchFilter = (filter, level, path, options) => {
   switch (options) {
-    case import_services11.QueryLogsRequest.MatchingOptions.INCLUSIVE:
+    case import_services12.QueryLogsRequest.MatchingOptions.INCLUSIVE:
       return level >= filter.level && (!filter.pattern || path.includes(filter.pattern));
-    case import_services11.QueryLogsRequest.MatchingOptions.EXPLICIT:
+    case import_services12.QueryLogsRequest.MatchingOptions.EXPLICIT:
       return level === filter.level && (!filter.pattern || path.includes(filter.pattern));
   }
 };
 var shouldLog = (entry2, request) => {
-  var _a;
-  const options = (_a = request.options) != null ? _a : import_services11.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  const options = request.options ?? import_services12.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   if (request.filters === void 0) {
-    return options === import_services11.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+    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;
 
 // packages/sdk/client-services/src/packlets/network/network-service.ts
-var import_codec_protobuf13 = require("@dxos/codec-protobuf");
+var import_codec_protobuf14 = require("@dxos/codec-protobuf");
 var NetworkServiceImpl = class {
   constructor(networkManager, signalManager) {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
   }
   queryStatus() {
-    return new import_codec_protobuf13.Stream(({ next }) => {
+    return new import_codec_protobuf14.Stream(({ next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
@@ -3725,10 +4282,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.");
   }
@@ -3770,25 +4327,40 @@ var toStorageType = (type) => {
 };
 
 // packages/sdk/client-services/src/packlets/system/system-service.ts
-var import_codec_protobuf14 = require("@dxos/codec-protobuf");
+var import_codec_protobuf15 = require("@dxos/codec-protobuf");
+var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
+var import_util10 = require("@dxos/util");
 var SystemServiceImpl = class {
-  constructor({ config, statusUpdate, onUpdateStatus, getCurrentStatus, onReset }) {
+  constructor({ config, statusUpdate, getDiagnostics, onUpdateStatus, getCurrentStatus, onReset }) {
     this._config = config;
     this._statusUpdate = statusUpdate;
     this._getCurrentStatus = getCurrentStatus;
+    this._getDiagnostics = getDiagnostics;
     this._onUpdateStatus = onUpdateStatus;
     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.
+  */
+  async getDiagnostics({ keys } = {}) {
+    const diagnostics = await this._getDiagnostics();
+    return {
+      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
+      })))
+    };
   }
   async updateStatus({ status }) {
     await this._onUpdateStatus(status);
   }
   // TODO(burdon): Standardize interval option in stream request?
   queryStatus({ interval = 3e3 } = {}) {
-    return new import_codec_protobuf14.Stream(({ next }) => {
+    return new import_codec_protobuf15.Stream(({ next }) => {
       const update = () => {
         next({
           status: this._getCurrentStatus()
@@ -3833,7 +4405,7 @@ var ServiceRegistry = class {
 };
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
-function _ts_decorate4(decorators, target, key, desc) {
+function _ts_decorate7(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")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -3843,23 +4415,22 @@ function _ts_decorate4(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var createDefaultModelFactory = () => {
-  return new import_model_factory.ModelFactory().registerModel(import_document_model.DocumentModel).registerModel(import_text_model.TextModel);
+  return new import_model_factory.ModelFactory().registerModel(import_document_model2.DocumentModel).registerModel(import_text_model.TextModel);
 };
-var ClientServicesHost = class {
+var ClientServicesHost = class ClientServicesHost2 {
   constructor({
     config,
     modelFactory = createDefaultModelFactory(),
-    // TODO(burdon): Create ApolloLink abstraction (see Client).
     transportFactory,
     signalManager,
-    connectionLog,
     storage,
     // TODO(wittjosiah): Turn this on by default.
     lockKey,
     callbacks
   } = {}) {
+    this._tracingService = import_tracing4.TRACE_PROCESSOR.createTraceSender();
     this._statusUpdate = new import_async17.Event();
     this._opening = false;
     this._open = false;
@@ -3878,7 +4449,7 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open();
+            void this.open(new import_context10.Context());
           }
         },
         onRelease: () => this.close()
@@ -3887,13 +4458,15 @@ var ClientServicesHost = class {
     this._systemService = new SystemServiceImpl({
       config: this._config,
       statusUpdate: this._statusUpdate,
-      getCurrentStatus: () => this.isOpen ? import_services12.SystemStatus.ACTIVE : import_services12.SystemStatus.INACTIVE,
+      getCurrentStatus: () => this.isOpen ? import_services14.SystemStatus.ACTIVE : import_services14.SystemStatus.INACTIVE,
+      getDiagnostics: () => {
+        return createDiagnostics(this._serviceRegistry.services, this._serviceContext, this._config);
+      },
       onUpdateStatus: async (status) => {
-        var _a, _b;
-        if (!this.isOpen && status === import_services12.SystemStatus.ACTIVE) {
-          await ((_a = this._resourceLock) == null ? void 0 : _a.acquire());
-        } else if (this.isOpen && status === import_services12.SystemStatus.INACTIVE) {
-          await ((_b = this._resourceLock) == null ? void 0 : _b.release());
+        if (!this.isOpen && status === import_services14.SystemStatus.ACTIVE) {
+          await this._resourceLock?.acquire();
+        } else if (this.isOpen && status === import_services14.SystemStatus.INACTIVE) {
+          await this._resourceLock?.release();
         }
       },
       onReset: async () => {
@@ -3902,12 +4475,19 @@ var ClientServicesHost = class {
     });
     this._loggingService = new LoggingServiceImpl();
     this._serviceRegistry = new ServiceRegistry(import_client_protocol5.clientServiceBundle, {
-      SystemService: this._systemService
+      SystemService: this._systemService,
+      TracingService: this._tracingService
     });
   }
   get isOpen() {
     return this._open;
   }
+  get config() {
+    return this._config;
+  }
+  get context() {
+    return this._serviceContext;
+  }
   get serviceRegistry() {
     return this._serviceRegistry;
   }
@@ -3923,59 +4503,125 @@ var ClientServicesHost = class {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    var _a, _b, _c;
-    (0, import_tiny_invariant13.default)(!this._open, "service host is open");
+    (0, import_invariant14.invariant)(!this._open, "service host is open", {
+      F: __dxlog_file17,
+      L: 181,
+      S: this,
+      A: [
+        "!this._open",
+        "'service host is open'"
+      ]
+    });
+    (0, import_log16.log)("initializing...", void 0, {
+      F: __dxlog_file17,
+      L: 182,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     if (config) {
-      (0, import_tiny_invariant13.default)(!this._config, "config already set");
+      (0, import_invariant14.invariant)(!this._config, "config already set", {
+        F: __dxlog_file17,
+        L: 185,
+        S: this,
+        A: [
+          "!this._config",
+          "'config already set'"
+        ]
+      });
       this._config = config;
       if (!this._storage) {
         this._storage = createStorageObjects(config.get("runtime.client.storage", {})).storage;
       }
     }
     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_tiny_invariant13.default)(!this._networkManager, "network manager already set");
+    (0, import_invariant14.invariant)(!this._networkManager, "network manager already set", {
+      F: __dxlog_file17,
+      L: 201,
+      S: this,
+      A: [
+        "!this._networkManager",
+        "'network manager already set'"
+      ]
+    });
     this._networkManager = new import_network_manager2.NetworkManager({
       log: connectionLog,
       transportFactory,
       signalManager
     });
+    (0, import_log16.log)("initialized", void 0, {
+      F: __dxlog_file17,
+      L: 208,
+      S: this,
+      C: (f, a) => f(...a)
+    });
   }
-  async open() {
-    var _a, _b, _c;
+  async open(ctx) {
     if (this._open) {
       return;
     }
     const traceId = import_keys12.PublicKey.random().toHex();
-    import_log15.log.trace("dxos.sdk.client-services-host.open", import_protocols9.trace.begin({
+    import_log16.log.trace("dxos.client-services.host.open", import_protocols10.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file14,
-      L: 203,
+      F: __dxlog_file17,
+      L: 219,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_tiny_invariant13.default)(this._config, "config not set");
-    (0, import_tiny_invariant13.default)(this._storage, "storage not set");
-    (0, import_tiny_invariant13.default)(this._signalManager, "signal manager not set");
-    (0, import_tiny_invariant13.default)(this._networkManager, "network manager not set");
+    (0, import_invariant14.invariant)(this._config, "config not set", {
+      F: __dxlog_file17,
+      L: 221,
+      S: this,
+      A: [
+        "this._config",
+        "'config not set'"
+      ]
+    });
+    (0, import_invariant14.invariant)(this._storage, "storage not set", {
+      F: __dxlog_file17,
+      L: 222,
+      S: this,
+      A: [
+        "this._storage",
+        "'storage not set'"
+      ]
+    });
+    (0, import_invariant14.invariant)(this._signalManager, "signal manager not set", {
+      F: __dxlog_file17,
+      L: 223,
+      S: this,
+      A: [
+        "this._signalManager",
+        "'signal manager not set'"
+      ]
+    });
+    (0, import_invariant14.invariant)(this._networkManager, "network manager not set", {
+      F: __dxlog_file17,
+      L: 224,
+      S: this,
+      A: [
+        "this._networkManager",
+        "'network manager not set'"
+      ]
+    });
     this._opening = true;
-    (0, import_log15.log)("opening...", {
-      lockKey: (_a = this._resourceLock) == null ? void 0 : _a.lockKey
+    (0, import_log16.log)("opening...", {
+      lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file14,
-      L: 211,
+      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 () => {
@@ -3985,6 +4631,7 @@ var ClientServicesHost = class {
       DataService: new import_echo_pipeline4.DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
       LoggingService: this._loggingService,
+      TracingService: this._tracingService,
       // TODO(burdon): Move to new protobuf definitions.
       DevtoolsHost: new DevtoolsServiceImpl({
         events: new DevtoolsHostEvents(),
@@ -3992,39 +4639,38 @@ var ClientServicesHost = class {
         context: this._serviceContext
       })
     });
-    await this._serviceContext.open();
+    await this._serviceContext.open(ctx);
     this._opening = false;
     this._open = true;
     this._statusUpdate.emit();
-    const deviceKey = (_c = this._serviceContext.identityManager.identity) == null ? void 0 : _c.deviceKey;
-    (0, import_log15.log)("opened", {
+    const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
+    (0, import_log16.log)("opened", {
       deviceKey
     }, {
-      F: __dxlog_file14,
-      L: 266,
+      F: __dxlog_file17,
+      L: 284,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log15.log.trace("dxos.sdk.client-services-host.open", import_protocols9.trace.end({
+    import_log16.log.trace("dxos.client-services.host.open", import_protocols10.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file14,
-      L: 267,
+      F: __dxlog_file17,
+      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;
-    (0, import_log15.log)("closing...", {
+    const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
+    (0, import_log16.log)("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file14,
-      L: 277,
+      F: __dxlog_file17,
+      L: 296,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4035,59 +4681,70 @@ var ClientServicesHost = class {
     await this._serviceContext.close();
     this._open = false;
     this._statusUpdate.emit();
-    (0, import_log15.log)("closed", {
+    (0, import_log16.log)("closed", {
       deviceKey
     }, {
-      F: __dxlog_file14,
-      L: 283,
+      F: __dxlog_file17,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
-    var _a, _b, _c;
     const traceId = import_keys12.PublicKey.random().toHex();
-    import_log15.log.trace("dxos.sdk.client-services-host.reset", import_protocols9.trace.begin({
+    import_log16.log.trace("dxos.sdk.client-services-host.reset", import_protocols10.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file14,
-      L: 288,
+      F: __dxlog_file17,
+      L: 307,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log15.log)("resetting...", void 0, {
-      F: __dxlog_file14,
-      L: 290,
+    (0, import_log16.log)("resetting...", void 0, {
+      F: __dxlog_file17,
+      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_log15.log)("reset", void 0, {
-      F: __dxlog_file14,
-      L: 293,
+    (0, import_log16.log)("reset", void 0, {
+      F: __dxlog_file17,
+      L: 312,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log15.log.trace("dxos.sdk.client-services-host.reset", import_protocols9.trace.end({
+    import_log16.log.trace("dxos.sdk.client-services-host.reset", import_protocols10.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file14,
-      L: 294,
+      F: __dxlog_file17,
+      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_decorate4([
-  import_async17.synchronized
+_ts_decorate7([
+  import_tracing4.trace.info()
+], ClientServicesHost.prototype, "_opening", void 0);
+_ts_decorate7([
+  import_tracing4.trace.info()
+], ClientServicesHost.prototype, "_open", void 0);
+_ts_decorate7([
+  import_async17.synchronized,
+  import_tracing4.trace.span()
 ], ClientServicesHost.prototype, "open", null);
-_ts_decorate4([
-  import_async17.synchronized
+_ts_decorate7([
+  import_async17.synchronized,
+  import_tracing4.trace.span()
 ], ClientServicesHost.prototype, "close", null);
+ClientServicesHost = _ts_decorate7([
+  import_tracing4.trace.resource()
+], ClientServicesHost);
 
 // packages/sdk/client-services/src/packlets/testing/invitation-utils.ts
+var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/testing/invitation-utils.ts";
 var sanitizeInvitation = (invitation) => {
   return {
     invitationId: invitation.invitationId,
@@ -4105,40 +4762,46 @@ var performInvitation = ({ host, guest, options, hooks }) => {
   const authCode = new import_async18.Trigger();
   const hostObservable = createInvitation(host, options);
   hostObservable.subscribe(async (hostInvitation) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     switch (hostInvitation.state) {
-      case import_services13.Invitation.State.CONNECTING: {
-        if ((_b = (_a = hooks == null ? void 0 : hooks.host) == null ? void 0 : _a.onConnecting) == null ? void 0 : _b.call(_a, hostObservable)) {
+      case import_services15.Invitation.State.CONNECTING: {
+        if (hooks?.host?.onConnecting?.(hostObservable)) {
           break;
         }
         const guestObservable = acceptInvitation(guest, hostInvitation);
         guestObservable.subscribe(async (guestInvitation) => {
-          var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2, _n2;
           switch (guestInvitation.state) {
-            case import_services13.Invitation.State.CONNECTING: {
-              if ((_b2 = (_a2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _a2.onConnecting) == null ? void 0 : _b2.call(_a2, guestObservable)) {
+            case import_services15.Invitation.State.CONNECTING: {
+              if (hooks?.guest?.onConnecting?.(guestObservable)) {
                 break;
               }
-              (0, import_tiny_invariant14.default)(hostInvitation.swarmKey.equals(guestInvitation.swarmKey));
+              (0, import_invariant15.invariant)(hostInvitation.swarmKey.equals(guestInvitation.swarmKey), void 0, {
+                F: __dxlog_file18,
+                L: 84,
+                S: void 0,
+                A: [
+                  "hostInvitation.swarmKey!.equals(guestInvitation.swarmKey!)",
+                  ""
+                ]
+              });
               break;
             }
-            case import_services13.Invitation.State.CONNECTED: {
-              (_d2 = (_c2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _c2.onConnected) == null ? void 0 : _d2.call(_c2, guestObservable);
+            case import_services15.Invitation.State.CONNECTED: {
+              hooks?.guest?.onConnected?.(guestObservable);
               break;
             }
-            case import_services13.Invitation.State.READY_FOR_AUTHENTICATION: {
-              if ((_f2 = (_e2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _e2.onReady) == null ? void 0 : _f2.call(_e2, guestObservable)) {
+            case import_services15.Invitation.State.READY_FOR_AUTHENTICATION: {
+              if (hooks?.guest?.onReady?.(guestObservable)) {
                 break;
               }
               await guestObservable.authenticate(await authCode.wait());
               break;
             }
-            case import_services13.Invitation.State.AUTHENTICATING: {
-              (_h2 = (_g2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _g2.onAuthenticating) == null ? void 0 : _h2.call(_g2, guestObservable);
+            case import_services15.Invitation.State.AUTHENTICATING: {
+              hooks?.guest?.onAuthenticating?.(guestObservable);
               break;
             }
-            case import_services13.Invitation.State.SUCCESS: {
-              if ((_j2 = (_i2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _i2.onSuccess) == null ? void 0 : _j2.call(_i2, guestObservable)) {
+            case import_services15.Invitation.State.SUCCESS: {
+              if (hooks?.guest?.onSuccess?.(guestObservable)) {
                 break;
               }
               guestComplete.wake({
@@ -4146,8 +4809,8 @@ var performInvitation = ({ host, guest, options, hooks }) => {
               });
               break;
             }
-            case import_services13.Invitation.State.CANCELLED: {
-              if ((_l2 = (_k2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _k2.onCancelled) == null ? void 0 : _l2.call(_k2, guestObservable)) {
+            case import_services15.Invitation.State.CANCELLED: {
+              if (hooks?.guest?.onCancelled?.(guestObservable)) {
                 break;
               }
               guestComplete.wake({
@@ -4155,8 +4818,8 @@ var performInvitation = ({ host, guest, options, hooks }) => {
               });
               break;
             }
-            case import_services13.Invitation.State.TIMEOUT: {
-              if ((_n2 = (_m2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _m2.onTimeout) == null ? void 0 : _n2.call(_m2, guestObservable)) {
+            case import_services15.Invitation.State.TIMEOUT: {
+              if (hooks?.guest?.onTimeout?.(guestObservable)) {
                 return;
               }
               guestComplete.wake({
@@ -4165,8 +4828,7 @@ var performInvitation = ({ host, guest, options, hooks }) => {
             }
           }
         }, (error) => {
-          var _a2, _b2;
-          if ((_b2 = (_a2 = hooks == null ? void 0 : hooks.guest) == null ? void 0 : _a2.onError) == null ? void 0 : _b2.call(_a2, guestObservable)) {
+          if (hooks?.guest?.onError?.(guestObservable)) {
             return;
           }
           guestComplete.wake({
@@ -4175,12 +4837,12 @@ var performInvitation = ({ host, guest, options, hooks }) => {
         });
         break;
       }
-      case import_services13.Invitation.State.CONNECTED: {
-        (_d = (_c = hooks == null ? void 0 : hooks.host) == null ? void 0 : _c.onConnected) == null ? void 0 : _d.call(_c, hostObservable);
+      case import_services15.Invitation.State.CONNECTED: {
+        hooks?.host?.onConnected?.(hostObservable);
         break;
       }
-      case import_services13.Invitation.State.READY_FOR_AUTHENTICATION: {
-        if ((_f = (_e = hooks == null ? void 0 : hooks.host) == null ? void 0 : _e.onReady) == null ? void 0 : _f.call(_e, hostObservable)) {
+      case import_services15.Invitation.State.READY_FOR_AUTHENTICATION: {
+        if (hooks?.host?.onReady?.(hostObservable)) {
           break;
         }
         if (hostInvitation.authCode) {
@@ -4188,12 +4850,12 @@ var performInvitation = ({ host, guest, options, hooks }) => {
         }
         break;
       }
-      case import_services13.Invitation.State.AUTHENTICATING: {
-        (_h = (_g = hooks == null ? void 0 : hooks.host) == null ? void 0 : _g.onAuthenticating) == null ? void 0 : _h.call(_g, hostObservable);
+      case import_services15.Invitation.State.AUTHENTICATING: {
+        hooks?.host?.onAuthenticating?.(hostObservable);
         break;
       }
-      case import_services13.Invitation.State.SUCCESS: {
-        if ((_j = (_i = hooks == null ? void 0 : hooks.host) == null ? void 0 : _i.onSuccess) == null ? void 0 : _j.call(_i, hostObservable)) {
+      case import_services15.Invitation.State.SUCCESS: {
+        if (hooks?.host?.onSuccess?.(hostObservable)) {
           break;
         }
         hostComplete.wake({
@@ -4201,8 +4863,8 @@ var performInvitation = ({ host, guest, options, hooks }) => {
         });
         break;
       }
-      case import_services13.Invitation.State.CANCELLED: {
-        if ((_l = (_k = hooks == null ? void 0 : hooks.host) == null ? void 0 : _k.onCancelled) == null ? void 0 : _l.call(_k, hostObservable)) {
+      case import_services15.Invitation.State.CANCELLED: {
+        if (hooks?.host?.onCancelled?.(hostObservable)) {
           break;
         }
         hostComplete.wake({
@@ -4210,8 +4872,8 @@ var performInvitation = ({ host, guest, options, hooks }) => {
         });
         break;
       }
-      case import_services13.Invitation.State.TIMEOUT: {
-        if ((_n = (_m = hooks == null ? void 0 : hooks.host) == null ? void 0 : _m.onTimeout) == null ? void 0 : _n.call(_m, hostObservable)) {
+      case import_services15.Invitation.State.TIMEOUT: {
+        if (hooks?.host?.onTimeout?.(hostObservable)) {
           break;
         }
         hostComplete.wake({
@@ -4221,8 +4883,7 @@ var performInvitation = ({ host, guest, options, hooks }) => {
       }
     }
   }, (error) => {
-    var _a, _b;
-    if ((_b = (_a = hooks == null ? void 0 : hooks.host) == null ? void 0 : _a.onError) == null ? void 0 : _b.call(_a, hostObservable)) {
+    if (hooks?.host?.onError?.(hostObservable)) {
       return;
     }
     hostComplete.wake({
@@ -4235,13 +4896,13 @@ var performInvitation = ({ host, guest, options, hooks }) => {
   ];
 };
 var createInvitation = (host, options) => {
-  options != null ? options : options = {
-    authMethod: import_services13.Invitation.AuthMethod.NONE,
-    ...options != null ? options : {}
+  options ??= {
+    authMethod: import_services15.Invitation.AuthMethod.NONE,
+    ...options ?? {}
   };
   if (host instanceof ServiceContext) {
     const hostHandler = host.getInvitationHandler({
-      kind: import_services13.Invitation.Kind.SPACE,
+      kind: import_services15.Invitation.Kind.SPACE,
       ...options
     });
     return host.invitations.createInvitation(hostHandler, options);
@@ -4260,8 +4921,8 @@ var acceptInvitation = (guest, invitation) => {
 };
 
 // packages/sdk/client-services/src/packlets/testing/test-builder.ts
-var import_context8 = require("@dxos/context");
-var import_credentials15 = require("@dxos/credentials");
+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_testing = require("@dxos/echo-pipeline/testing");
@@ -4295,7 +4956,7 @@ var createPeers = async (numPeers) => {
     const peer = createServiceContext({
       signalContext
     });
-    await peer.open();
+    await peer.open(new import_context11.Context());
     return peer;
   }));
 };
@@ -4310,7 +4971,7 @@ var syncItemsLocal = async (db1, db2) => {
 var TestBuilder = class {
   constructor() {
     this.signalContext = new import_messaging2.MemorySignalManagerContext();
-    this._ctx = new import_context8.Context();
+    this._ctx = new import_context11.Context();
   }
   createPeer(peerOptions) {
     const peer = new TestPeer(this.signalContext, peerOptions);
@@ -4333,18 +4994,15 @@ var TestPeer = class {
     return this._props;
   }
   get storage() {
-    var _a, _b;
-    return (_b = (_a = this._props).storage) != null ? _b : _a.storage = (0, import_random_access_storage2.createStorage)({
+    return this._props.storage ??= (0, import_random_access_storage2.createStorage)({
       type: this.opts.storageType
     });
   }
   get keyring() {
-    var _a, _b;
-    return (_b = (_a = this._props).keyring) != null ? _b : _a.keyring = new import_keyring2.Keyring(this.storage.createDirectory("keyring"));
+    return this._props.keyring ??= new import_keyring2.Keyring(this.storage.createDirectory("keyring"));
   }
   get feedStore() {
-    var _a, _b;
-    return (_b = (_a = this._props).feedStore) != null ? _b : _a.feedStore = new import_feed_store5.FeedStore({
+    return this._props.feedStore ??= new import_feed_store5.FeedStore({
       factory: new import_feed_store5.FeedFactory({
         root: this.storage.createDirectory("feeds"),
         signer: this.keyring,
@@ -4355,27 +5013,22 @@ var TestPeer = class {
     });
   }
   get metadataStore() {
-    var _a, _b;
-    return (_b = (_a = this._props).metadataStore) != null ? _b : _a.metadataStore = new import_echo_pipeline5.MetadataStore(this.storage.createDirectory("metadata"));
+    return this._props.metadataStore ??= new import_echo_pipeline5.MetadataStore(this.storage.createDirectory("metadata"));
   }
   get blobStore() {
-    var _a, _b;
-    return (_b = (_a = this._props).blobStore) != null ? _b : _a.blobStore = new import_teleport_extension_object_sync2.BlobStore(this.storage.createDirectory("blobs"));
+    return this._props.blobStore ??= new import_teleport_extension_object_sync2.BlobStore(this.storage.createDirectory("blobs"));
   }
   get snapshotStore() {
-    var _a, _b;
-    return (_b = (_a = this._props).snapshotStore) != null ? _b : _a.snapshotStore = new import_echo_pipeline5.SnapshotStore(this.storage.createDirectory("snapshots"));
+    return this._props.snapshotStore ??= new import_echo_pipeline5.SnapshotStore(this.storage.createDirectory("snapshots"));
   }
   get networkManager() {
-    var _a, _b;
-    return (_b = (_a = this._props).networkManager) != null ? _b : _a.networkManager = new import_network_manager3.NetworkManager({
+    return this._props.networkManager ??= new import_network_manager3.NetworkManager({
       signalManager: new import_messaging2.MemorySignalManager(this.signalContext),
       transportFactory: import_network_manager3.MemoryTransportFactory
     });
   }
   get spaceManager() {
-    var _a, _b;
-    return (_b = (_a = this._props).spaceManager) != null ? _b : _a.spaceManager = new import_echo_pipeline5.SpaceManager({
+    return this._props.spaceManager ??= new import_echo_pipeline5.SpaceManager({
       feedStore: this.feedStore,
       networkManager: this.networkManager,
       metadataStore: this.metadataStore,
@@ -4385,16 +5038,13 @@ var TestPeer = class {
     });
   }
   get identity() {
-    var _a;
-    return (_a = this._props.signingContext) != null ? _a : (0, import_debug8.failUndefined)();
+    return this._props.signingContext ?? (0, import_debug8.failUndefined)();
   }
   get dataSpaceManager() {
-    var _a, _b;
-    return (_b = (_a = this._props).dataSpaceManager) != null ? _b : _a.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_pipeline5.DataServiceSubscriptions(), this.keyring, this.identity, this.feedStore);
   }
   async createIdentity() {
-    var _a, _b;
-    (_b = (_a = this._props).signingContext) != null ? _b : _a.signingContext = await createSigningContext(this.keyring);
+    this._props.signingContext ??= await createSigningContext(this.keyring);
   }
   async destroy() {
     await this.storage.reset();
@@ -4406,8 +5056,8 @@ var createSigningContext = async (keyring) => {
   return {
     identityKey,
     deviceKey,
-    credentialSigner: (0, import_credentials15.createCredentialSignerWithChain)(keyring, {
-      credential: await new import_credentials15.CredentialGenerator(keyring, identityKey, deviceKey).createDeviceAuthorization(deviceKey)
+    credentialSigner: (0, import_credentials16.createCredentialSignerWithChain)(keyring, {
+      credential: await new import_credentials16.CredentialGenerator(keyring, identityKey, deviceKey).createDeviceAuthorization(deviceKey)
     }, deviceKey),
     recordCredential: async () => {
     }