@dxos/client-services 0.6.9 → 0.6.10-main.48c066e

package/dist/lib/node/{chunk-WTK4Q3EG.cjs → chunk-4Y7QCEWZ.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_WTK4Q3EG_exports = {};
-__export(chunk_WTK4Q3EG_exports, {
+var chunk_4Y7QCEWZ_exports = {};
+__export(chunk_4Y7QCEWZ_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -70,11 +70,12 @@ __export(chunk_WTK4Q3EG_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_WTK4Q3EG_exports);
+module.exports = __toCommonJS(chunk_4Y7QCEWZ_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
 var import_keys = require("@dxos/keys");
+var import_log = require("@dxos/log");
 var import_util = require("@dxos/util");
 var import_codec_protobuf2 = require("@dxos/codec-protobuf");
 var import_context = require("@dxos/context");
@@ -101,30 +102,30 @@ var import_util2 = require("@dxos/util");
 var import_async5 = require("@dxos/async");
 var import_context2 = require("@dxos/context");
 var import_credentials2 = require("@dxos/credentials");
-var import_log = require("@dxos/log");
-var import_protocols2 = require("@dxos/protocols");
+var import_log2 = require("@dxos/log");
+var import_proto = require("@dxos/protocols/proto");
 var import_async6 = require("@dxos/async");
 var import_client_protocol2 = require("@dxos/client-protocol");
 var import_credentials3 = require("@dxos/credentials");
 var import_feed_store2 = require("@dxos/feed-store");
 var import_invariant2 = require("@dxos/invariant");
 var import_keys3 = require("@dxos/keys");
-var import_log2 = require("@dxos/log");
+var import_log3 = require("@dxos/log");
 var import_credentials4 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe = require("@dxos/timeframe");
 var import_tracing3 = require("@dxos/tracing");
 var import_util3 = require("@dxos/util");
 var import_credentials5 = require("@dxos/credentials");
 var import_keys4 = require("@dxos/keys");
-var import_log3 = require("@dxos/log");
+var import_log4 = require("@dxos/log");
 var import_platform = __toESM(require("platform"));
 var import_async7 = require("@dxos/async");
 var import_context3 = require("@dxos/context");
 var import_credentials6 = require("@dxos/credentials");
 var import_invariant3 = require("@dxos/invariant");
 var import_keys5 = require("@dxos/keys");
-var import_log4 = require("@dxos/log");
-var import_protocols3 = require("@dxos/protocols");
+var import_log5 = require("@dxos/log");
+var import_protocols2 = require("@dxos/protocols");
 var import_services4 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials7 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
@@ -137,11 +138,11 @@ var import_context4 = require("@dxos/context");
 var import_credentials8 = require("@dxos/credentials");
 var import_debug = require("@dxos/debug");
 var import_invariant4 = require("@dxos/invariant");
-var import_log5 = require("@dxos/log");
+var import_log6 = require("@dxos/log");
 var import_services5 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util5 = require("@dxos/util");
 var import_invariant5 = require("@dxos/invariant");
-var import_protocols4 = require("@dxos/protocols");
+var import_protocols3 = require("@dxos/protocols");
 var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async9 = require("@dxos/async");
 var import_client_protocol3 = require("@dxos/client-protocol");
@@ -149,9 +150,9 @@ var import_context5 = require("@dxos/context");
 var import_crypto = require("@dxos/crypto");
 var import_invariant6 = require("@dxos/invariant");
 var import_keys6 = require("@dxos/keys");
-var import_log6 = require("@dxos/log");
+var import_log7 = require("@dxos/log");
 var import_network_manager = require("@dxos/network-manager");
-var import_protocols5 = require("@dxos/protocols");
+var import_protocols4 = require("@dxos/protocols");
 var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_invitations2 = require("@dxos/protocols/proto/dxos/halo/invitations");
@@ -160,8 +161,9 @@ var import_util6 = require("@dxos/util");
 var import_async10 = require("@dxos/async");
 var import_context6 = require("@dxos/context");
 var import_invariant7 = require("@dxos/invariant");
-var import_log7 = require("@dxos/log");
-var import_protocols6 = require("@dxos/protocols");
+var import_log8 = require("@dxos/log");
+var import_protocols5 = require("@dxos/protocols");
+var import_proto2 = require("@dxos/protocols/proto");
 var import_invitations3 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_teleport = require("@dxos/teleport");
 var import_context7 = require("@dxos/context");
@@ -171,14 +173,15 @@ var import_context8 = require("@dxos/context");
 var import_crypto2 = require("@dxos/crypto");
 var import_invariant8 = require("@dxos/invariant");
 var import_keys7 = require("@dxos/keys");
-var import_log8 = require("@dxos/log");
-var import_protocols7 = require("@dxos/protocols");
+var import_log9 = require("@dxos/log");
+var import_protocols6 = require("@dxos/protocols");
+var import_proto3 = require("@dxos/protocols/proto");
 var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations4 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_teleport2 = require("@dxos/teleport");
 var import_invariant9 = require("@dxos/invariant");
 var import_keys8 = require("@dxos/keys");
-var import_log9 = require("@dxos/log");
+var import_log10 = require("@dxos/log");
 var import_invitations5 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_util7 = require("@dxos/util");
 var import_codec_protobuf9 = require("@dxos/codec-protobuf");
@@ -186,8 +189,8 @@ var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials9 = require("@dxos/credentials");
 var import_feed_store3 = require("@dxos/feed-store");
 var import_invariant10 = require("@dxos/invariant");
-var import_log10 = require("@dxos/log");
-var import_protocols8 = require("@dxos/protocols");
+var import_log11 = require("@dxos/log");
+var import_protocols7 = require("@dxos/protocols");
 var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_async12 = require("@dxos/async");
@@ -197,12 +200,12 @@ var import_credentials11 = require("@dxos/credentials");
 var import_echo_pipeline = require("@dxos/echo-pipeline");
 var import_invariant11 = require("@dxos/invariant");
 var import_keys9 = require("@dxos/keys");
-var import_log11 = require("@dxos/log");
+var import_log12 = require("@dxos/log");
 var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials12 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_invariant12 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
-var import_log12 = require("@dxos/log");
+var import_log13 = require("@dxos/log");
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
 var import_debug2 = require("@dxos/debug");
 var import_rpc = require("@dxos/rpc");
@@ -212,8 +215,8 @@ var import_async13 = require("@dxos/async");
 var import_context10 = require("@dxos/context");
 var import_invariant13 = require("@dxos/invariant");
 var import_keys10 = require("@dxos/keys");
-var import_log13 = require("@dxos/log");
-var import_protocols9 = require("@dxos/protocols");
+var import_log14 = require("@dxos/log");
+var import_protocols8 = require("@dxos/protocols");
 var import_buf = require("@dxos/protocols/buf");
 var import_messenger_pb = require("@dxos/protocols/buf/dxos/edge/messenger_pb");
 var import_util8 = require("@dxos/util");
@@ -225,8 +228,8 @@ var import_echo_pipeline2 = require("@dxos/echo-pipeline");
 var import_echo_protocol = require("@dxos/echo-protocol");
 var import_invariant14 = require("@dxos/invariant");
 var import_keys11 = require("@dxos/keys");
-var import_log14 = require("@dxos/log");
-var import_protocols10 = require("@dxos/protocols");
+var import_log15 = require("@dxos/log");
+var import_protocols9 = require("@dxos/protocols");
 var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials13 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe3 = require("@dxos/timeframe");
@@ -239,14 +242,14 @@ var import_echo_db = require("@dxos/echo-db");
 var import_echo_protocol2 = require("@dxos/echo-protocol");
 var import_echo_schema = require("@dxos/echo-schema");
 var import_invariant15 = require("@dxos/invariant");
-var import_log15 = require("@dxos/log");
+var import_log16 = require("@dxos/log");
 var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async16 = require("@dxos/async");
 var import_context13 = require("@dxos/context");
 var import_invariant16 = require("@dxos/invariant");
 var import_keys12 = require("@dxos/keys");
-var import_log16 = require("@dxos/log");
-var import_protocols11 = require("@dxos/protocols");
+var import_log17 = require("@dxos/log");
+var import_proto4 = require("@dxos/protocols/proto");
 var import_teleport3 = require("@dxos/teleport");
 var import_util10 = require("@dxos/util");
 var import_async17 = require("@dxos/async");
@@ -260,8 +263,8 @@ var import_echo_schema2 = require("@dxos/echo-schema");
 var import_feed_store4 = require("@dxos/feed-store");
 var import_invariant17 = require("@dxos/invariant");
 var import_keys13 = require("@dxos/keys");
-var import_log17 = require("@dxos/log");
-var import_protocols12 = require("@dxos/protocols");
+var import_log18 = require("@dxos/log");
+var import_protocols10 = require("@dxos/protocols");
 var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials16 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_teleport_extension_gossip2 = require("@dxos/teleport-extension-gossip");
@@ -277,8 +280,8 @@ var import_credentials19 = require("@dxos/credentials");
 var import_debug5 = require("@dxos/debug");
 var import_feed_store5 = require("@dxos/feed-store");
 var import_invariant18 = require("@dxos/invariant");
-var import_log18 = require("@dxos/log");
-var import_protocols13 = require("@dxos/protocols");
+var import_log19 = require("@dxos/log");
+var import_protocols11 = require("@dxos/protocols");
 var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing9 = require("@dxos/tracing");
 var import_async19 = require("@dxos/async");
@@ -291,13 +294,13 @@ var import_feed_store6 = require("@dxos/feed-store");
 var import_invariant19 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
 var import_keys14 = require("@dxos/keys");
-var import_log19 = require("@dxos/log");
-var import_protocols14 = require("@dxos/protocols");
+var import_log20 = require("@dxos/log");
+var import_protocols12 = require("@dxos/protocols");
 var import_services17 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_tracing10 = require("@dxos/tracing");
 var import_util12 = require("@dxos/util");
-var import_protocols15 = require("@dxos/protocols");
+var import_protocols13 = require("@dxos/protocols");
 var import_config2 = require("@dxos/protocols/proto/dxos/config");
 var import_random_access_storage = require("@dxos/random-access-storage");
 var import_client_protocol7 = require("@dxos/client-protocol");
@@ -308,8 +311,8 @@ var import_keys15 = require("@dxos/keys");
 var import_kv_store = require("@dxos/kv-store");
 var import_automerge_repo = require("@dxos/automerge/automerge-repo");
 var import_invariant20 = require("@dxos/invariant");
-var import_log20 = require("@dxos/log");
-var import_protocols16 = require("@dxos/protocols");
+var import_log21 = require("@dxos/log");
+var import_protocols14 = require("@dxos/protocols");
 var import_util14 = require("@dxos/util");
 var import_async20 = require("@dxos/async");
 var import_client_protocol8 = require("@dxos/client-protocol");
@@ -317,10 +320,10 @@ var import_context16 = require("@dxos/context");
 var import_edge_client = require("@dxos/edge-client");
 var import_invariant21 = require("@dxos/invariant");
 var import_keys16 = require("@dxos/keys");
-var import_log21 = require("@dxos/log");
+var import_log22 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager2 = require("@dxos/network-manager");
-var import_protocols17 = require("@dxos/protocols");
+var import_protocols15 = require("@dxos/protocols");
 var import_services18 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing11 = require("@dxos/tracing");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
@@ -335,14 +338,15 @@ var import_util15 = require("@dxos/util");
 var import_async23 = require("@dxos/async");
 var import_codec_protobuf14 = require("@dxos/codec-protobuf");
 var import_keys18 = require("@dxos/keys");
-var import_log22 = require("@dxos/log");
+var import_log23 = require("@dxos/log");
 var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util16 = require("@dxos/util");
 var import_codec_protobuf15 = require("@dxos/codec-protobuf");
 var import_codec_protobuf16 = require("@dxos/codec-protobuf");
 var import_services21 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util17 = require("@dxos/util");
-var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devtools/feeds.ts";
+var subscribeToFeeds = ({ feedStore, spaceManager }, { feedKeys }) => {
   return new import_codec_protobuf.Stream(({ next }) => {
     const subscriptions = new import_async.EventSubscriptions();
     const feedMap = new import_util.ComplexMap(import_keys.PublicKey.hash);
@@ -350,17 +354,23 @@ var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
       const { feeds } = feedStore;
       feeds.filter((feed) => !feedKeys?.length || feedKeys.some((feedKey) => feedKey.equals(feed.key))).forEach((feed) => {
         if (!feedMap.has(feed.key)) {
-          feedMap.set(feed.key, feed);
+          feedMap.set(feed.key, {
+            feed
+          });
           feed.on("close", update);
           subscriptions.add(() => feed.off("close", update));
         }
+        if (!feedMap.get(feed.key)?.owner) {
+          feedMap.get(feed.key).owner = findFeedOwner(spaceManager, feed.key);
+        }
       });
       next({
-        feeds: Array.from(feedMap.values()).map((feed) => ({
+        feeds: Array.from(feedMap.values()).map(({ feed, owner }) => ({
           feedKey: feed.key,
           length: feed.properties.length,
           bytes: feed.core.byteLength,
-          downloaded: feed.core.bitfield?.data.toBuffer() ?? new Uint8Array()
+          downloaded: feed.core.bitfield?.data.toBuffer() ?? new Uint8Array(),
+          owner
         }))
       });
     };
@@ -371,6 +381,30 @@ var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
     };
   });
 };
+var findFeedOwner = (spaceManager, feedKey) => {
+  const feedInfo = [
+    ...spaceManager.spaces.values()
+  ].flatMap((space) => [
+    ...space.spaceState.feeds.values()
+  ]).find((feed) => feed.key.equals(feedKey));
+  import_log.log.info("feeds", {
+    feedInfo,
+    key: feedKey.truncate(),
+    allSpaces: spaceManager.spaces.size
+  }, {
+    F: __dxlog_file,
+    L: 75,
+    S: void 0,
+    C: (f, a) => f(...a)
+  });
+  if (!feedInfo) {
+    return void 0;
+  }
+  return {
+    identity: feedInfo.assertion.identityKey,
+    device: feedInfo.assertion.deviceKey
+  };
+};
 var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
   return new import_codec_protobuf.Stream(({ next }) => {
     if (!feedKey) {
@@ -383,6 +417,12 @@ var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
         return;
       }
       const update = async () => {
+        if (!feed.properties.length) {
+          next({
+            blocks: []
+          });
+          return;
+        }
         const iterator = new import_feed_store.FeedIterator(feed);
         await iterator.open();
         const blocks = [];
@@ -409,7 +449,7 @@ var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
     };
   });
 };
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devtools/network.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devtools/network.ts";
 var subscribeToNetworkStatus = ({ signalManager }) => new import_codec_protobuf2.Stream(({ next, close }) => {
   const update = () => {
     try {
@@ -426,7 +466,7 @@ var subscribeToNetworkStatus = ({ signalManager }) => new import_codec_protobuf2
 });
 var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf2.Stream(({ next }) => {
   const ctx = new import_context.Context(void 0, {
-    F: __dxlog_file,
+    F: __dxlog_file2,
     L: 36
   });
   signalManager.onMessage.on(ctx, (message) => {
@@ -620,9 +660,7 @@ var DevtoolsServiceImpl = class {
     throw new Error();
   }
   subscribeToFeeds(request) {
-    return subscribeToFeeds({
-      feedStore: this.params.context.feedStore
-    }, request);
+    return subscribeToFeeds(this.params.context, request);
   }
   subscribeToFeedBlocks(request) {
     return subscribeToFeedBlocks({
@@ -665,7 +703,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.6.9";
+var DXOS_VERSION = "0.6.10-main.48c066e";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -693,7 +731,7 @@ var getPlatform = () => {
     };
   }
 };
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts";
 var DEFAULT_TIMEOUT = 1e3;
 var createDiagnostics = async (clientServices, serviceContext, config) => {
   const diagnostics = {
@@ -710,7 +748,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
   await Promise.all([
     (async () => {
       (0, import_invariant.invariant)(clientServices.LoggingService, "SystemService is not available.", {
-        F: __dxlog_file2,
+        F: __dxlog_file3,
         L: 110,
         S: void 0,
         A: [
@@ -858,8 +896,8 @@ var findConfigs = () => {
   const configs = import_tracing2.TRACE_PROCESSOR.findResourcesByAnnotation(import_config.ConfigResource);
   return configs.map((r) => r.instance.deref()).filter(import_util2.nonNullable);
 };
-var __dxlog_file3 = "/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 __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
+var Credential = import_proto.schema.getCodecForType("dxos.halo.credentials.Credential");
 var createAuthProvider = (signer) => async (nonce) => {
   const credential = await signer.createCredential({
     assertion: {
@@ -874,7 +912,7 @@ var TrustedKeySetAuthVerifier = class {
   constructor(_params) {
     this._params = _params;
     this._ctx = new import_context2.Context(void 0, {
-      F: __dxlog_file3,
+      F: __dxlog_file4,
       L: 45
     });
   }
@@ -884,20 +922,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_file3,
+        F: __dxlog_file4,
         L: 56,
         S: this,
         C: (f, a) => f(...a)
       });
       const result = await (0, import_credentials2.verifyCredential)(credential);
       if (result.kind === "fail") {
-        (0, import_log.log)("Invalid credential", {
+        (0, import_log2.log)("Invalid credential", {
           result
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file4,
           L: 60,
           S: this,
           C: (f, a) => f(...a)
@@ -905,11 +943,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_file3,
+          F: __dxlog_file4,
           L: 65,
           S: this,
           C: (f, a) => f(...a)
@@ -917,10 +955,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_file3,
+          F: __dxlog_file4,
           L: 70,
           S: this,
           C: (f, a) => f(...a)
@@ -933,20 +971,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_file3,
+            F: __dxlog_file4,
             L: 81,
             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_file3,
+            F: __dxlog_file4,
             L: 84,
             S: this,
             C: (f, a) => f(...a)
@@ -969,7 +1007,7 @@ var TrustedKeySetAuthVerifier = class {
     return deviceSet.has(deviceKey);
   }
 };
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/default-space-state-machine.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/default-space-state-machine.ts";
 var DefaultSpaceStateMachine = class {
   constructor(_params) {
     this._params = _params;
@@ -982,11 +1020,11 @@ var DefaultSpaceStateMachine = class {
     switch (assertion["@type"]) {
       case "dxos.halo.credentials.DefaultSpace": {
         if (!credential.subject.id.equals(this._params.identityKey)) {
-          import_log3.log.warn("Invalid default space credential", {
+          import_log4.log.warn("Invalid default space credential", {
             expectedIdentity: this._params.identityKey,
             credential
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file5,
             L: 32,
             S: this,
             C: (f, a) => f(...a)
@@ -994,10 +1032,10 @@ var DefaultSpaceStateMachine = class {
           return;
         }
         if (!import_keys4.SpaceId.isValid(assertion.spaceId)) {
-          import_log3.log.warn("Invalid default space id", {
+          import_log4.log.warn("Invalid default space id", {
             id: assertion.spaceId
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file5,
             L: 36,
             S: this,
             C: (f, a) => f(...a)
@@ -1020,7 +1058,7 @@ 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_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
 var Identity = class {
   constructor({ space, signer, identityKey, deviceKey, presence }) {
     this.stateUpdate = new import_async6.Event();
@@ -1029,10 +1067,10 @@ var Identity = class {
     this._presence = presence;
     this.identityKey = identityKey;
     this.deviceKey = deviceKey;
-    import_log2.log.trace("dxos.halo.device", {
+    import_log3.log.trace("dxos.halo.device", {
       deviceKey
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 70,
       S: this,
       C: (f, a) => f(...a)
@@ -1111,7 +1149,7 @@ var Identity = class {
   */
   getIdentityCredentialSigner() {
     (0, import_invariant2.invariant)(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 159,
       S: this,
       A: [
@@ -1148,14 +1186,14 @@ var Identity = class {
     ]));
   }
   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_file5,
+      F: __dxlog_file6,
       L: 184,
       S: this,
       C: (f, a) => f(...a)
@@ -1216,7 +1254,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_file6 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-manager.ts";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-manager.ts";
 var DEVICE_PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var DEVICE_PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var IdentityManager = class {
@@ -1238,19 +1276,19 @@ var IdentityManager = class {
   }
   async open(ctx) {
     const traceId = import_keys5.PublicKey.random().toHex();
-    import_log4.log.trace("dxos.halo.identity-manager.open", import_protocols3.trace.begin({
+    import_log5.log.trace("dxos.halo.identity-manager.open", import_protocols2.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 107,
       S: this,
       C: (f, a) => f(...a)
     });
     const identityRecord = this._metadataStore.getIdentityRecord();
-    (0, import_log4.log)("identity record", {
+    (0, import_log5.log)("identity record", {
       identityRecord
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 110,
       S: this,
       C: (f, a) => f(...a)
@@ -1259,21 +1297,21 @@ var IdentityManager = class {
       this._identity = await this._constructIdentity(identityRecord);
       await this._identity.open(ctx);
       await this._identity.ready();
-      import_log4.log.trace("dxos.halo.identity", {
+      import_log5.log.trace("dxos.halo.identity", {
         identityKey: identityRecord.identityKey,
         displayName: this._identity.profileDocument?.displayName
       }, {
-        F: __dxlog_file6,
+        F: __dxlog_file7,
         L: 115,
         S: this,
         C: (f, a) => f(...a)
       });
       this.stateUpdate.emit();
     }
-    import_log4.log.trace("dxos.halo.identity-manager.open", import_protocols3.trace.end({
+    import_log5.log.trace("dxos.halo.identity-manager.open", import_protocols2.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 122,
       S: this,
       C: (f, a) => f(...a)
@@ -1281,13 +1319,13 @@ var IdentityManager = class {
   }
   async close() {
     await this._identity?.close(new import_context3.Context(void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 126
     }));
   }
   async createIdentity({ displayName, deviceProfile } = {}) {
     (0, import_invariant3.invariant)(!this._identity, "Identity already exists.", {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 131,
       S: this,
       A: [
@@ -1295,8 +1333,8 @@ var IdentityManager = class {
         "'Identity already exists.'"
       ]
     });
-    (0, import_log4.log)("creating identity...", void 0, {
-      F: __dxlog_file6,
+    (0, import_log5.log)("creating identity...", void 0, {
+      F: __dxlog_file7,
       L: 132,
       S: this,
       C: (f, a) => f(...a)
@@ -1314,13 +1352,13 @@ var IdentityManager = class {
     };
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new import_context3.Context(void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 147
     }));
     {
       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_file6,
+        F: __dxlog_file7,
         L: 151,
         S: this,
         A: [
@@ -1329,7 +1367,7 @@ var IdentityManager = class {
         ]
       });
       (0, import_invariant3.invariant)(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
-        F: __dxlog_file6,
+        F: __dxlog_file7,
         L: 152,
         S: this,
         A: [
@@ -1364,22 +1402,22 @@ var IdentityManager = class {
     await this._metadataStore.setIdentityRecord(identityRecord);
     this._identity = identity;
     await this._identity.ready();
-    import_log4.log.trace("dxos.halo.identity", {
+    import_log5.log.trace("dxos.halo.identity", {
       identityKey: identityRecord.identityKey,
       displayName: this._identity.profileDocument?.displayName
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 194,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdate.emit();
-    (0, import_log4.log)("created identity", {
+    (0, import_log5.log)("created identity", {
       identityKey: identity.identityKey,
       deviceKey: identity.deviceKey,
       profile: identity.profileDocument
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 200,
       S: this,
       C: (f, a) => f(...a)
@@ -1413,16 +1451,16 @@ var IdentityManager = class {
   * Accept an existing identity. Expects its device key to be authorized (now or later).
   */
   async acceptIdentity(params) {
-    (0, import_log4.log)("accepting identity", {
+    (0, import_log5.log)("accepting identity", {
       params
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 238,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant3.invariant)(!this._identity, "Identity already exists.", {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 239,
       S: this,
       A: [
@@ -1443,17 +1481,17 @@ var IdentityManager = class {
     };
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new import_context3.Context(void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 254
     }));
     this._identity = identity;
     await this._metadataStore.setIdentityRecord(identityRecord);
     await this._identity.ready();
-    import_log4.log.trace("dxos.halo.identity", {
+    import_log5.log.trace("dxos.halo.identity", {
       identityKey: identityRecord.identityKey,
       displayName: this._identity.profileDocument?.displayName
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 258,
       S: this,
       C: (f, a) => f(...a)
@@ -1463,11 +1501,11 @@ var IdentityManager = class {
       ...params.deviceProfile
     });
     this.stateUpdate.emit();
-    (0, import_log4.log)("accepted identity", {
+    (0, import_log5.log)("accepted identity", {
       identityKey: identity.identityKey,
       deviceKey: identity.deviceKey
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 268,
       S: this,
       C: (f, a) => f(...a)
@@ -1479,7 +1517,7 @@ var IdentityManager = class {
   */
   async updateProfile(profile) {
     (0, import_invariant3.invariant)(this._identity, "Identity not initialized.", {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 276,
       S: this,
       A: [
@@ -1510,7 +1548,7 @@ var IdentityManager = class {
   }
   async updateDeviceProfile(profile) {
     (0, import_invariant3.invariant)(this._identity, "Identity not initialized.", {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 293,
       S: this,
       A: [
@@ -1546,7 +1584,7 @@ var IdentityManager = class {
   }
   async _constructIdentity(identityRecord) {
     (0, import_invariant3.invariant)(!this._identity, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 319,
       S: this,
       A: [
@@ -1554,10 +1592,10 @@ var IdentityManager = class {
         ""
       ]
     });
-    (0, import_log4.log)("constructing identity", {
+    (0, import_log5.log)("constructing identity", {
       identityRecord
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 320,
       S: this,
       C: (f, a) => f(...a)
@@ -1572,7 +1610,7 @@ var IdentityManager = class {
       gossip
     });
     (0, import_invariant3.invariant)(identityRecord.haloSpace.controlFeedKey, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 333,
       S: this,
       A: [
@@ -1584,7 +1622,7 @@ var IdentityManager = class {
       writable: true
     });
     (0, import_invariant3.invariant)(identityRecord.haloSpace.dataFeedKey, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 337,
       S: this,
       A: [
@@ -1616,10 +1654,10 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey,
       deviceKey: identityRecord.deviceKey
     });
-    (0, import_log4.log)("done", {
+    (0, import_log5.log)("done", {
       identityKey: identityRecord.identityKey
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 364,
       S: this,
       C: (f, a) => f(...a)
@@ -1644,8 +1682,8 @@ var IdentityManager = class {
         }));
       },
       onAuthFailure: () => {
-        import_log4.log.warn("auth failure", void 0, {
-          F: __dxlog_file6,
+        import_log5.log.warn("auth failure", void 0, {
+          F: __dxlog_file7,
           L: 390,
           S: this,
           C: (f, a) => f(...a)
@@ -1667,7 +1705,7 @@ _ts_decorate2([
 IdentityManager = _ts_decorate2([
   import_tracing4.trace.resource()
 ], IdentityManager);
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-service.ts";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-service.ts";
 var DEFAULT_SPACE_SEARCH_TIMEOUT = 1e4;
 var IdentityServiceImpl = class extends import_context4.Resource {
   constructor(_identityManager, _keyring, _dataSpaceManagerProvider, _createIdentity, _onProfileUpdate) {
@@ -1697,7 +1735,7 @@ var IdentityServiceImpl = class extends import_context4.Resource {
     const space = await dataSpaceManager.createDefaultSpace();
     const identity = this._identityManager.identity;
     (0, import_invariant4.invariant)(identity, void 0, {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 59,
       S: this,
       A: [
@@ -1731,7 +1769,7 @@ var IdentityServiceImpl = class extends import_context4.Resource {
   }
   async updateProfile(profile) {
     (0, import_invariant4.invariant)(this._identityManager.identity, "Identity not initialized.", {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 89,
       S: this,
       A: [
@@ -1746,7 +1784,7 @@ var IdentityServiceImpl = class extends import_context4.Resource {
   // TODO(burdon): Rename createPresentation?
   async signPresentation({ presentation, nonce }) {
     (0, import_invariant4.invariant)(this._identityManager.identity, "Identity not initialized.", {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 97,
       S: this,
       A: [
@@ -1778,10 +1816,10 @@ var IdentityServiceImpl = class extends import_context4.Resource {
       }
       if (await dataSpaceManager.isDefaultSpace(space)) {
         if (foundDefaultSpace) {
-          import_log5.log.warn("Multiple default spaces found. Using the first one.", {
+          import_log6.log.warn("Multiple default spaces found. Using the first one.", {
             duplicate: space.id
           }, {
-            F: __dxlog_file7,
+            F: __dxlog_file8,
             L: 130,
             S: this,
             C: (f, a) => f(...a)
@@ -1794,8 +1832,8 @@ var IdentityServiceImpl = class extends import_context4.Resource {
         recordedDefaultSpaceTrigger.wake();
       }
     }, (err) => {
-      import_log5.log.catch(err, void 0, {
-        F: __dxlog_file7,
+      import_log6.log.catch(err, void 0, {
+        F: __dxlog_file8,
         L: 141,
         S: this,
         C: (f, a) => f(...a)
@@ -1811,7 +1849,7 @@ var IdentityServiceImpl = class extends import_context4.Resource {
     }
   }
 };
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts";
+var __dxlog_file9 = "/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;
@@ -1837,7 +1875,7 @@ var DeviceInvitationProtocol = class {
   }
   async admit(_, request) {
     (0, import_invariant5.invariant)(request.device, void 0, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 50,
       S: this,
       A: [
@@ -1860,7 +1898,7 @@ var DeviceInvitationProtocol = class {
     try {
       const identity = this._getIdentity();
       if (identity) {
-        return new import_protocols4.AlreadyJoinedError("Currently only one identity per client is supported.");
+        return new import_protocols3.AlreadyJoinedError("Currently only one identity per client is supported.");
       }
     } catch {
     }
@@ -1883,7 +1921,7 @@ var DeviceInvitationProtocol = class {
   }
   async accept(response, request) {
     (0, import_invariant5.invariant)(response.device, void 0, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 95,
       S: this,
       A: [
@@ -1893,7 +1931,7 @@ var DeviceInvitationProtocol = class {
     });
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
     (0, import_invariant5.invariant)(request.device, void 0, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 98,
       S: this,
       A: [
@@ -1932,23 +1970,23 @@ var tryAcquireBeforeContextDisposed = async (ctx, mutex) => {
     return guard;
   })());
 };
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts";
+var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts";
 var OPTIONS_TIMEOUT = 1e4;
 var InvitationGuestExtension = class extends import_teleport.RpcExtension {
   constructor(_invitationFlowMutex, _callbacks) {
     super({
       requested: {
-        InvitationHostService: import_protocols6.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_proto2.schema.getService("dxos.halo.invitations.InvitationHostService")
       },
       exposed: {
-        InvitationHostService: import_protocols6.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_proto2.schema.getService("dxos.halo.invitations.InvitationHostService")
       }
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
     this._ctx = new import_context6.Context(void 0, {
-      F: __dxlog_file9,
-      L: 33
+      F: __dxlog_file10,
+      L: 34
     });
     this._remoteOptionsTrigger = new import_async10.Trigger();
     this._invitationFlowLock = null;
@@ -1961,8 +1999,8 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
       InvitationHostService: {
         options: async (options) => {
           (0, import_invariant7.invariant)(!this._remoteOptions, "Remote options already set.", {
-            F: __dxlog_file9,
-            L: 63,
+            F: __dxlog_file10,
+            L: 64,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -1987,39 +2025,39 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      (0, import_log7.log)("guest acquire lock", void 0, {
-        F: __dxlog_file9,
-        L: 84,
+      (0, import_log8.log)("guest acquire lock", void 0, {
+        F: __dxlog_file10,
+        L: 85,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      (0, import_log7.log)("guest lock acquired", void 0, {
-        F: __dxlog_file9,
-        L: 86,
+      (0, import_log8.log)("guest lock acquired", void 0, {
+        F: __dxlog_file10,
+        L: 87,
         S: this,
         C: (f, a) => f(...a)
       });
       await (0, import_context6.cancelWithContext)(this._ctx, this.rpc.InvitationHostService.options({
         role: import_invitations3.InvitationOptions.Role.GUEST
       }));
-      (0, import_log7.log)("options sent", void 0, {
-        F: __dxlog_file9,
-        L: 91,
+      (0, import_log8.log)("options sent", void 0, {
+        F: __dxlog_file10,
+        L: 92,
         S: this,
         C: (f, a) => f(...a)
       });
       await (0, import_context6.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT
       }));
-      (0, import_log7.log)("options received", void 0, {
-        F: __dxlog_file9,
-        L: 93,
+      (0, import_log8.log)("options received", void 0, {
+        F: __dxlog_file10,
+        L: 94,
         S: this,
         C: (f, a) => f(...a)
       });
       if (this._remoteOptions?.role !== import_invitations3.InvitationOptions.Role.HOST) {
-        throw new import_protocols6.InvalidInvitationExtensionRoleError(void 0, {
+        throw new import_protocols5.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations3.InvitationOptions.Role.HOST,
           remoteOptions: this._remoteOptions,
           remotePeerId: context.remotePeerId
@@ -2046,33 +2084,33 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock.release();
       this._invitationFlowLock = null;
-      (0, import_log7.log)("invitation flow lock released", void 0, {
-        F: __dxlog_file9,
-        L: 126,
+      (0, import_log8.log)("invitation flow lock released", void 0, {
+        F: __dxlog_file10,
+        L: 127,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
 };
-var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
+var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
 var OPTIONS_TIMEOUT2 = 1e4;
 var MAX_OTP_ATTEMPTS = 3;
 var InvitationHostExtension = class extends import_teleport2.RpcExtension {
   constructor(_invitationFlowMutex, _callbacks) {
     super({
       requested: {
-        InvitationHostService: import_protocols7.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_proto3.schema.getService("dxos.halo.invitations.InvitationHostService")
       },
       exposed: {
-        InvitationHostService: import_protocols7.schema.getService("dxos.halo.invitations.InvitationHostService")
+        InvitationHostService: import_proto3.schema.getService("dxos.halo.invitations.InvitationHostService")
       }
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
     this._ctx = new import_context8.Context(void 0, {
-      F: __dxlog_file10,
-      L: 52
+      F: __dxlog_file11,
+      L: 53
     });
     this._remoteOptionsTrigger = new import_async11.Trigger();
     this._challenge = void 0;
@@ -2092,8 +2130,8 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
       InvitationHostService: {
         options: async (options) => {
           (0, import_invariant8.invariant)(!this._remoteOptions, "Remote options already set.", {
-            F: __dxlog_file10,
-            L: 101,
+            F: __dxlog_file11,
+            L: 102,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -2106,23 +2144,23 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
         introduce: async (request) => {
           const { profile, invitationId } = request;
           const traceId = import_keys7.PublicKey.random().toHex();
-          import_log8.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols7.trace.begin({
+          import_log9.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols6.trace.begin({
             id: traceId
           }), {
-            F: __dxlog_file10,
-            L: 110,
+            F: __dxlog_file11,
+            L: 111,
             S: this,
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
           this._assertInvitationState(import_services9.Invitation.State.CONNECTED);
           if (invitationId !== invitation?.invitationId) {
-            import_log8.log.warn("incorrect invitationId", {
+            import_log9.log.warn("incorrect invitationId", {
               expected: invitation.invitationId,
               actual: invitationId
             }, {
-              F: __dxlog_file10,
-              L: 116,
+              F: __dxlog_file11,
+              L: 117,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2132,22 +2170,22 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
               authMethod: import_services9.Invitation.AuthMethod.NONE
             };
           }
-          (0, import_log8.log)("guest introduced themselves", {
+          (0, import_log9.log)("guest introduced themselves", {
             guestProfile: profile
           }, {
-            F: __dxlog_file10,
-            L: 125,
+            F: __dxlog_file11,
+            L: 126,
             S: this,
             C: (f, a) => f(...a)
           });
           this.guestProfile = profile;
           this._callbacks.onStateUpdate(import_services9.Invitation.State.READY_FOR_AUTHENTICATION);
           this._challenge = invitation.authMethod === import_services9.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? (0, import_crypto2.randomBytes)(32) : void 0;
-          import_log8.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols7.trace.end({
+          import_log9.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols6.trace.end({
             id: traceId
           }), {
-            F: __dxlog_file10,
-            L: 132,
+            F: __dxlog_file11,
+            L: 133,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2158,20 +2196,20 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
         },
         authenticate: async ({ authCode: code, signedChallenge }) => {
           const traceId = import_keys7.PublicKey.random().toHex();
-          import_log8.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols7.trace.begin({
+          import_log9.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols6.trace.begin({
             id: traceId
           }), {
-            F: __dxlog_file10,
-            L: 141,
+            F: __dxlog_file11,
+            L: 142,
             S: this,
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
-          (0, import_log8.log)("received authentication request", {
+          (0, import_log9.log)("received authentication request", {
             authCode: code
           }, {
-            F: __dxlog_file10,
-            L: 144,
+            F: __dxlog_file11,
+            L: 145,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2183,9 +2221,9 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
           this._callbacks.onStateUpdate(import_services9.Invitation.State.AUTHENTICATING);
           switch (invitation.authMethod) {
             case import_services9.Invitation.AuthMethod.NONE: {
-              (0, import_log8.log)("authentication not required", void 0, {
-                F: __dxlog_file10,
-                L: 152,
+              (0, import_log9.log)("authentication not required", void 0, {
+                F: __dxlog_file11,
+                L: 153,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2219,11 +2257,11 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
               break;
             }
             default: {
-              import_log8.log.error("invalid authentication method", {
+              import_log9.log.error("invalid authentication method", {
                 authMethod: invitation.authMethod
               }, {
-                F: __dxlog_file10,
-                L: 190,
+                F: __dxlog_file11,
+                L: 191,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2241,14 +2279,14 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
               status
             };
           }
-          import_log8.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols7.trace.end({
+          import_log9.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols6.trace.end({
             id: traceId,
             data: {
               status
             }
           }), {
-            F: __dxlog_file10,
-            L: 202,
+            F: __dxlog_file11,
+            L: 203,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2258,11 +2296,11 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
         },
         admit: async (request) => {
           const traceId = import_keys7.PublicKey.random().toHex();
-          import_log8.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols7.trace.begin({
+          import_log9.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols6.trace.begin({
             id: traceId
           }), {
-            F: __dxlog_file10,
-            L: 208,
+            F: __dxlog_file11,
+            L: 209,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2275,11 +2313,11 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
               }
             }
             const response = await this._callbacks.admit(request);
-            import_log8.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols7.trace.end({
+            import_log9.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols6.trace.end({
               id: traceId
             }), {
-              F: __dxlog_file10,
-              L: 222,
+              F: __dxlog_file11,
+              L: 223,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2295,16 +2333,16 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      (0, import_log8.log)("host acquire lock", void 0, {
-        F: __dxlog_file10,
-        L: 237,
+      (0, import_log9.log)("host acquire lock", void 0, {
+        F: __dxlog_file11,
+        L: 238,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      (0, import_log8.log)("host lock acquired", void 0, {
-        F: __dxlog_file10,
-        L: 239,
+      (0, import_log9.log)("host lock acquired", void 0, {
+        F: __dxlog_file11,
+        L: 240,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2313,24 +2351,24 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
       await this.rpc.InvitationHostService.options({
         role: import_invitations4.InvitationOptions.Role.HOST
       });
-      (0, import_log8.log)("options sent", void 0, {
-        F: __dxlog_file10,
-        L: 243,
+      (0, import_log9.log)("options sent", void 0, {
+        F: __dxlog_file11,
+        L: 244,
         S: this,
         C: (f, a) => f(...a)
       });
       await (0, import_context8.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT2
       }));
-      (0, import_log8.log)("options received", void 0, {
-        F: __dxlog_file10,
-        L: 245,
+      (0, import_log9.log)("options received", void 0, {
+        F: __dxlog_file11,
+        L: 246,
         S: this,
         C: (f, a) => f(...a)
       });
       if (this._remoteOptions?.role !== import_invitations4.InvitationOptions.Role.GUEST) {
         this._callbacks.onStateUpdate(lastState);
-        throw new import_protocols7.InvalidInvitationExtensionRoleError(void 0, {
+        throw new import_protocols6.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations4.InvitationOptions.Role.GUEST,
           remoteOptions: this._remoteOptions,
           remotePeerId: context.remotePeerId
@@ -2376,9 +2414,9 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock?.release();
       this._invitationFlowLock = null;
-      (0, import_log8.log)("invitation flow lock released", void 0, {
-        F: __dxlog_file10,
-        L: 300,
+      (0, import_log9.log)("invitation flow lock released", void 0, {
+        F: __dxlog_file11,
+        L: 301,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2386,7 +2424,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
   }
 };
 var isAuthenticationRequired = (invitation) => invitation.authMethod !== import_services9.Invitation.AuthMethod.NONE;
-var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
+var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
 var InvitationTopology = class {
   constructor(_role) {
     this._role = _role;
@@ -2394,7 +2432,7 @@ var InvitationTopology = class {
   }
   init(controller) {
     (0, import_invariant9.invariant)(!this._controller, "Already initialized.", {
-      F: __dxlog_file11,
+      F: __dxlog_file12,
       L: 42,
       S: this,
       A: [
@@ -2406,7 +2444,7 @@ var InvitationTopology = class {
   }
   update() {
     (0, import_invariant9.invariant)(this._controller, "Not initialized.", {
-      F: __dxlog_file11,
+      F: __dxlog_file12,
       L: 47,
       S: this,
       A: [
@@ -2425,11 +2463,11 @@ var InvitationTopology = class {
     const firstUnknownPeer = candidates.find((peerId) => !this._seenPeers.has(peerId));
     this._seenPeers = new import_util7.ComplexSet(import_keys8.PublicKey.hash, allPeers.filter((peerId) => this._seenPeers.has(peerId)));
     if (firstUnknownPeer != null) {
-      (0, import_log9.log)("invitation connect", {
+      (0, import_log10.log)("invitation connect", {
         ownPeerId,
         remotePeerId: firstUnknownPeer
       }, {
-        F: __dxlog_file11,
+        F: __dxlog_file12,
         L: 69,
         S: this,
         C: (f, a) => f(...a)
@@ -2440,7 +2478,7 @@ var InvitationTopology = class {
   }
   async onOffer(peer) {
     (0, import_invariant9.invariant)(this._controller, "Not initialized.", {
-      F: __dxlog_file11,
+      F: __dxlog_file12,
       L: 76,
       S: this,
       A: [
@@ -2457,7 +2495,7 @@ var InvitationTopology = class {
     return `InvitationTopology(${this._role === import_invitations5.InvitationOptions.Role.GUEST ? "guest" : "host"})`;
   }
 };
-var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
+var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
 var metrics = import_tracing5.trace.metrics;
 var MAX_DELEGATED_INVITATION_HOST_TRIES = 3;
 var InvitationsHandler = class {
@@ -2484,7 +2522,7 @@ var InvitationsHandler = class {
           try {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             (0, import_invariant6.invariant)(deviceKey, void 0, {
-              F: __dxlog_file12,
+              F: __dxlog_file13,
               L: 94,
               S: this,
               A: [
@@ -2510,18 +2548,18 @@ var InvitationsHandler = class {
           (0, import_async9.scheduleTask)(connectionCtx, async () => {
             const traceId = import_keys6.PublicKey.random().toHex();
             try {
-              import_log6.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.begin({
+              import_log7.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols4.trace.begin({
                 id: traceId
               }), {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 119,
                 S: this,
                 C: (f, a) => f(...a)
               });
-              (0, import_log6.log)("connected", {
+              (0, import_log7.log)("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 120,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2529,21 +2567,21 @@ var InvitationsHandler = class {
               const deviceKey = await extension.completedTrigger.wait({
                 timeout: invitation.timeout
               });
-              (0, import_log6.log)("admitted guest", {
+              (0, import_log7.log)("admitted guest", {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 122,
                 S: this,
                 C: (f, a) => f(...a)
               });
               guardedState.set(extension, import_services7.Invitation.State.SUCCESS);
               metrics.increment("dxos.invitation.success");
-              import_log6.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.end({
+              import_log7.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols4.trace.end({
                 id: traceId
               }), {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 125,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2556,10 +2594,10 @@ var InvitationsHandler = class {
               if (err instanceof import_async9.TimeoutError) {
                 if (guardedState.set(extension, import_services7.Invitation.State.TIMEOUT)) {
                   metrics.increment("dxos.invitation.timeout");
-                  (0, import_log6.log)("timeout", {
+                  (0, import_log7.log)("timeout", {
                     ...protocol.toJSON()
                   }, {
-                    F: __dxlog_file12,
+                    F: __dxlog_file13,
                     L: 135,
                     S: this,
                     C: (f, a) => f(...a)
@@ -2568,19 +2606,19 @@ var InvitationsHandler = class {
               } else {
                 if (guardedState.error(extension, err)) {
                   metrics.increment("dxos.invitation.failed");
-                  import_log6.log.error("failed", err, {
-                    F: __dxlog_file12,
+                  import_log7.log.error("failed", err, {
+                    F: __dxlog_file13,
                     L: 140,
                     S: this,
                     C: (f, a) => f(...a)
                   });
                 }
               }
-              import_log6.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.error({
+              import_log7.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols4.trace.error({
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 143,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2590,11 +2628,11 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
-          if (err instanceof import_protocols5.InvalidInvitationExtensionRoleError) {
-            (0, import_log6.log)("invalid role", {
+          if (err instanceof import_protocols4.InvalidInvitationExtensionRoleError) {
+            (0, import_log7.log)("invalid role", {
               ...err.context
             }, {
-              F: __dxlog_file12,
+              F: __dxlog_file13,
               L: 151,
               S: this,
               C: (f, a) => f(...a)
@@ -2604,10 +2642,10 @@ var InvitationsHandler = class {
           if (err instanceof import_async9.TimeoutError) {
             if (guardedState.set(extension, import_services7.Invitation.State.TIMEOUT)) {
               metrics.increment("dxos.invitation.timeout");
-              (0, import_log6.log)("timeout", {
+              (0, import_log7.log)("timeout", {
                 err
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 157,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2616,8 +2654,8 @@ var InvitationsHandler = class {
           } else {
             if (guardedState.error(extension, err)) {
               metrics.increment("dxos.invitation.failed");
-              import_log6.log.error("failed", err, {
-                F: __dxlog_file12,
+              import_log7.log.error("failed", err, {
+                F: __dxlog_file13,
                 L: 162,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2630,8 +2668,8 @@ var InvitationsHandler = class {
     };
     if (invitation.lifetime && invitation.created) {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
-        import_log6.log.warn("invitation has already expired", void 0, {
-          F: __dxlog_file12,
+        import_log7.log.warn("invitation has already expired", void 0, {
+          F: __dxlog_file13,
           L: 173,
           S: this,
           C: (f, a) => f(...a)
@@ -2655,7 +2693,7 @@ var InvitationsHandler = class {
     const { timeout = import_client_protocol3.INVITATION_TIMEOUT } = invitation;
     if (deviceProfile) {
       (0, import_invariant6.invariant)(invitation.kind === import_services7.Invitation.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
-        F: __dxlog_file12,
+        F: __dxlog_file13,
         L: 207,
         S: this,
         A: [
@@ -2668,12 +2706,12 @@ var InvitationsHandler = class {
     const guardedState = this._createGuardedState(ctx, invitation, stream);
     const shouldCancelInvitationFlow = (extension) => {
       const isLockedByAnotherConnection = guardedState.mutex.isLocked() && !extension.hasFlowLock();
-      (0, import_log6.log)("should cancel invitation flow", {
+      (0, import_log7.log)("should cancel invitation flow", {
         isLockedByAnotherConnection,
         invitationType: import_services7.Invitation.Type.DELEGATED,
         triedPeers: triedPeersIds.size
       }, {
-        F: __dxlog_file12,
+        F: __dxlog_file13,
         L: 215,
         S: this,
         C: (f, a) => f(...a)
@@ -2696,11 +2734,11 @@ var InvitationsHandler = class {
             return;
           }
           connectionCtx.onDispose(async () => {
-            (0, import_log6.log)("extension disposed", {
+            (0, import_log7.log)("extension disposed", {
               admitted,
               currentState: guardedState.current.state
             }, {
-              F: __dxlog_file12,
+              F: __dxlog_file13,
               L: 243,
               S: this,
               C: (f, a) => f(...a)
@@ -2715,10 +2753,10 @@ var InvitationsHandler = class {
           (0, import_async9.scheduleTask)(connectionCtx, async () => {
             const traceId = import_keys6.PublicKey.random().toHex();
             try {
-              import_log6.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols5.trace.begin({
+              import_log7.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols4.trace.begin({
                 id: traceId
               }), {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 255,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2727,19 +2765,19 @@ var InvitationsHandler = class {
                 guardedState.set(extension, import_services7.Invitation.State.TIMEOUT);
                 extensionCtx.close();
               }, timeout);
-              (0, import_log6.log)("connected", {
+              (0, import_log7.log)("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 266,
                 S: this,
                 C: (f, a) => f(...a)
               });
               guardedState.set(extension, import_services7.Invitation.State.CONNECTED);
-              (0, import_log6.log)("introduce", {
+              (0, import_log7.log)("introduce", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 270,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2748,11 +2786,11 @@ var InvitationsHandler = class {
                 invitationId: invitation.invitationId,
                 ...protocol.createIntroduction()
               });
-              (0, import_log6.log)("introduce response", {
+              (0, import_log7.log)("introduce response", {
                 ...protocol.toJSON(),
                 response: introductionResponse
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 275,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2770,10 +2808,10 @@ var InvitationsHandler = class {
                     break;
                 }
               }
-              (0, import_log6.log)("request admission", {
+              (0, import_log7.log)("request admission", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 301,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2782,10 +2820,10 @@ var InvitationsHandler = class {
               const admissionResponse = await extension.rpc.InvitationHostService.admit(admissionRequest);
               admitted = true;
               const result = await protocol.accept(admissionResponse, admissionRequest);
-              (0, import_log6.log)("admitted by host", {
+              (0, import_log7.log)("admitted by host", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 312,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2795,28 +2833,28 @@ var InvitationsHandler = class {
                 ...result,
                 state: import_services7.Invitation.State.SUCCESS
               });
-              import_log6.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols5.trace.end({
+              import_log7.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols4.trace.end({
                 id: traceId
               }), {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 318,
                 S: this,
                 C: (f, a) => f(...a)
               });
             } catch (err) {
               if (err instanceof import_async9.TimeoutError) {
-                (0, import_log6.log)("timeout", {
+                (0, import_log7.log)("timeout", {
                   ...protocol.toJSON()
                 }, {
-                  F: __dxlog_file12,
+                  F: __dxlog_file13,
                   L: 321,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 guardedState.set(extension, import_services7.Invitation.State.TIMEOUT);
               } else {
-                (0, import_log6.log)("auth failed", err, {
-                  F: __dxlog_file12,
+                (0, import_log7.log)("auth failed", err, {
+                  F: __dxlog_file13,
                   L: 324,
                   S: this,
                   C: (f, a) => f(...a)
@@ -2824,11 +2862,11 @@ var InvitationsHandler = class {
                 guardedState.error(extension, err);
               }
               extensionCtx.close(err);
-              import_log6.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols5.trace.error({
+              import_log7.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols4.trace.error({
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 328,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2837,22 +2875,22 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
-          if (err instanceof import_protocols5.InvalidInvitationExtensionRoleError) {
+          if (err instanceof import_protocols4.InvalidInvitationExtensionRoleError) {
             return;
           }
           if (err instanceof import_async9.TimeoutError) {
-            (0, import_log6.log)("timeout", {
+            (0, import_log7.log)("timeout", {
               ...protocol.toJSON()
             }, {
-              F: __dxlog_file12,
+              F: __dxlog_file13,
               L: 337,
               S: this,
               C: (f, a) => f(...a)
             });
             guardedState.set(extension, import_services7.Invitation.State.TIMEOUT);
           } else {
-            (0, import_log6.log)("auth failed", err, {
-              F: __dxlog_file12,
+            (0, import_log7.log)("auth failed", err, {
+              F: __dxlog_file13,
               L: 340,
               S: this,
               C: (f, a) => f(...a)
@@ -2870,7 +2908,7 @@ var InvitationsHandler = class {
         await ctx.dispose();
       } else {
         (0, import_invariant6.invariant)(invitation.swarmKey, void 0, {
-          F: __dxlog_file12,
+          F: __dxlog_file13,
           L: 355,
           S: this,
           A: [
@@ -2972,23 +3010,23 @@ var InvitationsHandler = class {
   }
   _logStateUpdate(invitation, actor, newState) {
     if (this._isNotTerminal(newState)) {
-      (0, import_log6.log)("invitation state update", {
+      (0, import_log7.log)("invitation state update", {
         actor: actor?.constructor.name,
         newState: stateToString(newState),
         oldState: stateToString(invitation.state)
       }, {
-        F: __dxlog_file12,
+        F: __dxlog_file13,
         L: 460,
         S: this,
         C: (f, a) => f(...a)
       });
     } else {
-      import_log6.log.info("invitation state update", {
+      import_log7.log.info("invitation state update", {
         actor: actor?.constructor.name,
         newState: stateToString(newState),
         oldState: stateToString(invitation.state)
       }, {
-        F: __dxlog_file12,
+        F: __dxlog_file13,
         L: 466,
         S: this,
         C: (f, a) => f(...a)
@@ -3006,16 +3044,16 @@ var InvitationsHandler = class {
   }
   async _handleGuestOtpAuth(extension, setState, authenticated, options) {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
-      (0, import_log6.log)("guest waiting for authentication code...", void 0, {
-        F: __dxlog_file12,
+      (0, import_log7.log)("guest waiting for authentication code...", void 0, {
+        F: __dxlog_file13,
         L: 491,
         S: this,
         C: (f, a) => f(...a)
       });
       setState(import_services7.Invitation.State.READY_FOR_AUTHENTICATION);
       const authCode = await authenticated.wait(options);
-      (0, import_log6.log)("sending authentication request", void 0, {
-        F: __dxlog_file12,
+      (0, import_log7.log)("sending authentication request", void 0, {
+        F: __dxlog_file13,
         L: 495,
         S: this,
         C: (f, a) => f(...a)
@@ -3031,10 +3069,10 @@ var InvitationsHandler = class {
         if (attempt === MAX_OTP_ATTEMPTS) {
           throw new Error(`Maximum retry attempts: ${MAX_OTP_ATTEMPTS}`);
         } else {
-          (0, import_log6.log)("retrying invalid code", {
+          (0, import_log7.log)("retrying invalid code", {
             attempt
           }, {
-            F: __dxlog_file12,
+            F: __dxlog_file13,
             L: 506,
             S: this,
             C: (f, a) => f(...a)
@@ -3051,8 +3089,8 @@ var InvitationsHandler = class {
     if (introductionResponse.challenge == null) {
       throw new Error("challenge missing in the introduction");
     }
-    (0, import_log6.log)("sending authentication request", void 0, {
-      F: __dxlog_file12,
+    (0, import_log7.log)("sending authentication request", void 0, {
+      F: __dxlog_file13,
       L: 525,
       S: this,
       C: (f, a) => f(...a)
@@ -3167,7 +3205,7 @@ var InvitationsServiceImpl = class {
     });
   }
 };
-var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
+var __dxlog_file14 = "/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;
@@ -3183,14 +3221,14 @@ var SpaceInvitationProtocol = class {
   }
   checkCanInviteNewMembers() {
     if (this._spaceKey == null) {
-      return new import_protocols8.InvalidInvitationError("No spaceKey was provided for a space invitation.");
+      return new import_protocols7.InvalidInvitationError("No spaceKey was provided for a space invitation.");
     }
     const space = this._spaceManager.spaces.get(this._spaceKey);
     if (space == null) {
-      return new import_protocols8.SpaceNotFoundError(this._spaceKey);
+      return new import_protocols7.SpaceNotFoundError(this._spaceKey);
     }
     if (!space?.inner.spaceState.hasMembershipManagementPermission(this._signingContext.identityKey)) {
-      return new import_protocols8.AuthorizationError("No member management permission.");
+      return new import_protocols7.AuthorizationError("No member management permission.");
     }
     return void 0;
   }
@@ -3202,7 +3240,7 @@ var SpaceInvitationProtocol = class {
   }
   async admit(invitation, request, guestProfile) {
     (0, import_invariant10.invariant)(this._spaceKey && request.space, void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 74,
       S: this,
       A: [
@@ -3210,11 +3248,11 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    (0, import_log10.log)("writing guest credentials", {
+    (0, import_log11.log)("writing guest credentials", {
       host: this._signingContext.deviceKey,
       guest: request.space.deviceKey
     }, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 75,
       S: this,
       C: (f, a) => f(...a)
@@ -3236,7 +3274,7 @@ var SpaceInvitationProtocol = class {
   }
   async delegate(invitation) {
     (0, import_invariant10.invariant)(this._spaceKey, void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 95,
       S: this,
       A: [
@@ -3246,7 +3284,7 @@ var SpaceInvitationProtocol = class {
     });
     const space = this._spaceManager.spaces.get(this._spaceKey);
     (0, import_invariant10.invariant)(space, void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 97,
       S: this,
       A: [
@@ -3256,7 +3294,7 @@ var SpaceInvitationProtocol = class {
     });
     if (invitation.authMethod === import_services11.Invitation.AuthMethod.KNOWN_PUBLIC_KEY) {
       (0, import_invariant10.invariant)(invitation.guestKeypair?.publicKey, void 0, {
-        F: __dxlog_file13,
+        F: __dxlog_file14,
         L: 99,
         S: this,
         A: [
@@ -3265,11 +3303,11 @@ var SpaceInvitationProtocol = class {
         ]
       });
     }
-    (0, import_log10.log)("writing delegate space invitation", {
+    (0, import_log11.log)("writing delegate space invitation", {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 102,
       S: this,
       C: (f, a) => f(...a)
@@ -3284,7 +3322,7 @@ var SpaceInvitationProtocol = class {
       guestKey: invitation.authMethod === import_services11.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
     });
     (0, import_invariant10.invariant)(credential.credential, void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 122,
       S: this,
       A: [
@@ -3299,7 +3337,7 @@ var SpaceInvitationProtocol = class {
   }
   async cancelDelegation(invitation) {
     (0, import_invariant10.invariant)(this._spaceKey, void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 128,
       S: this,
       A: [
@@ -3308,7 +3346,7 @@ var SpaceInvitationProtocol = class {
       ]
     });
     (0, import_invariant10.invariant)(invitation.type === import_services11.Invitation.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 129,
       S: this,
       A: [
@@ -3318,7 +3356,7 @@ var SpaceInvitationProtocol = class {
     });
     const space = this._spaceManager.spaces.get(this._spaceKey);
     (0, import_invariant10.invariant)(space, void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 131,
       S: this,
       A: [
@@ -3326,18 +3364,18 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    (0, import_log10.log)("cancelling delegated space invitation", {
+    (0, import_log11.log)("cancelling delegated space invitation", {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
     const credential = await (0, import_credentials9.createCancelDelegatedSpaceInvitationCredential)(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
     (0, import_invariant10.invariant)(credential.credential, void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 140,
       S: this,
       A: [
@@ -3351,10 +3389,10 @@ var SpaceInvitationProtocol = class {
   }
   checkInvitation(invitation) {
     if (invitation.spaceKey == null) {
-      return new import_protocols8.InvalidInvitationError("No spaceKey was provided for a space invitation.");
+      return new import_protocols7.InvalidInvitationError("No spaceKey was provided for a space invitation.");
     }
     if (this._spaceManager.spaces.has(invitation.spaceKey)) {
-      return new import_protocols8.AlreadyJoinedError("Already joined space.");
+      return new import_protocols7.AlreadyJoinedError("Already joined space.");
     }
   }
   createIntroduction() {
@@ -3376,7 +3414,7 @@ var SpaceInvitationProtocol = class {
   }
   async accept(response) {
     (0, import_invariant10.invariant)(response.space, void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 175,
       S: this,
       A: [
@@ -3387,7 +3425,7 @@ var SpaceInvitationProtocol = class {
     const { credential, controlTimeframe, dataTimeframe } = response.space;
     const assertion = (0, import_credentials9.getCredentialAssertion)(credential);
     (0, import_invariant10.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 178,
       S: this,
       A: [
@@ -3396,7 +3434,7 @@ var SpaceInvitationProtocol = class {
       ]
     });
     (0, import_invariant10.invariant)(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 179,
       S: this,
       A: [
@@ -3405,7 +3443,7 @@ var SpaceInvitationProtocol = class {
       ]
     });
     if (this._spaceManager.spaces.has(assertion.spaceKey)) {
-      throw new import_protocols8.AlreadyJoinedError("Already joined space.");
+      throw new import_protocols7.AlreadyJoinedError("Already joined space.");
     }
     await this._spaceManager.acceptSpace({
       spaceKey: assertion.spaceKey,
@@ -3419,7 +3457,7 @@ var SpaceInvitationProtocol = class {
     };
   }
 };
-var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
+var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
 var InvitationsManager = class {
   constructor(_invitationsHandler, _getHandler, _metadataStore) {
     this._invitationsHandler = _invitationsHandler;
@@ -3461,8 +3499,8 @@ var InvitationsManager = class {
     try {
       await this._persistIfRequired(handler, stream, invitation);
     } catch (err) {
-      import_log11.log.catch(err, void 0, {
-        F: __dxlog_file14,
+      import_log12.log.catch(err, void 0, {
+        F: __dxlog_file15,
         L: 82,
         S: this,
         C: (f, a) => f(...a)
@@ -3485,7 +3523,7 @@ var InvitationsManager = class {
       const freshInvitations = persistentInvitations.filter((invitation) => !(0, import_echo_pipeline.hasInvitationExpired)(invitation));
       const loadTasks = freshInvitations.map((persistentInvitation) => {
         (0, import_invariant11.invariant)(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
-          F: __dxlog_file14,
+          F: __dxlog_file15,
           L: 103,
           S: this,
           A: [
@@ -3503,8 +3541,8 @@ var InvitationsManager = class {
         invitations: cInvitations.map((invitation) => invitation.get())
       };
     } catch (err) {
-      import_log11.log.catch(err, void 0, {
-        F: __dxlog_file14,
+      import_log12.log.catch(err, void 0, {
+        F: __dxlog_file15,
         L: 110,
         S: this,
         C: (f, a) => f(...a)
@@ -3535,14 +3573,14 @@ var InvitationsManager = class {
     return invitation;
   }
   async authenticate({ invitationId, authCode }) {
-    (0, import_log11.log)("authenticating...", void 0, {
-      F: __dxlog_file14,
+    (0, import_log12.log)("authenticating...", void 0, {
+      F: __dxlog_file15,
       L: 140,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant11.invariant)(invitationId, void 0, {
-      F: __dxlog_file14,
+      F: __dxlog_file15,
       L: 141,
       S: this,
       A: [
@@ -3552,10 +3590,10 @@ var InvitationsManager = class {
     });
     const observable = this._acceptInvitations.get(invitationId);
     if (!observable) {
-      import_log11.log.warn("invalid invitation", {
+      import_log12.log.warn("invalid invitation", {
         invitationId
       }, {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 144,
         S: this,
         C: (f, a) => f(...a)
@@ -3565,16 +3603,16 @@ var InvitationsManager = class {
     }
   }
   async cancelInvitation({ invitationId }) {
-    (0, import_log11.log)("cancelInvitation...", {
+    (0, import_log12.log)("cancelInvitation...", {
       invitationId
     }, {
-      F: __dxlog_file14,
+      F: __dxlog_file15,
       L: 151,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant11.invariant)(invitationId, void 0, {
-      F: __dxlog_file14,
+      F: __dxlog_file15,
       L: 152,
       S: this,
       A: [
@@ -3649,14 +3687,14 @@ var InvitationsManager = class {
         void ctx.dispose();
       }
     }, {
-      F: __dxlog_file14,
+      F: __dxlog_file15,
       L: 234
     });
     ctx.onDispose(() => {
-      (0, import_log11.log)("complete", {
+      (0, import_log12.log)("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 241,
         S: this,
         C: (f, a) => f(...a)
@@ -3686,10 +3724,10 @@ var InvitationsManager = class {
     const ctx = new import_context9.Context({
       onError: (err) => {
         if (err instanceof import_async12.TimeoutError) {
-          (0, import_log11.log)("timeout", {
+          (0, import_log12.log)("timeout", {
             ...handler.toJSON()
           }, {
-            F: __dxlog_file14,
+            F: __dxlog_file15,
             L: 261,
             S: this,
             C: (f, a) => f(...a)
@@ -3699,8 +3737,8 @@ var InvitationsManager = class {
             state: import_services12.Invitation.State.TIMEOUT
           });
         } else {
-          import_log11.log.warn("auth failed", err, {
-            F: __dxlog_file14,
+          import_log12.log.warn("auth failed", err, {
+            F: __dxlog_file15,
             L: 264,
             S: this,
             C: (f, a) => f(...a)
@@ -3713,14 +3751,14 @@ var InvitationsManager = class {
         void ctx.dispose();
       }
     }, {
-      F: __dxlog_file14,
+      F: __dxlog_file15,
       L: 258
     });
     ctx.onDispose(() => {
-      (0, import_log11.log)("complete", {
+      (0, import_log12.log)("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 271,
         S: this,
         C: (f, a) => f(...a)
@@ -3764,8 +3802,8 @@ var InvitationsManager = class {
     try {
       await this._metadataStore.removeInvitation(invitation.invitationId);
     } catch (err) {
-      import_log11.log.catch(err, void 0, {
-        F: __dxlog_file14,
+      import_log12.log.catch(err, void 0, {
+        F: __dxlog_file15,
         L: 307,
         S: this,
         C: (f, a) => f(...a)
@@ -3788,7 +3826,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_file15 = "/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;
@@ -3799,16 +3837,16 @@ var Lock = class {
     return this._lockPath;
   }
   async acquire() {
-    (0, import_log12.log)("acquiring lock...", void 0, {
-      F: __dxlog_file15,
+    (0, import_log13.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 this._onAcquire?.();
-    (0, import_log12.log)("acquired lock", void 0, {
-      F: __dxlog_file15,
+    (0, import_log13.log)("acquired lock", void 0, {
+      F: __dxlog_file16,
       L: 37,
       S: this,
       C: (f, a) => f(...a)
@@ -3817,7 +3855,7 @@ var Lock = class {
   async release() {
     await this._onRelease?.();
     (0, import_invariant12.invariant)(this._fileHandle, "Lock is not acquired", {
-      F: __dxlog_file15,
+      F: __dxlog_file16,
       L: 42,
       S: this,
       A: [
@@ -3829,7 +3867,7 @@ var Lock = class {
   }
 };
 _ts_decorate3([
-  import_log12.logInfo
+  import_log13.logInfo
 ], Lock.prototype, "lockKey", null);
 var isLocked = (lockPath) => import_lock_file.LockFile.isLocked(lockPath);
 function _ts_decorate4(decorators, target, key, desc) {
@@ -3970,7 +4008,7 @@ function _using_ctx() {
     }
   };
 }
-var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/edge-feed-replicator.ts";
+var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/edge-feed-replicator.ts";
 var EdgeFeedReplicator = class extends import_context10.Resource {
   constructor({ messenger, spaceId }) {
     super();
@@ -3988,16 +4026,16 @@ var EdgeFeedReplicator = class extends import_context10.Resource {
         return;
       }
       const [service, ...rest] = message.serviceId.split(":");
-      if (service !== import_protocols9.EdgeService.FEED_REPLICATOR) {
+      if (service !== import_protocols8.EdgeService.FEED_REPLICATOR) {
         return;
       }
       const [spaceId] = rest;
       if (spaceId !== this._spaceId) {
-        (0, import_log13.log)("spaceID mismatch", {
+        (0, import_log14.log)("spaceID mismatch", {
           spaceId,
           _spaceId: this._spaceId
         }, {
-          F: __dxlog_file16,
+          F: __dxlog_file17,
           L: 62,
           S: this,
           C: (f, a) => f(...a)
@@ -4005,11 +4043,11 @@ var EdgeFeedReplicator = class extends import_context10.Resource {
         return;
       }
       const payload = (0, import_cbor_x.decode)(message.payload.value);
-      import_log13.log.info("recv", {
+      import_log14.log.info("recv", {
         from: message.source,
         payload
       }, {
-        F: __dxlog_file16,
+        F: __dxlog_file17,
         L: 67,
         S: this,
         C: (f, a) => f(...a)
@@ -4030,10 +4068,10 @@ var EdgeFeedReplicator = class extends import_context10.Resource {
     this._remoteLength.clear();
   }
   async addFeed(feed) {
-    import_log13.log.info("addFeed", {
+    import_log14.log.info("addFeed", {
       key: feed.key
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 89,
       S: this,
       C: (f, a) => f(...a)
@@ -4048,7 +4086,7 @@ var EdgeFeedReplicator = class extends import_context10.Resource {
   }
   async _replicateFeed(feed) {
     (0, import_invariant13.invariant)(this._connectionCtx, void 0, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 102,
       S: this,
       A: [
@@ -4065,16 +4103,16 @@ var EdgeFeedReplicator = class extends import_context10.Resource {
     });
   }
   async _sendMessage(message) {
-    import_log13.log.info("sending message", {
+    import_log14.log.info("sending message", {
       message
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 115,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant13.invariant)(message.feedKey, void 0, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 117,
       S: this,
       A: [
@@ -4085,20 +4123,20 @@ var EdgeFeedReplicator = class extends import_context10.Resource {
     const payloadValue = (0, import_util8.bufferToArray)((0, import_cbor_x.encode)(message));
     await this._messenger.send(import_buf.buf.create(import_messenger_pb.MessageSchema, {
       source: {
-        identityKey: this._messenger.identityKey.toHex(),
-        peerKey: this._messenger.deviceKey.toHex()
+        identityKey: this._messenger.identityKey,
+        peerKey: this._messenger.peerKey
       },
-      serviceId: `${import_protocols9.EdgeService.FEED_REPLICATOR}:${this._spaceId}`,
+      serviceId: `${import_protocols8.EdgeService.FEED_REPLICATOR}:${this._spaceId}`,
       payload: {
         value: payloadValue
       }
     }));
   }
   _onMessage(message) {
-    import_log13.log.info("received message", {
+    import_log14.log.info("received message", {
       message
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 133,
       S: this,
       C: (f, a) => f(...a)
@@ -4111,10 +4149,10 @@ var EdgeFeedReplicator = class extends import_context10.Resource {
             const feedKey = import_keys10.PublicKey.fromHex(message.feedKey);
             const feed = this._feeds.get(feedKey);
             if (!feed) {
-              import_log13.log.warn("Feed not found", {
+              import_log14.log.warn("Feed not found", {
                 feedKey
               }, {
-                F: __dxlog_file16,
+                F: __dxlog_file17,
                 L: 141,
                 S: this,
                 C: (f, a) => f(...a)
@@ -4146,10 +4184,10 @@ var EdgeFeedReplicator = class extends import_context10.Resource {
           const feedKey = import_keys10.PublicKey.fromHex(message.feedKey);
           const feed = this._feeds.get(feedKey);
           if (!feed) {
-            import_log13.log.warn("Feed not found", {
+            import_log14.log.warn("Feed not found", {
               feedKey
             }, {
-              F: __dxlog_file16,
+              F: __dxlog_file17,
               L: 166,
               S: this,
               C: (f, a) => f(...a)
@@ -4160,10 +4198,10 @@ var EdgeFeedReplicator = class extends import_context10.Resource {
           break;
         }
         default: {
-          import_log13.log.warn("Unknown message", {
+          import_log14.log.warn("Unknown message", {
             ...message
           }, {
-            F: __dxlog_file16,
+            F: __dxlog_file17,
             L: 175,
             S: this,
             C: (f, a) => f(...a)
@@ -4173,12 +4211,12 @@ var EdgeFeedReplicator = class extends import_context10.Resource {
     });
   }
   async _pushBlocks(feed, from, to) {
-    import_log13.log.info("pushing blocks", {
+    import_log14.log.info("pushing blocks", {
       feed: feed.key.toHex(),
       from,
       to
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 182,
       S: this,
       C: (f, a) => f(...a)
@@ -4188,7 +4226,7 @@ var EdgeFeedReplicator = class extends import_context10.Resource {
         valueEncoding: "binary"
       });
       (0, import_invariant13.invariant)(data instanceof Uint8Array, void 0, {
-        F: __dxlog_file16,
+        F: __dxlog_file17,
         L: 187,
         S: this,
         A: [
@@ -4212,11 +4250,11 @@ var EdgeFeedReplicator = class extends import_context10.Resource {
     this._remoteLength.set(feed.key, to);
   }
   async _integrateBlocks(feed, blocks) {
-    import_log13.log.info("integrating blocks", {
+    import_log14.log.info("integrating blocks", {
       feed: feed.key.toHex(),
       blocks: blocks.length
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 208,
       S: this,
       C: (f, a) => f(...a)
@@ -4300,7 +4338,7 @@ var AutomergeSpaceState = class extends import_context12.Resource {
     await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
   }
 };
-var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts";
+var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts";
 var LOAD_DOC_TIMEOUT = 1e4;
 var runEpochMigration = async (ctx, context) => {
   switch (context.migration) {
@@ -4325,8 +4363,8 @@ var runEpochMigration = async (ctx, context) => {
       };
     }
     case import_services14.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
-      import_log15.log.info("Fragmenting", void 0, {
-        F: __dxlog_file17,
+      import_log16.log.info("Fragmenting", void 0, {
+        F: __dxlog_file18,
         L: 64,
         S: void 0,
         C: (f, a) => f(...a)
@@ -4339,7 +4377,7 @@ var runEpochMigration = async (ctx, context) => {
       const properties = (0, import_echo_db.findInlineObjectOfType)(rootHandle.docSync(), import_echo_schema.TYPE_PROPERTIES);
       const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
       (0, import_invariant15.invariant)(properties, "Properties not found", {
-        F: __dxlog_file17,
+        F: __dxlog_file18,
         L: 75,
         S: void 0,
         A: [
@@ -4354,7 +4392,7 @@ var runEpochMigration = async (ctx, context) => {
         ])
       });
       (0, import_invariant15.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-        F: __dxlog_file17,
+        F: __dxlog_file18,
         L: 82,
         S: void 0,
         A: [
@@ -4395,7 +4433,7 @@ var runEpochMigration = async (ctx, context) => {
         timeout: LOAD_DOC_TIMEOUT
       });
       (0, import_invariant15.invariant)(rootHandle.docSync(), "Root doc not found", {
-        F: __dxlog_file17,
+        F: __dxlog_file18,
         L: 115,
         S: void 0,
         A: [
@@ -4410,7 +4448,7 @@ var runEpochMigration = async (ctx, context) => {
             timeout: LOAD_DOC_TIMEOUT
           });
           (0, import_invariant15.invariant)(handle.docSync(), void 0, {
-            F: __dxlog_file17,
+            F: __dxlog_file18,
             L: 122,
             S: void 0,
             A: [
@@ -4425,12 +4463,12 @@ var runEpochMigration = async (ctx, context) => {
           });
           newRootContent.links[id] = newHandle.url;
         } catch (err) {
-          import_log15.log.warn("Failed to migrate reference", {
+          import_log16.log.warn("Failed to migrate reference", {
             id,
             url,
             error: err
           }, {
-            F: __dxlog_file17,
+            F: __dxlog_file18,
             L: 128,
             S: void 0,
             C: (f, a) => f(...a)
@@ -4449,7 +4487,7 @@ var runEpochMigration = async (ctx, context) => {
     }
     case import_services14.CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
       (0, import_invariant15.invariant)(context.newAutomergeRoot, void 0, {
-        F: __dxlog_file17,
+        F: __dxlog_file18,
         L: 143,
         S: void 0,
         A: [
@@ -4465,7 +4503,7 @@ var runEpochMigration = async (ctx, context) => {
   }
   return {};
 };
-var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
+var __dxlog_file19 = "/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;
@@ -4473,7 +4511,7 @@ var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var NotarizationPlugin = class {
   constructor() {
     this._ctx = new import_context13.Context(void 0, {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 62
     });
     this._extensionOpened = new import_async16.Event();
@@ -4493,16 +4531,16 @@ 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_log16.log)("notarize", {
+    (0, import_log17.log)("notarize", {
       credentials
     }, {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant16.invariant)(credentials.every((credential) => credential.id), "Credentials must have an id", {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 91,
       S: this,
       A: [
@@ -4513,10 +4551,10 @@ var NotarizationPlugin = class {
     const errors = new import_async16.Trigger();
     const ctx = this._ctx.derive({
       onError: (err) => {
-        import_log16.log.warn("Notarization error", {
+        import_log17.log.warn("Notarization error", {
           err
         }, {
-          F: __dxlog_file18,
+          F: __dxlog_file19,
           L: 99,
           S: this,
           C: (f, a) => f(...a)
@@ -4528,11 +4566,11 @@ var NotarizationPlugin = class {
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
       (0, import_async16.scheduleTask)(ctx, () => {
-        import_log16.log.warn("Notarization timeout", {
+        import_log17.log.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
-          F: __dxlog_file18,
+          F: __dxlog_file19,
           L: 111,
           S: this,
           C: (f, a) => f(...a)
@@ -4552,10 +4590,10 @@ var NotarizationPlugin = class {
           ...this._extensions
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
-          import_log16.log.info("Exhausted all peers to notarize with", {
+          import_log17.log.info("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
-            F: __dxlog_file18,
+            F: __dxlog_file19,
             L: 136,
             S: this,
             C: (f, a) => f(...a)
@@ -4565,11 +4603,11 @@ var NotarizationPlugin = class {
           return;
         }
         peersTried.add(peer);
-        (0, import_log16.log)("try notarizing", {
+        (0, import_log17.log)("try notarizing", {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
-          F: __dxlog_file18,
+          F: __dxlog_file19,
           L: 143,
           S: this,
           C: (f, a) => f(...a)
@@ -4577,8 +4615,8 @@ var NotarizationPlugin = class {
         await peer.rpc.NotarizationService.notarize({
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
-        (0, import_log16.log)("success", void 0, {
-          F: __dxlog_file18,
+        (0, import_log17.log)("success", void 0, {
+          F: __dxlog_file19,
           L: 147,
           S: this,
           C: (f, a) => f(...a)
@@ -4586,8 +4624,8 @@ var NotarizationPlugin = class {
         await (0, import_async16.sleep)(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
-          import_log16.log.info("error notarizing (recoverable)", err, {
-            F: __dxlog_file18,
+          import_log17.log.info("error notarizing (recoverable)", err, {
+            F: __dxlog_file19,
             L: 151,
             S: this,
             C: (f, a) => f(...a)
@@ -4604,8 +4642,8 @@ var NotarizationPlugin = class {
         allNotarized,
         errors.wait()
       ]);
-      (0, import_log16.log)("done", void 0, {
-        F: __dxlog_file18,
+      (0, import_log17.log)("done", void 0, {
+        F: __dxlog_file19,
         L: 162,
         S: this,
         C: (f, a) => f(...a)
@@ -4627,7 +4665,7 @@ var NotarizationPlugin = class {
   }
   setWriter(writer) {
     (0, import_invariant16.invariant)(!this._writer, "Writer already set.", {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 181,
       S: this,
       A: [
@@ -4652,7 +4690,7 @@ var NotarizationPlugin = class {
     }
     for (const credential of request.credentials ?? []) {
       (0, import_invariant16.invariant)(credential.id, "Credential must have an id", {
-        F: __dxlog_file18,
+        F: __dxlog_file19,
         L: 200,
         S: this,
         A: [
@@ -4669,10 +4707,10 @@ var NotarizationPlugin = class {
   createExtension() {
     const extension = new NotarizationTeleportExtension({
       onOpen: async () => {
-        (0, import_log16.log)("extension opened", {
+        (0, import_log17.log)("extension opened", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file18,
+          F: __dxlog_file19,
           L: 211,
           S: this,
           C: (f, a) => f(...a)
@@ -4681,10 +4719,10 @@ var NotarizationPlugin = class {
         this._extensionOpened.emit();
       },
       onClose: async () => {
-        (0, import_log16.log)("extension closed", {
+        (0, import_log17.log)("extension closed", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file18,
+          F: __dxlog_file19,
           L: 216,
           S: this,
           C: (f, a) => f(...a)
@@ -4700,10 +4738,10 @@ var NotarizationTeleportExtension = class extends import_teleport3.RpcExtension
   constructor(_params) {
     super({
       requested: {
-        NotarizationService: import_protocols11.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_proto4.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       },
       exposed: {
-        NotarizationService: import_protocols11.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_proto4.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       }
     });
     this._params = _params;
@@ -4799,11 +4837,11 @@ function _using_ctx2() {
     }
   };
 }
-var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
+var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var DataSpace = class {
   constructor(params) {
     this._ctx = new import_context11.Context(void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 89
     });
     this._notarizationPlugin = new NotarizationPlugin();
@@ -4844,10 +4882,10 @@ var DataSpace = class {
       });
     }
     this._state = params.initialState;
-    (0, import_log14.log)("new state", {
+    (0, import_log15.log)("new state", {
       state: import_services13.SpaceState[this._state]
     }, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 159,
       S: this,
       C: (f, a) => f(...a)
@@ -4906,15 +4944,15 @@ var DataSpace = class {
       this.inner.protocol.feedAdded.append(this._onFeedAdded);
     }
     await this._inner.open(new import_context11.Context(void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 233
     }));
     await this._edgeFeedReplicator?.open();
     this._state = import_services13.SpaceState.SPACE_CONTROL_ONLY;
-    (0, import_log14.log)("new state", {
+    (0, import_log15.log)("new state", {
       state: import_services13.SpaceState[this._state]
     }, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 238,
       S: this,
       C: (f, a) => f(...a)
@@ -4931,17 +4969,17 @@ var DataSpace = class {
     await this._callbacks.beforeClose?.();
     await this.preClose.callSerial();
     this._state = import_services13.SpaceState.SPACE_CLOSED;
-    (0, import_log14.log)("new state", {
+    (0, import_log15.log)("new state", {
       state: import_services13.SpaceState[this._state]
     }, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
     this._ctx = new import_context11.Context(void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 259
     });
     if (this._edgeFeedReplicator) {
@@ -4972,26 +5010,26 @@ var DataSpace = class {
         this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
       } catch (err) {
-        if (err instanceof import_protocols10.CancelledError || err instanceof import_context11.ContextDisposedError) {
-          (0, import_log14.log)("data pipeline initialization cancelled", err, {
-            F: __dxlog_file19,
+        if (err instanceof import_protocols9.CancelledError || err instanceof import_context11.ContextDisposedError) {
+          (0, import_log15.log)("data pipeline initialization cancelled", err, {
+            F: __dxlog_file20,
             L: 297,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
-        import_log14.log.error("Error initializing data pipeline", err, {
-          F: __dxlog_file19,
+        import_log15.log.error("Error initializing data pipeline", err, {
+          F: __dxlog_file20,
           L: 301,
           S: this,
           C: (f, a) => f(...a)
         });
         this._state = import_services13.SpaceState.SPACE_ERROR;
-        (0, import_log14.log)("new state", {
+        (0, import_log15.log)("new state", {
           state: import_services13.SpaceState[this._state]
         }, {
-          F: __dxlog_file19,
+          F: __dxlog_file20,
           L: 303,
           S: this,
           C: (f, a) => f(...a)
@@ -5005,13 +5043,13 @@ var DataSpace = class {
   }
   async initializeDataPipeline() {
     if (this._state !== import_services13.SpaceState.SPACE_CONTROL_ONLY) {
-      throw new import_protocols10.SystemError("Invalid operation");
+      throw new import_protocols9.SystemError("Invalid operation");
     }
     this._state = import_services13.SpaceState.SPACE_INITIALIZING;
-    (0, import_log14.log)("new state", {
+    (0, import_log15.log)("new state", {
       state: import_services13.SpaceState[this._state]
     }, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 319,
       S: this,
       C: (f, a) => f(...a)
@@ -5025,10 +5063,10 @@ var DataSpace = class {
   async _enterReadyState() {
     await this._callbacks.beforeReady?.();
     this._state = import_services13.SpaceState.SPACE_READY;
-    (0, import_log14.log)("new state", {
+    (0, import_log15.log)("new state", {
       state: import_services13.SpaceState[this._state]
     }, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 338,
       S: this,
       C: (f, a) => f(...a)
@@ -5043,8 +5081,8 @@ var DataSpace = class {
     });
     this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
-    (0, import_log14.log)("writable feeds created", void 0, {
-      F: __dxlog_file19,
+    (0, import_log15.log)("writable feeds created", void 0, {
+      F: __dxlog_file20,
       L: 354,
       S: this,
       C: (f, a) => f(...a)
@@ -5103,11 +5141,11 @@ var DataSpace = class {
     }
   }
   _onNewAutomergeRoot(rootUrl) {
-    (0, import_log14.log)("loading automerge root doc for space", {
+    (0, import_log15.log)("loading automerge root doc for space", {
       space: this.key,
       rootUrl
     }, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 420,
       S: this,
       C: (f, a) => f(...a)
@@ -5154,12 +5192,12 @@ var DataSpace = class {
         if (err instanceof import_context11.ContextDisposedError) {
           return;
         }
-        import_log14.log.warn("error loading automerge root doc", {
+        import_log15.log.warn("error loading automerge root doc", {
           space: this.key,
           rootUrl,
           err
         }, {
-          F: __dxlog_file19,
+          F: __dxlog_file20,
           L: 463,
           S: this,
           C: (f, a) => f(...a)
@@ -5246,10 +5284,10 @@ var DataSpace = class {
       await this._close();
     }
     this._state = import_services13.SpaceState.SPACE_INACTIVE;
-    (0, import_log14.log)("new state", {
+    (0, import_log15.log)("new state", {
       state: import_services13.SpaceState[this._state]
     }, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 545,
       S: this,
       C: (f, a) => f(...a)
@@ -5379,7 +5417,7 @@ function _ts_decorate6(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_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
+var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
 var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var DEFAULT_SPACE_KEY = "__DEFAULT__";
@@ -5434,45 +5472,45 @@ var DataSpaceManager = class extends import_context14.Resource {
     return this._spaces;
   }
   async _open() {
-    (0, import_log17.log)("open", void 0, {
-      F: __dxlog_file20,
+    (0, import_log18.log)("open", void 0, {
+      F: __dxlog_file21,
       L: 192,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log17.log.trace("dxos.echo.data-space-manager.open", import_protocols12.trace.begin({
+    import_log18.log.trace("dxos.echo.data-space-manager.open", import_protocols10.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 193,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log17.log)("metadata loaded", {
+    (0, import_log18.log)("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 194,
       S: this,
       C: (f, a) => f(...a)
     });
     await (0, import_util11.forEachAsync)(this._metadataStore.spaces, async (spaceMetadata) => {
       try {
-        (0, import_log17.log)("load space", {
+        (0, import_log18.log)("load space", {
           spaceMetadata
         }, {
-          F: __dxlog_file20,
+          F: __dxlog_file21,
           L: 198,
           S: this,
           C: (f, a) => f(...a)
         });
         await this._constructSpace(spaceMetadata);
       } catch (err) {
-        import_log17.log.error("Error loading space", {
+        import_log18.log.error("Error loading space", {
           spaceMetadata,
           err
         }, {
-          F: __dxlog_file20,
+          F: __dxlog_file21,
           L: 201,
           S: this,
           C: (f, a) => f(...a)
@@ -5480,18 +5518,18 @@ var DataSpaceManager = class extends import_context14.Resource {
       }
     });
     this.updated.emit();
-    import_log17.log.trace("dxos.echo.data-space-manager.open", import_protocols12.trace.end({
+    import_log18.log.trace("dxos.echo.data-space-manager.open", import_protocols10.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close() {
-    (0, import_log17.log)("close", void 0, {
-      F: __dxlog_file20,
+    (0, import_log18.log)("close", void 0, {
+      F: __dxlog_file21,
       L: 212,
       S: this,
       C: (f, a) => f(...a)
@@ -5506,7 +5544,7 @@ var DataSpaceManager = class extends import_context14.Resource {
   */
   async createSpace() {
     (0, import_invariant17.invariant)(this._lifecycleState === import_context14.LifecycleState.OPEN, "Not open.", {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 224,
       S: this,
       A: [
@@ -5524,10 +5562,10 @@ var DataSpaceManager = class extends import_context14.Resource {
       dataFeedKey,
       state: import_services15.SpaceState.SPACE_ACTIVE
     };
-    (0, import_log17.log)("creating space...", {
+    (0, import_log18.log)("creating space...", {
       spaceKey
     }, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 236,
       S: this,
       C: (f, a) => f(...a)
@@ -5539,7 +5577,7 @@ var DataSpaceManager = class extends import_context14.Resource {
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
     (0, import_invariant17.invariant)((0, import_credentials15.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 246,
       S: this,
       A: [
@@ -5567,11 +5605,11 @@ var DataSpaceManager = class extends import_context14.Resource {
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
       default:
-        import_log17.log.warn("unknown space version", {
+        import_log18.log.warn("unknown space version", {
           version: space.databaseRoot.getVersion(),
           spaceId: space.id
         }, {
-          F: __dxlog_file20,
+          F: __dxlog_file21,
           L: 271,
           S: this,
           C: (f, a) => f(...a)
@@ -5606,7 +5644,7 @@ var DataSpaceManager = class extends import_context14.Resource {
   async _getSpaceRootDocument(space) {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     (0, import_invariant17.invariant)(automergeIndex, void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 304,
       S: this,
       A: [
@@ -5620,16 +5658,16 @@ var DataSpaceManager = class extends import_context14.Resource {
   }
   // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
-    (0, import_log17.log)("accept space", {
+    (0, import_log18.log)("accept space", {
       opts
     }, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 313,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant17.invariant)(this._lifecycleState === import_context14.LifecycleState.OPEN, "Not open.", {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 314,
       S: this,
       A: [
@@ -5638,7 +5676,7 @@ var DataSpaceManager = class extends import_context14.Resource {
       ]
     });
     (0, import_invariant17.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 315,
       S: this,
       A: [
@@ -5662,7 +5700,7 @@ var DataSpaceManager = class extends import_context14.Resource {
   async admitMember(options) {
     const space = this._spaceManager.spaces.get(options.spaceKey);
     (0, import_invariant17.invariant)(space, void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 335,
       S: this,
       A: [
@@ -5671,11 +5709,11 @@ var DataSpaceManager = class extends import_context14.Resource {
       ]
     });
     if (space.spaceState.getMemberRole(options.identityKey) !== import_credentials16.SpaceMember.Role.REMOVED) {
-      throw new import_protocols12.AlreadyJoinedError();
+      throw new import_protocols10.AlreadyJoinedError();
     }
     const credentials = await (0, import_credentials15.createAdmissionCredentials)(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId);
     (0, import_invariant17.invariant)(credentials[0].credential, void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 354,
       S: this,
       A: [
@@ -5685,7 +5723,7 @@ var DataSpaceManager = class extends import_context14.Resource {
     });
     const spaceMemberCredential = credentials[0].credential.credential;
     (0, import_invariant17.invariant)((0, import_credentials15.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 356,
       S: this,
       A: [
@@ -5721,10 +5759,10 @@ var DataSpaceManager = class extends import_context14.Resource {
     });
   }
   async _constructSpace(metadata) {
-    (0, import_log17.log)("construct space", {
+    (0, import_log18.log)("construct space", {
       metadata
     }, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 392,
       S: this,
       C: (f, a) => f(...a)
@@ -5765,10 +5803,10 @@ var DataSpaceManager = class extends import_context14.Resource {
           session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
           await this._connectEchoMeshReplicator(space, session);
         } catch (err) {
-          import_log17.log.warn("error on authorized connection", {
+          import_log18.log.warn("error on authorized connection", {
             err
           }, {
-            F: __dxlog_file20,
+            F: __dxlog_file21,
             L: 434,
             S: this,
             C: (f, a) => f(...a)
@@ -5777,8 +5815,8 @@ var DataSpaceManager = class extends import_context14.Resource {
         }
       }),
       onAuthFailure: () => {
-        import_log17.log.warn("auth failure", void 0, {
-          F: __dxlog_file20,
+        import_log18.log.warn("auth failure", void 0, {
+          F: __dxlog_file21,
           L: 439,
           S: this,
           C: (f, a) => f(...a)
@@ -5808,21 +5846,21 @@ var DataSpaceManager = class extends import_context14.Resource {
       signingContext: this._signingContext,
       callbacks: {
         beforeReady: async () => {
-          (0, import_log17.log)("before space ready", {
+          (0, import_log18.log)("before space ready", {
             space: space.key
           }, {
-            F: __dxlog_file20,
+            F: __dxlog_file21,
             L: 466,
             S: this,
             C: (f, a) => f(...a)
           });
         },
         afterReady: async () => {
-          (0, import_log17.log)("after space ready", {
+          (0, import_log18.log)("after space ready", {
             space: space.key,
             open: this._lifecycleState === import_context14.LifecycleState.OPEN
           }, {
-            F: __dxlog_file20,
+            F: __dxlog_file21,
             L: 469,
             S: this,
             C: (f, a) => f(...a)
@@ -5838,10 +5876,10 @@ var DataSpaceManager = class extends import_context14.Resource {
           }
         },
         beforeClose: async () => {
-          (0, import_log17.log)("before space close", {
+          (0, import_log18.log)("before space close", {
             space: space.key
           }, {
-            F: __dxlog_file20,
+            F: __dxlog_file21,
             L: 477,
             S: this,
             C: (f, a) => f(...a)
@@ -5872,10 +5910,10 @@ var DataSpaceManager = class extends import_context14.Resource {
   async _connectEchoMeshReplicator(space, session) {
     const replicator = this._meshReplicator;
     if (!replicator) {
-      import_log17.log.warn("p2p automerge replication disabled", {
+      import_log18.log.warn("p2p automerge replication disabled", {
         space: space.key
       }, {
-        F: __dxlog_file20,
+        F: __dxlog_file21,
         L: 508,
         S: this,
         C: (f, a) => f(...a)
@@ -5899,16 +5937,16 @@ var DataSpaceManager = class extends import_context14.Resource {
         return (s && member.role === import_credentials16.SpaceMember.Role.REMOVED !== (s.authStatus === import_echo_pipeline3.AuthStatus.FAILURE)) ?? false;
       });
       sessionsToClose.forEach((session) => {
-        void session.close().catch(import_log17.log.error);
+        void session.close().catch(import_log18.log.error);
       });
       closedSessions += sessionsToClose.length;
     }
-    (0, import_log17.log)("processed member role changes", {
+    (0, import_log18.log)("processed member role changes", {
       roleChangeCount: memberInfo.length,
       peersOnline: presence.getPeersOnline().length,
       closedSessions
     }, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 534,
       S: this,
       C: (f, a) => f(...a)
@@ -5920,15 +5958,15 @@ var DataSpaceManager = class extends import_context14.Resource {
     if (role === import_credentials16.SpaceMember.Role.REMOVED) {
       const session = peerState.peerId && space.protocol.sessions.get(peerState.peerId);
       if (session != null) {
-        (0, import_log17.log)("closing a session with a removed peer", {
+        (0, import_log18.log)("closing a session with a removed peer", {
           peerId: peerState.peerId
         }, {
-          F: __dxlog_file20,
+          F: __dxlog_file21,
           L: 548,
           S: this,
           C: (f, a) => f(...a)
         });
-        void session.close().catch(import_log17.log.error);
+        void session.close().catch(import_log18.log.error);
       }
     }
   }
@@ -5983,7 +6021,7 @@ _ts_decorate6([
 DataSpaceManager = _ts_decorate6([
   (0, import_async17.trackLeaks)("open", "close")
 ], DataSpaceManager);
-var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
+var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
   constructor(_identityManager, _spaceManager, _getDataSpaceManager) {
     this._identityManager = _identityManager;
@@ -5999,7 +6037,7 @@ var SpacesServiceImpl = class {
   }
   async updateSpace({ spaceKey, state }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols13.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
     if (state) {
       switch (state) {
         case import_services16.SpaceState.SPACE_ACTIVE:
@@ -6009,7 +6047,7 @@ var SpacesServiceImpl = class {
           await space.deactivate();
           break;
         default:
-          throw new import_protocols13.ApiError("Invalid space state");
+          throw new import_protocols11.ApiError("Invalid space state");
       }
     }
   }
@@ -6017,17 +6055,17 @@ var SpacesServiceImpl = class {
     const identity = this._requireIdentity();
     const space = this._spaceManager.spaces.get(request.spaceKey);
     if (space == null) {
-      throw new import_protocols13.SpaceNotFoundError(request.spaceKey);
+      throw new import_protocols11.SpaceNotFoundError(request.spaceKey);
     }
     if (!space.spaceState.hasMembershipManagementPermission(identity.identityKey)) {
-      throw new import_protocols13.AuthorizationError("No member management permission.", {
+      throw new import_protocols11.AuthorizationError("No member management permission.", {
         spaceKey: space.key,
         role: space.spaceState.getMemberRole(identity.identityKey)
       });
     }
     const credentials = await (0, import_credentials19.createAdmissionCredentials)(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
     (0, import_invariant18.invariant)(credentials[0].credential, void 0, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 102,
       S: this,
       A: [
@@ -6037,7 +6075,7 @@ var SpacesServiceImpl = class {
     });
     const spaceMemberCredential = credentials[0].credential.credential;
     (0, import_invariant18.invariant)((0, import_credentials19.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 104,
       S: this,
       A: [
@@ -6052,10 +6090,10 @@ var SpacesServiceImpl = class {
       const scheduler = new import_async18.UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
-        (0, import_log18.log)("update", () => ({
+        (0, import_log19.log)("update", () => ({
           ids: spaces.map((space) => space.id)
         }), {
-          F: __dxlog_file21,
+          F: __dxlog_file22,
           L: 115,
           S: this,
           C: (f, a) => f(...a)
@@ -6104,14 +6142,14 @@ var SpacesServiceImpl = class {
   }
   async postMessage({ spaceKey, channel, message }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols13.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
     await space.postMessage(getChannelId(channel), message);
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
       (0, import_async18.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols13.SpaceNotFoundError(spaceKey));
+        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
           next(message);
         });
@@ -6121,7 +6159,7 @@ var SpacesServiceImpl = class {
   }
   queryCredentials({ spaceKey, noTail }) {
     return new import_codec_protobuf11.Stream(({ ctx, next, close }) => {
-      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols13.SpaceNotFoundError(spaceKey));
+      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
       const processor = {
         processCredential: async (credential) => {
           next(credential);
@@ -6137,7 +6175,7 @@ var SpacesServiceImpl = class {
     });
   }
   async writeCredentials({ spaceKey, credentials }) {
-    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols13.SpaceNotFoundError(spaceKey));
+    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
     for (const credential of credentials ?? []) {
       if (credential.proof) {
         await space.controlPipeline.writer.write({
@@ -6147,7 +6185,7 @@ var SpacesServiceImpl = class {
         });
       } else {
         (0, import_invariant18.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
-          F: __dxlog_file21,
+          F: __dxlog_file22,
           L: 213,
           S: this,
           A: [
@@ -6156,7 +6194,7 @@ var SpacesServiceImpl = class {
           ]
         });
         (0, import_invariant18.invariant)(this._identityManager.identity, "Identity is not available", {
-          F: __dxlog_file21,
+          F: __dxlog_file22,
           L: 214,
           S: this,
           A: [
@@ -6166,7 +6204,7 @@ var SpacesServiceImpl = class {
         });
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         (0, import_invariant18.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
-          F: __dxlog_file21,
+          F: __dxlog_file22,
           L: 216,
           S: this,
           A: [
@@ -6188,7 +6226,7 @@ var SpacesServiceImpl = class {
   }
   async createEpoch({ spaceKey, migration, automergeRootUrl }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols13.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols11.SpaceNotFoundError(spaceKey));
     const result = await space.createEpoch({
       migration,
       newAutomergeRoot: automergeRootUrl
@@ -6216,7 +6254,7 @@ var SpacesServiceImpl = class {
   async _joinByAdmission({ credential }) {
     const assertion = (0, import_credentials19.getCredentialAssertion)(credential);
     (0, import_invariant18.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 250,
       S: this,
       A: [
@@ -6226,7 +6264,7 @@ var SpacesServiceImpl = class {
     });
     const myIdentity = this._identityManager.identity;
     (0, import_invariant18.invariant)(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 252,
       S: this,
       A: [
@@ -6256,7 +6294,7 @@ var SpacesServiceImpl = class {
       id: space.id,
       spaceKey: space.key,
       state: space.state,
-      error: space.error ? (0, import_protocols13.encodeError)(space.error) : void 0,
+      error: space.error ? (0, import_protocols11.encodeError)(space.error) : void 0,
       pipeline: {
         currentEpoch: space.automergeSpaceState.lastEpoch,
         appliedEpoch: space.automergeSpaceState.lastEpoch,
@@ -6294,7 +6332,7 @@ var SpacesServiceImpl = class {
   }
   _requireIdentity() {
     if (!this._identityManager.identity) {
-      throw new import_protocols13.IdentityNotInitializedError("This device has no HALO identity available. See https://docs.dxos.org/guide/platform/halo");
+      throw new import_protocols11.IdentityNotInitializedError("This device has no HALO identity available. See https://docs.dxos.org/guide/platform/halo");
     }
     return this._identityManager.identity;
   }
@@ -6321,7 +6359,7 @@ function _ts_decorate7(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_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends import_context15.Resource {
   constructor(storage, level, networkManager, signalManager, _edgeConnection, _runtimeParams, _edgeFeatures) {
     super();
@@ -6360,19 +6398,19 @@ var ServiceContext = class extends import_context15.Resource {
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams, {
       onIdentityConstruction: (identity) => {
         if (this._edgeConnection) {
-          import_log19.log.info("Setting identity on edge connection", {
+          import_log20.log.info("Setting identity on edge connection", {
             identity: identity.identityKey.toHex(),
-            oldIdentity: this._edgeConnection.identityKey.toHex(),
+            oldIdentity: this._edgeConnection.identityKey,
             swarms: this.networkManager.topics
           }, {
-            F: __dxlog_file22,
+            F: __dxlog_file23,
             L: 128,
             S: this,
             C: (f, a) => f(...a)
           });
           this._edgeConnection.setIdentity({
-            deviceKey: identity.deviceKey,
-            identityKey: identity.identityKey
+            peerKey: identity.deviceKey.toHex(),
+            identityKey: identity.identityKey.toHex()
           });
           this.networkManager.setPeerInfo({
             identityKey: identity.identityKey.toHex(),
@@ -6399,16 +6437,16 @@ var ServiceContext = class extends import_context15.Resource {
   }
   async _open(ctx) {
     await this._checkStorageVersion();
-    (0, import_log19.log)("opening...", void 0, {
-      F: __dxlog_file22,
+    (0, import_log20.log)("opening...", void 0, {
+      F: __dxlog_file23,
       L: 186,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log19.log.trace("dxos.sdk.service-context.open", import_protocols14.trace.begin({
+    import_log20.log.trace("dxos.sdk.service-context.open", import_protocols12.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 187,
       S: this,
       C: (f, a) => f(...a)
@@ -6430,32 +6468,32 @@ var ServiceContext = class extends import_context15.Resource {
       await this._initialize(ctx);
     }
     const loadedInvitations = await this.invitationsManager.loadPersistentInvitations();
-    (0, import_log19.log)("loaded persistent invitations", {
+    (0, import_log20.log)("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 210,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log19.log.trace("dxos.sdk.service-context.open", import_protocols14.trace.end({
+    import_log20.log.trace("dxos.sdk.service-context.open", import_protocols12.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 212,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log19.log)("opened", void 0, {
-      F: __dxlog_file22,
+    (0, import_log20.log)("opened", void 0, {
+      F: __dxlog_file23,
       L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close(ctx) {
-    (0, import_log19.log)("closing...", void 0, {
-      F: __dxlog_file22,
+    (0, import_log20.log)("closing...", void 0, {
+      F: __dxlog_file23,
       L: 217,
       S: this,
       C: (f, a) => f(...a)
@@ -6472,8 +6510,8 @@ var ServiceContext = class extends import_context15.Resource {
     await this.networkManager.close();
     await this.signalManager.close();
     await this._edgeConnection?.close();
-    (0, import_log19.log)("closed", void 0, {
-      F: __dxlog_file22,
+    (0, import_log20.log)("closed", void 0, {
+      F: __dxlog_file23,
       L: 232,
       S: this,
       C: (f, a) => f(...a)
@@ -6482,7 +6520,7 @@ var ServiceContext = class extends import_context15.Resource {
   async createIdentity(params = {}) {
     const identity = await this.identityManager.createIdentity(params);
     await this._initialize(new import_context15.Context(void 0, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 237
     }));
     return identity;
@@ -6490,7 +6528,7 @@ var ServiceContext = class extends import_context15.Resource {
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant19.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 243,
       S: this,
       A: [
@@ -6511,21 +6549,21 @@ var ServiceContext = class extends import_context15.Resource {
   async _acceptIdentity(params) {
     const identity = await this.identityManager.acceptIdentity(params);
     await this._initialize(new import_context15.Context(void 0, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 259
     }));
     return identity;
   }
   async _checkStorageVersion() {
     await this.metadataStore.load();
-    if (this.metadataStore.version !== import_protocols14.STORAGE_VERSION) {
-      throw new import_protocols14.InvalidStorageVersionError(import_protocols14.STORAGE_VERSION, this.metadataStore.version);
+    if (this.metadataStore.version !== import_protocols12.STORAGE_VERSION) {
+      throw new import_protocols12.InvalidStorageVersionError(import_protocols12.STORAGE_VERSION, this.metadataStore.version);
     }
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    (0, import_log19.log)("initializing spaces...", void 0, {
-      F: __dxlog_file22,
+    (0, import_log20.log)("initializing spaces...", void 0, {
+      F: __dxlog_file23,
       L: 274,
       S: this,
       C: (f, a) => f(...a)
@@ -6561,7 +6599,7 @@ var ServiceContext = class extends import_context15.Resource {
     await this.dataSpaceManager.open();
     this._handlerFactories.set(import_services17.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant19.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file22,
+        F: __dxlog_file23,
         L: 303,
         S: this,
         A: [
@@ -6582,10 +6620,10 @@ var ServiceContext = class extends import_context15.Resource {
           return;
         }
         if (!this.dataSpaceManager) {
-          (0, import_log19.log)("dataSpaceManager not initialized yet, ignoring space admission", {
+          (0, import_log20.log)("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file22,
+            F: __dxlog_file23,
             L: 319,
             S: this,
             C: (f, a) => f(...a)
@@ -6593,10 +6631,10 @@ var ServiceContext = class extends import_context15.Resource {
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          (0, import_log19.log)("space already exists, ignoring space admission", {
+          (0, import_log20.log)("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file22,
+            F: __dxlog_file23,
             L: 323,
             S: this,
             C: (f, a) => f(...a)
@@ -6604,10 +6642,10 @@ var ServiceContext = class extends import_context15.Resource {
           return;
         }
         try {
-          (0, import_log19.log)("accepting space recorded in halo", {
+          (0, import_log20.log)("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file22,
+            F: __dxlog_file23,
             L: 328,
             S: this,
             C: (f, a) => f(...a)
@@ -6617,8 +6655,8 @@ var ServiceContext = class extends import_context15.Resource {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          import_log19.log.catch(err, void 0, {
-            F: __dxlog_file22,
+          import_log20.log.catch(err, void 0, {
+            F: __dxlog_file23,
             L: 334,
             S: this,
             C: (f, a) => f(...a)
@@ -6673,16 +6711,16 @@ var StorageDriver = import_config2.Runtime.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
   const { persistent = false, keyStore, dataStore } = config ?? {};
   if (persistent && dataStore === StorageDriver.RAM) {
-    throw new import_protocols15.InvalidConfigError("RAM storage cannot be used in persistent mode.");
+    throw new import_protocols13.InvalidConfigError("RAM storage cannot be used in persistent mode.");
   }
   if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
-    throw new import_protocols15.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
+    throw new import_protocols13.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
   }
   if (persistent && keyStore === StorageDriver.RAM) {
-    throw new import_protocols15.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
+    throw new import_protocols13.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
   }
   if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
-    throw new import_protocols15.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+    throw new import_protocols13.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
   }
   return {
     storage: (0, import_random_access_storage.createStorage)({
@@ -6718,7 +6756,7 @@ var createLevel = async (config) => {
   await level.open();
   return level;
 };
-var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.ts";
+var __dxlog_file24 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.ts";
 var encodeProfileArchive = (profile) => import_automerge_repo.cbor.encode(profile);
 var decodeProfileArchive = (data) => import_automerge_repo.cbor.decode(data);
 var exportProfileData = async ({ storage, level }) => {
@@ -6731,10 +6769,10 @@ var exportProfileData = async ({ storage, level }) => {
   {
     const directory = await storage.createDirectory();
     const files = await directory.list();
-    import_log20.log.info("begin exporting files", {
+    import_log21.log.info("begin exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file23,
+      F: __dxlog_file24,
       L: 30,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6744,23 +6782,23 @@ var exportProfileData = async ({ storage, level }) => {
       const { size } = await file.stat();
       const data = await file.read(0, size);
       archive.storage.push({
-        type: import_protocols16.ProfileArchiveEntryType.FILE,
+        type: import_protocols14.ProfileArchiveEntryType.FILE,
         key: filename,
         value: data
       });
     }
-    import_log20.log.info("done exporting files", {
+    import_log21.log.info("done exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file23,
+      F: __dxlog_file24,
       L: 41,
       S: void 0,
       C: (f, a) => f(...a)
     });
   }
   {
-    import_log20.log.info("begin exporting kv pairs", void 0, {
-      F: __dxlog_file23,
+    import_log21.log.info("begin exporting kv pairs", void 0, {
+      F: __dxlog_file24,
       L: 45,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6772,16 +6810,16 @@ var exportProfileData = async ({ storage, level }) => {
     let count = 0;
     for await (const [key, value] of iter) {
       archive.storage.push({
-        type: import_protocols16.ProfileArchiveEntryType.KEY_VALUE,
+        type: import_protocols14.ProfileArchiveEntryType.KEY_VALUE,
         key,
         value
       });
       count++;
     }
-    import_log20.log.info("done exporting kv pairs", {
+    import_log21.log.info("done exporting kv pairs", {
       count
     }, {
-      F: __dxlog_file23,
+      F: __dxlog_file24,
       L: 56,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6794,10 +6832,10 @@ var importProfileData = async ({ storage, level }, archive) => {
   let count = 0;
   for (const entry2 of archive.storage) {
     switch (entry2.type) {
-      case import_protocols16.ProfileArchiveEntryType.FILE: {
+      case import_protocols14.ProfileArchiveEntryType.FILE: {
         const directory = await storage.createDirectory();
         (0, import_invariant20.invariant)(typeof entry2.key === "string", "Invalid key type", {
-          F: __dxlog_file23,
+          F: __dxlog_file24,
           L: 79,
           S: void 0,
           A: [
@@ -6807,7 +6845,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         });
         const file = await directory.getOrCreateFile(entry2.key);
         (0, import_invariant20.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file23,
+          F: __dxlog_file24,
           L: 81,
           S: void 0,
           A: [
@@ -6819,9 +6857,9 @@ var importProfileData = async ({ storage, level }, archive) => {
         await file.close();
         break;
       }
-      case import_protocols16.ProfileArchiveEntryType.KEY_VALUE: {
+      case import_protocols14.ProfileArchiveEntryType.KEY_VALUE: {
         (0, import_invariant20.invariant)(entry2.key instanceof Uint8Array, "Invalid key type", {
-          F: __dxlog_file23,
+          F: __dxlog_file24,
           L: 87,
           S: void 0,
           A: [
@@ -6830,7 +6868,7 @@ var importProfileData = async ({ storage, level }, archive) => {
           ]
         });
         (0, import_invariant20.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file23,
+          F: __dxlog_file24,
           L: 88,
           S: void 0,
           A: [
@@ -6850,27 +6888,27 @@ var importProfileData = async ({ storage, level }, archive) => {
     if (++count % 1e3 === 0) {
       await batch.write();
       batch = level.batch();
-      import_log20.log.info("importing", {
+      import_log21.log.info("importing", {
         count,
         total: archive.storage.length,
         progress: `${(count / archive.storage.length * 100).toFixed()}%`
       }, {
-        F: __dxlog_file23,
+        F: __dxlog_file24,
         L: 101,
         S: void 0,
         C: (f, a) => f(...a)
       });
     }
   }
-  import_log20.log.info("committing changes..", void 0, {
-    F: __dxlog_file23,
+  import_log21.log.info("committing changes..", void 0, {
+    F: __dxlog_file24,
     L: 109,
     S: void 0,
     C: (f, a) => f(...a)
   });
   await batch.write();
 };
-var __dxlog_file24 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+var __dxlog_file25 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
@@ -6888,7 +6926,7 @@ var DevicesServiceImpl = class {
           });
         } else {
           (0, import_invariant22.invariant)(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file24,
+            F: __dxlog_file25,
             L: 32,
             S: this,
             A: [
@@ -7033,11 +7071,11 @@ var LoggingServiceImpl = class {
     };
   }
   async open() {
-    import_log22.log.runtimeConfig.processors.push(this._logProcessor);
+    import_log23.log.runtimeConfig.processors.push(this._logProcessor);
   }
   async close() {
-    const index = import_log22.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
-    import_log22.log.runtimeConfig.processors.splice(index, 1);
+    const index = import_log23.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    import_log23.log.runtimeConfig.processors.splice(index, 1);
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
@@ -7098,7 +7136,7 @@ var LoggingServiceImpl = class {
         }
         const record = {
           ...entry2,
-          context: (0, import_util16.jsonify)((0, import_log22.getContextFromEntry)(entry2)),
+          context: (0, import_util16.jsonify)((0, import_log23.getContextFromEntry)(entry2)),
           timestamp: /* @__PURE__ */ new Date(),
           meta: {
             // TODO(dmaretskyi): Fix proto.
@@ -7231,7 +7269,7 @@ function _ts_decorate8(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_file25 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file26 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var ClientServicesHost = class {
   constructor({
     config,
@@ -7269,7 +7307,7 @@ var ClientServicesHost = class {
         onAcquire: () => {
           if (!this._opening) {
             void this.open(new import_context16.Context(void 0, {
-              F: __dxlog_file25,
+              F: __dxlog_file26,
               L: 132
             }));
           }
@@ -7327,7 +7365,7 @@ var ClientServicesHost = class {
   */
   initialize({ config, ...options }) {
     (0, import_invariant21.invariant)(!this._open, "service host is open", {
-      F: __dxlog_file25,
+      F: __dxlog_file26,
       L: 198,
       S: this,
       A: [
@@ -7335,15 +7373,15 @@ var ClientServicesHost = class {
         "'service host is open'"
       ]
     });
-    (0, import_log21.log)("initializing...", void 0, {
-      F: __dxlog_file25,
+    (0, import_log22.log)("initializing...", void 0, {
+      F: __dxlog_file26,
       L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       (0, import_invariant21.invariant)(!this._config, "config already set", {
-        F: __dxlog_file25,
+        F: __dxlog_file26,
         L: 202,
         S: this,
         A: [
@@ -7357,8 +7395,8 @@ var ClientServicesHost = class {
       }
     }
     if (!options.signalManager) {
-      import_log21.log.warn("running signaling without telemetry metadata.", void 0, {
-        F: __dxlog_file25,
+      import_log22.log.warn("running signaling without telemetry metadata.", void 0, {
+        F: __dxlog_file26,
         L: 210,
         S: this,
         C: (f, a) => f(...a)
@@ -7366,7 +7404,8 @@ var ClientServicesHost = class {
     }
     const edgeEndpoint = config?.get("runtime.services.edge.url");
     if (edgeEndpoint) {
-      this._edgeConnection = new import_edge_client.EdgeClient(import_keys16.PublicKey.random(), import_keys16.PublicKey.random(), {
+      const randomKey = import_keys16.PublicKey.random().toHex();
+      this._edgeConnection = new import_edge_client.EdgeClient(randomKey, randomKey, {
         socketEndpoint: edgeEndpoint
       });
     }
@@ -7377,8 +7416,8 @@ var ClientServicesHost = class {
     }) : new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
     (0, import_invariant21.invariant)(!this._networkManager, "network manager already set", {
-      F: __dxlog_file25,
-      L: 233,
+      F: __dxlog_file26,
+      L: 232,
       S: this,
       A: [
         "!this._networkManager",
@@ -7390,13 +7429,13 @@ var ClientServicesHost = class {
       transportFactory,
       signalManager,
       peerInfo: this._edgeConnection ? {
-        identityKey: this._edgeConnection.identityKey.toHex(),
-        peerKey: this._edgeConnection.deviceKey.toHex()
+        identityKey: this._edgeConnection.identityKey,
+        peerKey: this._edgeConnection.peerKey
       } : void 0
     });
-    (0, import_log21.log)("initialized", void 0, {
-      F: __dxlog_file25,
-      L: 246,
+    (0, import_log22.log)("initialized", void 0, {
+      F: __dxlog_file26,
+      L: 245,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7406,17 +7445,17 @@ var ClientServicesHost = class {
       return;
     }
     const traceId = import_keys16.PublicKey.random().toHex();
-    import_log21.log.trace("dxos.client-services.host.open", import_protocols17.trace.begin({
+    import_log22.log.trace("dxos.client-services.host.open", import_protocols15.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file25,
-      L: 257,
+      F: __dxlog_file26,
+      L: 256,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant21.invariant)(this._config, "config not set", {
-      F: __dxlog_file25,
-      L: 259,
+      F: __dxlog_file26,
+      L: 258,
       S: this,
       A: [
         "this._config",
@@ -7424,8 +7463,8 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_invariant21.invariant)(this._storage, "storage not set", {
-      F: __dxlog_file25,
-      L: 260,
+      F: __dxlog_file26,
+      L: 259,
       S: this,
       A: [
         "this._storage",
@@ -7433,8 +7472,8 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_invariant21.invariant)(this._signalManager, "signal manager not set", {
-      F: __dxlog_file25,
-      L: 261,
+      F: __dxlog_file26,
+      L: 260,
       S: this,
       A: [
         "this._signalManager",
@@ -7442,8 +7481,8 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_invariant21.invariant)(this._networkManager, "network manager not set", {
-      F: __dxlog_file25,
-      L: 262,
+      F: __dxlog_file26,
+      L: 261,
       S: this,
       A: [
         "this._networkManager",
@@ -7451,11 +7490,11 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    (0, import_log21.log)("opening...", {
+    (0, import_log22.log)("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file25,
-      L: 265,
+      F: __dxlog_file26,
+      L: 264,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7507,19 +7546,19 @@ var ClientServicesHost = class {
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log21.log)("opened", {
+    (0, import_log22.log)("opened", {
       deviceKey
     }, {
-      F: __dxlog_file25,
-      L: 353,
+      F: __dxlog_file26,
+      L: 352,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log21.log.trace("dxos.client-services.host.open", import_protocols17.trace.end({
+    import_log22.log.trace("dxos.client-services.host.open", import_protocols15.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file25,
-      L: 354,
+      F: __dxlog_file26,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7529,11 +7568,11 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log21.log)("closing...", {
+    (0, import_log22.log)("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file25,
-      L: 365,
+      F: __dxlog_file26,
+      L: 364,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7547,44 +7586,44 @@ var ClientServicesHost = class {
     await this._level?.close();
     this._open = false;
     this._statusUpdate.emit();
-    (0, import_log21.log)("closed", {
+    (0, import_log22.log)("closed", {
       deviceKey
     }, {
-      F: __dxlog_file25,
-      L: 374,
+      F: __dxlog_file26,
+      L: 373,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
     const traceId = import_keys16.PublicKey.random().toHex();
-    import_log21.log.trace("dxos.sdk.client-services-host.reset", import_protocols17.trace.begin({
+    import_log22.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file25,
-      L: 379,
+      F: __dxlog_file26,
+      L: 378,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log21.log.info("resetting...", void 0, {
-      F: __dxlog_file25,
-      L: 381,
+    import_log22.log.info("resetting...", void 0, {
+      F: __dxlog_file26,
+      L: 380,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
-    import_log21.log.info("reset", void 0, {
-      F: __dxlog_file25,
-      L: 384,
+    import_log22.log.info("reset", void 0, {
+      F: __dxlog_file26,
+      L: 383,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log21.log.trace("dxos.sdk.client-services-host.reset", import_protocols17.trace.end({
+    import_log22.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file25,
-      L: 385,
+      F: __dxlog_file26,
+      L: 384,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7657,4 +7696,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-WTK4Q3EG.cjs.map
+//# sourceMappingURL=chunk-4Y7QCEWZ.cjs.map