@dxos/client-services 0.5.9-main.bf0ae3e → 0.5.9-main.bf3bb8f

package/dist/lib/node/{chunk-ZBIDLLZ4.cjs → chunk-5PALJZPW.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_ZBIDLLZ4_exports = {};
-__export(chunk_ZBIDLLZ4_exports, {
+var chunk_5PALJZPW_exports = {};
+__export(chunk_5PALJZPW_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   ClientServicesProviderResource: () => ClientServicesProviderResource,
@@ -56,8 +56,11 @@ __export(chunk_ZBIDLLZ4_exports, {
   createDiagnostics: () => createDiagnostics,
   createLevel: () => createLevel,
   createStorageObjects: () => createStorageObjects,
-  findPropertiesObject: () => findPropertiesObject,
+  decodeProfileArchive: () => decodeProfileArchive,
+  encodeProfileArchive: () => encodeProfileArchive,
+  exportProfileData: () => exportProfileData,
   getNetworkPeers: () => getNetworkPeers,
+  importProfileData: () => importProfileData,
   isLocked: () => isLocked,
   subscribeToFeedBlocks: () => subscribeToFeedBlocks,
   subscribeToFeeds: () => subscribeToFeeds,
@@ -67,7 +70,7 @@ __export(chunk_ZBIDLLZ4_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_ZBIDLLZ4_exports);
+module.exports = __toCommonJS(chunk_5PALJZPW_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 +130,208 @@ 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_echo_db = require("@dxos/echo-db");
+var import_echo_protocol2 = require("@dxos/echo-protocol");
+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_async15 = require("@dxos/async");
+var import_context12 = 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_util8 = require("@dxos/util");
+var import_async16 = require("@dxos/async");
 var import_client_protocol5 = require("@dxos/client-protocol");
-var import_context12 = require("@dxos/context");
+var import_context13 = require("@dxos/context");
 var import_credentials15 = require("@dxos/credentials");
+var import_echo_db2 = require("@dxos/echo-db");
 var import_echo_pipeline3 = require("@dxos/echo-pipeline");
-var import_echo_protocol = require("@dxos/echo-protocol");
+var import_echo_pipeline4 = require("@dxos/echo-pipeline");
+var import_echo_protocol3 = require("@dxos/echo-protocol");
 var import_echo_schema2 = require("@dxos/echo-schema");
-var import_invariant14 = require("@dxos/invariant");
+var import_feed_store4 = require("@dxos/feed-store");
+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_util9 = 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_async17 = 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_feed_store5 = require("@dxos/feed-store");
+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_async18 = require("@dxos/async");
+var import_context14 = 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_feed_store5 = require("@dxos/feed-store");
-var import_invariant16 = require("@dxos/invariant");
+var import_echo_db3 = require("@dxos/echo-db");
+var import_echo_pipeline5 = require("@dxos/echo-pipeline");
+var import_feed_store6 = require("@dxos/feed-store");
+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_util10 = 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_util11 = 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_automerge_repo = require("@dxos/automerge/automerge-repo");
+var import_invariant19 = require("@dxos/invariant");
+var import_log19 = require("@dxos/log");
+var import_protocols15 = require("@dxos/protocols");
+var import_util12 = require("@dxos/util");
+var import_async19 = 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_context15 = require("@dxos/context");
+var import_invariant20 = require("@dxos/invariant");
 var import_keys15 = require("@dxos/keys");
-var import_log17 = require("@dxos/log");
+var import_log20 = 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_protocols16 = require("@dxos/protocols");
+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_async20 = 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_invariant21 = 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_async21 = 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_util15 = require("@dxos/util");
+var import_async22 = require("@dxos/async");
 var import_codec_protobuf14 = require("@dxos/codec-protobuf");
-var import_codec_protobuf15 = require("@dxos/codec-protobuf");
+var import_keys18 = require("@dxos/keys");
+var import_log21 = require("@dxos/log");
 var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util14 = require("@dxos/util");
+var import_util16 = require("@dxos/util");
+var import_codec_protobuf15 = require("@dxos/codec-protobuf");
+var import_codec_protobuf16 = require("@dxos/codec-protobuf");
+var import_services21 = require("@dxos/protocols/proto/dxos/client/services");
+var import_util17 = require("@dxos/util");
 var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
   return new import_codec_protobuf.Stream(({ next }) => {
     const subscriptions = new import_async.EventSubscriptions();
@@ -374,6 +399,7 @@ var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
     };
   });
 };
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devtools/network.ts";
 var subscribeToNetworkStatus = ({ signalManager }) => new import_codec_protobuf2.Stream(({ next, close }) => {
   const update = () => {
     try {
@@ -389,7 +415,10 @@ var subscribeToNetworkStatus = ({ signalManager }) => new import_codec_protobuf2
   update();
 });
 var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf2.Stream(({ next }) => {
-  const ctx = new import_context.Context();
+  const ctx = new import_context.Context(void 0, {
+    F: __dxlog_file,
+    L: 36
+  });
   signalManager.onMessage.on(ctx, (message) => {
     next({
       message: {
@@ -617,7 +646,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.5.9-main.bf0ae3e";
+var DXOS_VERSION = "0.5.9-main.bf3bb8f";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -645,7 +674,7 @@ var getPlatform = () => {
     };
   }
 };
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts";
 var DEFAULT_TIMEOUT = 1e3;
 var createDiagnostics = async (clientServices, serviceContext, config) => {
   const diagnostics = {
@@ -662,7 +691,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
   await Promise.all([
     (async () => {
       (0, import_invariant.invariant)(clientServices.LoggingService, "SystemService is not available.", {
-        F: __dxlog_file,
+        F: __dxlog_file2,
         L: 110,
         S: void 0,
         A: [
@@ -851,7 +880,7 @@ _ts_decorate([
 ClientRpcServer = _ts_decorate([
   import_tracing2.trace.resource()
 ], ClientRpcServer);
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
 var Credential = import_protocols2.schema.getCodecForType("dxos.halo.credentials.Credential");
 var createAuthProvider = (signer) => async (nonce) => {
   const credential = await signer.createCredential({
@@ -866,7 +895,10 @@ var createAuthProvider = (signer) => async (nonce) => {
 var TrustedKeySetAuthVerifier = class {
   constructor(_params) {
     this._params = _params;
-    this._ctx = new import_context2.Context();
+    this._ctx = new import_context2.Context(void 0, {
+      F: __dxlog_file3,
+      L: 45
+    });
   }
   async close() {
     await this._ctx.dispose();
@@ -877,7 +909,7 @@ var TrustedKeySetAuthVerifier = class {
       (0, import_log.log)("authenticating...", {
         credential
       }, {
-        F: __dxlog_file2,
+        F: __dxlog_file3,
         L: 56,
         S: this,
         C: (f, a) => f(...a)
@@ -887,7 +919,7 @@ var TrustedKeySetAuthVerifier = class {
         (0, import_log.log)("Invalid credential", {
           result
         }, {
-          F: __dxlog_file2,
+          F: __dxlog_file3,
           L: 60,
           S: this,
           C: (f, a) => f(...a)
@@ -899,7 +931,7 @@ var TrustedKeySetAuthVerifier = class {
           nonce,
           credential
         }, {
-          F: __dxlog_file2,
+          F: __dxlog_file3,
           L: 65,
           S: this,
           C: (f, a) => f(...a)
@@ -910,7 +942,7 @@ var TrustedKeySetAuthVerifier = class {
         (0, import_log.log)("key is not currently in trusted set, waiting...", {
           key: credential.issuer
         }, {
-          F: __dxlog_file2,
+          F: __dxlog_file3,
           L: 70,
           S: this,
           C: (f, a) => f(...a)
@@ -926,7 +958,7 @@ var TrustedKeySetAuthVerifier = class {
           (0, import_log.log)("auth success", {
             key: credential.issuer
           }, {
-            F: __dxlog_file2,
+            F: __dxlog_file3,
             L: 81,
             S: this,
             C: (f, a) => f(...a)
@@ -936,7 +968,7 @@ var TrustedKeySetAuthVerifier = class {
           (0, import_log.log)("key is not currently in trusted set, waiting...", {
             key: credential.issuer
           }, {
-            F: __dxlog_file2,
+            F: __dxlog_file3,
             L: 84,
             S: this,
             C: (f, a) => f(...a)
@@ -959,7 +991,7 @@ var TrustedKeySetAuthVerifier = class {
     return deviceSet.has(deviceKey);
   }
 };
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/default-space-state-machine.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/default-space-state-machine.ts";
 var DefaultSpaceStateMachine = class {
   constructor(_params) {
     this._params = _params;
@@ -976,7 +1008,7 @@ var DefaultSpaceStateMachine = class {
             expectedIdentity: this._params.identityKey,
             credential
           }, {
-            F: __dxlog_file3,
+            F: __dxlog_file4,
             L: 32,
             S: this,
             C: (f, a) => f(...a)
@@ -987,7 +1019,7 @@ var DefaultSpaceStateMachine = class {
           import_log3.log.warn("Invalid default space id", {
             id: assertion.spaceId
           }, {
-            F: __dxlog_file3,
+            F: __dxlog_file4,
             L: 36,
             S: this,
             C: (f, a) => f(...a)
@@ -1010,7 +1042,7 @@ function _ts_decorate2(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
 var Identity = class {
   constructor({ space, signer, identityKey, deviceKey, presence }) {
     this.stateUpdate = new import_async6.Event();
@@ -1022,7 +1054,7 @@ var Identity = class {
     import_log2.log.trace("dxos.halo.device", {
       deviceKey
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 70,
       S: this,
       C: (f, a) => f(...a)
@@ -1101,7 +1133,7 @@ var Identity = class {
   */
   getIdentityCredentialSigner() {
     (0, import_invariant2.invariant)(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 159,
       S: this,
       A: [
@@ -1145,7 +1177,7 @@ var Identity = class {
       controlFeedKey,
       dataFeedKey
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 184,
       S: this,
       C: (f, a) => f(...a)
@@ -1206,7 +1238,7 @@ function _ts_decorate3(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-manager.ts";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-manager.ts";
 var DEVICE_PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var DEVICE_PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var IdentityManager = class {
@@ -1230,7 +1262,7 @@ var IdentityManager = class {
     import_log4.log.trace("dxos.halo.identity-manager.open", import_protocols3.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 104,
       S: this,
       C: (f, a) => f(...a)
@@ -1239,7 +1271,7 @@ var IdentityManager = class {
     (0, import_log4.log)("identity record", {
       identityRecord
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 107,
       S: this,
       C: (f, a) => f(...a)
@@ -1252,7 +1284,7 @@ var IdentityManager = class {
         identityKey: identityRecord.identityKey,
         displayName: this._identity.profileDocument?.displayName
       }, {
-        F: __dxlog_file5,
+        F: __dxlog_file6,
         L: 112,
         S: this,
         C: (f, a) => f(...a)
@@ -1262,18 +1294,21 @@ var IdentityManager = class {
     import_log4.log.trace("dxos.halo.identity-manager.open", import_protocols3.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    await this._identity?.close(new import_context3.Context());
+    await this._identity?.close(new import_context3.Context(void 0, {
+      F: __dxlog_file6,
+      L: 123
+    }));
   }
   async createIdentity({ displayName, deviceProfile } = {}) {
     (0, import_invariant3.invariant)(!this._identity, "Identity already exists.", {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 128,
       S: this,
       A: [
@@ -1282,7 +1317,7 @@ var IdentityManager = class {
       ]
     });
     (0, import_log4.log)("creating identity...", void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 129,
       S: this,
       C: (f, a) => f(...a)
@@ -1299,11 +1334,14 @@ var IdentityManager = class {
       }
     };
     const identity = await this._constructIdentity(identityRecord);
-    await identity.open(new import_context3.Context());
+    await identity.open(new import_context3.Context(void 0, {
+      F: __dxlog_file6,
+      L: 144
+    }));
     {
       const generator = new import_credentials6.CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       (0, import_invariant3.invariant)(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
-        F: __dxlog_file5,
+        F: __dxlog_file6,
         L: 148,
         S: this,
         A: [
@@ -1312,7 +1350,7 @@ var IdentityManager = class {
         ]
       });
       (0, import_invariant3.invariant)(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
-        F: __dxlog_file5,
+        F: __dxlog_file6,
         L: 149,
         S: this,
         A: [
@@ -1351,7 +1389,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey,
       displayName: this._identity.profileDocument?.displayName
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 191,
       S: this,
       C: (f, a) => f(...a)
@@ -1362,7 +1400,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey,
       profile: identity.profileDocument
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 197,
       S: this,
       C: (f, a) => f(...a)
@@ -1399,13 +1437,13 @@ var IdentityManager = class {
     (0, import_log4.log)("accepting identity", {
       params
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant3.invariant)(!this._identity, "Identity already exists.", {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 236,
       S: this,
       A: [
@@ -1425,7 +1463,10 @@ var IdentityManager = class {
       }
     };
     const identity = await this._constructIdentity(identityRecord);
-    await identity.open(new import_context3.Context());
+    await identity.open(new import_context3.Context(void 0, {
+      F: __dxlog_file6,
+      L: 251
+    }));
     this._identity = identity;
     await this._metadataStore.setIdentityRecord(identityRecord);
     await this._identity.ready();
@@ -1433,7 +1474,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey,
       displayName: this._identity.profileDocument?.displayName
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 255,
       S: this,
       C: (f, a) => f(...a)
@@ -1447,7 +1488,7 @@ var IdentityManager = class {
       identityKey: identity.identityKey,
       deviceKey: identity.deviceKey
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 265,
       S: this,
       C: (f, a) => f(...a)
@@ -1459,7 +1500,7 @@ var IdentityManager = class {
   */
   async updateProfile(profile) {
     (0, import_invariant3.invariant)(this._identity, "Identity not initialized.", {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 273,
       S: this,
       A: [
@@ -1490,7 +1531,7 @@ var IdentityManager = class {
   }
   async updateDeviceProfile(profile) {
     (0, import_invariant3.invariant)(this._identity, "Identity not initialized.", {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 290,
       S: this,
       A: [
@@ -1526,7 +1567,7 @@ var IdentityManager = class {
   }
   async _constructIdentity(identityRecord) {
     (0, import_invariant3.invariant)(!this._identity, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 316,
       S: this,
       A: [
@@ -1537,7 +1578,7 @@ var IdentityManager = class {
     (0, import_log4.log)("constructing identity", {
       identityRecord
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 317,
       S: this,
       C: (f, a) => f(...a)
@@ -1552,7 +1593,7 @@ var IdentityManager = class {
       gossip
     });
     (0, import_invariant3.invariant)(identityRecord.haloSpace.controlFeedKey, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 330,
       S: this,
       A: [
@@ -1564,7 +1605,7 @@ var IdentityManager = class {
       writable: true
     });
     (0, import_invariant3.invariant)(identityRecord.haloSpace.dataFeedKey, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 334,
       S: this,
       A: [
@@ -1598,7 +1639,7 @@ var IdentityManager = class {
     (0, import_log4.log)("done", {
       identityKey: identityRecord.identityKey
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 360,
       S: this,
       C: (f, a) => f(...a)
@@ -1623,7 +1664,7 @@ var IdentityManager = class {
       },
       onAuthFailure: () => {
         import_log4.log.warn("auth failure", void 0, {
-          F: __dxlog_file5,
+          F: __dxlog_file6,
           L: 385,
           S: this,
           C: (f, a) => f(...a)
@@ -1645,7 +1686,8 @@ _ts_decorate3([
 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 __dxlog_file7 = "/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();
@@ -1674,8 +1716,8 @@ var IdentityServiceImpl = class extends import_context4.Resource {
     const space = await dataSpaceManager.createDefaultSpace();
     const identity = this._identityManager.identity;
     (0, import_invariant4.invariant)(identity, void 0, {
-      F: __dxlog_file6,
-      L: 54,
+      F: __dxlog_file7,
+      L: 59,
       S: this,
       A: [
         "identity",
@@ -1708,8 +1750,8 @@ 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,
+      F: __dxlog_file7,
+      L: 89,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -1722,8 +1764,8 @@ 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,
+      F: __dxlog_file7,
+      L: 96,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -1739,25 +1781,55 @@ 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_file7,
+            L: 129,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          return;
+        }
+        foundDefaultSpace = true;
         await identity.updateDefaultSpace(space.id);
-        hasDefaultSpace = true;
-        break;
+        recodedDefaultSpace = true;
+        recordedDefaultSpaceTrigger.wake();
       }
-    }
-    if (!hasDefaultSpace) {
+    }, (err) => {
+      import_log5.log.catch(err, void 0, {
+        F: __dxlog_file7,
+        L: 140,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    });
+    await Promise.race([
+      allProcessed,
+      recordedDefaultSpaceTrigger.wait(),
+      (0, import_async8.sleep)(DEFAULT_SPACE_SEARCH_TIMEOUT)
+    ]);
+    if (!recodedDefaultSpace) {
       await this._createDefaultSpace(dataSpaceManager);
     }
   }
 };
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts";
 var DeviceInvitationProtocol = class {
   constructor(_keyring, _getIdentity, _acceptIdentity) {
     this._keyring = _keyring;
@@ -1783,7 +1855,7 @@ var DeviceInvitationProtocol = class {
   }
   async admit(_, request) {
     (0, import_invariant5.invariant)(request.device, void 0, {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 50,
       S: this,
       A: [
@@ -1829,7 +1901,7 @@ var DeviceInvitationProtocol = class {
   }
   async accept(response, request) {
     (0, import_invariant5.invariant)(response.device, void 0, {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 95,
       S: this,
       A: [
@@ -1839,7 +1911,7 @@ var DeviceInvitationProtocol = class {
     });
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
     (0, import_invariant5.invariant)(request.device, void 0, {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 98,
       S: this,
       A: [
@@ -1878,7 +1950,7 @@ var tryAcquireBeforeContextDisposed = async (ctx, mutex) => {
     return guard;
   })());
 };
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts";
+var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts";
 var OPTIONS_TIMEOUT = 1e4;
 var InvitationGuestExtension = class extends import_teleport.RpcExtension {
   constructor(_invitationFlowMutex, _callbacks) {
@@ -1892,8 +1964,11 @@ 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._ctx = new import_context6.Context(void 0, {
+      F: __dxlog_file9,
+      L: 33
+    });
+    this._remoteOptionsTrigger = new import_async10.Trigger();
     this._invitationFlowLock = null;
   }
   hasFlowLock() {
@@ -1904,7 +1979,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
       InvitationHostService: {
         options: async (options) => {
           (0, import_invariant7.invariant)(!this._remoteOptions, "Remote options already set.", {
-            F: __dxlog_file8,
+            F: __dxlog_file9,
             L: 63,
             S: this,
             A: [
@@ -1930,15 +2005,15 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      (0, import_log6.log)("guest acquire lock", void 0, {
-        F: __dxlog_file8,
+      (0, import_log7.log)("guest acquire lock", void 0, {
+        F: __dxlog_file9,
         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, {
-        F: __dxlog_file8,
+      (0, import_log7.log)("guest lock acquired", void 0, {
+        F: __dxlog_file9,
         L: 86,
         S: this,
         C: (f, a) => f(...a)
@@ -1946,8 +2021,8 @@ 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, {
-        F: __dxlog_file8,
+      (0, import_log7.log)("options sent", void 0, {
+        F: __dxlog_file9,
         L: 88,
         S: this,
         C: (f, a) => f(...a)
@@ -1955,8 +2030,8 @@ 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, {
-        F: __dxlog_file8,
+      (0, import_log7.log)("options received", void 0, {
+        F: __dxlog_file9,
         L: 90,
         S: this,
         C: (f, a) => f(...a)
@@ -1989,8 +2064,8 @@ 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, {
-        F: __dxlog_file8,
+      (0, import_log7.log)("invitation flow lock released", void 0, {
+        F: __dxlog_file9,
         L: 123,
         S: this,
         C: (f, a) => f(...a)
@@ -1998,7 +2073,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     }
   }
 };
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
+var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
 var OPTIONS_TIMEOUT2 = 1e4;
 var MAX_OTP_ATTEMPTS = 3;
 var InvitationHostExtension = class extends import_teleport2.RpcExtension {
@@ -2013,13 +2088,16 @@ 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._ctx = new import_context8.Context(void 0, {
+      F: __dxlog_file10,
+      L: 52
+    });
+    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() {
@@ -2032,7 +2110,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
       InvitationHostService: {
         options: async (options) => {
           (0, import_invariant8.invariant)(!this._remoteOptions, "Remote options already set.", {
-            F: __dxlog_file9,
+            F: __dxlog_file10,
             L: 101,
             S: this,
             A: [
@@ -2046,10 +2124,10 @@ 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,
+            F: __dxlog_file10,
             L: 110,
             S: this,
             C: (f, a) => f(...a)
@@ -2057,25 +2135,25 @@ 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
             }, {
-              F: __dxlog_file9,
+              F: __dxlog_file10,
               L: 116,
               S: this,
               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,
+            F: __dxlog_file10,
             L: 125,
             S: this,
             C: (f, a) => f(...a)
@@ -2083,10 +2161,10 @@ 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,
+            F: __dxlog_file10,
             L: 132,
             S: this,
             C: (f, a) => f(...a)
@@ -2098,19 +2176,19 @@ 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,
+            F: __dxlog_file10,
             L: 141,
             S: this,
             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,
+            F: __dxlog_file10,
             L: 144,
             S: this,
             C: (f, a) => f(...a)
@@ -2123,8 +2201,8 @@ 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, {
-                F: __dxlog_file9,
+              (0, import_log8.log)("authentication not required", void 0, {
+                F: __dxlog_file10,
                 L: 152,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2159,10 +2237,10 @@ 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,
+                F: __dxlog_file10,
                 L: 190,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2176,18 +2254,18 @@ 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
             }
           }), {
-            F: __dxlog_file9,
+            F: __dxlog_file10,
             L: 202,
             S: this,
             C: (f, a) => f(...a)
@@ -2198,10 +2276,10 @@ 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,
+            F: __dxlog_file10,
             L: 208,
             S: this,
             C: (f, a) => f(...a)
@@ -2215,10 +2293,10 @@ 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,
+              F: __dxlog_file10,
               L: 222,
               S: this,
               C: (f, a) => f(...a)
@@ -2235,15 +2313,15 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      (0, import_log7.log)("host acquire lock", void 0, {
-        F: __dxlog_file9,
+      (0, import_log8.log)("host acquire lock", void 0, {
+        F: __dxlog_file10,
         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, {
-        F: __dxlog_file9,
+      (0, import_log8.log)("host lock acquired", void 0, {
+        F: __dxlog_file10,
         L: 239,
         S: this,
         C: (f, a) => f(...a)
@@ -2253,8 +2331,8 @@ 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, {
-        F: __dxlog_file9,
+      (0, import_log8.log)("options sent", void 0, {
+        F: __dxlog_file10,
         L: 243,
         S: this,
         C: (f, a) => f(...a)
@@ -2262,8 +2340,8 @@ 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, {
-        F: __dxlog_file9,
+      (0, import_log8.log)("options received", void 0, {
+        F: __dxlog_file10,
         L: 245,
         S: this,
         C: (f, a) => f(...a)
@@ -2290,7 +2368,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 +2379,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,8 +2394,8 @@ 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, {
-        F: __dxlog_file9,
+      (0, import_log8.log)("invitation flow lock released", void 0, {
+        F: __dxlog_file10,
         L: 300,
         S: this,
         C: (f, a) => f(...a)
@@ -2326,15 +2404,15 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
   }
 };
 var isAuthenticationRequired = (invitation) => invitation.authMethod !== import_services8.Invitation.AuthMethod.NONE;
-var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
+var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
 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.", {
-      F: __dxlog_file10,
+      F: __dxlog_file11,
       L: 42,
       S: this,
       A: [
@@ -2346,7 +2424,7 @@ var InvitationTopology = class {
   }
   update() {
     (0, import_invariant9.invariant)(this._controller, "Not initialized.", {
-      F: __dxlog_file10,
+      F: __dxlog_file11,
       L: 47,
       S: this,
       A: [
@@ -2363,13 +2441,13 @@ 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
       }, {
-        F: __dxlog_file10,
+        F: __dxlog_file11,
         L: 69,
         S: this,
         C: (f, a) => f(...a)
@@ -2380,7 +2458,7 @@ var InvitationTopology = class {
   }
   async onOffer(peer) {
     (0, import_invariant9.invariant)(this._controller, "Not initialized.", {
-      F: __dxlog_file10,
+      F: __dxlog_file11,
       L: 76,
       S: this,
       A: [
@@ -2397,7 +2475,7 @@ var InvitationTopology = class {
     return `InvitationTopology(${this._role === import_invitations5.Options.Role.GUEST ? "guest" : "host"})`;
   }
 };
-var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
+var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
 var MAX_DELEGATED_INVITATION_HOST_TRIES = 3;
 var InvitationsHandler = class {
   /**
@@ -2422,7 +2500,7 @@ var InvitationsHandler = class {
           try {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             (0, import_invariant6.invariant)(deviceKey, void 0, {
-              F: __dxlog_file11,
+              F: __dxlog_file12,
               L: 90,
               S: this,
               A: [
@@ -2445,21 +2523,21 @@ 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,
+                F: __dxlog_file12,
                 L: 115,
                 S: this,
                 C: (f, a) => f(...a)
               });
-              (0, import_log5.log)("connected", {
+              (0, import_log6.log)("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 116,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2467,20 +2545,20 @@ 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()
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 118,
                 S: this,
                 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,
+                F: __dxlog_file12,
                 L: 120,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2490,12 +2568,12 @@ 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,
+                    F: __dxlog_file12,
                     L: 129,
                     S: this,
                     C: (f, a) => f(...a)
@@ -2503,19 +2581,19 @@ var InvitationsHandler = class {
                 }
               } else {
                 if (guardedState.error(extension, err)) {
-                  import_log5.log.error("failed", err, {
-                    F: __dxlog_file11,
+                  import_log6.log.error("failed", err, {
+                    F: __dxlog_file12,
                     L: 133,
                     S: this,
                     C: (f, a) => f(...a)
                   });
                 }
               }
-              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
               }), {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 136,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2526,22 +2604,22 @@ 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,
+              F: __dxlog_file12,
               L: 144,
               S: this,
               C: (f, a) => f(...a)
             });
             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,
+                F: __dxlog_file12,
                 L: 149,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2549,8 +2627,8 @@ var InvitationsHandler = class {
             }
           } else {
             if (guardedState.error(extension, err)) {
-              import_log5.log.error("failed", err, {
-                F: __dxlog_file11,
+              import_log6.log.error("failed", err, {
+                F: __dxlog_file12,
                 L: 153,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2563,14 +2641,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, {
-          F: __dxlog_file11,
+        import_log6.log.warn("invitation has already expired", void 0, {
+          F: __dxlog_file12,
           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 +2656,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);
     });
@@ -2587,7 +2665,7 @@ var InvitationsHandler = class {
     const { timeout = import_client_protocol2.INVITATION_TIMEOUT } = invitation;
     if (deviceProfile) {
       (0, import_invariant6.invariant)(invitation.kind === import_services6.Invitation.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
-        F: __dxlog_file11,
+        F: __dxlog_file12,
         L: 197,
         S: this,
         A: [
@@ -2596,16 +2674,16 @@ 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
       }, {
-        F: __dxlog_file11,
+        F: __dxlog_file12,
         L: 205,
         S: this,
         C: (f, a) => f(...a)
@@ -2628,11 +2706,11 @@ var InvitationsHandler = class {
             return;
           }
           connectionCtx.onDispose(async () => {
-            (0, import_log5.log)("extension disposed", {
+            (0, import_log6.log)("extension disposed", {
               admitted,
               currentState: guardedState.current.state
             }, {
-              F: __dxlog_file11,
+              F: __dxlog_file12,
               L: 233,
               S: this,
               C: (f, a) => f(...a)
@@ -2644,34 +2722,34 @@ 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,
+                F: __dxlog_file12,
                 L: 245,
                 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,
+                F: __dxlog_file12,
                 L: 256,
                 S: this,
                 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,
+                F: __dxlog_file12,
                 L: 260,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2680,11 +2758,11 @@ var InvitationsHandler = class {
                 invitationId: invitation.invitationId,
                 ...protocol.createIntroduction()
               });
-              (0, import_log5.log)("introduce response", {
+              (0, import_log6.log)("introduce response", {
                 ...protocol.toJSON(),
                 response: introductionResponse
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 265,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2702,10 +2780,10 @@ var InvitationsHandler = class {
                     break;
                 }
               }
-              (0, import_log5.log)("request admission", {
+              (0, import_log6.log)("request admission", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 291,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2714,10 +2792,10 @@ 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,
+                F: __dxlog_file12,
                 L: 302,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2727,28 +2805,28 @@ 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,
+                F: __dxlog_file12,
                 L: 308,
                 S: this,
                 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,
+                  F: __dxlog_file12,
                   L: 311,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 guardedState.set(extension, import_services6.Invitation.State.TIMEOUT);
               } else {
-                (0, import_log5.log)("auth failed", err, {
-                  F: __dxlog_file11,
+                (0, import_log6.log)("auth failed", err, {
+                  F: __dxlog_file12,
                   L: 314,
                   S: this,
                   C: (f, a) => f(...a)
@@ -2756,11 +2834,11 @@ 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
               }), {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 318,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2772,19 +2850,19 @@ 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,
+              F: __dxlog_file12,
               L: 327,
               S: this,
               C: (f, a) => f(...a)
             });
             guardedState.set(extension, import_services6.Invitation.State.TIMEOUT);
           } else {
-            (0, import_log5.log)("auth failed", err, {
-              F: __dxlog_file11,
+            (0, import_log6.log)("auth failed", err, {
+              F: __dxlog_file12,
               L: 330,
               S: this,
               C: (f, a) => f(...a)
@@ -2795,14 +2873,14 @@ 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);
         await ctx.dispose();
       } else {
         (0, import_invariant6.invariant)(invitation.swarmKey, void 0, {
-          F: __dxlog_file11,
+          F: __dxlog_file12,
           L: 345,
           S: this,
           A: [
@@ -2841,7 +2919,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,20 +2974,33 @@ var InvitationsHandler = class {
     };
   }
   _logStateUpdate(invitation, actor, newState) {
-    (0, import_log5.log)("invitation state update", {
-      actor: actor?.constructor.name,
-      newState: stateToString(newState),
-      oldState: stateToString(invitation.state)
-    }, {
-      F: __dxlog_file11,
-      L: 438,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
-  _isNotTerminal(currentState) {
-    return ![
-      import_services6.Invitation.State.SUCCESS,
+    if (this._isNotTerminal(newState)) {
+      (0, import_log6.log)("invitation state update", {
+        actor: actor?.constructor.name,
+        newState: stateToString(newState),
+        oldState: stateToString(invitation.state)
+      }, {
+        F: __dxlog_file12,
+        L: 439,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    } else {
+      import_log6.log.info("invitation state update", {
+        actor: actor?.constructor.name,
+        newState: stateToString(newState),
+        oldState: stateToString(invitation.state)
+      }, {
+        F: __dxlog_file12,
+        L: 445,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  _isNotTerminal(currentState) {
+    return ![
+      import_services6.Invitation.State.SUCCESS,
       import_services6.Invitation.State.ERROR,
       import_services6.Invitation.State.CANCELLED,
       import_services6.Invitation.State.TIMEOUT,
@@ -2918,17 +3009,17 @@ 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, {
-        F: __dxlog_file11,
-        L: 462,
+      (0, import_log6.log)("guest waiting for authentication code...", void 0, {
+        F: __dxlog_file12,
+        L: 470,
         S: this,
         C: (f, a) => f(...a)
       });
       setState(import_services6.Invitation.State.READY_FOR_AUTHENTICATION);
       const authCode = await authenticated.wait(options);
-      (0, import_log5.log)("sending authentication request", void 0, {
-        F: __dxlog_file11,
-        L: 466,
+      (0, import_log6.log)("sending authentication request", void 0, {
+        F: __dxlog_file12,
+        L: 474,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2943,11 +3034,11 @@ var InvitationsHandler = class {
         if (attempt === MAX_OTP_ATTEMPTS) {
           throw new Error(`Maximum retry attempts: ${MAX_OTP_ATTEMPTS}`);
         } else {
-          (0, import_log5.log)("retrying invalid code", {
+          (0, import_log6.log)("retrying invalid code", {
             attempt
           }, {
-            F: __dxlog_file11,
-            L: 477,
+            F: __dxlog_file12,
+            L: 485,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2963,9 +3054,9 @@ var InvitationsHandler = class {
     if (introductionResponse.challenge == null) {
       throw new Error("challenge missing in the introduction");
     }
-    (0, import_log5.log)("sending authentication request", void 0, {
-      F: __dxlog_file11,
-      L: 496,
+    (0, import_log6.log)("sending authentication request", void 0, {
+      F: __dxlog_file12,
+      L: 504,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3079,7 +3170,7 @@ var InvitationsServiceImpl = class {
     });
   }
 };
-var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
+var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
 var SpaceInvitationProtocol = class {
   constructor(_spaceManager, _signingContext, _keyring, _spaceKey) {
     this._spaceManager = _spaceManager;
@@ -3113,79 +3204,43 @@ var SpaceInvitationProtocol = class {
     };
   }
   async admit(invitation, request, guestProfile) {
-    (0, import_invariant10.invariant)(this._spaceKey, void 0, {
-      F: __dxlog_file12,
-      L: 76,
-      S: this,
-      A: [
-        "this._spaceKey",
-        ""
-      ]
-    });
-    const space = this._spaceManager.spaces.get(this._spaceKey);
-    (0, import_invariant10.invariant)(space, void 0, {
-      F: __dxlog_file12,
-      L: 78,
-      S: this,
-      A: [
-        "space",
-        ""
-      ]
-    });
-    (0, import_invariant10.invariant)(request.space, void 0, {
-      F: __dxlog_file12,
-      L: 80,
+    (0, import_invariant10.invariant)(this._spaceKey && request.space, void 0, {
+      F: __dxlog_file13,
+      L: 74,
       S: this,
       A: [
-        "request.space",
+        "this._spaceKey && request.space",
         ""
       ]
     });
-    const { identityKey, deviceKey } = request.space;
-    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
+      guest: request.space.deviceKey
     }, {
-      F: __dxlog_file12,
-      L: 87,
+      F: __dxlog_file13,
+      L: 75,
       S: this,
       C: (f, a) => f(...a)
     });
-    const credentials = await (0, import_credentials9.createAdmissionCredentials)(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, invitation.role ?? import_credentials10.SpaceMember.Role.ADMIN, space.inner.spaceState.membershipChainHeads, guestProfile, invitation.delegationCredentialId);
-    (0, import_invariant10.invariant)(credentials[0].credential, void 0, {
-      F: __dxlog_file12,
-      L: 101,
-      S: this,
-      A: [
-        "credentials[0].credential",
-        ""
-      ]
-    });
-    const spaceMemberCredential = credentials[0].credential.credential;
-    (0, import_invariant10.invariant)((0, import_credentials9.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file12,
-      L: 103,
-      S: this,
-      A: [
-        "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
-        ""
-      ]
+    const spaceMemberCredential = await this._spaceManager.admitMember({
+      spaceKey: this._spaceKey,
+      identityKey: request.space.identityKey,
+      role: invitation.role ?? import_credentials10.SpaceMember.Role.ADMIN,
+      profile: guestProfile,
+      delegationCredentialId: invitation.delegationCredentialId
     });
-    await (0, import_feed_store3.writeMessages)(space.inner.controlPipeline.writer, credentials);
+    const space = this._spaceManager.spaces.get(this._spaceKey);
     return {
       space: {
         credential: spaceMemberCredential,
-        controlTimeframe: space.inner.controlPipeline.state.timeframe
+        controlTimeframe: space?.inner.controlPipeline.state.timeframe
       }
     };
   }
   async delegate(invitation) {
     (0, import_invariant10.invariant)(this._spaceKey, void 0, {
-      F: __dxlog_file12,
-      L: 116,
+      F: __dxlog_file13,
+      L: 95,
       S: this,
       A: [
         "this._spaceKey",
@@ -3194,8 +3249,8 @@ var SpaceInvitationProtocol = class {
     });
     const space = this._spaceManager.spaces.get(this._spaceKey);
     (0, import_invariant10.invariant)(space, void 0, {
-      F: __dxlog_file12,
-      L: 118,
+      F: __dxlog_file13,
+      L: 97,
       S: this,
       A: [
         "space",
@@ -3204,8 +3259,8 @@ var SpaceInvitationProtocol = class {
     });
     if (invitation.authMethod === import_services10.Invitation.AuthMethod.KNOWN_PUBLIC_KEY) {
       (0, import_invariant10.invariant)(invitation.guestKeypair?.publicKey, void 0, {
-        F: __dxlog_file12,
-        L: 120,
+        F: __dxlog_file13,
+        L: 99,
         S: this,
         A: [
           "invitation.guestKeypair?.publicKey",
@@ -3213,12 +3268,12 @@ 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
     }, {
-      F: __dxlog_file12,
-      L: 123,
+      F: __dxlog_file13,
+      L: 102,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3232,8 +3287,8 @@ var SpaceInvitationProtocol = class {
       guestKey: invitation.authMethod === import_services10.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
     });
     (0, import_invariant10.invariant)(credential.credential, void 0, {
-      F: __dxlog_file12,
-      L: 143,
+      F: __dxlog_file13,
+      L: 122,
       S: this,
       A: [
         "credential.credential",
@@ -3247,8 +3302,8 @@ var SpaceInvitationProtocol = class {
   }
   async cancelDelegation(invitation) {
     (0, import_invariant10.invariant)(this._spaceKey, void 0, {
-      F: __dxlog_file12,
-      L: 149,
+      F: __dxlog_file13,
+      L: 128,
       S: this,
       A: [
         "this._spaceKey",
@@ -3256,8 +3311,8 @@ var SpaceInvitationProtocol = class {
       ]
     });
     (0, import_invariant10.invariant)(invitation.type === import_services10.Invitation.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
-      F: __dxlog_file12,
-      L: 150,
+      F: __dxlog_file13,
+      L: 129,
       S: this,
       A: [
         "invitation.type === Invitation.Type.DELEGATED && invitation.delegationCredentialId",
@@ -3266,27 +3321,27 @@ var SpaceInvitationProtocol = class {
     });
     const space = this._spaceManager.spaces.get(this._spaceKey);
     (0, import_invariant10.invariant)(space, void 0, {
-      F: __dxlog_file12,
-      L: 152,
+      F: __dxlog_file13,
+      L: 131,
       S: this,
       A: [
         "space",
         ""
       ]
     });
-    (0, import_log9.log)("cancelling delegated space invitation", {
+    (0, import_log10.log)("cancelling delegated space invitation", {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
-      F: __dxlog_file12,
-      L: 154,
+      F: __dxlog_file13,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
     const credential = await (0, import_credentials9.createCancelDelegatedSpaceInvitationCredential)(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
     (0, import_invariant10.invariant)(credential.credential, void 0, {
-      F: __dxlog_file12,
-      L: 161,
+      F: __dxlog_file13,
+      L: 140,
       S: this,
       A: [
         "credential.credential",
@@ -3324,8 +3379,8 @@ var SpaceInvitationProtocol = class {
   }
   async accept(response) {
     (0, import_invariant10.invariant)(response.space, void 0, {
-      F: __dxlog_file12,
-      L: 196,
+      F: __dxlog_file13,
+      L: 175,
       S: this,
       A: [
         "response.space",
@@ -3335,8 +3390,8 @@ var SpaceInvitationProtocol = class {
     const { credential, controlTimeframe, dataTimeframe } = response.space;
     const assertion = (0, import_credentials9.getCredentialAssertion)(credential);
     (0, import_invariant10.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
-      F: __dxlog_file12,
-      L: 199,
+      F: __dxlog_file13,
+      L: 178,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3344,8 +3399,8 @@ var SpaceInvitationProtocol = class {
       ]
     });
     (0, import_invariant10.invariant)(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
-      F: __dxlog_file12,
-      L: 200,
+      F: __dxlog_file13,
+      L: 179,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
@@ -3367,7 +3422,7 @@ var SpaceInvitationProtocol = class {
     };
   }
 };
-var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
+var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
 var InvitationsManager = class {
   constructor(_invitationsHandler, _getHandler, _metadataStore) {
     this._invitationsHandler = _invitationsHandler;
@@ -3375,12 +3430,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,8 +3464,8 @@ var InvitationsManager = class {
     try {
       await this._persistIfRequired(handler, stream, invitation);
     } catch (err) {
-      import_log10.log.catch(err, void 0, {
-        F: __dxlog_file13,
+      import_log11.log.catch(err, void 0, {
+        F: __dxlog_file14,
         L: 82,
         S: this,
         C: (f, a) => f(...a)
@@ -3433,7 +3488,7 @@ var InvitationsManager = class {
       const freshInvitations = persistentInvitations.filter((invitation) => !(0, import_echo_pipeline.hasInvitationExpired)(invitation));
       const loadTasks = freshInvitations.map((persistentInvitation) => {
         (0, import_invariant11.invariant)(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
-          F: __dxlog_file13,
+          F: __dxlog_file14,
           L: 103,
           S: this,
           A: [
@@ -3451,8 +3506,8 @@ var InvitationsManager = class {
         invitations: cInvitations.map((invitation) => invitation.get())
       };
     } catch (err) {
-      import_log10.log.catch(err, void 0, {
-        F: __dxlog_file13,
+      import_log11.log.catch(err, void 0, {
+        F: __dxlog_file14,
         L: 110,
         S: this,
         C: (f, a) => f(...a)
@@ -3483,14 +3538,14 @@ var InvitationsManager = class {
     return invitation;
   }
   async authenticate({ invitationId, authCode }) {
-    (0, import_log10.log)("authenticating...", void 0, {
-      F: __dxlog_file13,
+    (0, import_log11.log)("authenticating...", void 0, {
+      F: __dxlog_file14,
       L: 140,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant11.invariant)(invitationId, void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 141,
       S: this,
       A: [
@@ -3500,10 +3555,10 @@ 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,
+        F: __dxlog_file14,
         L: 144,
         S: this,
         C: (f, a) => f(...a)
@@ -3513,16 +3568,16 @@ var InvitationsManager = class {
     }
   }
   async cancelInvitation({ invitationId }) {
-    (0, import_log10.log)("cancelInvitation...", {
+    (0, import_log11.log)("cancelInvitation...", {
       invitationId
     }, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 151,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant11.invariant)(invitationId, void 0, {
-      F: __dxlog_file13,
+      F: __dxlog_file14,
       L: 152,
       S: this,
       A: [
@@ -3590,18 +3645,21 @@ 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);
         void ctx.dispose();
       }
+    }, {
+      F: __dxlog_file14,
+      L: 234
     });
     ctx.onDispose(() => {
-      (0, import_log10.log)("complete", {
+      (0, import_log11.log)("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file13,
+        F: __dxlog_file14,
         L: 241,
         S: this,
         C: (f, a) => f(...a)
@@ -3626,15 +3684,15 @@ 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,
+            F: __dxlog_file14,
             L: 261,
             S: this,
             C: (f, a) => f(...a)
@@ -3644,8 +3702,8 @@ var InvitationsManager = class {
             state: import_services11.Invitation.State.TIMEOUT
           });
         } else {
-          import_log10.log.warn("auth failed", err, {
-            F: __dxlog_file13,
+          import_log11.log.warn("auth failed", err, {
+            F: __dxlog_file14,
             L: 264,
             S: this,
             C: (f, a) => f(...a)
@@ -3657,12 +3715,15 @@ var InvitationsManager = class {
         }
         void ctx.dispose();
       }
+    }, {
+      F: __dxlog_file14,
+      L: 258
     });
     ctx.onDispose(() => {
-      (0, import_log10.log)("complete", {
+      (0, import_log11.log)("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file13,
+        F: __dxlog_file14,
         L: 271,
         S: this,
         C: (f, a) => f(...a)
@@ -3706,8 +3767,8 @@ var InvitationsManager = class {
     try {
       await this._metadataStore.removeInvitation(invitation.invitationId);
     } catch (err) {
-      import_log10.log.catch(err, void 0, {
-        F: __dxlog_file13,
+      import_log11.log.catch(err, void 0, {
+        F: __dxlog_file14,
         L: 307,
         S: this,
         C: (f, a) => f(...a)
@@ -3720,12 +3781,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 +3821,186 @@ 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_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts";
+var LOAD_DOC_TIMEOUT = 1e4;
+var runEpochMigration = async (ctx, context) => {
+  switch (context.migration) {
+    case import_services13.CreateEpochRequest.Migration.INIT_AUTOMERGE: {
+      const document = context.echoHost.createDoc();
+      await context.echoHost.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 = await context.echoHost.loadDoc(ctx, context.currentRoot, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
+      const newRoot = context.echoHost.createDoc(rootHandle.docSync());
+      await context.echoHost.flush();
+      return {
+        newRoot: newRoot.url
+      };
+    }
+    case import_services13.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
+      import_log13.log.info("Fragmenting", void 0, {
+        F: __dxlog_file15,
+        L: 64,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      const currentRootUrl = context.currentRoot;
+      const rootHandle = await context.echoHost.loadDoc(ctx, currentRootUrl, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
+      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_file15,
+        L: 75,
+        S: void 0,
+        A: [
+          "properties",
+          "'Properties not found'"
+        ]
+      });
+      const newRoot = context.echoHost.createDoc({
+        ...rootHandle.docSync(),
+        objects: Object.fromEntries([
+          properties
+        ])
+      });
+      (0, import_invariant13.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
+        F: __dxlog_file15,
+        L: 82,
+        S: void 0,
+        A: [
+          "typeof newRoot.url === 'string' && newRoot.url.length > 0",
+          ""
+        ]
+      });
+      const newLinks = [];
+      for (const [id, objData] of otherObjects) {
+        const handle = context.echoHost.createDoc({
+          version: import_echo_protocol2.SpaceDocVersion.CURRENT,
+          access: {
+            spaceKey: context.spaceKey.toHex()
+          },
+          objects: {
+            [id]: objData
+          }
+        });
+        newLinks.push([
+          id,
+          handle.url
+        ]);
+      }
+      newRoot.change((doc) => {
+        doc.links ??= {};
+        for (const [id, url] of newLinks) {
+          doc.links[id] = url;
+        }
+      });
+      await context.echoHost.flush();
+      return {
+        newRoot: newRoot.url
+      };
+    }
+    case import_services13.CreateEpochRequest.Migration.MIGRATE_REFERENCES_TO_DXN: {
+      const currentRootUrl = context.currentRoot;
+      const rootHandle = await context.echoHost.loadDoc(ctx, currentRootUrl, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
+      (0, import_invariant13.invariant)(rootHandle.docSync(), "Root doc not found", {
+        F: __dxlog_file15,
+        L: 115,
+        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 ?? {})) {
+        try {
+          const handle = await context.echoHost.loadDoc(ctx, url, {
+            timeout: LOAD_DOC_TIMEOUT
+          });
+          (0, import_invariant13.invariant)(handle.docSync(), void 0, {
+            F: __dxlog_file15,
+            L: 122,
+            S: void 0,
+            A: [
+              "handle.docSync()",
+              ""
+            ]
+          });
+          const newDoc = await (0, import_echo_db.convertLegacyReferences)(structuredClone(handle.docSync()));
+          const migratedDoc = (0, import_echo_db.migrateDocument)(handle.docSync(), newDoc);
+          const newHandle = context.echoHost.createDoc(migratedDoc, {
+            preserveHistory: true
+          });
+          newRootContent.links[id] = newHandle.url;
+        } catch (err) {
+          import_log13.log.warn("Failed to migrate reference", {
+            id,
+            url,
+            error: err
+          }, {
+            F: __dxlog_file15,
+            L: 128,
+            S: void 0,
+            C: (f, a) => f(...a)
+          });
+          delete newRootContent.links[id];
+        }
+      }
+      const migratedRoot = (0, import_echo_db.migrateDocument)(rootHandle.docSync(), newRootContent);
+      const newRoot = context.echoHost.createDoc(migratedRoot, {
+        preserveHistory: true
+      });
+      await context.echoHost.flush();
+      return {
+        newRoot: newRoot.url
+      };
+    }
+    case import_services13.CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
+      (0, import_invariant13.invariant)(context.newAutomergeRoot, void 0, {
+        F: __dxlog_file15,
+        L: 143,
+        S: void 0,
+        A: [
+          "context.newAutomergeRoot",
+          ""
+        ]
+      });
+      await context.echoHost.flush();
+      return {
+        newRoot: context.newAutomergeRoot
+      };
+    }
+  }
+  return {};
+};
+var __dxlog_file16 = "/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_context12.Context(void 0, {
+      F: __dxlog_file16,
+      L: 62
+    });
+    this._extensionOpened = new import_async15.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_util8.ComplexSet(import_keys11.PublicKey.hash);
+    this._processCredentialsTriggers = new import_util8.ComplexMap(import_keys11.PublicKey.hash);
   }
   get hasWriter() {
     return !!this._writer;
@@ -3779,16 +4014,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_file16,
       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_file16,
       L: 91,
       S: this,
       A: [
@@ -3796,13 +4031,13 @@ var NotarizationPlugin = class {
         "'Credentials must have an id'"
       ]
     });
-    const errors = new import_async14.Trigger();
+    const errors = new import_async15.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_file16,
           L: 99,
           S: this,
           C: (f, a) => f(...a)
@@ -3813,23 +4048,23 @@ var NotarizationPlugin = class {
     });
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
-      (0, import_async14.scheduleTask)(ctx, () => {
-        import_log12.log.warn("Notarization timeout", {
+      (0, import_async15.scheduleTask)(ctx, () => {
+        import_log14.log.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
-          F: __dxlog_file14,
+          F: __dxlog_file16,
           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_async15.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_async15.DeferredTask(ctx, async () => {
       try {
         if (this._extensions.size === 0) {
           return;
@@ -3838,24 +4073,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_file16,
             L: 136,
             S: this,
             C: (f, a) => f(...a)
           });
           peersTried.clear();
-          (0, import_async14.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
+          (0, import_async15.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_file16,
           L: 143,
           S: this,
           C: (f, a) => f(...a)
@@ -3863,17 +4098,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_file16,
           L: 147,
           S: this,
           C: (f, a) => f(...a)
         });
-        await (0, import_async14.sleep)(successDelay);
+        await (0, import_async15.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_file16,
             L: 151,
             S: this,
             C: (f, a) => f(...a)
@@ -3886,12 +4121,12 @@ var NotarizationPlugin = class {
     this._extensionOpened.on(ctx, () => notarizeTask.schedule());
     try {
       await Promise.race([
-        (0, import_context11.rejectOnDispose)(ctx),
+        (0, import_context12.rejectOnDispose)(ctx),
         allNotarized,
         errors.wait()
       ]);
-      (0, import_log12.log)("done", void 0, {
-        F: __dxlog_file14,
+      (0, import_log14.log)("done", void 0, {
+        F: __dxlog_file16,
         L: 162,
         S: this,
         C: (f, a) => f(...a)
@@ -3912,8 +4147,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_file16,
       L: 181,
       S: this,
       A: [
@@ -3927,7 +4162,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_util8.entry)(this._processCredentialsTriggers, id).orInsert(new import_async15.Trigger()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -3937,8 +4172,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_file16,
         L: 200,
         S: this,
         A: [
@@ -3955,10 +4190,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_file16,
           L: 211,
           S: this,
           C: (f, a) => f(...a)
@@ -3967,10 +4202,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_file16,
           L: 216,
           S: this,
           C: (f, a) => f(...a)
@@ -4022,16 +4257,84 @@ 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_file17 = "/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._ctx = new import_context10.Context(void 0, {
+      F: __dxlog_file17,
+      L: 84
+    });
     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 +4347,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_file17,
+      L: 146,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4087,6 +4390,9 @@ var DataSpace = class {
   get automergeSpaceState() {
     return this._automergeSpaceState;
   }
+  get databaseRoot() {
+    return this._databaseRoot;
+  }
   get _automergeInfo() {
     return {
       rootUrl: this._automergeSpaceState.rootUrl,
@@ -4103,14 +4409,18 @@ 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());
+    await this._inner.open(new import_context10.Context(void 0, {
+      F: __dxlog_file17,
+      L: 215
+    }));
     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_file17,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4124,19 +4434,23 @@ 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_file17,
+      L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
-    this._ctx = new import_context10.Context();
+    this._ctx = new import_context10.Context(void 0, {
+      F: __dxlog_file17,
+      L: 233
+    });
     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 +4466,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_file17,
+            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_file17,
+          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_file17,
+          L: 271,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4193,31 +4507,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_file17,
+      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_file17,
+      L: 306,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4231,9 +4542,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_file17,
+      L: 322,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4291,57 +4602,66 @@ 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_file17,
+      L: 388,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._echoHost.replicateDocument(rootUrl);
     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) {
+            if (this._state !== import_services12.SpaceState.REQUIRES_MIGRATION) {
+              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_file17,
+          L: 433,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4364,148 +4684,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, {
+      echoHost: this._echoHost,
+      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 +4721,7 @@ var DataSpace = class {
       ]
     ]));
     await this._echoHost.updateIndexes();
+    return credential;
   }
   async activate() {
     if (![
@@ -4536,11 +4743,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_file17,
+      L: 514,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4567,10 +4774,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 +4793,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 +4876,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_file18 = "/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 +4890,12 @@ 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_context13.Context(void 0, {
+      F: __dxlog_file18,
+      L: 104
+    });
+    this.updated = new import_async16.Event();
+    this._spaces = new import_util9.ComplexMap(import_keys12.PublicKey.hash);
     this._isOpen = false;
     this._instanceId = import_keys12.PublicKey.random().toHex();
     import_tracing6.trace.diagnostic({
@@ -4708,10 +4906,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 +4926,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_file18,
+      L: 156,
       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_file18,
+      L: 157,
       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_file18,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
-    await (0, import_util8.forEachAsync)(this._metadataStore.spaces, async (spaceMetadata) => {
+    await (0, import_util9.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_file18,
+          L: 162,
           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_file18,
+          L: 165,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4775,19 +4973,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_file18,
+      L: 172,
       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_file18,
+      L: 177,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4802,9 +5000,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_file18,
+      L: 191,
       S: this,
       A: [
         "this._isOpen",
@@ -4819,13 +5017,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_file18,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4835,9 +5033,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_file18,
+      L: 213,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -4850,16 +5048,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_protocol3.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_protocol3.SpaceDocVersion.LEGACY: {
+        const convertedDoc = await (0, import_echo_db2.convertLegacyReferences)(space.databaseRoot.docSync());
+        const [_, properties] = (0, import_echo_db2.findInlineObjectOfType)(convertedDoc, import_echo_protocol3.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_file18,
+          L: 238,
+          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_protocol3.encodeReference)((0, import_echo_schema2.getTypeReference)(import_client_protocol5.PropertiesType))
       },
       data: {
         [DEFAULT_SPACE_KEY]: this._signingContext.identityKey.toHex()
@@ -4868,9 +5088,9 @@ var DataSpaceManager = class {
         keys: []
       }
     };
-    const propertiesId = import_keys12.PublicKey.random().toHex();
+    const propertiesId = (0, import_echo_schema2.generateEchoId)();
     document.change((doc) => {
-      (0, import_util8.assignDeep)(doc, [
+      (0, import_util9.assignDeep)(doc, [
         "objects",
         propertiesId
       ], properties);
@@ -4880,9 +5100,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_file18,
+      L: 271,
       S: this,
       A: [
         "automergeIndex",
@@ -4895,26 +5115,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_file18,
+      L: 280,
       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_file18,
+      L: 281,
       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_file18,
+      L: 282,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -4934,23 +5154,72 @@ var DataSpaceManager = class {
     this.updated.emit();
     return space;
   }
+  async admitMember(options) {
+    const space = this._spaceManager.spaces.get(options.spaceKey);
+    (0, import_invariant15.invariant)(space, void 0, {
+      F: __dxlog_file18,
+      L: 302,
+      S: this,
+      A: [
+        "space",
+        ""
+      ]
+    });
+    if (space.spaceState.getMemberRole(options.identityKey) !== import_credentials16.SpaceMember.Role.REMOVED) {
+      throw new import_protocols11.AlreadyJoinedError();
+    }
+    const credentials = await (0, import_credentials15.createAdmissionCredentials)(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId);
+    (0, import_invariant15.invariant)(credentials[0].credential, void 0, {
+      F: __dxlog_file18,
+      L: 321,
+      S: this,
+      A: [
+        "credentials[0].credential",
+        ""
+      ]
+    });
+    const spaceMemberCredential = credentials[0].credential.credential;
+    (0, import_invariant15.invariant)((0, import_credentials15.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file18,
+      L: 323,
+      S: this,
+      A: [
+        "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
+        ""
+      ]
+    });
+    await (0, import_feed_store4.writeMessages)(space.controlPipeline.writer, credentials);
+    return spaceMemberCredential;
+  }
   /**
   * Wait until the space data pipeline is fully initialized.
   * Used by invitation handler.
   * TODO(dmaretskyi): Consider removing.
   */
   async waitUntilSpaceReady(spaceKey) {
-    await (0, import_context12.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
+    await (0, import_context13.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 requestSpaceAdmissionCredential(spaceKey) {
+    return this._spaceManager.requestSpaceAdmissionCredential({
+      spaceKey,
+      identityKey: this._signingContext.identityKey,
+      timeout: 15e3,
+      swarmIdentity: {
+        peerKey: this._signingContext.deviceKey,
+        credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
+        credentialAuthenticator: async () => true
+      }
+    });
+  }
   async _constructSpace(metadata) {
-    (0, import_log13.log)("construct space", {
+    (0, import_log15.log)("construct space", {
       metadata
     }, {
-      F: __dxlog_file16,
-      L: 285,
+      F: __dxlog_file18,
+      L: 358,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4975,9 +5244,10 @@ var DataSpaceManager = class {
       swarmIdentity: {
         peerKey: this._signingContext.deviceKey,
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
-        credentialAuthenticator: (0, import_util8.deferFunction)(() => dataSpace.authVerifier.verifier)
+        credentialAuthenticator: (0, import_util9.deferFunction)(() => dataSpace.authVerifier.verifier)
       },
       onAuthorizedConnection: (session) => {
+        session.addExtension("dxos.mesh.teleport.admission-discovery", new import_echo_pipeline4.CredentialServerExtension(space));
         session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
           remotePeerId: session.remotePeerId
         }));
@@ -4986,15 +5256,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_file18,
+          L: 396,
           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 +5277,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 +5287,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_file18,
+            L: 423,
             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_file18,
+            L: 426,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5047,11 +5317,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_file18,
+            L: 434,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5060,7 +5330,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);
       }
     });
@@ -5082,17 +5352,17 @@ var DataSpaceManager = class {
         return (s && member.role === import_credentials16.SpaceMember.Role.REMOVED !== (s.authStatus === import_echo_pipeline3.AuthStatus.FAILURE)) ?? false;
       });
       sessionsToClose.forEach((session) => {
-        void session.close().catch(import_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_file18,
+      L: 470,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5103,20 +5373,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_file18,
+          L: 484,
           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 +5403,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 +5422,21 @@ var DataSpaceManager = class {
   }
 };
 _ts_decorate5([
-  import_async15.synchronized
+  import_async16.synchronized
 ], DataSpaceManager.prototype, "open", null);
 _ts_decorate5([
-  import_async15.synchronized
+  import_async16.synchronized
 ], DataSpaceManager.prototype, "close", null);
 _ts_decorate5([
-  import_async15.synchronized
+  import_async16.synchronized
 ], DataSpaceManager.prototype, "createSpace", null);
 _ts_decorate5([
-  import_async15.synchronized
+  import_async16.synchronized
 ], DataSpaceManager.prototype, "acceptSpace", null);
 DataSpaceManager = _ts_decorate5([
-  (0, import_async15.trackLeaks)("open", "close")
+  (0, import_async16.trackLeaks)("open", "close")
 ], DataSpaceManager);
-var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
+var __dxlog_file19 = "/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 +5455,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 +5479,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_file19,
+      L: 102,
       S: this,
       A: [
         "credentials[0].credential",
@@ -5219,27 +5489,27 @@ 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_file19,
+      L: 104,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
         ""
       ]
     });
-    await (0, import_feed_store4.writeMessages)(space.controlPipeline.writer, credentials);
+    await (0, import_feed_store5.writeMessages)(space.controlPipeline.writer, credentials);
   }
   querySpaces() {
     return new import_codec_protobuf11.Stream(({ next, ctx }) => {
-      const scheduler = new import_async16.UpdateScheduler(ctx, async () => {
+      const scheduler = new import_async17.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_file19,
+          L: 115,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5250,14 +5520,22 @@ var SpacesServiceImpl = class {
       }, {
         maxFrequency: process.env.NODE_ENV === "test" ? void 0 : 2
       });
-      (0, import_async16.scheduleTask)(ctx, async () => {
+      (0, import_async17.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const subscriptions = new import_async16.EventSubscriptions();
+        const subscriptions = new import_async17.EventSubscriptions();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeSpaces = () => {
           subscriptions.clear();
           for (const space of dataSpaceManager.spaces.values()) {
-            subscriptions.add(space.stateUpdate.on(ctx, () => scheduler.forceTrigger()));
+            let lastState;
+            subscriptions.add(space.stateUpdate.on(ctx, () => {
+              if (space.state !== lastState) {
+                scheduler.forceTrigger();
+              } else {
+                scheduler.trigger();
+              }
+              lastState = space.state;
+            }));
             subscriptions.add(space.presence.updated.on(ctx, () => scheduler.trigger()));
             subscriptions.add(space.automergeSpaceState.onNewEpoch.on(ctx, () => scheduler.trigger()));
             subscriptions.add(space.inner.controlPipeline.state.timeframeUpdate.on(ctx, () => scheduler.trigger()));
@@ -5284,7 +5562,7 @@ var SpacesServiceImpl = class {
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
-      (0, import_async16.scheduleTask)(ctx, async () => {
+      (0, import_async17.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 +5581,7 @@ var SpacesServiceImpl = class {
         }
       };
       ctx.onDispose(() => space.spaceState.removeCredentialProcessor(processor));
-      (0, import_async16.scheduleTask)(ctx, async () => {
+      (0, import_async17.scheduleTask)(ctx, async () => {
         await space.spaceState.addCredentialProcessor(processor);
         if (noTail) {
           close();
@@ -5321,18 +5599,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_file19,
+          L: 213,
           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_file19,
+          L: 214,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -5340,9 +5618,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_file19,
+          L: 216,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -5364,10 +5642,66 @@ 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
+    };
+  }
+  async admitContact(request) {
+    const dataSpaceManager = await this._getDataSpaceManager();
+    await dataSpaceManager.admitMember({
+      spaceKey: request.spaceKey,
+      identityKey: request.contact.identityKey,
+      role: request.role
+    });
+  }
+  async joinBySpaceKey({ spaceKey }) {
+    const dataSpaceManager = await this._getDataSpaceManager();
+    const credential = await dataSpaceManager.requestSpaceAdmissionCredential(spaceKey);
+    return this._joinByAdmission({
+      credential
+    });
+  }
+  async _joinByAdmission({ credential }) {
+    const assertion = (0, import_credentials19.getCredentialAssertion)(credential);
+    (0, import_invariant16.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
+      F: __dxlog_file19,
+      L: 250,
+      S: this,
+      A: [
+        "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
+        "'Invalid credential'"
+      ]
+    });
+    const myIdentity = this._identityManager.identity;
+    (0, import_invariant16.invariant)(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
+      F: __dxlog_file19,
+      L: 252,
+      S: this,
+      A: [
+        "myIdentity && credential.subject.id.equals(myIdentity.identityKey)",
+        ""
+      ]
+    });
+    const dataSpaceManager = await this._getDataSpaceManager();
+    let dataSpace = dataSpaceManager.spaces.get(assertion.spaceKey);
+    if (!dataSpace) {
+      dataSpace = await dataSpaceManager.acceptSpace({
+        spaceKey: assertion.spaceKey,
+        genesisFeedKey: assertion.genesisFeedKey
+      });
+      await myIdentity.controlPipeline.writer.write({
+        credential: {
+          credential
+        }
+      });
+    }
+    return {
+      space: this._serializeSpace(dataSpace)
+    };
   }
   _serializeSpace(space) {
     return {
@@ -5386,7 +5720,8 @@ var SpacesServiceImpl = class {
         startDataTimeframe: void 0,
         currentDataTimeframe: void 0,
         targetDataTimeframe: void 0,
-        totalDataTimeframe: void 0
+        totalDataTimeframe: void 0,
+        spaceRootUrl: space.databaseRoot?.url
       },
       members: Array.from(space.inner.spaceState.members.values()).map((member) => {
         const peers = space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key));
@@ -5400,7 +5735,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 +5773,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_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var ServiceContext = class extends import_context14.Resource {
   constructor(storage, level, networkManager, signalManager, _runtimeParams) {
     super();
     this.storage = storage;
@@ -5447,24 +5782,24 @@ 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_async18.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({
-      factory: new import_feed_store5.FeedFactory({
+    this.feedStore = new import_feed_store6.FeedStore({
+      factory: new import_feed_store6.FeedFactory({
         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 +5807,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_file20,
       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_file20,
       L: 150,
       S: this,
       C: (f, a) => f(...a)
@@ -5505,32 +5840,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_file20,
       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_file20,
       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_file20,
       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_file20,
       L: 170,
       S: this,
       C: (f, a) => f(...a)
@@ -5546,8 +5881,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_file20,
       L: 182,
       S: this,
       C: (f, a) => f(...a)
@@ -5555,13 +5890,16 @@ 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_context14.Context(void 0, {
+      F: __dxlog_file20,
+      L: 187
+    }));
     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_file20,
       L: 193,
       S: this,
       A: [
@@ -5581,7 +5919,10 @@ 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_context14.Context(void 0, {
+      F: __dxlog_file20,
+      L: 209
+    }));
     return identity;
   }
   async _checkStorageVersion() {
@@ -5592,8 +5933,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_file20,
       L: 224,
       S: this,
       C: (f, a) => f(...a)
@@ -5614,9 +5955,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_file20,
         L: 249,
         S: this,
         A: [
@@ -5637,10 +5978,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_file20,
             L: 265,
             S: this,
             C: (f, a) => f(...a)
@@ -5648,10 +5989,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_file20,
             L: 269,
             S: this,
             C: (f, a) => f(...a)
@@ -5659,10 +6000,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_file20,
             L: 274,
             S: this,
             C: (f, a) => f(...a)
@@ -5672,8 +6013,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_file20,
             L: 280,
             S: this,
             C: (f, a) => f(...a)
@@ -5691,7 +6032,7 @@ _ts_decorate6([
   import_tracing8.trace.span()
 ], ServiceContext.prototype, "_initialize", null);
 ServiceContext = _ts_decorate6([
-  (0, import_util9.safeInstanceof)("dxos.client-services.ServiceContext"),
+  (0, import_util10.safeInstanceof)("dxos.client-services.ServiceContext"),
   import_tracing8.trace.resource()
 ], ServiceContext);
 var ServiceRegistry = class {
@@ -5726,7 +6067,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_file21 = "/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 +6078,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_file21,
       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_file21,
       L: 37,
       S: this,
       C: (f, a) => f(...a)
@@ -5754,8 +6095,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_file21,
       L: 42,
       S: this,
       A: [
@@ -5767,11 +6108,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_util11.isNode)() ? import_client_protocol6.DX_DATA : "dxos/storage" } = config ?? {};
   return `${dataRoot}/`;
 };
 var isPersistent = (config) => {
@@ -5827,7 +6168,159 @@ 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_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.ts";
+var encodeProfileArchive = (profile) => import_automerge_repo.cbor.encode(profile);
+var decodeProfileArchive = (data) => import_automerge_repo.cbor.decode(data);
+var exportProfileData = async ({ storage, level }) => {
+  const archive = {
+    storage: [],
+    meta: {
+      timestamp: (/* @__PURE__ */ new Date()).toISOString()
+    }
+  };
+  {
+    const directory = await storage.createDirectory();
+    const files = await directory.list();
+    import_log19.log.info("begin exporting files", {
+      count: files.length
+    }, {
+      F: __dxlog_file22,
+      L: 30,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+    for (const filename of files) {
+      const file = await directory.getOrCreateFile(filename);
+      const { size } = await file.stat();
+      const data = await file.read(0, size);
+      archive.storage.push({
+        type: import_protocols15.ProfileArchiveEntryType.FILE,
+        key: filename,
+        value: data
+      });
+    }
+    import_log19.log.info("done exporting files", {
+      count: files.length
+    }, {
+      F: __dxlog_file22,
+      L: 41,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  }
+  {
+    import_log19.log.info("begin exporting kv pairs", void 0, {
+      F: __dxlog_file22,
+      L: 45,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+    const iter = await level.iterator({
+      keyEncoding: "binary",
+      valueEncoding: "binary"
+    });
+    let count = 0;
+    for await (const [key, value] of iter) {
+      archive.storage.push({
+        type: import_protocols15.ProfileArchiveEntryType.KEY_VALUE,
+        key,
+        value
+      });
+      count++;
+    }
+    import_log19.log.info("done exporting kv pairs", {
+      count
+    }, {
+      F: __dxlog_file22,
+      L: 56,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  }
+  return archive;
+};
+var importProfileData = async ({ storage, level }, archive) => {
+  let batch = level.batch();
+  let count = 0;
+  for (const entry2 of archive.storage) {
+    switch (entry2.type) {
+      case import_protocols15.ProfileArchiveEntryType.FILE: {
+        const directory = await storage.createDirectory();
+        (0, import_invariant19.invariant)(typeof entry2.key === "string", "Invalid key type", {
+          F: __dxlog_file22,
+          L: 79,
+          S: void 0,
+          A: [
+            "typeof entry.key === 'string'",
+            "'Invalid key type'"
+          ]
+        });
+        const file = await directory.getOrCreateFile(entry2.key);
+        (0, import_invariant19.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
+          F: __dxlog_file22,
+          L: 81,
+          S: void 0,
+          A: [
+            "entry.value instanceof Uint8Array",
+            "'Invalid value type'"
+          ]
+        });
+        await file.write(0, (0, import_util12.arrayToBuffer)(entry2.value));
+        await file.close();
+        break;
+      }
+      case import_protocols15.ProfileArchiveEntryType.KEY_VALUE: {
+        (0, import_invariant19.invariant)(entry2.key instanceof Uint8Array, "Invalid key type", {
+          F: __dxlog_file22,
+          L: 87,
+          S: void 0,
+          A: [
+            "entry.key instanceof Uint8Array",
+            "'Invalid key type'"
+          ]
+        });
+        (0, import_invariant19.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
+          F: __dxlog_file22,
+          L: 88,
+          S: void 0,
+          A: [
+            "entry.value instanceof Uint8Array",
+            "'Invalid value type'"
+          ]
+        });
+        batch.put(entry2.key, entry2.value, {
+          keyEncoding: "binary",
+          valueEncoding: "binary"
+        });
+        break;
+      }
+      default:
+        throw new Error(`Invalid entry type: ${entry2.type}`);
+    }
+    if (++count % 1e3 === 0) {
+      await batch.write();
+      batch = level.batch();
+      import_log19.log.info("importing", {
+        count,
+        total: archive.storage.length,
+        progress: `${(count / archive.storage.length * 100).toFixed()}%`
+      }, {
+        F: __dxlog_file22,
+        L: 101,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  import_log19.log.info("committing changes..", void 0, {
+    F: __dxlog_file22,
+    L: 109,
+    S: void 0,
+    C: (f, a) => f(...a)
+  });
+  await batch.write();
+};
+var __dxlog_file23 = "/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 +6337,8 @@ var DevicesServiceImpl = class {
             devices: []
           });
         } else {
-          (0, import_invariant19.invariant)(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file20,
+          (0, import_invariant21.invariant)(this._identityManager.identity?.presence, "presence not present", {
+            F: __dxlog_file23,
             L: 32,
             S: this,
             A: [
@@ -5860,9 +6353,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 +6379,7 @@ var DevicesServiceImpl = class {
           presenceSubscribed = true;
         }
       };
-      const subscriptions = new import_async19.EventSubscriptions();
+      const subscriptions = new import_async20.EventSubscriptions();
       if (this._identityManager.identity) {
         subscribeIdentity();
         subscribePresence();
@@ -5911,7 +6404,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 +6419,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,35 +6429,112 @@ 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 ContactsServiceImpl = class {
+  constructor(_identityManager, _spaceManager, _dataSpaceManagerProvider) {
+    this._identityManager = _identityManager;
+    this._spaceManager = _spaceManager;
+    this._dataSpaceManagerProvider = _dataSpaceManagerProvider;
+  }
+  async getContacts() {
+    const identity = this._identityManager.identity;
+    if (identity == null) {
+      return {
+        contacts: []
+      };
+    }
+    const contacts = [
+      ...this._spaceManager.spaces.values()
+    ].flatMap((s) => [
+      ...s.spaceState.members.values()
+    ].map((m) => [
+      s.key,
+      m
+    ])).reduce((acc, v) => {
+      const [spaceKey, memberInfo] = v;
+      if (memberInfo.key.equals(identity.identityKey)) {
+        return acc;
+      }
+      const existing = acc.get(memberInfo.key);
+      if (existing != null) {
+        existing.profile ??= memberInfo.profile;
+        existing.commonSpaces?.push(spaceKey);
+      } else {
+        acc.set(memberInfo.key, {
+          identityKey: memberInfo.key,
+          profile: memberInfo.profile,
+          commonSpaces: [
+            spaceKey
+          ]
+        });
+      }
+      return acc;
+    }, new import_util15.ComplexMap(import_keys17.PublicKey.hash));
+    return {
+      contacts: [
+        ...contacts.values()
+      ]
+    };
+  }
+  queryContacts() {
+    const subscribedSpaceKeySet = new import_util15.ComplexSet(import_keys17.PublicKey.hash);
+    return new import_codec_protobuf13.Stream(({ next, ctx }) => {
+      const pushUpdateTask = new import_async21.UpdateScheduler(ctx, async () => {
+        const contacts = await this.getContacts();
+        next(contacts);
+      }, {
+        maxFrequency: 2
+      });
+      (0, import_async21.scheduleTask)(ctx, async () => {
+        const subscriptions = new import_async21.EventSubscriptions();
+        ctx.onDispose(() => subscriptions.clear());
+        const subscribeToSpaceAndUpdate = () => {
+          const oldSetSize = subscribedSpaceKeySet.size;
+          for (const space of this._spaceManager.spaces.values()) {
+            if (!subscribedSpaceKeySet.has(space.key)) {
+              subscriptions.add(space.stateUpdate.on(ctx, () => pushUpdateTask.trigger()));
+              subscribedSpaceKeySet.add(space.key);
+            }
+          }
+          if (oldSetSize !== subscribedSpaceKeySet.size) {
+            pushUpdateTask.trigger();
+          }
+        };
+        const unsubscribe = (await this._dataSpaceManagerProvider()).updated.on(ctx, subscribeToSpaceAndUpdate);
+        ctx.onDispose(unsubscribe);
+        subscribeToSpaceAndUpdate();
+      });
+    });
+  }
 };
 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._sessionId = import_keys18.PublicKey.random().toHex();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
   }
   async open() {
-    import_log18.log.runtimeConfig.processors.push(this._logProcessor);
+    import_log21.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_log21.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    import_log21.log.runtimeConfig.processors.splice(index, 1);
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
-      import_util13.tracer.clear();
+      import_util16.tracer.clear();
     }
     if (record === true) {
-      import_util13.tracer.start();
+      import_util16.tracer.start();
     } else if (record === false) {
-      import_util13.tracer.stop();
+      import_util16.tracer.stop();
     }
     return {
-      recording: import_util13.tracer.recording
+      recording: import_util16.tracer.recording
     };
   }
   /**
@@ -5972,13 +6542,13 @@ var LoggingServiceImpl = class {
   */
   queryMetrics({ interval = 5e3 }) {
     const getNumericalValues = (key) => {
-      const events = import_util13.tracer.get(key) ?? [];
+      const events = import_util16.tracer.get(key) ?? [];
       return {
         key,
-        stats: (0, import_util13.numericalValues)(events, "duration")
+        stats: (0, import_util16.numericalValues)(events, "duration")
       };
     };
-    return new import_codec_protobuf13.Stream(({ next }) => {
+    return new import_codec_protobuf14.Stream(({ next }) => {
       const update = () => {
         const metrics = {
           timestamp: /* @__PURE__ */ new Date(),
@@ -6000,7 +6570,7 @@ var LoggingServiceImpl = class {
     });
   }
   queryLogs(request) {
-    return new import_codec_protobuf13.Stream(({ ctx, next }) => {
+    return new import_codec_protobuf14.Stream(({ ctx, next }) => {
       const handler = (entry2) => {
         if (LOG_PROCESSING > 0) {
           return;
@@ -6013,7 +6583,7 @@ var LoggingServiceImpl = class {
         }
         const record = {
           ...entry2,
-          context: (0, import_util13.jsonify)((0, import_log18.getContextFromEntry)(entry2)),
+          context: (0, import_util16.jsonify)((0, import_log21.getContextFromEntry)(entry2)),
           timestamp: /* @__PURE__ */ new Date(),
           meta: {
             // TODO(dmaretskyi): Fix proto.
@@ -6022,7 +6592,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_util16.getDebugName)(entry2.meta?.S)
             }
           }
         };
@@ -6039,16 +6609,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));
   }
@@ -6060,7 +6630,7 @@ var NetworkServiceImpl = class {
     this.signalManager = signalManager;
   }
   queryStatus() {
-    return new import_codec_protobuf14.Stream(({ next }) => {
+    return new import_codec_protobuf15.Stream(({ next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
@@ -6103,9 +6673,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_util17.jsonKeyReplacer)({
+        truncate: keys === import_services21.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
+        humanize: keys === import_services21.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
       })))
     };
   }
@@ -6117,7 +6687,7 @@ var SystemServiceImpl = class {
   }
   // TODO(burdon): Standardize interval option in stream request?
   queryStatus({ interval = 3e3 } = {}) {
-    return new import_codec_protobuf15.Stream(({ next }) => {
+    return new import_codec_protobuf16.Stream(({ next }) => {
       const update = () => {
         next({
           status: this._getCurrentStatus()
@@ -6146,7 +6716,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_file24 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var ClientServicesHost = class {
   constructor({
     config,
@@ -6160,7 +6730,7 @@ var ClientServicesHost = class {
     runtimeParams
   } = {}) {
     this._tracingService = import_tracing9.TRACE_PROCESSOR.createTraceSender();
-    this._statusUpdate = new import_async18.Event();
+    this._statusUpdate = new import_async19.Event();
     this._opening = false;
     this._open = false;
     this._storage = storage;
@@ -6179,7 +6749,10 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open(new import_context14.Context());
+            void this.open(new import_context15.Context(void 0, {
+              F: __dxlog_file24,
+              L: 121
+            }));
           }
         },
         onRelease: () => this.close()
@@ -6188,14 +6761,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,25 +6807,25 @@ var ClientServicesHost = class {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    (0, import_invariant18.invariant)(!this._open, "service host is open", {
-      F: __dxlog_file21,
-      L: 186,
+    (0, import_invariant20.invariant)(!this._open, "service host is open", {
+      F: __dxlog_file24,
+      L: 187,
       S: this,
       A: [
         "!this._open",
         "'service host is open'"
       ]
     });
-    (0, import_log17.log)("initializing...", void 0, {
-      F: __dxlog_file21,
-      L: 187,
+    (0, import_log20.log)("initializing...", void 0, {
+      F: __dxlog_file24,
+      L: 188,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
-      (0, import_invariant18.invariant)(!this._config, "config already set", {
-        F: __dxlog_file21,
-        L: 190,
+      (0, import_invariant20.invariant)(!this._config, "config already set", {
+        F: __dxlog_file24,
+        L: 191,
         S: this,
         A: [
           "!this._config",
@@ -6265,9 +6838,9 @@ var ClientServicesHost = class {
       }
     }
     if (!options.signalManager) {
-      import_log17.log.warn("running signaling without telemetry metadata.", void 0, {
-        F: __dxlog_file21,
-        L: 198,
+      import_log20.log.warn("running signaling without telemetry metadata.", void 0, {
+        F: __dxlog_file24,
+        L: 199,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6276,9 +6849,9 @@ 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,
-      L: 209,
+    (0, import_invariant20.invariant)(!this._networkManager, "network manager already set", {
+      F: __dxlog_file24,
+      L: 210,
       S: this,
       A: [
         "!this._networkManager",
@@ -6290,9 +6863,9 @@ var ClientServicesHost = class {
       transportFactory,
       signalManager
     });
-    (0, import_log17.log)("initialized", void 0, {
-      F: __dxlog_file21,
-      L: 216,
+    (0, import_log20.log)("initialized", void 0, {
+      F: __dxlog_file24,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6302,44 +6875,44 @@ 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_log20.log.trace("dxos.client-services.host.open", import_protocols16.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file21,
-      L: 227,
+      F: __dxlog_file24,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant18.invariant)(this._config, "config not set", {
-      F: __dxlog_file21,
-      L: 229,
+    (0, import_invariant20.invariant)(this._config, "config not set", {
+      F: __dxlog_file24,
+      L: 230,
       S: this,
       A: [
         "this._config",
         "'config not set'"
       ]
     });
-    (0, import_invariant18.invariant)(this._storage, "storage not set", {
-      F: __dxlog_file21,
-      L: 230,
+    (0, import_invariant20.invariant)(this._storage, "storage not set", {
+      F: __dxlog_file24,
+      L: 231,
       S: this,
       A: [
         "this._storage",
         "'storage not set'"
       ]
     });
-    (0, import_invariant18.invariant)(this._signalManager, "signal manager not set", {
-      F: __dxlog_file21,
-      L: 231,
+    (0, import_invariant20.invariant)(this._signalManager, "signal manager not set", {
+      F: __dxlog_file24,
+      L: 232,
       S: this,
       A: [
         "this._signalManager",
         "'signal manager not set'"
       ]
     });
-    (0, import_invariant18.invariant)(this._networkManager, "network manager not set", {
-      F: __dxlog_file21,
-      L: 232,
+    (0, import_invariant20.invariant)(this._networkManager, "network manager not set", {
+      F: __dxlog_file24,
+      L: 233,
       S: this,
       A: [
         "this._networkManager",
@@ -6347,11 +6920,11 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    (0, import_log17.log)("opening...", {
+    (0, import_log20.log)("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file21,
-      L: 235,
+      F: __dxlog_file24,
+      L: 236,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6362,16 +6935,18 @@ var ClientServicesHost = class {
     await this._level.open();
     await this._loggingService.open();
     this._serviceContext = new ServiceContext(this._storage, this._level, this._networkManager, this._signalManager, this._runtimeParams);
+    const dataSpaceManagerProvider = async () => {
+      await this._serviceContext.initialized.wait();
+      return this._serviceContext.dataSpaceManager;
+    };
     const identityService = new IdentityServiceImpl(this._serviceContext.identityManager, this._serviceContext.keyring, () => this._serviceContext.dataSpaceManager, (params) => this._createIdentity(params), (profile) => this._serviceContext.broadcastProfileUpdate(profile));
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
       IdentityService: identityService,
+      ContactsService: new ContactsServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, dataSpaceManagerProvider),
       InvitationsService: new InvitationsServiceImpl(this._serviceContext.invitationsManager),
       DevicesService: new DevicesServiceImpl(this._serviceContext.identityManager),
-      SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, async () => {
-        await this._serviceContext.initialized.wait();
-        return this._serviceContext.dataSpaceManager;
-      }),
+      SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, dataSpaceManagerProvider),
       DataService: this._serviceContext.echoHost.dataService,
       QueryService: this._serviceContext.echoHost.queryService,
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
@@ -6401,19 +6976,19 @@ var ClientServicesHost = class {
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log17.log)("opened", {
+    (0, import_log20.log)("opened", {
       deviceKey
     }, {
-      F: __dxlog_file21,
-      L: 314,
+      F: __dxlog_file24,
+      L: 322,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log17.log.trace("dxos.client-services.host.open", import_protocols15.trace.end({
+    import_log20.log.trace("dxos.client-services.host.open", import_protocols16.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file21,
-      L: 315,
+      F: __dxlog_file24,
+      L: 323,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6423,11 +6998,11 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log17.log)("closing...", {
+    (0, import_log20.log)("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file21,
-      L: 326,
+      F: __dxlog_file24,
+      L: 334,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6441,44 +7016,44 @@ var ClientServicesHost = class {
     await this._level?.close();
     this._open = false;
     this._statusUpdate.emit();
-    (0, import_log17.log)("closed", {
+    (0, import_log20.log)("closed", {
       deviceKey
     }, {
-      F: __dxlog_file21,
-      L: 335,
+      F: __dxlog_file24,
+      L: 343,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
     const traceId = import_keys15.PublicKey.random().toHex();
-    import_log17.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.begin({
+    import_log20.log.trace("dxos.sdk.client-services-host.reset", import_protocols16.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file21,
-      L: 340,
+      F: __dxlog_file24,
+      L: 348,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log17.log.info("resetting...", void 0, {
-      F: __dxlog_file21,
-      L: 342,
+    import_log20.log.info("resetting...", void 0, {
+      F: __dxlog_file24,
+      L: 350,
       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,
-      L: 345,
+    import_log20.log.info("reset", void 0, {
+      F: __dxlog_file24,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log17.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.end({
+    import_log20.log.trace("dxos.sdk.client-services-host.reset", import_protocols16.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file21,
-      L: 346,
+      F: __dxlog_file24,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6497,11 +7072,11 @@ _ts_decorate8([
   import_tracing9.trace.info()
 ], ClientServicesHost.prototype, "_open", void 0);
 _ts_decorate8([
-  import_async18.synchronized,
+  import_async19.synchronized,
   import_tracing9.trace.span()
 ], ClientServicesHost.prototype, "open", null);
 _ts_decorate8([
-  import_async18.synchronized,
+  import_async19.synchronized,
   import_tracing9.trace.span()
 ], ClientServicesHost.prototype, "close", null);
 ClientServicesHost = _ts_decorate8([
@@ -6537,8 +7112,11 @@ ClientServicesHost = _ts_decorate8([
   createDiagnostics,
   createLevel,
   createStorageObjects,
-  findPropertiesObject,
+  decodeProfileArchive,
+  encodeProfileArchive,
+  exportProfileData,
   getNetworkPeers,
+  importProfileData,
   isLocked,
   subscribeToFeedBlocks,
   subscribeToFeeds,
@@ -6548,4 +7126,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-ZBIDLLZ4.cjs.map
+//# sourceMappingURL=chunk-5PALJZPW.cjs.map