@dxos/client-services 0.5.9-main.bfee100 → 0.5.9-main.d63ef8d

package/dist/lib/node/{chunk-STUWVNPH.cjs → chunk-OD7BTUYY.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_STUWVNPH_exports = {};
-__export(chunk_STUWVNPH_exports, {
+var chunk_OD7BTUYY_exports = {};
+__export(chunk_OD7BTUYY_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   ClientServicesProviderResource: () => ClientServicesProviderResource,
@@ -56,7 +56,6 @@ __export(chunk_STUWVNPH_exports, {
   createDiagnostics: () => createDiagnostics,
   createLevel: () => createLevel,
   createStorageObjects: () => createStorageObjects,
-  findPropertiesObject: () => findPropertiesObject,
   getNetworkPeers: () => getNetworkPeers,
   isLocked: () => isLocked,
   subscribeToFeedBlocks: () => subscribeToFeedBlocks,
@@ -67,7 +66,7 @@ __export(chunk_STUWVNPH_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_STUWVNPH_exports);
+module.exports = __toCommonJS(chunk_OD7BTUYY_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -127,186 +126,201 @@ var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip"
 var import_timeframe2 = require("@dxos/timeframe");
 var import_tracing4 = require("@dxos/tracing");
 var import_util3 = require("@dxos/util");
+var import_async8 = require("@dxos/async");
 var import_codec_protobuf9 = require("@dxos/codec-protobuf");
 var import_context4 = require("@dxos/context");
 var import_credentials8 = require("@dxos/credentials");
 var import_debug2 = require("@dxos/debug");
 var import_invariant4 = require("@dxos/invariant");
+var import_log5 = require("@dxos/log");
 var import_services4 = require("@dxos/protocols/proto/dxos/client/services");
+var import_util4 = require("@dxos/util");
 var import_invariant5 = require("@dxos/invariant");
 var import_protocols4 = require("@dxos/protocols");
 var import_services5 = require("@dxos/protocols/proto/dxos/client/services");
-var import_async8 = require("@dxos/async");
+var import_async9 = require("@dxos/async");
 var import_client_protocol2 = require("@dxos/client-protocol");
 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_log5 = require("@dxos/log");
+var import_log6 = require("@dxos/log");
 var import_network_manager = require("@dxos/network-manager");
 var import_protocols5 = require("@dxos/protocols");
 var import_services6 = 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");
-var import_util4 = require("@dxos/util");
-var import_async9 = require("@dxos/async");
+var import_util5 = require("@dxos/util");
+var import_async10 = require("@dxos/async");
 var import_context6 = require("@dxos/context");
 var import_invariant7 = require("@dxos/invariant");
-var import_log6 = require("@dxos/log");
+var import_log7 = require("@dxos/log");
 var import_protocols6 = require("@dxos/protocols");
 var import_invitations3 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_teleport = require("@dxos/teleport");
 var import_context7 = require("@dxos/context");
 var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
-var import_async10 = require("@dxos/async");
+var import_async11 = require("@dxos/async");
 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_log7 = require("@dxos/log");
+var import_log8 = require("@dxos/log");
 var import_protocols7 = require("@dxos/protocols");
 var import_services8 = 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_log8 = require("@dxos/log");
+var import_log9 = require("@dxos/log");
 var import_invitations5 = require("@dxos/protocols/proto/dxos/halo/invitations");
-var import_util5 = require("@dxos/util");
+var import_util6 = require("@dxos/util");
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
 var import_services9 = 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_log9 = require("@dxos/log");
+var import_log10 = require("@dxos/log");
 var import_protocols8 = require("@dxos/protocols");
 var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
-var import_async11 = require("@dxos/async");
+var import_async12 = require("@dxos/async");
 var import_client_protocol3 = require("@dxos/client-protocol");
 var import_context9 = require("@dxos/context");
 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_log10 = require("@dxos/log");
+var import_log11 = require("@dxos/log");
 var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials12 = require("@dxos/protocols/proto/dxos/halo/credentials");
-var import_async12 = require("@dxos/async");
+var import_async13 = require("@dxos/async");
 var import_client_protocol4 = require("@dxos/client-protocol");
 var import_context10 = require("@dxos/context");
 var import_debug3 = require("@dxos/debug");
 var import_echo_pipeline2 = require("@dxos/echo-pipeline");
-var import_echo_schema = require("@dxos/echo-schema");
+var import_echo_protocol = require("@dxos/echo-protocol");
 var import_invariant12 = require("@dxos/invariant");
 var import_keys10 = require("@dxos/keys");
-var import_log11 = require("@dxos/log");
+var import_log12 = require("@dxos/log");
 var import_protocols9 = require("@dxos/protocols");
 var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials13 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe3 = require("@dxos/timeframe");
 var import_tracing5 = require("@dxos/tracing");
-var import_util6 = require("@dxos/util");
-var import_async13 = require("@dxos/async");
-var import_credentials14 = require("@dxos/credentials");
+var import_util7 = require("@dxos/util");
 var import_async14 = require("@dxos/async");
 var import_context11 = require("@dxos/context");
+var import_credentials14 = require("@dxos/credentials");
+var import_async15 = require("@dxos/async");
+var import_automerge = require("@dxos/automerge/automerge");
+var import_context12 = require("@dxos/context");
+var import_echo_db = require("@dxos/echo-db");
+var import_echo_pipeline3 = require("@dxos/echo-pipeline");
+var import_echo_schema = require("@dxos/echo-schema");
 var import_invariant13 = require("@dxos/invariant");
+var import_log13 = require("@dxos/log");
+var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
+var import_util8 = require("@dxos/util");
+var import_async16 = require("@dxos/async");
+var import_context13 = require("@dxos/context");
+var import_invariant14 = require("@dxos/invariant");
 var import_keys11 = require("@dxos/keys");
-var import_log12 = require("@dxos/log");
+var import_log14 = require("@dxos/log");
 var import_protocols10 = require("@dxos/protocols");
 var import_teleport3 = require("@dxos/teleport");
-var import_util7 = require("@dxos/util");
-var import_async15 = require("@dxos/async");
+var import_util9 = require("@dxos/util");
+var import_async17 = require("@dxos/async");
 var import_client_protocol5 = require("@dxos/client-protocol");
-var import_context12 = require("@dxos/context");
+var import_context14 = require("@dxos/context");
 var import_credentials15 = require("@dxos/credentials");
-var import_echo_pipeline3 = require("@dxos/echo-pipeline");
-var import_echo_protocol = require("@dxos/echo-protocol");
+var import_echo_db2 = require("@dxos/echo-db");
+var import_echo_pipeline4 = require("@dxos/echo-pipeline");
+var import_echo_protocol2 = require("@dxos/echo-protocol");
 var import_echo_schema2 = require("@dxos/echo-schema");
-var import_invariant14 = require("@dxos/invariant");
+var import_invariant15 = require("@dxos/invariant");
 var import_keys12 = require("@dxos/keys");
-var import_log13 = require("@dxos/log");
+var import_log15 = require("@dxos/log");
 var import_protocols11 = require("@dxos/protocols");
-var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services14 = 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");
 var import_tracing6 = require("@dxos/tracing");
-var import_util8 = require("@dxos/util");
+var import_util10 = require("@dxos/util");
 var import_credentials17 = require("@dxos/credentials");
 var import_debug4 = require("@dxos/debug");
 var import_credentials18 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe4 = require("@dxos/timeframe");
-var import_async16 = require("@dxos/async");
+var import_async18 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_credentials19 = require("@dxos/credentials");
 var import_debug5 = require("@dxos/debug");
 var import_feed_store4 = require("@dxos/feed-store");
-var import_invariant15 = require("@dxos/invariant");
-var import_log14 = require("@dxos/log");
+var import_invariant16 = require("@dxos/invariant");
+var import_log16 = require("@dxos/log");
 var import_protocols12 = require("@dxos/protocols");
-var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing7 = require("@dxos/tracing");
-var import_async17 = require("@dxos/async");
-var import_context13 = require("@dxos/context");
+var import_async19 = require("@dxos/async");
+var import_context15 = require("@dxos/context");
 var import_credentials20 = require("@dxos/credentials");
 var import_debug6 = require("@dxos/debug");
-var import_echo_db = require("@dxos/echo-db");
-var import_echo_pipeline4 = require("@dxos/echo-pipeline");
+var import_echo_db3 = require("@dxos/echo-db");
+var import_echo_pipeline5 = require("@dxos/echo-pipeline");
 var import_feed_store5 = require("@dxos/feed-store");
-var import_invariant16 = require("@dxos/invariant");
+var import_invariant17 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
 var import_keys13 = require("@dxos/keys");
-var import_log15 = require("@dxos/log");
+var import_log17 = require("@dxos/log");
 var import_protocols13 = require("@dxos/protocols");
-var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_tracing8 = require("@dxos/tracing");
-var import_util9 = require("@dxos/util");
-var import_invariant17 = require("@dxos/invariant");
+var import_util11 = require("@dxos/util");
+var import_invariant18 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
-var import_log16 = require("@dxos/log");
+var import_log18 = require("@dxos/log");
 var import_protocols14 = require("@dxos/protocols");
 var import_config = require("@dxos/protocols/proto/dxos/config");
 var import_random_access_storage = require("@dxos/random-access-storage");
 var import_client_protocol6 = require("@dxos/client-protocol");
 var import_config2 = require("@dxos/protocols/proto/dxos/config");
-var import_util10 = require("@dxos/util");
+var import_util12 = require("@dxos/util");
 var import_node_path = __toESM(require("node:path"));
 var import_keys14 = require("@dxos/keys");
 var import_kv_store = require("@dxos/kv-store");
-var import_async18 = require("@dxos/async");
+var import_async20 = require("@dxos/async");
 var import_client_protocol7 = require("@dxos/client-protocol");
-var import_context14 = require("@dxos/context");
-var import_invariant18 = require("@dxos/invariant");
+var import_context16 = require("@dxos/context");
+var import_invariant19 = require("@dxos/invariant");
 var import_keys15 = require("@dxos/keys");
-var import_log17 = require("@dxos/log");
+var import_log19 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager2 = require("@dxos/network-manager");
 var import_protocols15 = require("@dxos/protocols");
-var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services17 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing9 = require("@dxos/tracing");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
-var import_async19 = require("@dxos/async");
+var import_async21 = require("@dxos/async");
 var import_codec_protobuf12 = require("@dxos/codec-protobuf");
-var import_invariant19 = require("@dxos/invariant");
-var import_services17 = require("@dxos/protocols/proto/dxos/client/services");
-var import_config3 = require("@dxos/config");
+var import_invariant20 = require("@dxos/invariant");
 var import_services18 = require("@dxos/protocols/proto/dxos/client/services");
+var import_config3 = require("@dxos/config");
+var import_services19 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing10 = require("@dxos/tracing");
-var import_util11 = require("@dxos/util");
+var import_util13 = require("@dxos/util");
 var import_keys16 = require("@dxos/keys");
-var import_util12 = require("@dxos/util");
-var import_async20 = require("@dxos/async");
+var import_util14 = require("@dxos/util");
+var import_async22 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
 var import_keys17 = require("@dxos/keys");
-var import_log18 = require("@dxos/log");
-var import_services19 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util13 = require("@dxos/util");
+var import_log20 = require("@dxos/log");
+var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
+var import_util15 = require("@dxos/util");
 var import_codec_protobuf14 = require("@dxos/codec-protobuf");
 var import_codec_protobuf15 = require("@dxos/codec-protobuf");
-var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util14 = require("@dxos/util");
+var import_services21 = require("@dxos/protocols/proto/dxos/client/services");
+var import_util16 = require("@dxos/util");
 var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
   return new import_codec_protobuf.Stream(({ next }) => {
     const subscriptions = new import_async.EventSubscriptions();
@@ -617,7 +631,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.5.9-main.bfee100";
+var DXOS_VERSION = "0.5.9-main.d63ef8d";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -1646,6 +1660,7 @@ IdentityManager = _ts_decorate3([
   import_tracing4.trace.resource()
 ], IdentityManager);
 var __dxlog_file6 = "/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) {
     super();
@@ -1675,7 +1690,7 @@ var IdentityServiceImpl = class extends import_context4.Resource {
     const identity = this._identityManager.identity;
     (0, import_invariant4.invariant)(identity, void 0, {
       F: __dxlog_file6,
-      L: 54,
+      L: 59,
       S: this,
       A: [
         "identity",
@@ -1709,7 +1724,7 @@ var IdentityServiceImpl = class extends import_context4.Resource {
   async updateProfile(profile) {
     (0, import_invariant4.invariant)(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file6,
-      L: 84,
+      L: 89,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -1723,7 +1738,7 @@ var IdentityServiceImpl = class extends import_context4.Resource {
   async signPresentation({ presentation, nonce }) {
     (0, import_invariant4.invariant)(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file6,
-      L: 91,
+      L: 96,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -1739,20 +1754,43 @@ var IdentityServiceImpl = class extends import_context4.Resource {
     });
   }
   async _fixIdentityWithoutDefaultSpace(identity) {
-    let hasDefaultSpace = false;
+    let recodedDefaultSpace = false;
+    let foundDefaultSpace = false;
     const dataSpaceManager = this._dataSpaceManagerProvider();
-    for (const space of dataSpaceManager.spaces.values()) {
+    const recordedDefaultSpaceTrigger = new import_async8.Trigger();
+    const allProcessed = (0, import_util4.safeAwaitAll)(dataSpaceManager.spaces.values(), async (space) => {
       if (space.state === import_services4.SpaceState.CLOSED) {
         await space.open();
-        await space.initializeDataPipeline();
+        const requiresMigration = space.stateUpdate.waitForCondition(() => space.state === import_services4.SpaceState.REQUIRES_MIGRATION);
+        await Promise.race([
+          space.initializeDataPipeline(),
+          requiresMigration
+        ]);
       }
       if (await dataSpaceManager.isDefaultSpace(space)) {
+        if (foundDefaultSpace) {
+          import_log5.log.warn("Multiple default spaces found. Using the first one.", {
+            duplicate: space.id
+          }, {
+            F: __dxlog_file6,
+            L: 127,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          return;
+        }
+        foundDefaultSpace = true;
         await identity.updateDefaultSpace(space.id);
-        hasDefaultSpace = true;
-        break;
+        recodedDefaultSpace = true;
+        recordedDefaultSpaceTrigger.wake();
       }
-    }
-    if (!hasDefaultSpace) {
+    });
+    await Promise.race([
+      allProcessed,
+      recordedDefaultSpaceTrigger.wait(),
+      (0, import_async8.sleep)(DEFAULT_SPACE_SEARCH_TIMEOUT)
+    ]);
+    if (!recodedDefaultSpace) {
       await this._createDefaultSpace(dataSpaceManager);
     }
   }
@@ -1893,7 +1931,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
     this._ctx = new import_context6.Context();
-    this._remoteOptionsTrigger = new import_async9.Trigger();
+    this._remoteOptionsTrigger = new import_async10.Trigger();
     this._invitationFlowLock = null;
   }
   hasFlowLock() {
@@ -1930,14 +1968,14 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      (0, import_log6.log)("guest acquire lock", void 0, {
+      (0, import_log7.log)("guest acquire lock", void 0, {
         F: __dxlog_file8,
         L: 84,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      (0, import_log6.log)("guest lock acquired", void 0, {
+      (0, import_log7.log)("guest lock acquired", void 0, {
         F: __dxlog_file8,
         L: 86,
         S: this,
@@ -1946,7 +1984,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
       await (0, import_context6.cancelWithContext)(this._ctx, this.rpc.InvitationHostService.options({
         role: import_invitations3.Options.Role.GUEST
       }));
-      (0, import_log6.log)("options sent", void 0, {
+      (0, import_log7.log)("options sent", void 0, {
         F: __dxlog_file8,
         L: 88,
         S: this,
@@ -1955,7 +1993,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
       await (0, import_context6.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT
       }));
-      (0, import_log6.log)("options received", void 0, {
+      (0, import_log7.log)("options received", void 0, {
         F: __dxlog_file8,
         L: 90,
         S: this,
@@ -1989,7 +2027,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock.release();
       this._invitationFlowLock = null;
-      (0, import_log6.log)("invitation flow lock released", void 0, {
+      (0, import_log7.log)("invitation flow lock released", void 0, {
         F: __dxlog_file8,
         L: 123,
         S: this,
@@ -2014,12 +2052,12 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
     this._ctx = new import_context8.Context();
-    this._remoteOptionsTrigger = new import_async10.Trigger();
+    this._remoteOptionsTrigger = new import_async11.Trigger();
     this._challenge = void 0;
     this.guestProfile = void 0;
     this.authenticationPassed = false;
     this.authenticationRetry = 0;
-    this.completedTrigger = new import_async10.Trigger();
+    this.completedTrigger = new import_async11.Trigger();
     this._invitationFlowLock = null;
   }
   hasFlowLock() {
@@ -2046,7 +2084,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
         introduce: async (request) => {
           const { profile, invitationId } = request;
           const traceId = import_keys7.PublicKey.random().toHex();
-          import_log7.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols7.trace.begin({
+          import_log8.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols7.trace.begin({
             id: traceId
           }), {
             F: __dxlog_file9,
@@ -2057,7 +2095,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
           const invitation = this._requireActiveInvitation();
           this._assertInvitationState(import_services8.Invitation.State.CONNECTED);
           if (invitationId !== invitation?.invitationId) {
-            import_log7.log.warn("incorrect invitationId", {
+            import_log8.log.warn("incorrect invitationId", {
               expected: invitation.invitationId,
               actual: invitationId
             }, {
@@ -2067,12 +2105,12 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
               C: (f, a) => f(...a)
             });
             this._callbacks.onError(new Error("Incorrect invitationId."));
-            (0, import_async10.scheduleTask)(this._ctx, () => this.close());
+            (0, import_async11.scheduleTask)(this._ctx, () => this.close());
             return {
               authMethod: import_services8.Invitation.AuthMethod.NONE
             };
           }
-          (0, import_log7.log)("guest introduced themselves", {
+          (0, import_log8.log)("guest introduced themselves", {
             guestProfile: profile
           }, {
             F: __dxlog_file9,
@@ -2083,7 +2121,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
           this.guestProfile = profile;
           this._callbacks.onStateUpdate(import_services8.Invitation.State.READY_FOR_AUTHENTICATION);
           this._challenge = invitation.authMethod === import_services8.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? (0, import_crypto2.randomBytes)(32) : void 0;
-          import_log7.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols7.trace.end({
+          import_log8.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols7.trace.end({
             id: traceId
           }), {
             F: __dxlog_file9,
@@ -2098,7 +2136,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
         },
         authenticate: async ({ authCode: code, signedChallenge }) => {
           const traceId = import_keys7.PublicKey.random().toHex();
-          import_log7.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols7.trace.begin({
+          import_log8.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols7.trace.begin({
             id: traceId
           }), {
             F: __dxlog_file9,
@@ -2107,7 +2145,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
-          (0, import_log7.log)("received authentication request", {
+          (0, import_log8.log)("received authentication request", {
             authCode: code
           }, {
             F: __dxlog_file9,
@@ -2123,7 +2161,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
           this._callbacks.onStateUpdate(import_services8.Invitation.State.AUTHENTICATING);
           switch (invitation.authMethod) {
             case import_services8.Invitation.AuthMethod.NONE: {
-              (0, import_log7.log)("authentication not required", void 0, {
+              (0, import_log8.log)("authentication not required", void 0, {
                 F: __dxlog_file9,
                 L: 152,
                 S: this,
@@ -2159,7 +2197,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
               break;
             }
             default: {
-              import_log7.log.error("invalid authentication method", {
+              import_log8.log.error("invalid authentication method", {
                 authMethod: invitation.authMethod
               }, {
                 F: __dxlog_file9,
@@ -2176,12 +2214,12 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
             import_invitations4.AuthenticationResponse.Status.INVALID_OTP
           ].includes(status)) {
             this._callbacks.onError(new Error(`Authentication failed, with status=${status}`));
-            (0, import_async10.scheduleTask)(this._ctx, () => this.close());
+            (0, import_async11.scheduleTask)(this._ctx, () => this.close());
             return {
               status
             };
           }
-          import_log7.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols7.trace.end({
+          import_log8.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols7.trace.end({
             id: traceId,
             data: {
               status
@@ -2198,7 +2236,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
         },
         admit: async (request) => {
           const traceId = import_keys7.PublicKey.random().toHex();
-          import_log7.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols7.trace.begin({
+          import_log8.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols7.trace.begin({
             id: traceId
           }), {
             F: __dxlog_file9,
@@ -2215,7 +2253,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
               }
             }
             const response = await this._callbacks.admit(request);
-            import_log7.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols7.trace.end({
+            import_log8.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols7.trace.end({
               id: traceId
             }), {
               F: __dxlog_file9,
@@ -2235,14 +2273,14 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      (0, import_log7.log)("host acquire lock", void 0, {
+      (0, import_log8.log)("host acquire lock", void 0, {
         F: __dxlog_file9,
         L: 237,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      (0, import_log7.log)("host lock acquired", void 0, {
+      (0, import_log8.log)("host lock acquired", void 0, {
         F: __dxlog_file9,
         L: 239,
         S: this,
@@ -2253,7 +2291,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
       await this.rpc.InvitationHostService.options({
         role: import_invitations4.Options.Role.HOST
       });
-      (0, import_log7.log)("options sent", void 0, {
+      (0, import_log8.log)("options sent", void 0, {
         F: __dxlog_file9,
         L: 243,
         S: this,
@@ -2262,7 +2300,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
       await (0, import_context8.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT2
       }));
-      (0, import_log7.log)("options received", void 0, {
+      (0, import_log8.log)("options received", void 0, {
         F: __dxlog_file9,
         L: 245,
         S: this,
@@ -2290,7 +2328,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
   _requireActiveInvitation() {
     const invitation = this._callbacks.activeInvitation;
     if (invitation == null) {
-      (0, import_async10.scheduleTask)(this._ctx, () => this.close());
+      (0, import_async11.scheduleTask)(this._ctx, () => this.close());
       throw new Error("Active invitation not found");
     }
     return invitation;
@@ -2301,7 +2339,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
       stateOrMany
     ];
     if (!validStates.includes(invitation.state)) {
-      (0, import_async10.scheduleTask)(this._ctx, () => this.close());
+      (0, import_async11.scheduleTask)(this._ctx, () => this.close());
       throw new import_invariant8.InvariantViolation(`Expected ${stateToString(invitation.state)} to be one of [${validStates.map(stateToString).join(", ")}]`);
     }
   }
@@ -2316,7 +2354,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock?.release();
       this._invitationFlowLock = null;
-      (0, import_log7.log)("invitation flow lock released", void 0, {
+      (0, import_log8.log)("invitation flow lock released", void 0, {
         F: __dxlog_file9,
         L: 300,
         S: this,
@@ -2330,7 +2368,7 @@ var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var InvitationTopology = class {
   constructor(_role) {
     this._role = _role;
-    this._seenPeers = new import_util5.ComplexSet(import_keys8.PublicKey.hash);
+    this._seenPeers = new import_util6.ComplexSet(import_keys8.PublicKey.hash);
   }
   init(controller) {
     (0, import_invariant9.invariant)(!this._controller, "Already initialized.", {
@@ -2363,9 +2401,9 @@ var InvitationTopology = class {
       return;
     }
     const firstUnknownPeer = candidates.find((peerId) => !this._seenPeers.has(peerId));
-    this._seenPeers = new import_util5.ComplexSet(import_keys8.PublicKey.hash, allPeers.filter((peerId) => this._seenPeers.has(peerId)));
+    this._seenPeers = new import_util6.ComplexSet(import_keys8.PublicKey.hash, allPeers.filter((peerId) => this._seenPeers.has(peerId)));
     if (firstUnknownPeer != null) {
-      (0, import_log8.log)("invitation connect", {
+      (0, import_log9.log)("invitation connect", {
         ownPeerId,
         remotePeerId: firstUnknownPeer
       }, {
@@ -2445,10 +2483,10 @@ var InvitationsHandler = class {
               guardedState.error(extension, new import_context5.ContextDisposedError());
             }
           });
-          (0, import_async8.scheduleTask)(connectionCtx, async () => {
+          (0, import_async9.scheduleTask)(connectionCtx, async () => {
             const traceId = import_keys6.PublicKey.random().toHex();
             try {
-              import_log5.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.begin({
+              import_log6.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.begin({
                 id: traceId
               }), {
                 F: __dxlog_file11,
@@ -2456,7 +2494,7 @@ var InvitationsHandler = class {
                 S: this,
                 C: (f, a) => f(...a)
               });
-              (0, import_log5.log)("connected", {
+              (0, import_log6.log)("connected", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file11,
@@ -2467,7 +2505,7 @@ var InvitationsHandler = class {
               const deviceKey = await extension.completedTrigger.wait({
                 timeout: invitation.timeout
               });
-              (0, import_log5.log)("admitted guest", {
+              (0, import_log6.log)("admitted guest", {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
@@ -2477,7 +2515,7 @@ var InvitationsHandler = class {
                 C: (f, a) => f(...a)
               });
               guardedState.set(extension, import_services6.Invitation.State.SUCCESS);
-              import_log5.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.end({
+              import_log6.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.end({
                 id: traceId
               }), {
                 F: __dxlog_file11,
@@ -2490,9 +2528,9 @@ var InvitationsHandler = class {
                 await ctx.dispose();
               }
             } catch (err) {
-              if (err instanceof import_async8.TimeoutError) {
+              if (err instanceof import_async9.TimeoutError) {
                 if (guardedState.set(extension, import_services6.Invitation.State.TIMEOUT)) {
-                  (0, import_log5.log)("timeout", {
+                  (0, import_log6.log)("timeout", {
                     ...protocol.toJSON()
                   }, {
                     F: __dxlog_file11,
@@ -2503,7 +2541,7 @@ var InvitationsHandler = class {
                 }
               } else {
                 if (guardedState.error(extension, err)) {
-                  import_log5.log.error("failed", err, {
+                  import_log6.log.error("failed", err, {
                     F: __dxlog_file11,
                     L: 133,
                     S: this,
@@ -2511,7 +2549,7 @@ var InvitationsHandler = class {
                   });
                 }
               }
-              import_log5.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.error({
+              import_log6.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols5.trace.error({
                 id: traceId,
                 error: err
               }), {
@@ -2526,7 +2564,7 @@ var InvitationsHandler = class {
         },
         onError: (err) => {
           if (err instanceof import_protocols5.InvalidInvitationExtensionRoleError) {
-            (0, import_log5.log)("invalid role", {
+            (0, import_log6.log)("invalid role", {
               ...err.context
             }, {
               F: __dxlog_file11,
@@ -2536,9 +2574,9 @@ var InvitationsHandler = class {
             });
             return;
           }
-          if (err instanceof import_async8.TimeoutError) {
+          if (err instanceof import_async9.TimeoutError) {
             if (guardedState.set(extension, import_services6.Invitation.State.TIMEOUT)) {
-              (0, import_log5.log)("timeout", {
+              (0, import_log6.log)("timeout", {
                 err
               }, {
                 F: __dxlog_file11,
@@ -2549,7 +2587,7 @@ var InvitationsHandler = class {
             }
           } else {
             if (guardedState.error(extension, err)) {
-              import_log5.log.error("failed", err, {
+              import_log6.log.error("failed", err, {
                 F: __dxlog_file11,
                 L: 153,
                 S: this,
@@ -2563,14 +2601,14 @@ var InvitationsHandler = class {
     };
     if (invitation.lifetime && invitation.created) {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
-        import_log5.log.warn("invitation has already expired", void 0, {
+        import_log6.log.warn("invitation has already expired", void 0, {
           F: __dxlog_file11,
           L: 164,
           S: this,
           C: (f, a) => f(...a)
         });
       } else {
-        (0, import_async8.scheduleTask)(ctx, async () => {
+        (0, import_async9.scheduleTask)(ctx, async () => {
           await swarmConnection.close();
           guardedState.set(null, import_services6.Invitation.State.EXPIRED);
           await ctx.dispose();
@@ -2578,7 +2616,7 @@ var InvitationsHandler = class {
       }
     }
     let swarmConnection;
-    (0, import_async8.scheduleTask)(ctx, async () => {
+    (0, import_async9.scheduleTask)(ctx, async () => {
       swarmConnection = await this._joinSwarm(ctx, invitation, import_invitations2.Options.Role.HOST, createExtension);
       guardedState.set(null, import_services6.Invitation.State.CONNECTING);
     });
@@ -2596,11 +2634,11 @@ var InvitationsHandler = class {
         ]
       });
     }
-    const triedPeersIds = new import_util4.ComplexSet(import_keys6.PublicKey.hash);
+    const triedPeersIds = new import_util5.ComplexSet(import_keys6.PublicKey.hash);
     const guardedState = this._createGuardedState(ctx, invitation, stream);
     const shouldCancelInvitationFlow = (extension) => {
       const isLockedByAnotherConnection = guardedState.mutex.isLocked() && !extension.hasFlowLock();
-      (0, import_log5.log)("should cancel invitation flow", {
+      (0, import_log6.log)("should cancel invitation flow", {
         isLockedByAnotherConnection,
         invitationType: import_services6.Invitation.Type.DELEGATED,
         triedPeers: triedPeersIds.size
@@ -2628,7 +2666,7 @@ var InvitationsHandler = class {
             return;
           }
           connectionCtx.onDispose(async () => {
-            (0, import_log5.log)("extension disposed", {
+            (0, import_log6.log)("extension disposed", {
               admitted,
               currentState: guardedState.current.state
             }, {
@@ -2644,10 +2682,10 @@ var InvitationsHandler = class {
               }
             }
           });
-          (0, import_async8.scheduleTask)(connectionCtx, async () => {
+          (0, import_async9.scheduleTask)(connectionCtx, async () => {
             const traceId = import_keys6.PublicKey.random().toHex();
             try {
-              import_log5.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols5.trace.begin({
+              import_log6.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols5.trace.begin({
                 id: traceId
               }), {
                 F: __dxlog_file11,
@@ -2655,11 +2693,11 @@ var InvitationsHandler = class {
                 S: this,
                 C: (f, a) => f(...a)
               });
-              (0, import_async8.scheduleTask)(connectionCtx, () => {
+              (0, import_async9.scheduleTask)(connectionCtx, () => {
                 guardedState.set(extension, import_services6.Invitation.State.TIMEOUT);
                 extensionCtx.close();
               }, timeout);
-              (0, import_log5.log)("connected", {
+              (0, import_log6.log)("connected", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file11,
@@ -2668,7 +2706,7 @@ var InvitationsHandler = class {
                 C: (f, a) => f(...a)
               });
               guardedState.set(extension, import_services6.Invitation.State.CONNECTED);
-              (0, import_log5.log)("introduce", {
+              (0, import_log6.log)("introduce", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file11,
@@ -2680,7 +2718,7 @@ var InvitationsHandler = class {
                 invitationId: invitation.invitationId,
                 ...protocol.createIntroduction()
               });
-              (0, import_log5.log)("introduce response", {
+              (0, import_log6.log)("introduce response", {
                 ...protocol.toJSON(),
                 response: introductionResponse
               }, {
@@ -2702,7 +2740,7 @@ var InvitationsHandler = class {
                     break;
                 }
               }
-              (0, import_log5.log)("request admission", {
+              (0, import_log6.log)("request admission", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file11,
@@ -2714,7 +2752,7 @@ var InvitationsHandler = class {
               const admissionResponse = await extension.rpc.InvitationHostService.admit(admissionRequest);
               admitted = true;
               const result = await protocol.accept(admissionResponse, admissionRequest);
-              (0, import_log5.log)("admitted by host", {
+              (0, import_log6.log)("admitted by host", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file11,
@@ -2727,7 +2765,7 @@ var InvitationsHandler = class {
                 ...result,
                 state: import_services6.Invitation.State.SUCCESS
               });
-              import_log5.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols5.trace.end({
+              import_log6.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols5.trace.end({
                 id: traceId
               }), {
                 F: __dxlog_file11,
@@ -2736,8 +2774,8 @@ var InvitationsHandler = class {
                 C: (f, a) => f(...a)
               });
             } catch (err) {
-              if (err instanceof import_async8.TimeoutError) {
-                (0, import_log5.log)("timeout", {
+              if (err instanceof import_async9.TimeoutError) {
+                (0, import_log6.log)("timeout", {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file11,
@@ -2747,7 +2785,7 @@ var InvitationsHandler = class {
                 });
                 guardedState.set(extension, import_services6.Invitation.State.TIMEOUT);
               } else {
-                (0, import_log5.log)("auth failed", err, {
+                (0, import_log6.log)("auth failed", err, {
                   F: __dxlog_file11,
                   L: 314,
                   S: this,
@@ -2756,7 +2794,7 @@ var InvitationsHandler = class {
                 guardedState.error(extension, err);
               }
               extensionCtx.close(err);
-              import_log5.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols5.trace.error({
+              import_log6.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols5.trace.error({
                 id: traceId,
                 error: err
               }), {
@@ -2772,8 +2810,8 @@ var InvitationsHandler = class {
           if (err instanceof import_protocols5.InvalidInvitationExtensionRoleError) {
             return;
           }
-          if (err instanceof import_async8.TimeoutError) {
-            (0, import_log5.log)("timeout", {
+          if (err instanceof import_async9.TimeoutError) {
+            (0, import_log6.log)("timeout", {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file11,
@@ -2783,7 +2821,7 @@ var InvitationsHandler = class {
             });
             guardedState.set(extension, import_services6.Invitation.State.TIMEOUT);
           } else {
-            (0, import_log5.log)("auth failed", err, {
+            (0, import_log6.log)("auth failed", err, {
               F: __dxlog_file11,
               L: 330,
               S: this,
@@ -2795,7 +2833,7 @@ var InvitationsHandler = class {
       });
       return extension;
     };
-    (0, import_async8.scheduleTask)(ctx, async () => {
+    (0, import_async9.scheduleTask)(ctx, async () => {
       const error = protocol.checkInvitation(invitation);
       if (error) {
         stream.error(error);
@@ -2841,7 +2879,7 @@ var InvitationsHandler = class {
   * invitation flow connections.
   */
   _createGuardedState(ctx, invitation, stream) {
-    const mutex = new import_async8.Mutex();
+    const mutex = new import_async9.Mutex();
     let lastActiveExtension = null;
     let currentInvitation = {
       ...invitation
@@ -2896,7 +2934,7 @@ var InvitationsHandler = class {
     };
   }
   _logStateUpdate(invitation, actor, newState) {
-    (0, import_log5.log)("invitation state update", {
+    (0, import_log6.log)("invitation state update", {
       actor: actor?.constructor.name,
       newState: stateToString(newState),
       oldState: stateToString(invitation.state)
@@ -2918,7 +2956,7 @@ var InvitationsHandler = class {
   }
   async _handleGuestOtpAuth(extension, setState, authenticated, options) {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
-      (0, import_log5.log)("guest waiting for authentication code...", void 0, {
+      (0, import_log6.log)("guest waiting for authentication code...", void 0, {
         F: __dxlog_file11,
         L: 462,
         S: this,
@@ -2926,7 +2964,7 @@ var InvitationsHandler = class {
       });
       setState(import_services6.Invitation.State.READY_FOR_AUTHENTICATION);
       const authCode = await authenticated.wait(options);
-      (0, import_log5.log)("sending authentication request", void 0, {
+      (0, import_log6.log)("sending authentication request", void 0, {
         F: __dxlog_file11,
         L: 466,
         S: this,
@@ -2943,7 +2981,7 @@ var InvitationsHandler = class {
         if (attempt === MAX_OTP_ATTEMPTS) {
           throw new Error(`Maximum retry attempts: ${MAX_OTP_ATTEMPTS}`);
         } else {
-          (0, import_log5.log)("retrying invalid code", {
+          (0, import_log6.log)("retrying invalid code", {
             attempt
           }, {
             F: __dxlog_file11,
@@ -2963,7 +3001,7 @@ var InvitationsHandler = class {
     if (introductionResponse.challenge == null) {
       throw new Error("challenge missing in the introduction");
     }
-    (0, import_log5.log)("sending authentication request", void 0, {
+    (0, import_log6.log)("sending authentication request", void 0, {
       F: __dxlog_file11,
       L: 496,
       S: this,
@@ -3145,7 +3183,7 @@ var SpaceInvitationProtocol = class {
     if (space.inner.spaceState.getMemberRole(identityKey) !== import_credentials10.SpaceMember.Role.REMOVED) {
       throw new import_protocols8.AlreadyJoinedError();
     }
-    (0, import_log9.log)("writing guest credentials", {
+    (0, import_log10.log)("writing guest credentials", {
       host: this._signingContext.deviceKey,
       guest: deviceKey
     }, {
@@ -3213,7 +3251,7 @@ var SpaceInvitationProtocol = class {
         ]
       });
     }
-    (0, import_log9.log)("writing delegate space invitation", {
+    (0, import_log10.log)("writing delegate space invitation", {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
@@ -3274,7 +3312,7 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    (0, import_log9.log)("cancelling delegated space invitation", {
+    (0, import_log10.log)("cancelling delegated space invitation", {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
@@ -3375,12 +3413,12 @@ var InvitationsManager = class {
     this._metadataStore = _metadataStore;
     this._createInvitations = /* @__PURE__ */ new Map();
     this._acceptInvitations = /* @__PURE__ */ new Map();
-    this.invitationCreated = new import_async11.Event();
-    this.invitationAccepted = new import_async11.Event();
-    this.removedCreated = new import_async11.Event();
-    this.removedAccepted = new import_async11.Event();
-    this.saved = new import_async11.Event();
-    this._persistentInvitationsLoadedEvent = new import_async11.Event();
+    this.invitationCreated = new import_async12.Event();
+    this.invitationAccepted = new import_async12.Event();
+    this.removedCreated = new import_async12.Event();
+    this.removedAccepted = new import_async12.Event();
+    this.saved = new import_async12.Event();
+    this._persistentInvitationsLoadedEvent = new import_async12.Event();
     this._persistentInvitationsLoaded = false;
   }
   async createInvitation(options) {
@@ -3409,7 +3447,7 @@ var InvitationsManager = class {
     try {
       await this._persistIfRequired(handler, stream, invitation);
     } catch (err) {
-      import_log10.log.catch(err, void 0, {
+      import_log11.log.catch(err, void 0, {
         F: __dxlog_file13,
         L: 82,
         S: this,
@@ -3451,7 +3489,7 @@ var InvitationsManager = class {
         invitations: cInvitations.map((invitation) => invitation.get())
       };
     } catch (err) {
-      import_log10.log.catch(err, void 0, {
+      import_log11.log.catch(err, void 0, {
         F: __dxlog_file13,
         L: 110,
         S: this,
@@ -3483,7 +3521,7 @@ var InvitationsManager = class {
     return invitation;
   }
   async authenticate({ invitationId, authCode }) {
-    (0, import_log10.log)("authenticating...", void 0, {
+    (0, import_log11.log)("authenticating...", void 0, {
       F: __dxlog_file13,
       L: 140,
       S: this,
@@ -3500,7 +3538,7 @@ var InvitationsManager = class {
     });
     const observable = this._acceptInvitations.get(invitationId);
     if (!observable) {
-      import_log10.log.warn("invalid invitation", {
+      import_log11.log.warn("invalid invitation", {
         invitationId
       }, {
         F: __dxlog_file13,
@@ -3513,7 +3551,7 @@ var InvitationsManager = class {
     }
   }
   async cancelInvitation({ invitationId }) {
-    (0, import_log10.log)("cancelInvitation...", {
+    (0, import_log11.log)("cancelInvitation...", {
       invitationId
     }, {
       F: __dxlog_file13,
@@ -3590,7 +3628,7 @@ var InvitationsManager = class {
     };
   }
   _createObservableInvitation(handler, invitation) {
-    const stream = new import_async11.PushStream();
+    const stream = new import_async12.PushStream();
     const ctx = new import_context9.Context({
       onError: (err) => {
         stream.error(err);
@@ -3598,7 +3636,7 @@ var InvitationsManager = class {
       }
     });
     ctx.onDispose(() => {
-      (0, import_log10.log)("complete", {
+      (0, import_log11.log)("complete", {
         ...handler.toJSON()
       }, {
         F: __dxlog_file13,
@@ -3626,12 +3664,12 @@ var InvitationsManager = class {
     };
   }
   _createObservableAcceptingInvitation(handler, initialState) {
-    const otpEnteredTrigger = new import_async11.Trigger();
-    const stream = new import_async11.PushStream();
+    const otpEnteredTrigger = new import_async12.Trigger();
+    const stream = new import_async12.PushStream();
     const ctx = new import_context9.Context({
       onError: (err) => {
-        if (err instanceof import_async11.TimeoutError) {
-          (0, import_log10.log)("timeout", {
+        if (err instanceof import_async12.TimeoutError) {
+          (0, import_log11.log)("timeout", {
             ...handler.toJSON()
           }, {
             F: __dxlog_file13,
@@ -3644,7 +3682,7 @@ var InvitationsManager = class {
             state: import_services11.Invitation.State.TIMEOUT
           });
         } else {
-          import_log10.log.warn("auth failed", err, {
+          import_log11.log.warn("auth failed", err, {
             F: __dxlog_file13,
             L: 264,
             S: this,
@@ -3659,7 +3697,7 @@ var InvitationsManager = class {
       }
     });
     ctx.onDispose(() => {
-      (0, import_log10.log)("complete", {
+      (0, import_log11.log)("complete", {
         ...handler.toJSON()
       }, {
         F: __dxlog_file13,
@@ -3706,7 +3744,7 @@ var InvitationsManager = class {
     try {
       await this._metadataStore.removeInvitation(invitation.invitationId);
     } catch (err) {
-      import_log10.log.catch(err, void 0, {
+      import_log11.log.catch(err, void 0, {
         F: __dxlog_file13,
         L: 307,
         S: this,
@@ -3720,12 +3758,18 @@ var InvitationsManager = class {
     }, callback);
   }
 };
-var AutomergeSpaceState = class {
+var AutomergeSpaceState = class extends import_context11.Resource {
   constructor(_onNewRoot) {
+    super();
     this._onNewRoot = _onNewRoot;
     this.rootUrl = void 0;
     this.lastEpoch = void 0;
-    this.onNewEpoch = new import_async13.Event();
+    this.onNewEpoch = new import_async14.Event();
+    this._isProcessingRootDocs = false;
+  }
+  async _open(ctx) {
+  }
+  async _close(ctx) {
     this._isProcessingRootDocs = false;
   }
   async processCredential(credential) {
@@ -3754,18 +3798,152 @@ var AutomergeSpaceState = class {
     await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
   }
 };
-var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
+var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts";
+var runEpochMigration = async (ctx, context) => {
+  switch (context.migration) {
+    case import_services13.CreateEpochRequest.Migration.INIT_AUTOMERGE: {
+      const document = context.repo.create();
+      await context.repo.flush();
+      return {
+        newRoot: document.url
+      };
+    }
+    case import_services13.CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY: {
+      if (!context.currentRoot) {
+        throw new Error("Space does not have an automerge root");
+      }
+      const rootHandle = context.repo.find(context.currentRoot);
+      await (0, import_context12.cancelWithContext)(ctx, (0, import_async15.asyncTimeout)(rootHandle.whenReady(), 1e4));
+      const newRoot = context.repo.create(rootHandle.docSync());
+      await context.repo.flush();
+      return {
+        newRoot: newRoot.url
+      };
+    }
+    case import_services13.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
+      import_log13.log.info("Fragmenting", void 0, {
+        F: __dxlog_file14,
+        L: 63,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      const currentRootUrl = context.currentRoot;
+      const rootHandle = context.repo.find(currentRootUrl);
+      await (0, import_context12.cancelWithContext)(ctx, (0, import_async15.asyncTimeout)(rootHandle.whenReady(), 1e4));
+      const objects = Object.entries(rootHandle.docSync().objects);
+      const properties = (0, import_echo_db.findInlineObjectOfType)(rootHandle.docSync(), import_echo_schema.TYPE_PROPERTIES);
+      const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
+      (0, import_invariant13.invariant)(properties, "Properties not found", {
+        F: __dxlog_file14,
+        L: 73,
+        S: void 0,
+        A: [
+          "properties",
+          "'Properties not found'"
+        ]
+      });
+      const newSpaceDoc = {
+        ...rootHandle.docSync(),
+        objects: Object.fromEntries([
+          properties
+        ])
+      };
+      const newRoot = context.repo.create(newSpaceDoc);
+      (0, import_invariant13.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
+        F: __dxlog_file14,
+        L: 78,
+        S: void 0,
+        A: [
+          "typeof newRoot.url === 'string' && newRoot.url.length > 0",
+          ""
+        ]
+      });
+      const docLoader = new import_echo_pipeline3.AutomergeDocumentLoaderImpl(context.spaceId, context.repo, context.spaceKey);
+      await docLoader.loadSpaceRootDocHandle(ctx, {
+        rootUrl: newRoot.url
+      });
+      otherObjects.forEach(([key, value]) => {
+        const handle = docLoader.createDocumentForObject(key);
+        handle.change((doc) => {
+          (0, import_util8.assignDeep)(doc, [
+            "objects",
+            key
+          ], value);
+        });
+      });
+      await context.repo.flush();
+      return {
+        newRoot: newRoot.url
+      };
+    }
+    case import_services13.CreateEpochRequest.Migration.MIGRATE_REFERENCES_TO_DXN: {
+      const currentRootUrl = context.currentRoot;
+      const rootHandle = context.repo.find(currentRootUrl);
+      await (0, import_context12.cancelWithContext)(ctx, (0, import_async15.asyncTimeout)(rootHandle.whenReady(), 1e4));
+      (0, import_invariant13.invariant)(rootHandle.docSync(), "Root doc not found", {
+        F: __dxlog_file14,
+        L: 100,
+        S: void 0,
+        A: [
+          "rootHandle.docSync()",
+          "'Root doc not found'"
+        ]
+      });
+      const newRootContent = await (0, import_echo_db.convertLegacySpaceRootDoc)(structuredClone(rootHandle.docSync()));
+      for (const [id, url] of Object.entries(newRootContent.links ?? {})) {
+        const handle = context.repo.find(url);
+        await (0, import_context12.cancelWithContext)(ctx, (0, import_async15.asyncTimeout)(handle.whenReady(), 1e4));
+        (0, import_invariant13.invariant)(handle.docSync(), "Doc not found", {
+          F: __dxlog_file14,
+          L: 107,
+          S: void 0,
+          A: [
+            "handle.docSync()",
+            "'Doc not found'"
+          ]
+        });
+        const newDoc = await (0, import_echo_db.convertLegacyReferences)(structuredClone(handle.docSync()));
+        const migratedDoc = (0, import_echo_db.migrateDocument)(handle.docSync(), newDoc);
+        const newHandle = context.repo.import(import_automerge.next.save(migratedDoc));
+        newRootContent.links[id] = newHandle.url;
+      }
+      const migratedRoot = (0, import_echo_db.migrateDocument)(rootHandle.docSync(), newRootContent);
+      const newRoot = context.repo.import(import_automerge.next.save(migratedRoot));
+      await context.repo.flush();
+      return {
+        newRoot: newRoot.url
+      };
+    }
+    case import_services13.CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
+      (0, import_invariant13.invariant)(context.newAutomergeRoot, void 0, {
+        F: __dxlog_file14,
+        L: 124,
+        S: void 0,
+        A: [
+          "context.newAutomergeRoot",
+          ""
+        ]
+      });
+      await context.repo.flush();
+      return {
+        newRoot: context.newAutomergeRoot
+      };
+    }
+  }
+  return {};
+};
+var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
 var DEFAULT_RETRY_TIMEOUT = 1e3;
 var DEFAULT_SUCCESS_DELAY = 1e3;
 var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
 var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var NotarizationPlugin = class {
   constructor() {
-    this._ctx = new import_context11.Context();
-    this._extensionOpened = new import_async14.Event();
+    this._ctx = new import_context13.Context();
+    this._extensionOpened = new import_async16.Event();
     this._extensions = /* @__PURE__ */ new Set();
-    this._processedCredentials = new import_util7.ComplexSet(import_keys11.PublicKey.hash);
-    this._processCredentialsTriggers = new import_util7.ComplexMap(import_keys11.PublicKey.hash);
+    this._processedCredentials = new import_util9.ComplexSet(import_keys11.PublicKey.hash);
+    this._processCredentialsTriggers = new import_util9.ComplexMap(import_keys11.PublicKey.hash);
   }
   get hasWriter() {
     return !!this._writer;
@@ -3779,16 +3957,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_log12.log)("notarize", {
+    (0, import_log14.log)("notarize", {
       credentials
     }, {
-      F: __dxlog_file14,
+      F: __dxlog_file15,
       L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant13.invariant)(credentials.every((credential) => credential.id), "Credentials must have an id", {
-      F: __dxlog_file14,
+    (0, import_invariant14.invariant)(credentials.every((credential) => credential.id), "Credentials must have an id", {
+      F: __dxlog_file15,
       L: 91,
       S: this,
       A: [
@@ -3796,13 +3974,13 @@ var NotarizationPlugin = class {
         "'Credentials must have an id'"
       ]
     });
-    const errors = new import_async14.Trigger();
+    const errors = new import_async16.Trigger();
     const ctx = this._ctx.derive({
       onError: (err) => {
-        import_log12.log.warn("Notarization error", {
+        import_log14.log.warn("Notarization error", {
           err
         }, {
-          F: __dxlog_file14,
+          F: __dxlog_file15,
           L: 99,
           S: this,
           C: (f, a) => f(...a)
@@ -3813,23 +3991,23 @@ var NotarizationPlugin = class {
     });
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
-      (0, import_async14.scheduleTask)(ctx, () => {
-        import_log12.log.warn("Notarization timeout", {
+      (0, import_async16.scheduleTask)(ctx, () => {
+        import_log14.log.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
-          F: __dxlog_file14,
+          F: __dxlog_file15,
           L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
         void ctx.dispose();
-        errors.throw(new import_async14.TimeoutError(timeout, "Notarization timed out"));
+        errors.throw(new import_async16.TimeoutError(timeout, "Notarization timed out"));
       }, timeout);
     }
     const allNotarized = Promise.all(credentials.map((credential) => this._waitUntilProcessed(credential.id)));
     const peersTried = /* @__PURE__ */ new Set();
-    const notarizeTask = new import_async14.DeferredTask(ctx, async () => {
+    const notarizeTask = new import_async16.DeferredTask(ctx, async () => {
       try {
         if (this._extensions.size === 0) {
           return;
@@ -3838,24 +4016,24 @@ var NotarizationPlugin = class {
           ...this._extensions
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
-          import_log12.log.info("Exhausted all peers to notarize with", {
+          import_log14.log.info("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
-            F: __dxlog_file14,
+            F: __dxlog_file15,
             L: 136,
             S: this,
             C: (f, a) => f(...a)
           });
           peersTried.clear();
-          (0, import_async14.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
+          (0, import_async16.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
           return;
         }
         peersTried.add(peer);
-        (0, import_log12.log)("try notarizing", {
+        (0, import_log14.log)("try notarizing", {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
-          F: __dxlog_file14,
+          F: __dxlog_file15,
           L: 143,
           S: this,
           C: (f, a) => f(...a)
@@ -3863,17 +4041,17 @@ var NotarizationPlugin = class {
         await peer.rpc.NotarizationService.notarize({
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
-        (0, import_log12.log)("success", void 0, {
-          F: __dxlog_file14,
+        (0, import_log14.log)("success", void 0, {
+          F: __dxlog_file15,
           L: 147,
           S: this,
           C: (f, a) => f(...a)
         });
-        await (0, import_async14.sleep)(successDelay);
+        await (0, import_async16.sleep)(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
-          import_log12.log.info("error notarizing (recoverable)", err, {
-            F: __dxlog_file14,
+          import_log14.log.info("error notarizing (recoverable)", err, {
+            F: __dxlog_file15,
             L: 151,
             S: this,
             C: (f, a) => f(...a)
@@ -3886,12 +4064,12 @@ var NotarizationPlugin = class {
     this._extensionOpened.on(ctx, () => notarizeTask.schedule());
     try {
       await Promise.race([
-        (0, import_context11.rejectOnDispose)(ctx),
+        (0, import_context13.rejectOnDispose)(ctx),
         allNotarized,
         errors.wait()
       ]);
-      (0, import_log12.log)("done", void 0, {
-        F: __dxlog_file14,
+      (0, import_log14.log)("done", void 0, {
+        F: __dxlog_file15,
         L: 162,
         S: this,
         C: (f, a) => f(...a)
@@ -3912,8 +4090,8 @@ var NotarizationPlugin = class {
     this._processCredentialsTriggers.delete(credential.id);
   }
   setWriter(writer) {
-    (0, import_invariant13.invariant)(!this._writer, "Writer already set.", {
-      F: __dxlog_file14,
+    (0, import_invariant14.invariant)(!this._writer, "Writer already set.", {
+      F: __dxlog_file15,
       L: 181,
       S: this,
       A: [
@@ -3927,7 +4105,7 @@ var NotarizationPlugin = class {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await (0, import_util7.entry)(this._processCredentialsTriggers, id).orInsert(new import_async14.Trigger()).value.wait();
+    await (0, import_util9.entry)(this._processCredentialsTriggers, id).orInsert(new import_async16.Trigger()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -3937,8 +4115,8 @@ var NotarizationPlugin = class {
       throw new Error(WRITER_NOT_SET_ERROR_CODE);
     }
     for (const credential of request.credentials ?? []) {
-      (0, import_invariant13.invariant)(credential.id, "Credential must have an id", {
-        F: __dxlog_file14,
+      (0, import_invariant14.invariant)(credential.id, "Credential must have an id", {
+        F: __dxlog_file15,
         L: 200,
         S: this,
         A: [
@@ -3955,10 +4133,10 @@ var NotarizationPlugin = class {
   createExtension() {
     const extension = new NotarizationTeleportExtension({
       onOpen: async () => {
-        (0, import_log12.log)("extension opened", {
+        (0, import_log14.log)("extension opened", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file14,
+          F: __dxlog_file15,
           L: 211,
           S: this,
           C: (f, a) => f(...a)
@@ -3967,10 +4145,10 @@ var NotarizationPlugin = class {
         this._extensionOpened.emit();
       },
       onClose: async () => {
-        (0, import_log12.log)("extension closed", {
+        (0, import_log14.log)("extension closed", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file14,
+          F: __dxlog_file15,
           L: 216,
           S: this,
           C: (f, a) => f(...a)
@@ -4022,16 +4200,81 @@ function _ts_decorate4(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
+function _using_ctx() {
+  var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
+    var err = new Error();
+    err.name = "SuppressedError";
+    err.suppressed = suppressed;
+    err.error = error;
+    return err;
+  }, empty = {}, stack = [];
+  function using(isAwait, value) {
+    if (value != null) {
+      if (Object(value) !== value) {
+        throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
+      }
+      if (isAwait) {
+        var dispose = value[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")];
+      }
+      if (dispose == null) {
+        dispose = value[Symbol.dispose || Symbol.for("Symbol.dispose")];
+      }
+      if (typeof dispose !== "function") {
+        throw new TypeError(`Property [Symbol.dispose] is not a function.`);
+      }
+      stack.push({
+        v: value,
+        d: dispose,
+        a: isAwait
+      });
+    } else if (isAwait) {
+      stack.push({
+        d: value,
+        a: isAwait
+      });
+    }
+    return value;
+  }
+  return {
+    e: empty,
+    u: using.bind(null, false),
+    a: using.bind(null, true),
+    d: function() {
+      var error = this.e;
+      function next() {
+        while (resource = stack.pop()) {
+          try {
+            var resource, disposalResult = resource.d && resource.d.call(resource.v);
+            if (resource.a) {
+              return Promise.resolve(disposalResult).then(next, err);
+            }
+          } catch (e) {
+            return err(e);
+          }
+        }
+        if (error !== empty)
+          throw error;
+      }
+      function err(e) {
+        error = error !== empty ? new _disposeSuppressedError(error, e) : e;
+        return next();
+      }
+      return next();
+    }
+  };
+}
+var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var DataSpace = class {
   constructor(params) {
     this._ctx = new import_context10.Context();
     this._notarizationPlugin = new NotarizationPlugin();
     this._cache = void 0;
     this._automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
+    this._epochProcessingMutex = new import_async13.Mutex();
     this._state = import_services12.SpaceState.CLOSED;
+    this._databaseRoot = null;
     this.error = void 0;
-    this.stateUpdate = new import_async12.Event();
+    this.stateUpdate = new import_async13.Event();
     this.metrics = {};
     this._inner = params.inner;
     this._inner.stateUpdate.on(this._ctx, () => this.stateUpdate.emit());
@@ -4044,17 +4287,17 @@ var DataSpace = class {
     this._callbacks = params.callbacks ?? {};
     this._echoHost = params.echoHost;
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new import_util6.ComplexSet(import_keys10.PublicKey.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => member.role !== import_credentials13.SpaceMember.Role.REMOVED).map((member) => member.key)),
+      trustedKeysProvider: () => new import_util7.ComplexSet(import_keys10.PublicKey.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => member.role !== import_credentials13.SpaceMember.Role.REMOVED).map((member) => member.key)),
       update: this._inner.stateUpdate,
       authTimeout: import_client_protocol4.AUTH_TIMEOUT
     });
     this._cache = params.cache;
     this._state = params.initialState;
-    (0, import_log11.log)("new state", {
+    (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
-      F: __dxlog_file15,
-      L: 143,
+      F: __dxlog_file16,
+      L: 146,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4087,6 +4330,9 @@ var DataSpace = class {
   get automergeSpaceState() {
     return this._automergeSpaceState;
   }
+  get databaseRoot() {
+    return this._databaseRoot;
+  }
   get _automergeInfo() {
     return {
       rootUrl: this._automergeSpaceState.rootUrl,
@@ -4103,14 +4349,15 @@ var DataSpace = class {
     await this._gossip.open();
     await this._notarizationPlugin.open();
     await this._inner.spaceState.addCredentialProcessor(this._notarizationPlugin);
+    await this._automergeSpaceState.open();
     await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
     await this._inner.open(new import_context10.Context());
     this._state = import_services12.SpaceState.CONTROL_ONLY;
-    (0, import_log11.log)("new state", {
+    (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
-      F: __dxlog_file15,
-      L: 209,
+      F: __dxlog_file16,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4124,11 +4371,11 @@ var DataSpace = class {
   async _close() {
     await this._callbacks.beforeClose?.();
     this._state = import_services12.SpaceState.CLOSED;
-    (0, import_log11.log)("new state", {
+    (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
-      F: __dxlog_file15,
-      L: 223,
+      F: __dxlog_file16,
+      L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4137,6 +4384,7 @@ var DataSpace = class {
     await this.authVerifier.close();
     await this._inner.close();
     await this._inner.spaceState.removeCredentialProcessor(this._automergeSpaceState);
+    await this._automergeSpaceState.close();
     await this._inner.spaceState.removeCredentialProcessor(this._notarizationPlugin);
     await this._notarizationPlugin.close();
     await this._presence.close();
@@ -4152,32 +4400,32 @@ var DataSpace = class {
   * Initialize the data pipeline in a separate task.
   */
   initializeDataPipelineAsync() {
-    (0, import_async12.scheduleTask)(this._ctx, async () => {
+    (0, import_async13.scheduleTask)(this._ctx, async () => {
       try {
         this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
       } catch (err) {
         if (err instanceof import_protocols9.CancelledError || err instanceof import_context10.ContextDisposedError) {
-          (0, import_log11.log)("data pipeline initialization cancelled", err, {
-            F: __dxlog_file15,
-            L: 256,
+          (0, import_log12.log)("data pipeline initialization cancelled", err, {
+            F: __dxlog_file16,
+            L: 265,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
-        import_log11.log.error("Error initializing data pipeline", err, {
-          F: __dxlog_file15,
-          L: 260,
+        import_log12.log.error("Error initializing data pipeline", err, {
+          F: __dxlog_file16,
+          L: 269,
           S: this,
           C: (f, a) => f(...a)
         });
         this._state = import_services12.SpaceState.ERROR;
-        (0, import_log11.log)("new state", {
+        (0, import_log12.log)("new state", {
           state: import_services12.SpaceState[this._state]
         }, {
-          F: __dxlog_file15,
-          L: 262,
+          F: __dxlog_file16,
+          L: 271,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4193,31 +4441,28 @@ var DataSpace = class {
       throw new import_protocols9.SystemError("Invalid operation");
     }
     this._state = import_services12.SpaceState.INITIALIZING;
-    (0, import_log11.log)("new state", {
+    (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
-      F: __dxlog_file15,
-      L: 278,
+      F: __dxlog_file16,
+      L: 287,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._initializeAndReadControlPipeline();
-    await (0, import_async12.sleep)(1);
+    await (0, import_async13.sleep)(1);
+    const ready = this.stateUpdate.waitForCondition(() => this._state === import_services12.SpaceState.READY);
     this._automergeSpaceState.startProcessingRootDocs();
-    await (0, import_context10.cancelWithContext)(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
-    (0, import_log11.log)("data pipeline ready", void 0, {
-      F: __dxlog_file15,
-      L: 290,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    await ready;
+  }
+  async _enterReadyState() {
     await this._callbacks.beforeReady?.();
     this._state = import_services12.SpaceState.READY;
-    (0, import_log11.log)("new state", {
+    (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
-      F: __dxlog_file15,
-      L: 294,
+      F: __dxlog_file16,
+      L: 306,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4231,9 +4476,9 @@ var DataSpace = class {
     });
     this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
-    (0, import_log11.log)("writable feeds created", void 0, {
-      F: __dxlog_file15,
-      L: 310,
+    (0, import_log12.log)("writable feeds created", void 0, {
+      F: __dxlog_file16,
+      L: 322,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4291,12 +4536,12 @@ var DataSpace = class {
     }
   }
   _onNewAutomergeRoot(rootUrl) {
-    (0, import_log11.log)("loading automerge root doc for space", {
+    (0, import_log12.log)("loading automerge root doc for space", {
       space: this.key,
       rootUrl
     }, {
-      F: __dxlog_file15,
-      L: 376,
+      F: __dxlog_file16,
+      L: 388,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4304,44 +4549,52 @@ var DataSpace = class {
     const handle = this._echoHost.automergeRepo.find(rootUrl);
     queueMicrotask(async () => {
       try {
-        await (0, import_debug3.warnAfterTimeout)(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
-          await (0, import_context10.cancelWithContext)(this._ctx, handle.whenReady());
-        });
-        if (this._ctx.disposed) {
-          return;
-        }
-        const doc = handle.docSync() ?? (0, import_invariant12.failedInvariant)();
-        if (!doc.access?.spaceKey) {
-          handle.change((doc2) => {
-            doc2.access = {
-              spaceKey: this.key.toHex()
-            };
-          });
-        }
-        if (!this._echoHost.roots.has(handle.documentId)) {
-          await this._echoHost.openSpaceRoot(handle.url);
-        } else {
-          import_log11.log.warn("echo database root already exists", {
-            space: this.key,
-            rootUrl
-          }, {
-            F: __dxlog_file15,
-            L: 403,
-            S: this,
-            C: (f, a) => f(...a)
+        try {
+          var _usingCtx = _using_ctx();
+          await (0, import_debug3.warnAfterTimeout)(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
+            await (0, import_context10.cancelWithContext)(this._ctx, handle.whenReady());
           });
+          if (this._ctx.disposed) {
+            return;
+          }
+          const _guard = (
+            // Ensure only one root is processed at a time.
+            _usingCtx.u(await this._epochProcessingMutex.acquire())
+          );
+          const doc = handle.docSync() ?? (0, import_invariant12.failedInvariant)();
+          if (!doc.access?.spaceKey) {
+            handle.change((doc2) => {
+              doc2.access = {
+                spaceKey: this.key.toHex()
+              };
+            });
+          }
+          const root = await this._echoHost.openSpaceRoot(handle.url);
+          this._databaseRoot = root;
+          if (root.getVersion() !== import_echo_protocol.SpaceDocVersion.CURRENT) {
+            this._state = import_services12.SpaceState.REQUIRES_MIGRATION;
+            this.stateUpdate.emit();
+          } else {
+            if (this._state !== import_services12.SpaceState.READY) {
+              await this._enterReadyState();
+            }
+          }
+        } catch (_) {
+          _usingCtx.e = _;
+        } finally {
+          _usingCtx.d();
         }
       } catch (err) {
         if (err instanceof import_context10.ContextDisposedError) {
           return;
         }
-        import_log11.log.warn("error loading automerge root doc", {
+        import_log12.log.warn("error loading automerge root doc", {
           space: this.key,
           rootUrl,
           err
         }, {
-          F: __dxlog_file15,
-          L: 409,
+          F: __dxlog_file16,
+          L: 431,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4364,148 +4617,34 @@ var DataSpace = class {
     });
   }
   async createEpoch(options) {
-    let epoch;
-    switch (options?.migration) {
-      case void 0:
-      case import_services12.CreateEpochRequest.Migration.NONE:
-        {
-          epoch = {
-            previousId: this._automergeSpaceState.lastEpoch?.id,
-            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
-            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new import_timeframe3.Timeframe(),
-            automergeRoot: this._automergeSpaceState.lastEpoch?.subject.assertion?.automergeRoot
-          };
-        }
-        break;
-      case import_services12.CreateEpochRequest.Migration.INIT_AUTOMERGE:
-        {
-          const document = this._echoHost.automergeRepo.create();
-          epoch = {
-            previousId: this._automergeSpaceState.lastEpoch?.id,
-            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
-            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new import_timeframe3.Timeframe(),
-            automergeRoot: document.url
-          };
-        }
-        break;
-      case import_services12.CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY:
-        {
-          const currentRootUrl = this._automergeSpaceState.rootUrl;
-          const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl);
-          await (0, import_context10.cancelWithContext)(this._ctx, (0, import_async12.asyncTimeout)(rootHandle.whenReady(), 1e4));
-          const newRoot = this._echoHost.automergeRepo.create(rootHandle.docSync());
-          await this._echoHost.automergeRepo.flush([
-            newRoot.documentId
-          ]);
-          (0, import_invariant12.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-            F: __dxlog_file15,
-            L: 460,
-            S: this,
-            A: [
-              "typeof newRoot.url === 'string' && newRoot.url.length > 0",
-              ""
-            ]
-          });
-          epoch = {
-            previousId: this._automergeSpaceState.lastEpoch?.id,
-            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
-            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new import_timeframe3.Timeframe(),
-            automergeRoot: newRoot.url
-          };
-        }
-        break;
-      case import_services12.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT:
-        {
-          import_log11.log.info("Fragmenting", void 0, {
-            F: __dxlog_file15,
-            L: 472,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          const currentRootUrl = this._automergeSpaceState.rootUrl;
-          const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl);
-          await (0, import_context10.cancelWithContext)(this._ctx, (0, import_async12.asyncTimeout)(rootHandle.whenReady(), 1e4));
-          const objects = Object.entries(rootHandle.docSync().objects);
-          const properties = findPropertiesObject(rootHandle.docSync());
-          const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
-          (0, import_invariant12.invariant)(properties, "Properties not found", {
-            F: __dxlog_file15,
-            L: 482,
-            S: this,
-            A: [
-              "properties",
-              "'Properties not found'"
-            ]
-          });
-          const newSpaceDoc = {
-            ...rootHandle.docSync(),
-            objects: Object.fromEntries([
-              properties
-            ])
-          };
-          const newRoot = this._echoHost.automergeRepo.create(newSpaceDoc);
-          (0, import_invariant12.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-            F: __dxlog_file15,
-            L: 487,
-            S: this,
-            A: [
-              "typeof newRoot.url === 'string' && newRoot.url.length > 0",
-              ""
-            ]
-          });
-          const docLoader = new import_echo_pipeline2.AutomergeDocumentLoaderImpl(await (0, import_echo_pipeline2.createIdFromSpaceKey)(this.key), this._echoHost.automergeRepo, this.key);
-          await docLoader.loadSpaceRootDocHandle(this._ctx, {
-            rootUrl: newRoot.url
-          });
-          otherObjects.forEach(([key, value]) => {
-            const handle = docLoader.createDocumentForObject(key);
-            handle.change((doc) => {
-              (0, import_util6.assignDeep)(doc, [
-                "objects",
-                key
-              ], value);
-            });
-          });
-          epoch = {
-            previousId: this._automergeSpaceState.lastEpoch?.id,
-            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
-            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new import_timeframe3.Timeframe(),
-            automergeRoot: newRoot.url
-          };
-        }
-        break;
-      case import_services12.CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT:
-        {
-          (0, import_invariant12.invariant)(options.newAutomergeRoot, void 0, {
-            F: __dxlog_file15,
-            L: 517,
-            S: this,
-            A: [
-              "options.newAutomergeRoot",
-              ""
-            ]
-          });
-          epoch = {
-            previousId: this._automergeSpaceState.lastEpoch?.id,
-            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
-            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new import_timeframe3.Timeframe(),
-            automergeRoot: options.newAutomergeRoot
-          };
-        }
-        break;
-    }
-    if (!epoch) {
-      return;
+    const ctx = this._ctx.derive();
+    if (!options?.migration) {
+      return null;
     }
+    const { newRoot } = await runEpochMigration(ctx, {
+      repo: this._echoHost.automergeRepo,
+      spaceId: this.id,
+      spaceKey: this.key,
+      migration: options.migration,
+      currentRoot: this._automergeSpaceState.rootUrl ?? null,
+      newAutomergeRoot: options.newAutomergeRoot
+    });
+    const epoch = {
+      previousId: this._automergeSpaceState.lastEpoch?.id,
+      number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
+      timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new import_timeframe3.Timeframe(),
+      automergeRoot: newRoot ?? this._automergeSpaceState.rootUrl
+    };
+    const credential = await this._signingContext.credentialSigner.createCredential({
+      subject: this.key,
+      assertion: {
+        "@type": "dxos.halo.credentials.Epoch",
+        ...epoch
+      }
+    });
     const receipt = await this.inner.controlPipeline.writer.write({
       credential: {
-        credential: await this._signingContext.credentialSigner.createCredential({
-          subject: this.key,
-          assertion: {
-            "@type": "dxos.halo.credentials.Epoch",
-            ...epoch
-          }
-        })
+        credential
       }
     });
     await this.inner.controlPipeline.state.waitUntilTimeframe(new import_timeframe3.Timeframe([
@@ -4515,6 +4654,7 @@ var DataSpace = class {
       ]
     ]));
     await this._echoHost.updateIndexes();
+    return credential;
   }
   async activate() {
     if (![
@@ -4536,11 +4676,11 @@ var DataSpace = class {
       await this._close();
     }
     this._state = import_services12.SpaceState.INACTIVE;
-    (0, import_log11.log)("new state", {
+    (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
-      F: __dxlog_file15,
-      L: 571,
+      F: __dxlog_file16,
+      L: 512,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4567,10 +4707,10 @@ _ts_decorate4([
   })
 ], DataSpace.prototype, "_automergeInfo", null);
 _ts_decorate4([
-  import_async12.synchronized
+  import_async13.synchronized
 ], DataSpace.prototype, "open", null);
 _ts_decorate4([
-  import_async12.synchronized
+  import_async13.synchronized
 ], DataSpace.prototype, "close", null);
 _ts_decorate4([
   import_tracing5.trace.span({
@@ -4586,27 +4726,15 @@ _ts_decorate4([
   (0, import_debug3.timed)(1e4)
 ], DataSpace.prototype, "_createWritableFeeds", null);
 _ts_decorate4([
-  import_async12.synchronized
+  import_async13.synchronized
 ], DataSpace.prototype, "activate", null);
 _ts_decorate4([
-  import_async12.synchronized
+  import_async13.synchronized
 ], DataSpace.prototype, "deactivate", null);
 DataSpace = _ts_decorate4([
-  (0, import_async12.trackLeaks)("open", "close"),
+  (0, import_async13.trackLeaks)("open", "close"),
   import_tracing5.trace.resource()
 ], DataSpace);
-var findPropertiesObject = (spaceDoc) => {
-  for (const id in spaceDoc.objects ?? {}) {
-    const obj = spaceDoc.objects[id];
-    if (obj.system.type?.itemId === import_echo_schema.TYPE_PROPERTIES) {
-      return [
-        id,
-        obj
-      ];
-    }
-  }
-  return void 0;
-};
 var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
   const credentials = [
     await (0, import_credentials17.createCredential)({
@@ -4681,7 +4809,7 @@ function _ts_decorate5(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_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
+var __dxlog_file17 = "/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__";
@@ -4695,9 +4823,9 @@ var DataSpaceManager = class {
     this._echoHost = _echoHost;
     this._invitationsManager = _invitationsManager;
     this._params = _params;
-    this._ctx = new import_context12.Context();
-    this.updated = new import_async15.Event();
-    this._spaces = new import_util8.ComplexMap(import_keys12.PublicKey.hash);
+    this._ctx = new import_context14.Context();
+    this.updated = new import_async17.Event();
+    this._spaces = new import_util10.ComplexMap(import_keys12.PublicKey.hash);
     this._isOpen = false;
     this._instanceId = import_keys12.PublicKey.random().toHex();
     import_tracing6.trace.diagnostic({
@@ -4708,10 +4836,10 @@ var DataSpaceManager = class {
           const rootUrl = space.automergeSpaceState.rootUrl;
           const rootHandle = rootUrl ? this._echoHost.automergeRepo.find(rootUrl) : void 0;
           const rootDoc = rootHandle?.docSync();
-          const properties = rootDoc && findPropertiesObject(rootDoc);
+          const properties = rootDoc && (0, import_echo_db2.findInlineObjectOfType)(rootDoc, import_echo_schema2.TYPE_PROPERTIES);
           return {
             key: space.key.toHex(),
-            state: import_services13.SpaceState[space.state],
+            state: import_services14.SpaceState[space.state],
             name: properties?.[1].data.name ?? null,
             inlineObjects: rootDoc ? Object.keys(rootDoc.objects ?? {}).length : null,
             linkedObjects: rootDoc ? Object.keys(rootDoc.links ?? {}).length : null,
@@ -4728,46 +4856,46 @@ var DataSpaceManager = class {
     return this._spaces;
   }
   async open() {
-    (0, import_log13.log)("open", void 0, {
-      F: __dxlog_file16,
-      L: 140,
+    (0, import_log15.log)("open", void 0, {
+      F: __dxlog_file17,
+      L: 146,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log13.log.trace("dxos.echo.data-space-manager.open", import_protocols11.trace.begin({
+    import_log15.log.trace("dxos.echo.data-space-manager.open", import_protocols11.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file16,
-      L: 141,
+      F: __dxlog_file17,
+      L: 147,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log13.log)("metadata loaded", {
+    (0, import_log15.log)("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
-      F: __dxlog_file16,
-      L: 142,
+      F: __dxlog_file17,
+      L: 148,
       S: this,
       C: (f, a) => f(...a)
     });
-    await (0, import_util8.forEachAsync)(this._metadataStore.spaces, async (spaceMetadata) => {
+    await (0, import_util10.forEachAsync)(this._metadataStore.spaces, async (spaceMetadata) => {
       try {
-        (0, import_log13.log)("load space", {
+        (0, import_log15.log)("load space", {
           spaceMetadata
         }, {
-          F: __dxlog_file16,
-          L: 146,
+          F: __dxlog_file17,
+          L: 152,
           S: this,
           C: (f, a) => f(...a)
         });
         await this._constructSpace(spaceMetadata);
       } catch (err) {
-        import_log13.log.error("Error loading space", {
+        import_log15.log.error("Error loading space", {
           spaceMetadata,
           err
         }, {
-          F: __dxlog_file16,
-          L: 149,
+          F: __dxlog_file17,
+          L: 155,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4775,19 +4903,19 @@ var DataSpaceManager = class {
     });
     this._isOpen = true;
     this.updated.emit();
-    import_log13.log.trace("dxos.echo.data-space-manager.open", import_protocols11.trace.end({
+    import_log15.log.trace("dxos.echo.data-space-manager.open", import_protocols11.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file16,
-      L: 156,
+      F: __dxlog_file17,
+      L: 162,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    (0, import_log13.log)("close", void 0, {
-      F: __dxlog_file16,
-      L: 161,
+    (0, import_log15.log)("close", void 0, {
+      F: __dxlog_file17,
+      L: 167,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4802,9 +4930,9 @@ var DataSpaceManager = class {
   * Creates a new space writing the genesis credentials to the control feed.
   */
   async createSpace() {
-    (0, import_invariant14.invariant)(this._isOpen, "Not open.", {
-      F: __dxlog_file16,
-      L: 175,
+    (0, import_invariant15.invariant)(this._isOpen, "Not open.", {
+      F: __dxlog_file17,
+      L: 181,
       S: this,
       A: [
         "this._isOpen",
@@ -4819,13 +4947,13 @@ var DataSpaceManager = class {
       genesisFeedKey: controlFeedKey,
       controlFeedKey,
       dataFeedKey,
-      state: import_services13.SpaceState.ACTIVE
+      state: import_services14.SpaceState.ACTIVE
     };
-    (0, import_log13.log)("creating space...", {
+    (0, import_log15.log)("creating space...", {
       spaceKey
     }, {
-      F: __dxlog_file16,
-      L: 187,
+      F: __dxlog_file17,
+      L: 193,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4835,9 +4963,9 @@ var DataSpaceManager = class {
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, root.url);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    (0, import_invariant14.invariant)((0, import_credentials15.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file16,
-      L: 197,
+    (0, import_invariant15.invariant)((0, import_credentials15.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file17,
+      L: 203,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -4850,16 +4978,38 @@ var DataSpaceManager = class {
     return space;
   }
   async isDefaultSpace(space) {
-    const rootDoc = await this._getSpaceRootDocument(space);
-    const [_, properties] = findPropertiesObject(rootDoc.docSync()) ?? [];
-    return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
+    if (!space.databaseRoot) {
+      return false;
+    }
+    switch (space.databaseRoot.getVersion()) {
+      case import_echo_protocol2.SpaceDocVersion.CURRENT: {
+        const [_, properties] = (0, import_echo_db2.findInlineObjectOfType)(space.databaseRoot.docSync(), import_echo_schema2.TYPE_PROPERTIES) ?? [];
+        return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
+      }
+      case import_echo_protocol2.SpaceDocVersion.LEGACY: {
+        const convertedDoc = await (0, import_echo_db2.convertLegacyReferences)(space.databaseRoot.docSync());
+        const [_, properties] = (0, import_echo_db2.findInlineObjectOfType)(convertedDoc, import_echo_protocol2.LEGACY_TYPE_PROPERTIES) ?? [];
+        return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
+      }
+      default:
+        import_log15.log.warn("unknown space version", {
+          version: space.databaseRoot.getVersion(),
+          spaceId: space.id
+        }, {
+          F: __dxlog_file17,
+          L: 228,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        return false;
+    }
   }
   async createDefaultSpace() {
     const space = await this.createSpace();
     const document = await this._getSpaceRootDocument(space);
     const properties = {
       system: {
-        type: (0, import_echo_protocol.encodeReference)((0, import_echo_schema2.getTypeReference)(import_client_protocol5.PropertiesType))
+        type: (0, import_echo_protocol2.encodeReference)((0, import_echo_schema2.getTypeReference)(import_client_protocol5.PropertiesType))
       },
       data: {
         [DEFAULT_SPACE_KEY]: this._signingContext.identityKey.toHex()
@@ -4870,7 +5020,7 @@ var DataSpaceManager = class {
     };
     const propertiesId = (0, import_echo_schema2.generateEchoId)();
     document.change((doc) => {
-      (0, import_util8.assignDeep)(doc, [
+      (0, import_util10.assignDeep)(doc, [
         "objects",
         propertiesId
       ], properties);
@@ -4880,9 +5030,9 @@ var DataSpaceManager = class {
   }
   async _getSpaceRootDocument(space) {
     const automergeIndex = space.automergeSpaceState.rootUrl;
-    (0, import_invariant14.invariant)(automergeIndex, void 0, {
-      F: __dxlog_file16,
-      L: 240,
+    (0, import_invariant15.invariant)(automergeIndex, void 0, {
+      F: __dxlog_file17,
+      L: 261,
       S: this,
       A: [
         "automergeIndex",
@@ -4895,26 +5045,26 @@ var DataSpaceManager = class {
   }
   // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
-    (0, import_log13.log)("accept space", {
+    (0, import_log15.log)("accept space", {
       opts
     }, {
-      F: __dxlog_file16,
-      L: 249,
+      F: __dxlog_file17,
+      L: 270,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant14.invariant)(this._isOpen, "Not open.", {
-      F: __dxlog_file16,
-      L: 250,
+    (0, import_invariant15.invariant)(this._isOpen, "Not open.", {
+      F: __dxlog_file17,
+      L: 271,
       S: this,
       A: [
         "this._isOpen",
         "'Not open.'"
       ]
     });
-    (0, import_invariant14.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
-      F: __dxlog_file16,
-      L: 251,
+    (0, import_invariant15.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
+      F: __dxlog_file17,
+      L: 272,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -4940,17 +5090,17 @@ var DataSpaceManager = class {
   * TODO(dmaretskyi): Consider removing.
   */
   async waitUntilSpaceReady(spaceKey) {
-    await (0, import_context12.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
+    await (0, import_context14.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
-      return !!space && space.state === import_services13.SpaceState.READY;
+      return !!space && space.state === import_services14.SpaceState.READY;
     }));
   }
   async _constructSpace(metadata) {
-    (0, import_log13.log)("construct space", {
+    (0, import_log15.log)("construct space", {
       metadata
     }, {
-      F: __dxlog_file16,
-      L: 285,
+      F: __dxlog_file17,
+      L: 306,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4975,7 +5125,7 @@ var DataSpaceManager = class {
       swarmIdentity: {
         peerKey: this._signingContext.deviceKey,
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
-        credentialAuthenticator: (0, import_util8.deferFunction)(() => dataSpace.authVerifier.verifier)
+        credentialAuthenticator: (0, import_util10.deferFunction)(() => dataSpace.authVerifier.verifier)
       },
       onAuthorizedConnection: (session) => {
         session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
@@ -4986,15 +5136,15 @@ var DataSpaceManager = class {
         session.addExtension("dxos.mesh.teleport.automerge", this._echoHost.createReplicationExtension());
       },
       onAuthFailure: () => {
-        import_log13.log.warn("auth failure", void 0, {
-          F: __dxlog_file16,
-          L: 322,
+        import_log15.log.warn("auth failure", void 0, {
+          F: __dxlog_file17,
+          L: 343,
           S: this,
           C: (f, a) => f(...a)
         });
       },
       onMemberRolesChanged: async (members) => {
-        if (dataSpace?.state === import_services13.SpaceState.READY) {
+        if (dataSpace?.state === import_services14.SpaceState.READY) {
           this._handleMemberRoleChanges(presence, space.protocol, members);
         }
       },
@@ -5007,7 +5157,7 @@ var DataSpaceManager = class {
     dataFeed && await space.setDataFeed(dataFeed);
     const dataSpace = new DataSpace({
       inner: space,
-      initialState: metadata.state === import_services13.SpaceState.INACTIVE ? import_services13.SpaceState.INACTIVE : import_services13.SpaceState.CLOSED,
+      initialState: metadata.state === import_services14.SpaceState.INACTIVE ? import_services14.SpaceState.INACTIVE : import_services14.SpaceState.CLOSED,
       metadataStore: this._metadataStore,
       gossip,
       presence,
@@ -5017,22 +5167,22 @@ var DataSpaceManager = class {
       signingContext: this._signingContext,
       callbacks: {
         beforeReady: async () => {
-          (0, import_log13.log)("before space ready", {
+          (0, import_log15.log)("before space ready", {
             space: space.key
           }, {
-            F: __dxlog_file16,
-            L: 349,
+            F: __dxlog_file17,
+            L: 370,
             S: this,
             C: (f, a) => f(...a)
           });
         },
         afterReady: async () => {
-          (0, import_log13.log)("after space ready", {
+          (0, import_log15.log)("after space ready", {
             space: space.key,
             open: this._isOpen
           }, {
-            F: __dxlog_file16,
-            L: 352,
+            F: __dxlog_file17,
+            L: 373,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5047,11 +5197,11 @@ var DataSpaceManager = class {
           }
         },
         beforeClose: async () => {
-          (0, import_log13.log)("before space close", {
+          (0, import_log15.log)("before space close", {
             space: space.key
           }, {
-            F: __dxlog_file16,
-            L: 360,
+            F: __dxlog_file17,
+            L: 381,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5060,7 +5210,7 @@ var DataSpaceManager = class {
       cache: metadata.cache
     });
     presence.newPeer.on((peerState) => {
-      if (dataSpace.state === import_services13.SpaceState.READY) {
+      if (dataSpace.state === import_services14.SpaceState.READY) {
         this._handleNewPeerConnected(space, peerState);
       }
     });
@@ -5079,20 +5229,20 @@ var DataSpaceManager = class {
       const peers = presence.getPeersByIdentityKey(member.key);
       const sessions = peers.map((p) => p.peerId && spaceProtocol.sessions.get(p.peerId));
       const sessionsToClose = sessions.filter((s) => {
-        return (s && member.role === import_credentials16.SpaceMember.Role.REMOVED !== (s.authStatus === import_echo_pipeline3.AuthStatus.FAILURE)) ?? false;
+        return (s && member.role === import_credentials16.SpaceMember.Role.REMOVED !== (s.authStatus === import_echo_pipeline4.AuthStatus.FAILURE)) ?? false;
       });
       sessionsToClose.forEach((session) => {
-        void session.close().catch(import_log13.log.error);
+        void session.close().catch(import_log15.log.error);
       });
       closedSessions += sessionsToClose.length;
     }
-    (0, import_log13.log)("processed member role changes", {
+    (0, import_log15.log)("processed member role changes", {
       roleChangeCount: memberInfo.length,
       peersOnline: presence.getPeersOnline().length,
       closedSessions
     }, {
-      F: __dxlog_file16,
-      L: 396,
+      F: __dxlog_file17,
+      L: 417,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5103,20 +5253,20 @@ var DataSpaceManager = class {
     if (role === import_credentials16.SpaceMember.Role.REMOVED) {
       const session = peerState.peerId && space.protocol.sessions.get(peerState.peerId);
       if (session != null) {
-        (0, import_log13.log)("closing a session with a removed peer", {
+        (0, import_log15.log)("closing a session with a removed peer", {
           peerId: peerState.peerId
         }, {
-          F: __dxlog_file16,
-          L: 410,
+          F: __dxlog_file17,
+          L: 431,
           S: this,
           C: (f, a) => f(...a)
         });
-        void session.close().catch(import_log13.log.error);
+        void session.close().catch(import_log15.log.error);
       }
     }
   }
   async _handleInvitationStatusChange(dataSpace, delegatedInvitation, isActive) {
-    if (dataSpace?.state !== import_services13.SpaceState.READY) {
+    if (dataSpace?.state !== import_services14.SpaceState.READY) {
       return;
     }
     if (isActive) {
@@ -5133,8 +5283,8 @@ var DataSpaceManager = class {
   async _createDelegatedInvitations(space, invitations) {
     const tasks = invitations.map(([credentialId, invitation]) => {
       return this._invitationsManager.createInvitation({
-        type: import_services13.Invitation.Type.DELEGATED,
-        kind: import_services13.Invitation.Kind.SPACE,
+        type: import_services14.Invitation.Type.DELEGATED,
+        kind: import_services14.Invitation.Kind.SPACE,
         spaceKey: space.key,
         authMethod: invitation.authMethod,
         invitationId: invitation.invitationId,
@@ -5152,21 +5302,21 @@ var DataSpaceManager = class {
   }
 };
 _ts_decorate5([
-  import_async15.synchronized
+  import_async17.synchronized
 ], DataSpaceManager.prototype, "open", null);
 _ts_decorate5([
-  import_async15.synchronized
+  import_async17.synchronized
 ], DataSpaceManager.prototype, "close", null);
 _ts_decorate5([
-  import_async15.synchronized
+  import_async17.synchronized
 ], DataSpaceManager.prototype, "createSpace", null);
 _ts_decorate5([
-  import_async15.synchronized
+  import_async17.synchronized
 ], DataSpaceManager.prototype, "acceptSpace", null);
 DataSpaceManager = _ts_decorate5([
-  (0, import_async15.trackLeaks)("open", "close")
+  (0, import_async17.trackLeaks)("open", "close")
 ], DataSpaceManager);
-var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
+var __dxlog_file18 = "/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;
@@ -5185,10 +5335,10 @@ var SpacesServiceImpl = class {
     const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols12.SpaceNotFoundError(spaceKey));
     if (state) {
       switch (state) {
-        case import_services14.SpaceState.ACTIVE:
+        case import_services15.SpaceState.ACTIVE:
           await space.activate();
           break;
-        case import_services14.SpaceState.INACTIVE:
+        case import_services15.SpaceState.INACTIVE:
           await space.deactivate();
           break;
         default:
@@ -5209,9 +5359,9 @@ var SpacesServiceImpl = class {
       });
     }
     const credentials = await (0, import_credentials19.createAdmissionCredentials)(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
-    (0, import_invariant15.invariant)(credentials[0].credential, void 0, {
-      F: __dxlog_file17,
-      L: 97,
+    (0, import_invariant16.invariant)(credentials[0].credential, void 0, {
+      F: __dxlog_file18,
+      L: 98,
       S: this,
       A: [
         "credentials[0].credential",
@@ -5219,9 +5369,9 @@ var SpacesServiceImpl = class {
       ]
     });
     const spaceMemberCredential = credentials[0].credential.credential;
-    (0, import_invariant15.invariant)((0, import_credentials19.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file17,
-      L: 99,
+    (0, import_invariant16.invariant)((0, import_credentials19.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file18,
+      L: 100,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -5232,14 +5382,14 @@ var SpacesServiceImpl = class {
   }
   querySpaces() {
     return new import_codec_protobuf11.Stream(({ next, ctx }) => {
-      const scheduler = new import_async16.UpdateScheduler(ctx, async () => {
+      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_log14.log)("update", {
+        (0, import_log16.log)("update", {
           spaces
         }, {
-          F: __dxlog_file17,
-          L: 110,
+          F: __dxlog_file18,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5250,9 +5400,9 @@ var SpacesServiceImpl = class {
       }, {
         maxFrequency: process.env.NODE_ENV === "test" ? void 0 : 2
       });
-      (0, import_async16.scheduleTask)(ctx, async () => {
+      (0, import_async18.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const subscriptions = new import_async16.EventSubscriptions();
+        const subscriptions = new import_async18.EventSubscriptions();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeSpaces = () => {
           subscriptions.clear();
@@ -5284,7 +5434,7 @@ var SpacesServiceImpl = class {
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
-      (0, import_async16.scheduleTask)(ctx, async () => {
+      (0, import_async18.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols12.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
@@ -5303,7 +5453,7 @@ var SpacesServiceImpl = class {
         }
       };
       ctx.onDispose(() => space.spaceState.removeCredentialProcessor(processor));
-      (0, import_async16.scheduleTask)(ctx, async () => {
+      (0, import_async18.scheduleTask)(ctx, async () => {
         await space.spaceState.addCredentialProcessor(processor);
         if (noTail) {
           close();
@@ -5321,18 +5471,18 @@ var SpacesServiceImpl = class {
           }
         });
       } else {
-        (0, import_invariant15.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
-          F: __dxlog_file17,
-          L: 198,
+        (0, import_invariant16.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
+          F: __dxlog_file18,
+          L: 199,
           S: this,
           A: [
             "!credential.id",
             "'Id on unsigned credentials is not allowed'"
           ]
         });
-        (0, import_invariant15.invariant)(this._identityManager.identity, "Identity is not available", {
-          F: __dxlog_file17,
-          L: 199,
+        (0, import_invariant16.invariant)(this._identityManager.identity, "Identity is not available", {
+          F: __dxlog_file18,
+          L: 200,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -5340,9 +5490,9 @@ var SpacesServiceImpl = class {
           ]
         });
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
-        (0, import_invariant15.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
-          F: __dxlog_file17,
-          L: 201,
+        (0, import_invariant16.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
+          F: __dxlog_file18,
+          L: 202,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -5364,10 +5514,13 @@ 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_protocols12.SpaceNotFoundError(spaceKey));
-    await space.createEpoch({
+    const credential = await space.createEpoch({
       migration,
       newAutomergeRoot: automergeRootUrl
     });
+    return {
+      epochCredential: credential ?? void 0
+    };
   }
   _serializeSpace(space) {
     return {
@@ -5400,7 +5553,7 @@ var SpacesServiceImpl = class {
             profile: member.profile ?? {}
           },
           role: member.role,
-          presence: peers.length > 0 ? import_services14.SpaceMember.PresenceState.ONLINE : import_services14.SpaceMember.PresenceState.OFFLINE,
+          presence: peers.length > 0 ? import_services15.SpaceMember.PresenceState.ONLINE : import_services15.SpaceMember.PresenceState.OFFLINE,
           peerStates: peers
         };
       }),
@@ -5438,8 +5591,8 @@ 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_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
-var ServiceContext = class extends import_context13.Resource {
+var __dxlog_file19 = "/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, _runtimeParams) {
     super();
     this.storage = storage;
@@ -5447,11 +5600,11 @@ var ServiceContext = class extends import_context13.Resource {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this._runtimeParams = _runtimeParams;
-    this.initialized = new import_async17.Trigger();
+    this.initialized = new import_async19.Trigger();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = import_keys13.PublicKey.random().toHex();
-    this.metadataStore = new import_echo_pipeline4.MetadataStore(storage.createDirectory("metadata"));
-    this.snapshotStore = new import_echo_pipeline4.SnapshotStore(storage.createDirectory("snapshots"));
+    this.metadataStore = new import_echo_pipeline5.MetadataStore(storage.createDirectory("metadata"));
+    this.snapshotStore = new import_echo_pipeline5.SnapshotStore(storage.createDirectory("snapshots"));
     this.blobStore = new import_teleport_extension_object_sync.BlobStore(storage.createDirectory("blobs"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
     this.feedStore = new import_feed_store5.FeedStore({
@@ -5459,12 +5612,12 @@ var ServiceContext = class extends import_context13.Resource {
         root: storage.createDirectory("feeds"),
         signer: this.keyring,
         hypercore: {
-          valueEncoding: import_echo_pipeline4.valueEncoding,
+          valueEncoding: import_echo_pipeline5.valueEncoding,
           stats: true
         }
       })
     });
-    this.spaceManager = new import_echo_pipeline4.SpaceManager({
+    this.spaceManager = new import_echo_pipeline5.SpaceManager({
       feedStore: this.feedStore,
       networkManager: this.networkManager,
       blobStore: this.blobStore,
@@ -5472,25 +5625,25 @@ var ServiceContext = class extends import_context13.Resource {
       snapshotStore: this.snapshotStore
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams);
-    this.echoHost = new import_echo_db.EchoHost({
+    this.echoHost = new import_echo_db3.EchoHost({
       kv: this.level
     });
     this.invitations = new InvitationsHandler(this.networkManager, _runtimeParams?.invitationConnectionDefaultParams);
     this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
-    this._handlerFactories.set(import_services15.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug6.failUndefined)(), this._acceptIdentity.bind(this)));
+    this._handlerFactories.set(import_services16.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug6.failUndefined)(), this._acceptIdentity.bind(this)));
   }
   async _open(ctx) {
     await this._checkStorageVersion();
-    (0, import_log15.log)("opening...", void 0, {
-      F: __dxlog_file18,
+    (0, import_log17.log)("opening...", void 0, {
+      F: __dxlog_file19,
       L: 149,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log15.log.trace("dxos.sdk.service-context.open", import_protocols13.trace.begin({
+    import_log17.log.trace("dxos.sdk.service-context.open", import_protocols13.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 150,
       S: this,
       C: (f, a) => f(...a)
@@ -5505,32 +5658,32 @@ var ServiceContext = class extends import_context13.Resource {
       await this._initialize(ctx);
     }
     const loadedInvitations = await this.invitationsManager.loadPersistentInvitations();
-    (0, import_log15.log)("loaded persistent invitations", {
+    (0, import_log17.log)("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log15.log.trace("dxos.sdk.service-context.open", import_protocols13.trace.end({
+    import_log17.log.trace("dxos.sdk.service-context.open", import_protocols13.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log15.log)("opened", void 0, {
-      F: __dxlog_file18,
+    (0, import_log17.log)("opened", void 0, {
+      F: __dxlog_file19,
       L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close(ctx) {
-    (0, import_log15.log)("closing...", void 0, {
-      F: __dxlog_file18,
+    (0, import_log17.log)("closing...", void 0, {
+      F: __dxlog_file19,
       L: 170,
       S: this,
       C: (f, a) => f(...a)
@@ -5546,8 +5699,8 @@ var ServiceContext = class extends import_context13.Resource {
     await this.echoHost.close(ctx);
     await this.networkManager.close();
     await this.signalManager.close();
-    (0, import_log15.log)("closed", void 0, {
-      F: __dxlog_file18,
+    (0, import_log17.log)("closed", void 0, {
+      F: __dxlog_file19,
       L: 182,
       S: this,
       C: (f, a) => f(...a)
@@ -5555,13 +5708,13 @@ var ServiceContext = class extends import_context13.Resource {
   }
   async createIdentity(params = {}) {
     const identity = await this.identityManager.createIdentity(params);
-    await this._initialize(new import_context13.Context());
+    await this._initialize(new import_context15.Context());
     return identity;
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    (0, import_invariant16.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file18,
+    (0, import_invariant17.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
+      F: __dxlog_file19,
       L: 193,
       S: this,
       A: [
@@ -5581,7 +5734,7 @@ var ServiceContext = class extends import_context13.Resource {
   }
   async _acceptIdentity(params) {
     const identity = await this.identityManager.acceptIdentity(params);
-    await this._initialize(new import_context13.Context());
+    await this._initialize(new import_context15.Context());
     return identity;
   }
   async _checkStorageVersion() {
@@ -5592,8 +5745,8 @@ var ServiceContext = class extends import_context13.Resource {
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    (0, import_log15.log)("initializing spaces...", void 0, {
-      F: __dxlog_file18,
+    (0, import_log17.log)("initializing spaces...", void 0, {
+      F: __dxlog_file19,
       L: 224,
       S: this,
       C: (f, a) => f(...a)
@@ -5614,9 +5767,9 @@ var ServiceContext = class extends import_context13.Resource {
     };
     this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, signingContext, this.feedStore, this.echoHost, this.invitationsManager, this._runtimeParams);
     await this.dataSpaceManager.open();
-    this._handlerFactories.set(import_services15.Invitation.Kind.SPACE, (invitation) => {
-      (0, import_invariant16.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file18,
+    this._handlerFactories.set(import_services16.Invitation.Kind.SPACE, (invitation) => {
+      (0, import_invariant17.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+        F: __dxlog_file19,
         L: 249,
         S: this,
         A: [
@@ -5637,10 +5790,10 @@ var ServiceContext = class extends import_context13.Resource {
           return;
         }
         if (!this.dataSpaceManager) {
-          (0, import_log15.log)("dataSpaceManager not initialized yet, ignoring space admission", {
+          (0, import_log17.log)("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file18,
+            F: __dxlog_file19,
             L: 265,
             S: this,
             C: (f, a) => f(...a)
@@ -5648,10 +5801,10 @@ var ServiceContext = class extends import_context13.Resource {
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          (0, import_log15.log)("space already exists, ignoring space admission", {
+          (0, import_log17.log)("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file18,
+            F: __dxlog_file19,
             L: 269,
             S: this,
             C: (f, a) => f(...a)
@@ -5659,10 +5812,10 @@ var ServiceContext = class extends import_context13.Resource {
           return;
         }
         try {
-          (0, import_log15.log)("accepting space recorded in halo", {
+          (0, import_log17.log)("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file18,
+            F: __dxlog_file19,
             L: 274,
             S: this,
             C: (f, a) => f(...a)
@@ -5672,8 +5825,8 @@ var ServiceContext = class extends import_context13.Resource {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          import_log15.log.catch(err, void 0, {
-            F: __dxlog_file18,
+          import_log17.log.catch(err, void 0, {
+            F: __dxlog_file19,
             L: 280,
             S: this,
             C: (f, a) => f(...a)
@@ -5691,7 +5844,7 @@ _ts_decorate6([
   import_tracing8.trace.span()
 ], ServiceContext.prototype, "_initialize", null);
 ServiceContext = _ts_decorate6([
-  (0, import_util9.safeInstanceof)("dxos.client-services.ServiceContext"),
+  (0, import_util11.safeInstanceof)("dxos.client-services.ServiceContext"),
   import_tracing8.trace.resource()
 ], ServiceContext);
 var ServiceRegistry = class {
@@ -5726,7 +5879,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_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/node.ts";
+var __dxlog_file20 = "/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;
@@ -5737,16 +5890,16 @@ var Lock = class {
     return this._lockPath;
   }
   async acquire() {
-    (0, import_log16.log)("acquiring lock...", void 0, {
-      F: __dxlog_file19,
+    (0, import_log18.log)("acquiring lock...", void 0, {
+      F: __dxlog_file20,
       L: 32,
       S: this,
       C: (f, a) => f(...a)
     });
     this._fileHandle = await import_lock_file.LockFile.acquire(this._lockPath);
     await this._onAcquire?.();
-    (0, import_log16.log)("acquired lock", void 0, {
-      F: __dxlog_file19,
+    (0, import_log18.log)("acquired lock", void 0, {
+      F: __dxlog_file20,
       L: 37,
       S: this,
       C: (f, a) => f(...a)
@@ -5754,8 +5907,8 @@ var Lock = class {
   }
   async release() {
     await this._onRelease?.();
-    (0, import_invariant17.invariant)(this._fileHandle, "Lock is not acquired", {
-      F: __dxlog_file19,
+    (0, import_invariant18.invariant)(this._fileHandle, "Lock is not acquired", {
+      F: __dxlog_file20,
       L: 42,
       S: this,
       A: [
@@ -5767,11 +5920,11 @@ var Lock = class {
   }
 };
 _ts_decorate7([
-  import_log16.logInfo
+  import_log18.logInfo
 ], Lock.prototype, "lockKey", null);
 var isLocked = (lockPath) => import_lock_file.LockFile.isLocked(lockPath);
 var getRootPath = (config) => {
-  const { dataRoot = (0, import_util10.isNode)() ? import_client_protocol6.DX_DATA : "dxos/storage" } = config ?? {};
+  const { dataRoot = (0, import_util12.isNode)() ? import_client_protocol6.DX_DATA : "dxos/storage" } = config ?? {};
   return `${dataRoot}/`;
 };
 var isPersistent = (config) => {
@@ -5827,7 +5980,7 @@ var createLevel = async (config) => {
   await level.open();
   return level;
 };
-var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
@@ -5844,8 +5997,8 @@ var DevicesServiceImpl = class {
             devices: []
           });
         } else {
-          (0, import_invariant19.invariant)(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file20,
+          (0, import_invariant20.invariant)(this._identityManager.identity?.presence, "presence not present", {
+            F: __dxlog_file21,
             L: 32,
             S: this,
             A: [
@@ -5860,9 +6013,9 @@ var DevicesServiceImpl = class {
               const peerState = peers.find((peer) => peer.identityKey.equals(key));
               return {
                 deviceKey: key,
-                kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services17.DeviceKind.CURRENT : import_services17.DeviceKind.TRUSTED,
+                kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services18.DeviceKind.CURRENT : import_services18.DeviceKind.TRUSTED,
                 profile,
-                presence: isMe ? import_services17.Device.PresenceState.ONLINE : peerState ? import_services17.Device.PresenceState.ONLINE : import_services17.Device.PresenceState.OFFLINE
+                presence: isMe ? import_services18.Device.PresenceState.ONLINE : peerState ? import_services18.Device.PresenceState.ONLINE : import_services18.Device.PresenceState.OFFLINE
               };
             })
           });
@@ -5886,7 +6039,7 @@ var DevicesServiceImpl = class {
           presenceSubscribed = true;
         }
       };
-      const subscriptions = new import_async19.EventSubscriptions();
+      const subscriptions = new import_async21.EventSubscriptions();
       if (this._identityManager.identity) {
         subscribeIdentity();
         subscribePresence();
@@ -5911,7 +6064,7 @@ var DiagnosticsCollector = class {
   }
   static async collect(config = findConfigs(), services = findSystemServiceProvider(), options = {}) {
     const serviceDiagnostics = await services?.services?.SystemService?.getDiagnostics({
-      keys: options.humanize ? import_services18.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE : options.truncate ? import_services18.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE : void 0
+      keys: options.humanize ? import_services19.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE : options.truncate ? import_services19.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE : void 0
     }, {
       timeout: GET_DIAGNOSTICS_RPC_TIMEOUT
     });
@@ -5926,7 +6079,7 @@ var DiagnosticsCollector = class {
       client: clientDiagnostics,
       broadcast: await this.broadcastSender.broadcastDiagnosticsRequest()
     };
-    return JSON.parse(JSON.stringify(diagnostics, (0, import_util11.jsonKeyReplacer)(options)));
+    return JSON.parse(JSON.stringify(diagnostics, (0, import_util13.jsonKeyReplacer)(options)));
   }
 };
 var findSystemServiceProvider = () => {
@@ -5936,11 +6089,11 @@ var findSystemServiceProvider = () => {
 };
 var findConfigs = () => {
   const configs = import_tracing10.TRACE_PROCESSOR.findResourcesByAnnotation(import_config3.ConfigResource);
-  return configs.map((r) => r.instance.deref()).filter(import_util11.nonNullable);
+  return configs.map((r) => r.instance.deref()).filter(import_util13.nonNullable);
 };
 var LoggingServiceImpl = class {
   constructor() {
-    this._logs = new import_async20.Event();
+    this._logs = new import_async22.Event();
     this._started = Date.now();
     this._sessionId = import_keys17.PublicKey.random().toHex();
     this._logProcessor = (_config, entry2) => {
@@ -5948,23 +6101,23 @@ var LoggingServiceImpl = class {
     };
   }
   async open() {
-    import_log18.log.runtimeConfig.processors.push(this._logProcessor);
+    import_log20.log.runtimeConfig.processors.push(this._logProcessor);
   }
   async close() {
-    const index = import_log18.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
-    import_log18.log.runtimeConfig.processors.splice(index, 1);
+    const index = import_log20.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    import_log20.log.runtimeConfig.processors.splice(index, 1);
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
-      import_util13.tracer.clear();
+      import_util15.tracer.clear();
     }
     if (record === true) {
-      import_util13.tracer.start();
+      import_util15.tracer.start();
     } else if (record === false) {
-      import_util13.tracer.stop();
+      import_util15.tracer.stop();
     }
     return {
-      recording: import_util13.tracer.recording
+      recording: import_util15.tracer.recording
     };
   }
   /**
@@ -5972,10 +6125,10 @@ var LoggingServiceImpl = class {
   */
   queryMetrics({ interval = 5e3 }) {
     const getNumericalValues = (key) => {
-      const events = import_util13.tracer.get(key) ?? [];
+      const events = import_util15.tracer.get(key) ?? [];
       return {
         key,
-        stats: (0, import_util13.numericalValues)(events, "duration")
+        stats: (0, import_util15.numericalValues)(events, "duration")
       };
     };
     return new import_codec_protobuf13.Stream(({ next }) => {
@@ -6013,7 +6166,7 @@ var LoggingServiceImpl = class {
         }
         const record = {
           ...entry2,
-          context: (0, import_util13.jsonify)((0, import_log18.getContextFromEntry)(entry2)),
+          context: (0, import_util15.jsonify)((0, import_log20.getContextFromEntry)(entry2)),
           timestamp: /* @__PURE__ */ new Date(),
           meta: {
             // TODO(dmaretskyi): Fix proto.
@@ -6022,7 +6175,7 @@ var LoggingServiceImpl = class {
             scope: {
               hostSessionId: this._sessionId,
               uptimeSeconds: (Date.now() - this._started) / 1e3,
-              name: (0, import_util13.getDebugName)(entry2.meta?.S)
+              name: (0, import_util15.getDebugName)(entry2.meta?.S)
             }
           }
         };
@@ -6039,16 +6192,16 @@ var LoggingServiceImpl = class {
 };
 var matchFilter = (filter, level, path2, options) => {
   switch (options) {
-    case import_services19.QueryLogsRequest.MatchingOptions.INCLUSIVE:
+    case import_services20.QueryLogsRequest.MatchingOptions.INCLUSIVE:
       return level >= filter.level && (!filter.pattern || path2.includes(filter.pattern));
-    case import_services19.QueryLogsRequest.MatchingOptions.EXPLICIT:
+    case import_services20.QueryLogsRequest.MatchingOptions.EXPLICIT:
       return level === filter.level && (!filter.pattern || path2.includes(filter.pattern));
   }
 };
 var shouldLog = (entry2, request) => {
-  const options = request.options ?? import_services19.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  const options = request.options ?? import_services20.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   if (request.filters === void 0) {
-    return options === import_services19.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+    return options === import_services20.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   } else {
     return request.filters.some((filter) => matchFilter(filter, entry2.level, entry2.meta?.F ?? "", options));
   }
@@ -6103,9 +6256,9 @@ var SystemServiceImpl = class {
     const diagnostics = await this._getDiagnostics();
     return {
       timestamp: /* @__PURE__ */ new Date(),
-      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util14.jsonKeyReplacer)({
-        truncate: keys === import_services20.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
-        humanize: keys === import_services20.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
+      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util16.jsonKeyReplacer)({
+        truncate: keys === import_services21.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
+        humanize: keys === import_services21.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
       })))
     };
   }
@@ -6146,7 +6299,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_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var ClientServicesHost = class {
   constructor({
     config,
@@ -6160,7 +6313,7 @@ var ClientServicesHost = class {
     runtimeParams
   } = {}) {
     this._tracingService = import_tracing9.TRACE_PROCESSOR.createTraceSender();
-    this._statusUpdate = new import_async18.Event();
+    this._statusUpdate = new import_async20.Event();
     this._opening = false;
     this._open = false;
     this._storage = storage;
@@ -6179,7 +6332,7 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open(new import_context14.Context());
+            void this.open(new import_context16.Context());
           }
         },
         onRelease: () => this.close()
@@ -6188,14 +6341,14 @@ var ClientServicesHost = class {
     this._systemService = new SystemServiceImpl({
       config: () => this._config,
       statusUpdate: this._statusUpdate,
-      getCurrentStatus: () => this.isOpen ? import_services16.SystemStatus.ACTIVE : import_services16.SystemStatus.INACTIVE,
+      getCurrentStatus: () => this.isOpen ? import_services17.SystemStatus.ACTIVE : import_services17.SystemStatus.INACTIVE,
       getDiagnostics: () => {
         return createDiagnostics(this._serviceRegistry.services, this._serviceContext, this._config);
       },
       onUpdateStatus: async (status) => {
-        if (!this.isOpen && status === import_services16.SystemStatus.ACTIVE) {
+        if (!this.isOpen && status === import_services17.SystemStatus.ACTIVE) {
           await this._resourceLock?.acquire();
-        } else if (this.isOpen && status === import_services16.SystemStatus.INACTIVE) {
+        } else if (this.isOpen && status === import_services17.SystemStatus.INACTIVE) {
           await this._resourceLock?.release();
         }
       },
@@ -6234,8 +6387,8 @@ var ClientServicesHost = class {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    (0, import_invariant18.invariant)(!this._open, "service host is open", {
-      F: __dxlog_file21,
+    (0, import_invariant19.invariant)(!this._open, "service host is open", {
+      F: __dxlog_file22,
       L: 186,
       S: this,
       A: [
@@ -6243,15 +6396,15 @@ var ClientServicesHost = class {
         "'service host is open'"
       ]
     });
-    (0, import_log17.log)("initializing...", void 0, {
-      F: __dxlog_file21,
+    (0, import_log19.log)("initializing...", void 0, {
+      F: __dxlog_file22,
       L: 187,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
-      (0, import_invariant18.invariant)(!this._config, "config already set", {
-        F: __dxlog_file21,
+      (0, import_invariant19.invariant)(!this._config, "config already set", {
+        F: __dxlog_file22,
         L: 190,
         S: this,
         A: [
@@ -6265,8 +6418,8 @@ var ClientServicesHost = class {
       }
     }
     if (!options.signalManager) {
-      import_log17.log.warn("running signaling without telemetry metadata.", void 0, {
-        F: __dxlog_file21,
+      import_log19.log.warn("running signaling without telemetry metadata.", void 0, {
+        F: __dxlog_file22,
         L: 198,
         S: this,
         C: (f, a) => f(...a)
@@ -6276,8 +6429,8 @@ var ClientServicesHost = class {
       iceServers: this._config?.get("runtime.services.ice")
     }), signalManager = new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
-    (0, import_invariant18.invariant)(!this._networkManager, "network manager already set", {
-      F: __dxlog_file21,
+    (0, import_invariant19.invariant)(!this._networkManager, "network manager already set", {
+      F: __dxlog_file22,
       L: 209,
       S: this,
       A: [
@@ -6290,8 +6443,8 @@ var ClientServicesHost = class {
       transportFactory,
       signalManager
     });
-    (0, import_log17.log)("initialized", void 0, {
-      F: __dxlog_file21,
+    (0, import_log19.log)("initialized", void 0, {
+      F: __dxlog_file22,
       L: 216,
       S: this,
       C: (f, a) => f(...a)
@@ -6302,16 +6455,16 @@ var ClientServicesHost = class {
       return;
     }
     const traceId = import_keys15.PublicKey.random().toHex();
-    import_log17.log.trace("dxos.client-services.host.open", import_protocols15.trace.begin({
+    import_log19.log.trace("dxos.client-services.host.open", import_protocols15.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant18.invariant)(this._config, "config not set", {
-      F: __dxlog_file21,
+    (0, import_invariant19.invariant)(this._config, "config not set", {
+      F: __dxlog_file22,
       L: 229,
       S: this,
       A: [
@@ -6319,8 +6472,8 @@ var ClientServicesHost = class {
         "'config not set'"
       ]
     });
-    (0, import_invariant18.invariant)(this._storage, "storage not set", {
-      F: __dxlog_file21,
+    (0, import_invariant19.invariant)(this._storage, "storage not set", {
+      F: __dxlog_file22,
       L: 230,
       S: this,
       A: [
@@ -6328,8 +6481,8 @@ var ClientServicesHost = class {
         "'storage not set'"
       ]
     });
-    (0, import_invariant18.invariant)(this._signalManager, "signal manager not set", {
-      F: __dxlog_file21,
+    (0, import_invariant19.invariant)(this._signalManager, "signal manager not set", {
+      F: __dxlog_file22,
       L: 231,
       S: this,
       A: [
@@ -6337,8 +6490,8 @@ var ClientServicesHost = class {
         "'signal manager not set'"
       ]
     });
-    (0, import_invariant18.invariant)(this._networkManager, "network manager not set", {
-      F: __dxlog_file21,
+    (0, import_invariant19.invariant)(this._networkManager, "network manager not set", {
+      F: __dxlog_file22,
       L: 232,
       S: this,
       A: [
@@ -6347,10 +6500,10 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    (0, import_log17.log)("opening...", {
+    (0, import_log19.log)("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 235,
       S: this,
       C: (f, a) => f(...a)
@@ -6401,18 +6554,18 @@ var ClientServicesHost = class {
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log17.log)("opened", {
+    (0, import_log19.log)("opened", {
       deviceKey
     }, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 314,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log17.log.trace("dxos.client-services.host.open", import_protocols15.trace.end({
+    import_log19.log.trace("dxos.client-services.host.open", import_protocols15.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 315,
       S: this,
       C: (f, a) => f(...a)
@@ -6423,10 +6576,10 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log17.log)("closing...", {
+    (0, import_log19.log)("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 326,
       S: this,
       C: (f, a) => f(...a)
@@ -6441,10 +6594,10 @@ var ClientServicesHost = class {
     await this._level?.close();
     this._open = false;
     this._statusUpdate.emit();
-    (0, import_log17.log)("closed", {
+    (0, import_log19.log)("closed", {
       deviceKey
     }, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 335,
       S: this,
       C: (f, a) => f(...a)
@@ -6452,32 +6605,32 @@ var ClientServicesHost = class {
   }
   async reset() {
     const traceId = import_keys15.PublicKey.random().toHex();
-    import_log17.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.begin({
+    import_log19.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 340,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log17.log.info("resetting...", void 0, {
-      F: __dxlog_file21,
+    import_log19.log.info("resetting...", void 0, {
+      F: __dxlog_file22,
       L: 342,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
-    import_log17.log.info("reset", void 0, {
-      F: __dxlog_file21,
+    import_log19.log.info("reset", void 0, {
+      F: __dxlog_file22,
       L: 345,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log17.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.end({
+    import_log19.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 346,
       S: this,
       C: (f, a) => f(...a)
@@ -6497,11 +6650,11 @@ _ts_decorate8([
   import_tracing9.trace.info()
 ], ClientServicesHost.prototype, "_open", void 0);
 _ts_decorate8([
-  import_async18.synchronized,
+  import_async20.synchronized,
   import_tracing9.trace.span()
 ], ClientServicesHost.prototype, "open", null);
 _ts_decorate8([
-  import_async18.synchronized,
+  import_async20.synchronized,
   import_tracing9.trace.span()
 ], ClientServicesHost.prototype, "close", null);
 ClientServicesHost = _ts_decorate8([
@@ -6537,7 +6690,6 @@ ClientServicesHost = _ts_decorate8([
   createDiagnostics,
   createLevel,
   createStorageObjects,
-  findPropertiesObject,
   getNetworkPeers,
   isLocked,
   subscribeToFeedBlocks,
@@ -6548,4 +6700,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-STUWVNPH.cjs.map
+//# sourceMappingURL=chunk-OD7BTUYY.cjs.map