@dxos/client-services 0.5.9-next.728078d → 0.5.9-next.73dcc17

package/dist/lib/node/{chunk-XZHIBOD3.cjs → chunk-LIWLWYC3.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_XZHIBOD3_exports = {};
-__export(chunk_XZHIBOD3_exports, {
+var chunk_LIWLWYC3_exports = {};
+__export(chunk_LIWLWYC3_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   ClientServicesProviderResource: () => ClientServicesProviderResource,
@@ -70,7 +70,7 @@ __export(chunk_XZHIBOD3_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_XZHIBOD3_exports);
+module.exports = __toCommonJS(chunk_LIWLWYC3_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -216,32 +216,30 @@ var import_util7 = require("@dxos/util");
 var import_async14 = require("@dxos/async");
 var import_context11 = require("@dxos/context");
 var import_credentials14 = require("@dxos/credentials");
-var import_async15 = require("@dxos/async");
-var import_automerge = require("@dxos/automerge/automerge");
-var import_context12 = require("@dxos/context");
 var import_echo_db = require("@dxos/echo-db");
-var import_echo_pipeline3 = require("@dxos/echo-pipeline");
+var import_echo_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_util8 = require("@dxos/util");
-var import_async16 = require("@dxos/async");
-var import_context13 = require("@dxos/context");
+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_log14 = require("@dxos/log");
 var import_protocols10 = require("@dxos/protocols");
 var import_teleport3 = require("@dxos/teleport");
-var import_util9 = require("@dxos/util");
-var import_async17 = 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_context14 = 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_pipeline4 = require("@dxos/echo-pipeline");
-var import_echo_protocol2 = require("@dxos/echo-protocol");
+var import_echo_protocol3 = require("@dxos/echo-protocol");
 var import_echo_schema2 = require("@dxos/echo-schema");
+var import_feed_store4 = require("@dxos/feed-store");
 var import_invariant15 = require("@dxos/invariant");
 var import_keys12 = require("@dxos/keys");
 var import_log15 = require("@dxos/log");
@@ -250,28 +248,28 @@ 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_util10 = 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_async18 = 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_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_services15 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing7 = require("@dxos/tracing");
-var import_async19 = require("@dxos/async");
-var import_context15 = 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_db3 = require("@dxos/echo-db");
 var import_echo_pipeline5 = require("@dxos/echo-pipeline");
-var import_feed_store5 = require("@dxos/feed-store");
+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");
@@ -280,7 +278,7 @@ var import_protocols13 = require("@dxos/protocols");
 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_util11 = require("@dxos/util");
+var import_util10 = require("@dxos/util");
 var import_invariant18 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
 var import_log18 = require("@dxos/log");
@@ -289,7 +287,7 @@ 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_util12 = 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");
@@ -297,10 +295,10 @@ 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_util13 = require("@dxos/util");
-var import_async20 = require("@dxos/async");
+var import_util12 = require("@dxos/util");
+var import_async19 = require("@dxos/async");
 var import_client_protocol7 = require("@dxos/client-protocol");
-var import_context16 = require("@dxos/context");
+var import_context15 = require("@dxos/context");
 var import_invariant20 = require("@dxos/invariant");
 var import_keys15 = require("@dxos/keys");
 var import_log20 = require("@dxos/log");
@@ -310,24 +308,28 @@ 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_async21 = require("@dxos/async");
+var import_async20 = require("@dxos/async");
 var import_codec_protobuf12 = require("@dxos/codec-protobuf");
 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_util14 = require("@dxos/util");
+var import_util13 = require("@dxos/util");
 var import_keys16 = require("@dxos/keys");
-var import_util15 = require("@dxos/util");
-var import_async22 = 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_util15 = require("@dxos/util");
+var import_async22 = require("@dxos/async");
+var import_codec_protobuf14 = 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_util16 = require("@dxos/util");
-var import_codec_protobuf14 = require("@dxos/codec-protobuf");
 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 }) => {
@@ -397,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 {
@@ -412,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: {
@@ -640,7 +646,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.5.9-next.728078d";
+var DXOS_VERSION = "0.5.9-next.73dcc17";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -668,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 = {
@@ -685,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: [
@@ -874,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({
@@ -889,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();
@@ -900,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)
@@ -910,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)
@@ -922,7 +931,7 @@ var TrustedKeySetAuthVerifier = class {
           nonce,
           credential
         }, {
-          F: __dxlog_file2,
+          F: __dxlog_file3,
           L: 65,
           S: this,
           C: (f, a) => f(...a)
@@ -933,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)
@@ -949,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)
@@ -959,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)
@@ -982,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;
@@ -999,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)
@@ -1010,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)
@@ -1033,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();
@@ -1045,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)
@@ -1124,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: [
@@ -1168,7 +1177,7 @@ var Identity = class {
       controlFeedKey,
       dataFeedKey
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 184,
       S: this,
       C: (f, a) => f(...a)
@@ -1229,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 {
@@ -1253,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)
@@ -1262,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)
@@ -1275,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)
@@ -1285,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: [
@@ -1305,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)
@@ -1322,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: [
@@ -1335,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: [
@@ -1374,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)
@@ -1385,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)
@@ -1422,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: [
@@ -1448,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();
@@ -1456,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)
@@ -1470,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)
@@ -1482,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: [
@@ -1513,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: [
@@ -1549,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: [
@@ -1560,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)
@@ -1575,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: [
@@ -1587,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: [
@@ -1621,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)
@@ -1646,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)
@@ -1668,7 +1686,7 @@ _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) {
@@ -1698,7 +1716,7 @@ var IdentityServiceImpl = class extends import_context4.Resource {
     const space = await dataSpaceManager.createDefaultSpace();
     const identity = this._identityManager.identity;
     (0, import_invariant4.invariant)(identity, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 59,
       S: this,
       A: [
@@ -1732,7 +1750,7 @@ var IdentityServiceImpl = class extends import_context4.Resource {
   }
   async updateProfile(profile) {
     (0, import_invariant4.invariant)(this._identityManager.identity, "Identity not initialized.", {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 89,
       S: this,
       A: [
@@ -1746,7 +1764,7 @@ var IdentityServiceImpl = class extends import_context4.Resource {
   }
   async signPresentation({ presentation, nonce }) {
     (0, import_invariant4.invariant)(this._identityManager.identity, "Identity not initialized.", {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 96,
       S: this,
       A: [
@@ -1781,8 +1799,8 @@ var IdentityServiceImpl = class extends import_context4.Resource {
           import_log5.log.warn("Multiple default spaces found. Using the first one.", {
             duplicate: space.id
           }, {
-            F: __dxlog_file6,
-            L: 127,
+            F: __dxlog_file7,
+            L: 129,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1793,6 +1811,13 @@ var IdentityServiceImpl = class extends import_context4.Resource {
         recodedDefaultSpace = true;
         recordedDefaultSpaceTrigger.wake();
       }
+    }, (err) => {
+      import_log5.log.catch(err, void 0, {
+        F: __dxlog_file7,
+        L: 140,
+        S: this,
+        C: (f, a) => f(...a)
+      });
     });
     await Promise.race([
       allProcessed,
@@ -1804,7 +1829,7 @@ var IdentityServiceImpl = class extends import_context4.Resource {
     }
   }
 };
-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;
@@ -1830,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: [
@@ -1876,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: [
@@ -1886,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: [
@@ -1925,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) {
@@ -1939,7 +1964,10 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
-    this._ctx = new import_context6.Context();
+    this._ctx = new import_context6.Context(void 0, {
+      F: __dxlog_file9,
+      L: 33
+    });
     this._remoteOptionsTrigger = new import_async10.Trigger();
     this._invitationFlowLock = null;
   }
@@ -1951,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: [
@@ -1978,14 +2006,14 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     await super.onOpen(context);
     try {
       (0, import_log7.log)("guest acquire lock", void 0, {
-        F: __dxlog_file8,
+        F: __dxlog_file9,
         L: 84,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
       (0, import_log7.log)("guest lock acquired", void 0, {
-        F: __dxlog_file8,
+        F: __dxlog_file9,
         L: 86,
         S: this,
         C: (f, a) => f(...a)
@@ -1994,7 +2022,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
         role: import_invitations3.Options.Role.GUEST
       }));
       (0, import_log7.log)("options sent", void 0, {
-        F: __dxlog_file8,
+        F: __dxlog_file9,
         L: 88,
         S: this,
         C: (f, a) => f(...a)
@@ -2003,7 +2031,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
         timeout: OPTIONS_TIMEOUT
       }));
       (0, import_log7.log)("options received", void 0, {
-        F: __dxlog_file8,
+        F: __dxlog_file9,
         L: 90,
         S: this,
         C: (f, a) => f(...a)
@@ -2037,7 +2065,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
       this._invitationFlowLock.release();
       this._invitationFlowLock = null;
       (0, import_log7.log)("invitation flow lock released", void 0, {
-        F: __dxlog_file8,
+        F: __dxlog_file9,
         L: 123,
         S: this,
         C: (f, a) => f(...a)
@@ -2045,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 {
@@ -2060,7 +2088,10 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
-    this._ctx = new import_context8.Context();
+    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;
@@ -2079,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: [
@@ -2096,7 +2127,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
           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)
@@ -2108,7 +2139,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
               expected: invitation.invitationId,
               actual: invitationId
             }, {
-              F: __dxlog_file9,
+              F: __dxlog_file10,
               L: 116,
               S: this,
               C: (f, a) => f(...a)
@@ -2122,7 +2153,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
           (0, import_log8.log)("guest introduced themselves", {
             guestProfile: profile
           }, {
-            F: __dxlog_file9,
+            F: __dxlog_file10,
             L: 125,
             S: this,
             C: (f, a) => f(...a)
@@ -2133,7 +2164,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
           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)
@@ -2148,7 +2179,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
           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)
@@ -2157,7 +2188,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
           (0, import_log8.log)("received authentication request", {
             authCode: code
           }, {
-            F: __dxlog_file9,
+            F: __dxlog_file10,
             L: 144,
             S: this,
             C: (f, a) => f(...a)
@@ -2171,7 +2202,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
           switch (invitation.authMethod) {
             case import_services8.Invitation.AuthMethod.NONE: {
               (0, import_log8.log)("authentication not required", void 0, {
-                F: __dxlog_file9,
+                F: __dxlog_file10,
                 L: 152,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2209,7 +2240,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
               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)
@@ -2234,7 +2265,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
               status
             }
           }), {
-            F: __dxlog_file9,
+            F: __dxlog_file10,
             L: 202,
             S: this,
             C: (f, a) => f(...a)
@@ -2248,7 +2279,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
           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)
@@ -2265,7 +2296,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
             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)
@@ -2283,14 +2314,14 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
     await super.onOpen(context);
     try {
       (0, import_log8.log)("host acquire lock", void 0, {
-        F: __dxlog_file9,
+        F: __dxlog_file10,
         L: 237,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
       (0, import_log8.log)("host lock acquired", void 0, {
-        F: __dxlog_file9,
+        F: __dxlog_file10,
         L: 239,
         S: this,
         C: (f, a) => f(...a)
@@ -2301,7 +2332,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
         role: import_invitations4.Options.Role.HOST
       });
       (0, import_log8.log)("options sent", void 0, {
-        F: __dxlog_file9,
+        F: __dxlog_file10,
         L: 243,
         S: this,
         C: (f, a) => f(...a)
@@ -2310,7 +2341,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
         timeout: OPTIONS_TIMEOUT2
       }));
       (0, import_log8.log)("options received", void 0, {
-        F: __dxlog_file9,
+        F: __dxlog_file10,
         L: 245,
         S: this,
         C: (f, a) => f(...a)
@@ -2364,7 +2395,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
       this._invitationFlowLock?.release();
       this._invitationFlowLock = null;
       (0, import_log8.log)("invitation flow lock released", void 0, {
-        F: __dxlog_file9,
+        F: __dxlog_file10,
         L: 300,
         S: this,
         C: (f, a) => f(...a)
@@ -2373,7 +2404,7 @@ 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;
@@ -2381,7 +2412,7 @@ var InvitationTopology = class {
   }
   init(controller) {
     (0, import_invariant9.invariant)(!this._controller, "Already initialized.", {
-      F: __dxlog_file10,
+      F: __dxlog_file11,
       L: 42,
       S: this,
       A: [
@@ -2393,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: [
@@ -2416,7 +2447,7 @@ var InvitationTopology = class {
         ownPeerId,
         remotePeerId: firstUnknownPeer
       }, {
-        F: __dxlog_file10,
+        F: __dxlog_file11,
         L: 69,
         S: this,
         C: (f, a) => f(...a)
@@ -2427,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: [
@@ -2444,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 {
   /**
@@ -2469,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: [
@@ -2498,7 +2529,7 @@ var InvitationsHandler = class {
               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)
@@ -2506,7 +2537,7 @@ var InvitationsHandler = class {
               (0, import_log6.log)("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 116,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2518,7 +2549,7 @@ var InvitationsHandler = class {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 118,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2527,7 +2558,7 @@ var InvitationsHandler = class {
               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)
@@ -2542,7 +2573,7 @@ var InvitationsHandler = class {
                   (0, import_log6.log)("timeout", {
                     ...protocol.toJSON()
                   }, {
-                    F: __dxlog_file11,
+                    F: __dxlog_file12,
                     L: 129,
                     S: this,
                     C: (f, a) => f(...a)
@@ -2551,7 +2582,7 @@ var InvitationsHandler = class {
               } else {
                 if (guardedState.error(extension, err)) {
                   import_log6.log.error("failed", err, {
-                    F: __dxlog_file11,
+                    F: __dxlog_file12,
                     L: 133,
                     S: this,
                     C: (f, a) => f(...a)
@@ -2562,7 +2593,7 @@ var InvitationsHandler = class {
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 136,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2576,7 +2607,7 @@ var InvitationsHandler = class {
             (0, import_log6.log)("invalid role", {
               ...err.context
             }, {
-              F: __dxlog_file11,
+              F: __dxlog_file12,
               L: 144,
               S: this,
               C: (f, a) => f(...a)
@@ -2588,7 +2619,7 @@ var InvitationsHandler = class {
               (0, import_log6.log)("timeout", {
                 err
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 149,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2597,7 +2628,7 @@ var InvitationsHandler = class {
           } else {
             if (guardedState.error(extension, err)) {
               import_log6.log.error("failed", err, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 153,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2611,7 +2642,7 @@ var InvitationsHandler = class {
     if (invitation.lifetime && invitation.created) {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
         import_log6.log.warn("invitation has already expired", void 0, {
-          F: __dxlog_file11,
+          F: __dxlog_file12,
           L: 164,
           S: this,
           C: (f, a) => f(...a)
@@ -2634,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: [
@@ -2652,7 +2683,7 @@ var InvitationsHandler = class {
         invitationType: import_services6.Invitation.Type.DELEGATED,
         triedPeers: triedPeersIds.size
       }, {
-        F: __dxlog_file11,
+        F: __dxlog_file12,
         L: 205,
         S: this,
         C: (f, a) => f(...a)
@@ -2679,7 +2710,7 @@ var InvitationsHandler = class {
               admitted,
               currentState: guardedState.current.state
             }, {
-              F: __dxlog_file11,
+              F: __dxlog_file12,
               L: 233,
               S: this,
               C: (f, a) => f(...a)
@@ -2697,7 +2728,7 @@ var InvitationsHandler = class {
               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)
@@ -2709,7 +2740,7 @@ var InvitationsHandler = class {
               (0, import_log6.log)("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 256,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2718,7 +2749,7 @@ var InvitationsHandler = class {
               (0, import_log6.log)("introduce", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 260,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2731,7 +2762,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON(),
                 response: introductionResponse
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 265,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2752,7 +2783,7 @@ var InvitationsHandler = class {
               (0, import_log6.log)("request admission", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 291,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2764,7 +2795,7 @@ var InvitationsHandler = class {
               (0, import_log6.log)("admitted by host", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 302,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2777,7 +2808,7 @@ var InvitationsHandler = class {
               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)
@@ -2787,7 +2818,7 @@ var InvitationsHandler = class {
                 (0, import_log6.log)("timeout", {
                   ...protocol.toJSON()
                 }, {
-                  F: __dxlog_file11,
+                  F: __dxlog_file12,
                   L: 311,
                   S: this,
                   C: (f, a) => f(...a)
@@ -2795,7 +2826,7 @@ var InvitationsHandler = class {
                 guardedState.set(extension, import_services6.Invitation.State.TIMEOUT);
               } else {
                 (0, import_log6.log)("auth failed", err, {
-                  F: __dxlog_file11,
+                  F: __dxlog_file12,
                   L: 314,
                   S: this,
                   C: (f, a) => f(...a)
@@ -2807,7 +2838,7 @@ var InvitationsHandler = class {
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 318,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2823,7 +2854,7 @@ var InvitationsHandler = class {
             (0, import_log6.log)("timeout", {
               ...protocol.toJSON()
             }, {
-              F: __dxlog_file11,
+              F: __dxlog_file12,
               L: 327,
               S: this,
               C: (f, a) => f(...a)
@@ -2831,7 +2862,7 @@ var InvitationsHandler = class {
             guardedState.set(extension, import_services6.Invitation.State.TIMEOUT);
           } else {
             (0, import_log6.log)("auth failed", err, {
-              F: __dxlog_file11,
+              F: __dxlog_file12,
               L: 330,
               S: this,
               C: (f, a) => f(...a)
@@ -2849,7 +2880,7 @@ var InvitationsHandler = class {
         await ctx.dispose();
       } else {
         (0, import_invariant6.invariant)(invitation.swarmKey, void 0, {
-          F: __dxlog_file11,
+          F: __dxlog_file12,
           L: 345,
           S: this,
           A: [
@@ -2943,16 +2974,29 @@ var InvitationsHandler = class {
     };
   }
   _logStateUpdate(invitation, actor, newState) {
-    (0, import_log6.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)
-    });
+    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 ![
@@ -2966,16 +3010,16 @@ var InvitationsHandler = class {
   async _handleGuestOtpAuth(extension, setState, authenticated, options) {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       (0, import_log6.log)("guest waiting for authentication code...", void 0, {
-        F: __dxlog_file11,
-        L: 462,
+        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_log6.log)("sending authentication request", void 0, {
-        F: __dxlog_file11,
-        L: 466,
+        F: __dxlog_file12,
+        L: 474,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2993,8 +3037,8 @@ var InvitationsHandler = class {
           (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)
           });
@@ -3011,8 +3055,8 @@ var InvitationsHandler = class {
       throw new Error("challenge missing in the introduction");
     }
     (0, import_log6.log)("sending authentication request", void 0, {
-      F: __dxlog_file11,
-      L: 496,
+      F: __dxlog_file12,
+      L: 504,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3126,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;
@@ -3160,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_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",
@@ -3241,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",
@@ -3251,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",
@@ -3264,8 +3272,8 @@ var SpaceInvitationProtocol = class {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
-      F: __dxlog_file12,
-      L: 123,
+      F: __dxlog_file13,
+      L: 102,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3279,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",
@@ -3294,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",
@@ -3303,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",
@@ -3313,8 +3321,8 @@ 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",
@@ -3325,15 +3333,15 @@ var SpaceInvitationProtocol = class {
       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",
@@ -3371,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",
@@ -3382,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'",
@@ -3391,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)",
@@ -3414,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;
@@ -3457,7 +3465,7 @@ var InvitationsManager = class {
       await this._persistIfRequired(handler, stream, invitation);
     } catch (err) {
       import_log11.log.catch(err, void 0, {
-        F: __dxlog_file13,
+        F: __dxlog_file14,
         L: 82,
         S: this,
         C: (f, a) => f(...a)
@@ -3480,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: [
@@ -3499,7 +3507,7 @@ var InvitationsManager = class {
       };
     } catch (err) {
       import_log11.log.catch(err, void 0, {
-        F: __dxlog_file13,
+        F: __dxlog_file14,
         L: 110,
         S: this,
         C: (f, a) => f(...a)
@@ -3531,13 +3539,13 @@ var InvitationsManager = class {
   }
   async authenticate({ invitationId, authCode }) {
     (0, import_log11.log)("authenticating...", void 0, {
-      F: __dxlog_file13,
+      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: [
@@ -3550,7 +3558,7 @@ var InvitationsManager = class {
       import_log11.log.warn("invalid invitation", {
         invitationId
       }, {
-        F: __dxlog_file13,
+        F: __dxlog_file14,
         L: 144,
         S: this,
         C: (f, a) => f(...a)
@@ -3563,13 +3571,13 @@ var InvitationsManager = class {
     (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: [
@@ -3643,12 +3651,15 @@ var InvitationsManager = class {
         stream.error(err);
         void ctx.dispose();
       }
+    }, {
+      F: __dxlog_file14,
+      L: 234
     });
     ctx.onDispose(() => {
       (0, import_log11.log)("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file13,
+        F: __dxlog_file14,
         L: 241,
         S: this,
         C: (f, a) => f(...a)
@@ -3681,7 +3692,7 @@ var InvitationsManager = class {
           (0, import_log11.log)("timeout", {
             ...handler.toJSON()
           }, {
-            F: __dxlog_file13,
+            F: __dxlog_file14,
             L: 261,
             S: this,
             C: (f, a) => f(...a)
@@ -3692,7 +3703,7 @@ var InvitationsManager = class {
           });
         } else {
           import_log11.log.warn("auth failed", err, {
-            F: __dxlog_file13,
+            F: __dxlog_file14,
             L: 264,
             S: this,
             C: (f, a) => f(...a)
@@ -3704,12 +3715,15 @@ var InvitationsManager = class {
         }
         void ctx.dispose();
       }
+    }, {
+      F: __dxlog_file14,
+      L: 258
     });
     ctx.onDispose(() => {
       (0, import_log11.log)("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file13,
+        F: __dxlog_file14,
         L: 271,
         S: this,
         C: (f, a) => f(...a)
@@ -3754,7 +3768,7 @@ var InvitationsManager = class {
       await this._metadataStore.removeInvitation(invitation.invitationId);
     } catch (err) {
       import_log11.log.catch(err, void 0, {
-        F: __dxlog_file13,
+        F: __dxlog_file14,
         L: 307,
         S: this,
         C: (f, a) => f(...a)
@@ -3807,12 +3821,13 @@ var AutomergeSpaceState = class extends import_context11.Resource {
     await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
   }
 };
-var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/epoch-migrations.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.repo.create();
-      await context.repo.flush();
+      const document = context.echoHost.createDoc();
+      await context.echoHost.flush();
       return {
         newRoot: document.url
       };
@@ -3821,77 +3836,88 @@ var runEpochMigration = async (ctx, context) => {
       if (!context.currentRoot) {
         throw new Error("Space does not have an automerge root");
       }
-      const rootHandle = context.repo.find(context.currentRoot);
-      await (0, import_context12.cancelWithContext)(ctx, (0, import_async15.asyncTimeout)(rootHandle.whenReady(), 1e4));
-      const newRoot = context.repo.create(rootHandle.docSync());
-      await context.repo.flush();
+      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_file14,
-        L: 63,
+        F: __dxlog_file15,
+        L: 64,
         S: void 0,
         C: (f, a) => f(...a)
       });
       const currentRootUrl = context.currentRoot;
-      const rootHandle = context.repo.find(currentRootUrl);
-      await (0, import_context12.cancelWithContext)(ctx, (0, import_async15.asyncTimeout)(rootHandle.whenReady(), 1e4));
+      const 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_file14,
-        L: 73,
+        F: __dxlog_file15,
+        L: 75,
         S: void 0,
         A: [
           "properties",
           "'Properties not found'"
         ]
       });
-      const newSpaceDoc = {
+      const newRoot = context.echoHost.createDoc({
         ...rootHandle.docSync(),
         objects: Object.fromEntries([
           properties
         ])
-      };
-      const newRoot = context.repo.create(newSpaceDoc);
+      });
       (0, import_invariant13.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-        F: __dxlog_file14,
-        L: 78,
+        F: __dxlog_file15,
+        L: 82,
         S: void 0,
         A: [
           "typeof newRoot.url === 'string' && newRoot.url.length > 0",
           ""
         ]
       });
-      const docLoader = new import_echo_pipeline3.AutomergeDocumentLoaderImpl(context.spaceId, context.repo, context.spaceKey);
-      await docLoader.loadSpaceRootDocHandle(ctx, {
-        rootUrl: newRoot.url
-      });
-      otherObjects.forEach(([key, value]) => {
-        const handle = docLoader.createDocumentForObject(key);
-        handle.change((doc) => {
-          (0, import_util8.assignDeep)(doc, [
-            "objects",
-            key
-          ], value);
+      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.repo.flush();
+      await context.echoHost.flush();
       return {
         newRoot: newRoot.url
       };
     }
     case import_services13.CreateEpochRequest.Migration.MIGRATE_REFERENCES_TO_DXN: {
       const currentRootUrl = context.currentRoot;
-      const rootHandle = context.repo.find(currentRootUrl);
-      await (0, import_context12.cancelWithContext)(ctx, (0, import_async15.asyncTimeout)(rootHandle.whenReady(), 1e4));
+      const rootHandle = await context.echoHost.loadDoc(ctx, currentRootUrl, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
       (0, import_invariant13.invariant)(rootHandle.docSync(), "Root doc not found", {
-        F: __dxlog_file14,
-        L: 100,
+        F: __dxlog_file15,
+        L: 115,
         S: void 0,
         A: [
           "rootHandle.docSync()",
@@ -3900,40 +3926,59 @@ var runEpochMigration = async (ctx, context) => {
       });
       const newRootContent = await (0, import_echo_db.convertLegacySpaceRootDoc)(structuredClone(rootHandle.docSync()));
       for (const [id, url] of Object.entries(newRootContent.links ?? {})) {
-        const handle = context.repo.find(url);
-        await (0, import_context12.cancelWithContext)(ctx, (0, import_async15.asyncTimeout)(handle.whenReady(), 1e4));
-        (0, import_invariant13.invariant)(handle.docSync(), "Doc not found", {
-          F: __dxlog_file14,
-          L: 107,
-          S: void 0,
-          A: [
-            "handle.docSync()",
-            "'Doc not found'"
-          ]
-        });
-        const newDoc = await (0, import_echo_db.convertLegacyReferences)(structuredClone(handle.docSync()));
-        const migratedDoc = (0, import_echo_db.migrateDocument)(handle.docSync(), newDoc);
-        const newHandle = context.repo.import(import_automerge.next.save(migratedDoc));
-        newRootContent.links[id] = newHandle.url;
+        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.repo.import(import_automerge.next.save(migratedRoot));
-      await context.repo.flush();
+      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_file14,
-        L: 124,
+        F: __dxlog_file15,
+        L: 143,
         S: void 0,
         A: [
           "context.newAutomergeRoot",
           ""
         ]
       });
-      await context.repo.flush();
+      await context.echoHost.flush();
       return {
         newRoot: context.newAutomergeRoot
       };
@@ -3941,18 +3986,21 @@ var runEpochMigration = async (ctx, context) => {
   }
   return {};
 };
-var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
+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_context13.Context();
-    this._extensionOpened = new import_async16.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_util9.ComplexSet(import_keys11.PublicKey.hash);
-    this._processCredentialsTriggers = new import_util9.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;
@@ -3969,13 +4017,13 @@ var NotarizationPlugin = class {
     (0, import_log14.log)("notarize", {
       credentials
     }, {
-      F: __dxlog_file15,
+      F: __dxlog_file16,
       L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant14.invariant)(credentials.every((credential) => credential.id), "Credentials must have an id", {
-      F: __dxlog_file15,
+      F: __dxlog_file16,
       L: 91,
       S: this,
       A: [
@@ -3983,13 +4031,13 @@ var NotarizationPlugin = class {
         "'Credentials must have an id'"
       ]
     });
-    const errors = new import_async16.Trigger();
+    const errors = new import_async15.Trigger();
     const ctx = this._ctx.derive({
       onError: (err) => {
         import_log14.log.warn("Notarization error", {
           err
         }, {
-          F: __dxlog_file15,
+          F: __dxlog_file16,
           L: 99,
           S: this,
           C: (f, a) => f(...a)
@@ -4000,23 +4048,23 @@ var NotarizationPlugin = class {
     });
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
-      (0, import_async16.scheduleTask)(ctx, () => {
+      (0, import_async15.scheduleTask)(ctx, () => {
         import_log14.log.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
-          F: __dxlog_file15,
+          F: __dxlog_file16,
           L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
         void ctx.dispose();
-        errors.throw(new import_async16.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_async16.DeferredTask(ctx, async () => {
+    const notarizeTask = new import_async15.DeferredTask(ctx, async () => {
       try {
         if (this._extensions.size === 0) {
           return;
@@ -4028,13 +4076,13 @@ var NotarizationPlugin = class {
           import_log14.log.info("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
-            F: __dxlog_file15,
+            F: __dxlog_file16,
             L: 136,
             S: this,
             C: (f, a) => f(...a)
           });
           peersTried.clear();
-          (0, import_async16.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
+          (0, import_async15.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
           return;
         }
         peersTried.add(peer);
@@ -4042,7 +4090,7 @@ var NotarizationPlugin = class {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
-          F: __dxlog_file15,
+          F: __dxlog_file16,
           L: 143,
           S: this,
           C: (f, a) => f(...a)
@@ -4051,16 +4099,16 @@ var NotarizationPlugin = class {
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
         (0, import_log14.log)("success", void 0, {
-          F: __dxlog_file15,
+          F: __dxlog_file16,
           L: 147,
           S: this,
           C: (f, a) => f(...a)
         });
-        await (0, import_async16.sleep)(successDelay);
+        await (0, import_async15.sleep)(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
           import_log14.log.info("error notarizing (recoverable)", err, {
-            F: __dxlog_file15,
+            F: __dxlog_file16,
             L: 151,
             S: this,
             C: (f, a) => f(...a)
@@ -4073,12 +4121,12 @@ var NotarizationPlugin = class {
     this._extensionOpened.on(ctx, () => notarizeTask.schedule());
     try {
       await Promise.race([
-        (0, import_context13.rejectOnDispose)(ctx),
+        (0, import_context12.rejectOnDispose)(ctx),
         allNotarized,
         errors.wait()
       ]);
       (0, import_log14.log)("done", void 0, {
-        F: __dxlog_file15,
+        F: __dxlog_file16,
         L: 162,
         S: this,
         C: (f, a) => f(...a)
@@ -4100,7 +4148,7 @@ var NotarizationPlugin = class {
   }
   setWriter(writer) {
     (0, import_invariant14.invariant)(!this._writer, "Writer already set.", {
-      F: __dxlog_file15,
+      F: __dxlog_file16,
       L: 181,
       S: this,
       A: [
@@ -4114,7 +4162,7 @@ var NotarizationPlugin = class {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await (0, import_util9.entry)(this._processCredentialsTriggers, id).orInsert(new import_async16.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.
@@ -4125,7 +4173,7 @@ var NotarizationPlugin = class {
     }
     for (const credential of request.credentials ?? []) {
       (0, import_invariant14.invariant)(credential.id, "Credential must have an id", {
-        F: __dxlog_file15,
+        F: __dxlog_file16,
         L: 200,
         S: this,
         A: [
@@ -4145,7 +4193,7 @@ var NotarizationPlugin = class {
         (0, import_log14.log)("extension opened", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file15,
+          F: __dxlog_file16,
           L: 211,
           S: this,
           C: (f, a) => f(...a)
@@ -4157,7 +4205,7 @@ var NotarizationPlugin = class {
         (0, import_log14.log)("extension closed", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file15,
+          F: __dxlog_file16,
           L: 216,
           S: this,
           C: (f, a) => f(...a)
@@ -4272,10 +4320,13 @@ function _using_ctx() {
     }
   };
 }
-var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
+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));
@@ -4305,7 +4356,7 @@ var DataSpace = class {
     (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 146,
       S: this,
       C: (f, a) => f(...a)
@@ -4360,12 +4411,15 @@ var DataSpace = class {
     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_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 217,
       S: this,
       C: (f, a) => f(...a)
@@ -4383,13 +4437,16 @@ var DataSpace = class {
     (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
-      F: __dxlog_file16,
+      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);
@@ -4416,7 +4473,7 @@ var DataSpace = class {
       } catch (err) {
         if (err instanceof import_protocols9.CancelledError || err instanceof import_context10.ContextDisposedError) {
           (0, import_log12.log)("data pipeline initialization cancelled", err, {
-            F: __dxlog_file16,
+            F: __dxlog_file17,
             L: 265,
             S: this,
             C: (f, a) => f(...a)
@@ -4424,7 +4481,7 @@ var DataSpace = class {
           return;
         }
         import_log12.log.error("Error initializing data pipeline", err, {
-          F: __dxlog_file16,
+          F: __dxlog_file17,
           L: 269,
           S: this,
           C: (f, a) => f(...a)
@@ -4433,7 +4490,7 @@ var DataSpace = class {
         (0, import_log12.log)("new state", {
           state: import_services12.SpaceState[this._state]
         }, {
-          F: __dxlog_file16,
+          F: __dxlog_file17,
           L: 271,
           S: this,
           C: (f, a) => f(...a)
@@ -4453,7 +4510,7 @@ var DataSpace = class {
     (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 287,
       S: this,
       C: (f, a) => f(...a)
@@ -4470,7 +4527,7 @@ var DataSpace = class {
     (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 306,
       S: this,
       C: (f, a) => f(...a)
@@ -4486,7 +4543,7 @@ var DataSpace = class {
     this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
     (0, import_log12.log)("writable feeds created", void 0, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 322,
       S: this,
       C: (f, a) => f(...a)
@@ -4549,7 +4606,7 @@ var DataSpace = class {
       space: this.key,
       rootUrl
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 388,
       S: this,
       C: (f, a) => f(...a)
@@ -4603,8 +4660,8 @@ var DataSpace = class {
           rootUrl,
           err
         }, {
-          F: __dxlog_file16,
-          L: 431,
+          F: __dxlog_file17,
+          L: 433,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4632,7 +4689,7 @@ var DataSpace = class {
       return null;
     }
     const { newRoot } = await runEpochMigration(ctx, {
-      repo: this._echoHost.automergeRepo,
+      echoHost: this._echoHost,
       spaceId: this.id,
       spaceKey: this.key,
       migration: options.migration,
@@ -4689,8 +4746,8 @@ var DataSpace = class {
     (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
-      F: __dxlog_file16,
-      L: 512,
+      F: __dxlog_file17,
+      L: 514,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4819,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_file17 = "/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__";
@@ -4833,9 +4890,12 @@ var DataSpaceManager = class {
     this._echoHost = _echoHost;
     this._invitationsManager = _invitationsManager;
     this._params = _params;
-    this._ctx = new import_context14.Context();
-    this.updated = new import_async17.Event();
-    this._spaces = new import_util10.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({
@@ -4867,34 +4927,34 @@ var DataSpaceManager = class {
   }
   async open() {
     (0, import_log15.log)("open", void 0, {
-      F: __dxlog_file17,
-      L: 146,
+      F: __dxlog_file18,
+      L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
     import_log15.log.trace("dxos.echo.data-space-manager.open", import_protocols11.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file17,
-      L: 147,
+      F: __dxlog_file18,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log15.log)("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
-      F: __dxlog_file17,
-      L: 148,
+      F: __dxlog_file18,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
-    await (0, import_util10.forEachAsync)(this._metadataStore.spaces, async (spaceMetadata) => {
+    await (0, import_util9.forEachAsync)(this._metadataStore.spaces, async (spaceMetadata) => {
       try {
         (0, import_log15.log)("load space", {
           spaceMetadata
         }, {
-          F: __dxlog_file17,
-          L: 152,
+          F: __dxlog_file18,
+          L: 162,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4904,8 +4964,8 @@ var DataSpaceManager = class {
           spaceMetadata,
           err
         }, {
-          F: __dxlog_file17,
-          L: 155,
+          F: __dxlog_file18,
+          L: 165,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4916,16 +4976,16 @@ var DataSpaceManager = class {
     import_log15.log.trace("dxos.echo.data-space-manager.open", import_protocols11.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file17,
-      L: 162,
+      F: __dxlog_file18,
+      L: 172,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
     (0, import_log15.log)("close", void 0, {
-      F: __dxlog_file17,
-      L: 167,
+      F: __dxlog_file18,
+      L: 177,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4941,8 +5001,8 @@ var DataSpaceManager = class {
   */
   async createSpace() {
     (0, import_invariant15.invariant)(this._isOpen, "Not open.", {
-      F: __dxlog_file17,
-      L: 181,
+      F: __dxlog_file18,
+      L: 191,
       S: this,
       A: [
         "this._isOpen",
@@ -4962,8 +5022,8 @@ var DataSpaceManager = class {
     (0, import_log15.log)("creating space...", {
       spaceKey
     }, {
-      F: __dxlog_file17,
-      L: 193,
+      F: __dxlog_file18,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4974,8 +5034,8 @@ var DataSpaceManager = class {
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
     (0, import_invariant15.invariant)((0, import_credentials15.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file17,
-      L: 203,
+      F: __dxlog_file18,
+      L: 213,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -4992,13 +5052,13 @@ var DataSpaceManager = class {
       return false;
     }
     switch (space.databaseRoot.getVersion()) {
-      case import_echo_protocol2.SpaceDocVersion.CURRENT: {
+      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_protocol2.SpaceDocVersion.LEGACY: {
+      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_protocol2.LEGACY_TYPE_PROPERTIES) ?? [];
+        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:
@@ -5006,8 +5066,8 @@ var DataSpaceManager = class {
           version: space.databaseRoot.getVersion(),
           spaceId: space.id
         }, {
-          F: __dxlog_file17,
-          L: 228,
+          F: __dxlog_file18,
+          L: 238,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5019,7 +5079,7 @@ var DataSpaceManager = class {
     const document = await this._getSpaceRootDocument(space);
     const properties = {
       system: {
-        type: (0, import_echo_protocol2.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()
@@ -5030,7 +5090,7 @@ var DataSpaceManager = class {
     };
     const propertiesId = (0, import_echo_schema2.generateEchoId)();
     document.change((doc) => {
-      (0, import_util10.assignDeep)(doc, [
+      (0, import_util9.assignDeep)(doc, [
         "objects",
         propertiesId
       ], properties);
@@ -5041,8 +5101,8 @@ var DataSpaceManager = class {
   async _getSpaceRootDocument(space) {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     (0, import_invariant15.invariant)(automergeIndex, void 0, {
-      F: __dxlog_file17,
-      L: 261,
+      F: __dxlog_file18,
+      L: 271,
       S: this,
       A: [
         "automergeIndex",
@@ -5058,14 +5118,14 @@ var DataSpaceManager = class {
     (0, import_log15.log)("accept space", {
       opts
     }, {
-      F: __dxlog_file17,
-      L: 270,
+      F: __dxlog_file18,
+      L: 280,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant15.invariant)(this._isOpen, "Not open.", {
-      F: __dxlog_file17,
-      L: 271,
+      F: __dxlog_file18,
+      L: 281,
       S: this,
       A: [
         "this._isOpen",
@@ -5073,8 +5133,8 @@ var DataSpaceManager = class {
       ]
     });
     (0, import_invariant15.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
-      F: __dxlog_file17,
-      L: 272,
+      F: __dxlog_file18,
+      L: 282,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -5094,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_context14.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_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_log15.log)("construct space", {
       metadata
     }, {
-      F: __dxlog_file17,
-      L: 306,
+      F: __dxlog_file18,
+      L: 358,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5135,9 +5244,10 @@ var DataSpaceManager = class {
       swarmIdentity: {
         peerKey: this._signingContext.deviceKey,
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
-        credentialAuthenticator: (0, import_util10.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
         }));
@@ -5147,8 +5257,8 @@ var DataSpaceManager = class {
       },
       onAuthFailure: () => {
         import_log15.log.warn("auth failure", void 0, {
-          F: __dxlog_file17,
-          L: 343,
+          F: __dxlog_file18,
+          L: 396,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5180,8 +5290,8 @@ var DataSpaceManager = class {
           (0, import_log15.log)("before space ready", {
             space: space.key
           }, {
-            F: __dxlog_file17,
-            L: 370,
+            F: __dxlog_file18,
+            L: 423,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5191,8 +5301,8 @@ var DataSpaceManager = class {
             space: space.key,
             open: this._isOpen
           }, {
-            F: __dxlog_file17,
-            L: 373,
+            F: __dxlog_file18,
+            L: 426,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5210,8 +5320,8 @@ var DataSpaceManager = class {
           (0, import_log15.log)("before space close", {
             space: space.key
           }, {
-            F: __dxlog_file17,
-            L: 381,
+            F: __dxlog_file18,
+            L: 434,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5239,7 +5349,7 @@ var DataSpaceManager = class {
       const peers = presence.getPeersByIdentityKey(member.key);
       const sessions = peers.map((p) => p.peerId && spaceProtocol.sessions.get(p.peerId));
       const sessionsToClose = sessions.filter((s) => {
-        return (s && member.role === import_credentials16.SpaceMember.Role.REMOVED !== (s.authStatus === import_echo_pipeline4.AuthStatus.FAILURE)) ?? false;
+        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_log15.log.error);
@@ -5251,8 +5361,8 @@ var DataSpaceManager = class {
       peersOnline: presence.getPeersOnline().length,
       closedSessions
     }, {
-      F: __dxlog_file17,
-      L: 417,
+      F: __dxlog_file18,
+      L: 470,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5266,8 +5376,8 @@ var DataSpaceManager = class {
         (0, import_log15.log)("closing a session with a removed peer", {
           peerId: peerState.peerId
         }, {
-          F: __dxlog_file17,
-          L: 431,
+          F: __dxlog_file18,
+          L: 484,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5312,21 +5422,21 @@ var DataSpaceManager = class {
   }
 };
 _ts_decorate5([
-  import_async17.synchronized
+  import_async16.synchronized
 ], DataSpaceManager.prototype, "open", null);
 _ts_decorate5([
-  import_async17.synchronized
+  import_async16.synchronized
 ], DataSpaceManager.prototype, "close", null);
 _ts_decorate5([
-  import_async17.synchronized
+  import_async16.synchronized
 ], DataSpaceManager.prototype, "createSpace", null);
 _ts_decorate5([
-  import_async17.synchronized
+  import_async16.synchronized
 ], DataSpaceManager.prototype, "acceptSpace", null);
 DataSpaceManager = _ts_decorate5([
-  (0, import_async17.trackLeaks)("open", "close")
+  (0, import_async16.trackLeaks)("open", "close")
 ], DataSpaceManager);
-var __dxlog_file18 = "/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;
@@ -5370,8 +5480,8 @@ 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_invariant16.invariant)(credentials[0].credential, void 0, {
-      F: __dxlog_file18,
-      L: 98,
+      F: __dxlog_file19,
+      L: 102,
       S: this,
       A: [
         "credentials[0].credential",
@@ -5380,26 +5490,26 @@ var SpacesServiceImpl = class {
     });
     const spaceMemberCredential = credentials[0].credential.credential;
     (0, import_invariant16.invariant)((0, import_credentials19.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file18,
-      L: 100,
+      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_async18.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_log16.log)("update", {
           spaces
         }, {
-          F: __dxlog_file18,
-          L: 111,
+          F: __dxlog_file19,
+          L: 115,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5410,9 +5520,9 @@ var SpacesServiceImpl = class {
       }, {
         maxFrequency: process.env.NODE_ENV === "test" ? void 0 : 2
       });
-      (0, import_async18.scheduleTask)(ctx, async () => {
+      (0, import_async17.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const subscriptions = new import_async18.EventSubscriptions();
+        const subscriptions = new import_async17.EventSubscriptions();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeSpaces = () => {
           subscriptions.clear();
@@ -5452,7 +5562,7 @@ var SpacesServiceImpl = class {
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
-      (0, import_async18.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) => {
@@ -5471,7 +5581,7 @@ var SpacesServiceImpl = class {
         }
       };
       ctx.onDispose(() => space.spaceState.removeCredentialProcessor(processor));
-      (0, import_async18.scheduleTask)(ctx, async () => {
+      (0, import_async17.scheduleTask)(ctx, async () => {
         await space.spaceState.addCredentialProcessor(processor);
         if (noTail) {
           close();
@@ -5490,8 +5600,8 @@ var SpacesServiceImpl = class {
         });
       } else {
         (0, import_invariant16.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
-          F: __dxlog_file18,
-          L: 209,
+          F: __dxlog_file19,
+          L: 213,
           S: this,
           A: [
             "!credential.id",
@@ -5499,8 +5609,8 @@ var SpacesServiceImpl = class {
           ]
         });
         (0, import_invariant16.invariant)(this._identityManager.identity, "Identity is not available", {
-          F: __dxlog_file18,
-          L: 210,
+          F: __dxlog_file19,
+          L: 214,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -5509,8 +5619,8 @@ var SpacesServiceImpl = class {
         });
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         (0, import_invariant16.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
-          F: __dxlog_file18,
-          L: 212,
+          F: __dxlog_file19,
+          L: 216,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -5540,6 +5650,59 @@ var SpacesServiceImpl = class {
       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 {
       id: space.id,
@@ -5557,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));
@@ -5609,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_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
-var ServiceContext = class extends import_context15.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;
@@ -5618,15 +5782,15 @@ var ServiceContext = class extends import_context15.Resource {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this._runtimeParams = _runtimeParams;
-    this.initialized = new import_async19.Trigger();
+    this.initialized = new import_async18.Trigger();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = import_keys13.PublicKey.random().toHex();
     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: {
@@ -5653,7 +5817,7 @@ var ServiceContext = class extends import_context15.Resource {
   async _open(ctx) {
     await this._checkStorageVersion();
     (0, import_log17.log)("opening...", void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 149,
       S: this,
       C: (f, a) => f(...a)
@@ -5661,7 +5825,7 @@ var ServiceContext = class extends import_context15.Resource {
     import_log17.log.trace("dxos.sdk.service-context.open", import_protocols13.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 150,
       S: this,
       C: (f, a) => f(...a)
@@ -5679,7 +5843,7 @@ var ServiceContext = class extends import_context15.Resource {
     (0, import_log17.log)("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 163,
       S: this,
       C: (f, a) => f(...a)
@@ -5687,13 +5851,13 @@ var ServiceContext = class extends import_context15.Resource {
     import_log17.log.trace("dxos.sdk.service-context.open", import_protocols13.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log17.log)("opened", void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 166,
       S: this,
       C: (f, a) => f(...a)
@@ -5701,7 +5865,7 @@ var ServiceContext = class extends import_context15.Resource {
   }
   async _close(ctx) {
     (0, import_log17.log)("closing...", void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 170,
       S: this,
       C: (f, a) => f(...a)
@@ -5718,7 +5882,7 @@ var ServiceContext = class extends import_context15.Resource {
     await this.networkManager.close();
     await this.signalManager.close();
     (0, import_log17.log)("closed", void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 182,
       S: this,
       C: (f, a) => f(...a)
@@ -5726,13 +5890,16 @@ var ServiceContext = class extends import_context15.Resource {
   }
   async createIdentity(params = {}) {
     const identity = await this.identityManager.createIdentity(params);
-    await this._initialize(new import_context15.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_invariant17.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 193,
       S: this,
       A: [
@@ -5752,7 +5919,10 @@ var ServiceContext = class extends import_context15.Resource {
   }
   async _acceptIdentity(params) {
     const identity = await this.identityManager.acceptIdentity(params);
-    await this._initialize(new import_context15.Context());
+    await this._initialize(new import_context14.Context(void 0, {
+      F: __dxlog_file20,
+      L: 209
+    }));
     return identity;
   }
   async _checkStorageVersion() {
@@ -5764,7 +5934,7 @@ var ServiceContext = class extends import_context15.Resource {
   // Called when identity is created.
   async _initialize(ctx) {
     (0, import_log17.log)("initializing spaces...", void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 224,
       S: this,
       C: (f, a) => f(...a)
@@ -5787,7 +5957,7 @@ var ServiceContext = class extends import_context15.Resource {
     await this.dataSpaceManager.open();
     this._handlerFactories.set(import_services16.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant17.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file19,
+        F: __dxlog_file20,
         L: 249,
         S: this,
         A: [
@@ -5811,7 +5981,7 @@ var ServiceContext = class extends import_context15.Resource {
           (0, import_log17.log)("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file19,
+            F: __dxlog_file20,
             L: 265,
             S: this,
             C: (f, a) => f(...a)
@@ -5822,7 +5992,7 @@ var ServiceContext = class extends import_context15.Resource {
           (0, import_log17.log)("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file19,
+            F: __dxlog_file20,
             L: 269,
             S: this,
             C: (f, a) => f(...a)
@@ -5833,7 +6003,7 @@ var ServiceContext = class extends import_context15.Resource {
           (0, import_log17.log)("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file19,
+            F: __dxlog_file20,
             L: 274,
             S: this,
             C: (f, a) => f(...a)
@@ -5844,7 +6014,7 @@ var ServiceContext = class extends import_context15.Resource {
           });
         } catch (err) {
           import_log17.log.catch(err, void 0, {
-            F: __dxlog_file19,
+            F: __dxlog_file20,
             L: 280,
             S: this,
             C: (f, a) => f(...a)
@@ -5862,7 +6032,7 @@ _ts_decorate6([
   import_tracing8.trace.span()
 ], ServiceContext.prototype, "_initialize", null);
 ServiceContext = _ts_decorate6([
-  (0, import_util11.safeInstanceof)("dxos.client-services.ServiceContext"),
+  (0, import_util10.safeInstanceof)("dxos.client-services.ServiceContext"),
   import_tracing8.trace.resource()
 ], ServiceContext);
 var ServiceRegistry = class {
@@ -5897,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_file20 = "/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;
@@ -5909,7 +6079,7 @@ var Lock = class {
   }
   async acquire() {
     (0, import_log18.log)("acquiring lock...", void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 32,
       S: this,
       C: (f, a) => f(...a)
@@ -5917,7 +6087,7 @@ var Lock = class {
     this._fileHandle = await import_lock_file.LockFile.acquire(this._lockPath);
     await this._onAcquire?.();
     (0, import_log18.log)("acquired lock", void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 37,
       S: this,
       C: (f, a) => f(...a)
@@ -5926,7 +6096,7 @@ var Lock = class {
   async release() {
     await this._onRelease?.();
     (0, import_invariant18.invariant)(this._fileHandle, "Lock is not acquired", {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 42,
       S: this,
       A: [
@@ -5942,7 +6112,7 @@ _ts_decorate7([
 ], Lock.prototype, "lockKey", null);
 var isLocked = (lockPath) => import_lock_file.LockFile.isLocked(lockPath);
 var getRootPath = (config) => {
-  const { dataRoot = (0, import_util12.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) => {
@@ -5998,7 +6168,7 @@ var createLevel = async (config) => {
   await level.open();
   return level;
 };
-var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.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 }) => {
@@ -6014,7 +6184,7 @@ var exportProfileData = async ({ storage, level }) => {
     import_log19.log.info("begin exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 30,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6032,7 +6202,7 @@ var exportProfileData = async ({ storage, level }) => {
     import_log19.log.info("done exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 41,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6040,7 +6210,7 @@ var exportProfileData = async ({ storage, level }) => {
   }
   {
     import_log19.log.info("begin exporting kv pairs", void 0, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 45,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6061,7 +6231,7 @@ var exportProfileData = async ({ storage, level }) => {
     import_log19.log.info("done exporting kv pairs", {
       count
     }, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 56,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6070,14 +6240,15 @@ var exportProfileData = async ({ storage, level }) => {
   return archive;
 };
 var importProfileData = async ({ storage, level }, archive) => {
-  const batch = level.batch();
+  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_file21,
-          L: 78,
+          F: __dxlog_file22,
+          L: 79,
           S: void 0,
           A: [
             "typeof entry.key === 'string'",
@@ -6086,22 +6257,22 @@ var importProfileData = async ({ storage, level }, archive) => {
         });
         const file = await directory.getOrCreateFile(entry2.key);
         (0, import_invariant19.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file21,
-          L: 80,
+          F: __dxlog_file22,
+          L: 81,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
             "'Invalid value type'"
           ]
         });
-        await file.write(0, (0, import_util13.arrayToBuffer)(entry2.value));
+        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_file21,
-          L: 86,
+          F: __dxlog_file22,
+          L: 87,
           S: void 0,
           A: [
             "entry.key instanceof Uint8Array",
@@ -6109,8 +6280,8 @@ var importProfileData = async ({ storage, level }, archive) => {
           ]
         });
         (0, import_invariant19.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file21,
-          L: 87,
+          F: __dxlog_file22,
+          L: 88,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -6126,10 +6297,30 @@ var importProfileData = async ({ storage, level }, archive) => {
       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_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+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;
@@ -6147,7 +6338,7 @@ var DevicesServiceImpl = class {
           });
         } else {
           (0, import_invariant21.invariant)(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file22,
+            F: __dxlog_file23,
             L: 32,
             S: this,
             A: [
@@ -6188,7 +6379,7 @@ var DevicesServiceImpl = class {
           presenceSubscribed = true;
         }
       };
-      const subscriptions = new import_async21.EventSubscriptions();
+      const subscriptions = new import_async20.EventSubscriptions();
       if (this._identityManager.identity) {
         subscribeIdentity();
         subscribePresence();
@@ -6228,7 +6419,7 @@ var DiagnosticsCollector = class {
       client: clientDiagnostics,
       broadcast: await this.broadcastSender.broadcastDiagnosticsRequest()
     };
-    return JSON.parse(JSON.stringify(diagnostics, (0, import_util14.jsonKeyReplacer)(options)));
+    return JSON.parse(JSON.stringify(diagnostics, (0, import_util13.jsonKeyReplacer)(options)));
   }
 };
 var findSystemServiceProvider = () => {
@@ -6238,13 +6429,90 @@ var findSystemServiceProvider = () => {
 };
 var findConfigs = () => {
   const configs = import_tracing10.TRACE_PROCESSOR.findResourcesByAnnotation(import_config3.ConfigResource);
-  return configs.map((r) => r.instance.deref()).filter(import_util14.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_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);
     };
@@ -6280,7 +6548,7 @@ var LoggingServiceImpl = class {
         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(),
@@ -6302,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;
@@ -6362,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,
@@ -6419,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()
@@ -6448,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_file23 = "/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,
@@ -6462,7 +6730,7 @@ var ClientServicesHost = class {
     runtimeParams
   } = {}) {
     this._tracingService = import_tracing9.TRACE_PROCESSOR.createTraceSender();
-    this._statusUpdate = new import_async20.Event();
+    this._statusUpdate = new import_async19.Event();
     this._opening = false;
     this._open = false;
     this._storage = storage;
@@ -6481,7 +6749,10 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open(new import_context16.Context());
+            void this.open(new import_context15.Context(void 0, {
+              F: __dxlog_file24,
+              L: 121
+            }));
           }
         },
         onRelease: () => this.close()
@@ -6537,8 +6808,8 @@ var ClientServicesHost = class {
   */
   initialize({ config, ...options }) {
     (0, import_invariant20.invariant)(!this._open, "service host is open", {
-      F: __dxlog_file23,
-      L: 186,
+      F: __dxlog_file24,
+      L: 187,
       S: this,
       A: [
         "!this._open",
@@ -6546,15 +6817,15 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_log20.log)("initializing...", void 0, {
-      F: __dxlog_file23,
-      L: 187,
+      F: __dxlog_file24,
+      L: 188,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       (0, import_invariant20.invariant)(!this._config, "config already set", {
-        F: __dxlog_file23,
-        L: 190,
+        F: __dxlog_file24,
+        L: 191,
         S: this,
         A: [
           "!this._config",
@@ -6568,8 +6839,8 @@ var ClientServicesHost = class {
     }
     if (!options.signalManager) {
       import_log20.log.warn("running signaling without telemetry metadata.", void 0, {
-        F: __dxlog_file23,
-        L: 198,
+        F: __dxlog_file24,
+        L: 199,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6579,8 +6850,8 @@ var ClientServicesHost = class {
     }), signalManager = new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
     (0, import_invariant20.invariant)(!this._networkManager, "network manager already set", {
-      F: __dxlog_file23,
-      L: 209,
+      F: __dxlog_file24,
+      L: 210,
       S: this,
       A: [
         "!this._networkManager",
@@ -6593,8 +6864,8 @@ var ClientServicesHost = class {
       signalManager
     });
     (0, import_log20.log)("initialized", void 0, {
-      F: __dxlog_file23,
-      L: 216,
+      F: __dxlog_file24,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6607,14 +6878,14 @@ var ClientServicesHost = class {
     import_log20.log.trace("dxos.client-services.host.open", import_protocols16.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file23,
-      L: 227,
+      F: __dxlog_file24,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant20.invariant)(this._config, "config not set", {
-      F: __dxlog_file23,
-      L: 229,
+      F: __dxlog_file24,
+      L: 230,
       S: this,
       A: [
         "this._config",
@@ -6622,8 +6893,8 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_invariant20.invariant)(this._storage, "storage not set", {
-      F: __dxlog_file23,
-      L: 230,
+      F: __dxlog_file24,
+      L: 231,
       S: this,
       A: [
         "this._storage",
@@ -6631,8 +6902,8 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_invariant20.invariant)(this._signalManager, "signal manager not set", {
-      F: __dxlog_file23,
-      L: 231,
+      F: __dxlog_file24,
+      L: 232,
       S: this,
       A: [
         "this._signalManager",
@@ -6640,8 +6911,8 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_invariant20.invariant)(this._networkManager, "network manager not set", {
-      F: __dxlog_file23,
-      L: 232,
+      F: __dxlog_file24,
+      L: 233,
       S: this,
       A: [
         "this._networkManager",
@@ -6652,8 +6923,8 @@ var ClientServicesHost = class {
     (0, import_log20.log)("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file23,
-      L: 235,
+      F: __dxlog_file24,
+      L: 236,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6664,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),
@@ -6706,16 +6979,16 @@ var ClientServicesHost = class {
     (0, import_log20.log)("opened", {
       deviceKey
     }, {
-      F: __dxlog_file23,
-      L: 314,
+      F: __dxlog_file24,
+      L: 322,
       S: this,
       C: (f, a) => f(...a)
     });
     import_log20.log.trace("dxos.client-services.host.open", import_protocols16.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file23,
-      L: 315,
+      F: __dxlog_file24,
+      L: 323,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6728,8 +7001,8 @@ var ClientServicesHost = class {
     (0, import_log20.log)("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file23,
-      L: 326,
+      F: __dxlog_file24,
+      L: 334,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6746,8 +7019,8 @@ var ClientServicesHost = class {
     (0, import_log20.log)("closed", {
       deviceKey
     }, {
-      F: __dxlog_file23,
-      L: 335,
+      F: __dxlog_file24,
+      L: 343,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6757,30 +7030,30 @@ var ClientServicesHost = class {
     import_log20.log.trace("dxos.sdk.client-services-host.reset", import_protocols16.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file23,
-      L: 340,
+      F: __dxlog_file24,
+      L: 348,
       S: this,
       C: (f, a) => f(...a)
     });
     import_log20.log.info("resetting...", void 0, {
-      F: __dxlog_file23,
-      L: 342,
+      F: __dxlog_file24,
+      L: 350,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
     import_log20.log.info("reset", void 0, {
-      F: __dxlog_file23,
-      L: 345,
+      F: __dxlog_file24,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
     import_log20.log.trace("dxos.sdk.client-services-host.reset", import_protocols16.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file23,
-      L: 346,
+      F: __dxlog_file24,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6799,11 +7072,11 @@ _ts_decorate8([
   import_tracing9.trace.info()
 ], ClientServicesHost.prototype, "_open", void 0);
 _ts_decorate8([
-  import_async20.synchronized,
+  import_async19.synchronized,
   import_tracing9.trace.span()
 ], ClientServicesHost.prototype, "open", null);
 _ts_decorate8([
-  import_async20.synchronized,
+  import_async19.synchronized,
   import_tracing9.trace.span()
 ], ClientServicesHost.prototype, "close", null);
 ClientServicesHost = _ts_decorate8([
@@ -6853,4 +7126,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-XZHIBOD3.cjs.map
+//# sourceMappingURL=chunk-LIWLWYC3.cjs.map