npm - @dxos/client-services - Versions diffs - 0.5.9-main.4fc2821 → 0.5.9-main.51854a6 - Mend

@dxos/client-services 0.5.9-main.4fc2821 → 0.5.9-main.51854a6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

package/dist/lib/node/{chunk-5B5T4YX6.cjs → chunk-SSRPYM2G.cjs} RENAMED Viewed

@@ -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_5B5T4YX6_exports = {};
-__export(chunk_5B5T4YX6_exports, {
+var chunk_SSRPYM2G_exports = {};
+__export(chunk_SSRPYM2G_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   ClientServicesProviderResource: () => ClientServicesProviderResource,
@@ -66,7 +66,7 @@ __export(chunk_5B5T4YX6_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_5B5T4YX6_exports);
+module.exports = __toCommonJS(chunk_SSRPYM2G_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -236,8 +236,10 @@ var import_context14 = require("@dxos/context");
 var import_credentials15 = require("@dxos/credentials");
 var import_echo_db2 = require("@dxos/echo-db");
 var import_echo_pipeline4 = require("@dxos/echo-pipeline");
+var import_echo_pipeline5 = require("@dxos/echo-pipeline");
 var import_echo_protocol2 = 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");
@@ -255,7 +257,7 @@ var import_async18 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_credentials19 = require("@dxos/credentials");
 var import_debug5 = require("@dxos/debug");
-var import_feed_store4 = require("@dxos/feed-store");
+var import_feed_store5 = require("@dxos/feed-store");
 var import_invariant16 = require("@dxos/invariant");
 var import_log16 = require("@dxos/log");
 var import_protocols12 = require("@dxos/protocols");
@@ -266,8 +268,8 @@ var import_context15 = 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_echo_pipeline6 = require("@dxos/echo-pipeline");
+var import_feed_store6 = require("@dxos/feed-store");
 var import_invariant17 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
 var import_keys13 = require("@dxos/keys");
@@ -314,13 +316,17 @@ var import_util14 = require("@dxos/util");
 var import_async22 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
 var import_keys17 = require("@dxos/keys");
-var import_log20 = require("@dxos/log");
-var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util15 = require("@dxos/util");
+var import_async23 = require("@dxos/async");
 var import_codec_protobuf14 = require("@dxos/codec-protobuf");
+var import_keys18 = require("@dxos/keys");
+var import_log20 = require("@dxos/log");
+var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
+var import_util16 = require("@dxos/util");
 var import_codec_protobuf15 = require("@dxos/codec-protobuf");
+var import_codec_protobuf16 = require("@dxos/codec-protobuf");
 var import_services21 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util16 = require("@dxos/util");
+var import_util17 = require("@dxos/util");
 var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
   return new import_codec_protobuf.Stream(({ next }) => {
     const subscriptions = new import_async.EventSubscriptions();
@@ -388,6 +394,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 {
@@ -403,7 +410,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: {
@@ -631,7 +641,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.5.9-main.4fc2821";
+var DXOS_VERSION = "0.5.9-main.51854a6";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -659,7 +669,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 = {
@@ -676,7 +686,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: [
@@ -865,7 +875,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({
@@ -880,7 +890,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();
@@ -891,7 +904,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)
@@ -901,7 +914,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)
@@ -913,7 +926,7 @@ var TrustedKeySetAuthVerifier = class {
           nonce,
           credential
         }, {
-          F: __dxlog_file2,
+          F: __dxlog_file3,
           L: 65,
           S: this,
           C: (f, a) => f(...a)
@@ -924,7 +937,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)
@@ -940,7 +953,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)
@@ -950,7 +963,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)
@@ -973,7 +986,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;
@@ -990,7 +1003,7 @@ var DefaultSpaceStateMachine = class {
             expectedIdentity: this._params.identityKey,
             credential
           }, {
-            F: __dxlog_file3,
+            F: __dxlog_file4,
             L: 32,
             S: this,
             C: (f, a) => f(...a)
@@ -1001,7 +1014,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)
@@ -1024,7 +1037,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();
@@ -1036,7 +1049,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)
@@ -1115,7 +1128,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: [
@@ -1159,7 +1172,7 @@ var Identity = class {
       controlFeedKey,
       dataFeedKey
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 184,
       S: this,
       C: (f, a) => f(...a)
@@ -1220,7 +1233,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 {
@@ -1244,7 +1257,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)
@@ -1253,7 +1266,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)
@@ -1266,7 +1279,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)
@@ -1276,18 +1289,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: [
@@ -1296,7 +1312,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)
@@ -1313,11 +1329,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: [
@@ -1326,7 +1345,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: [
@@ -1365,7 +1384,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)
@@ -1376,7 +1395,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)
@@ -1413,13 +1432,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: [
@@ -1439,7 +1458,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();
@@ -1447,7 +1469,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)
@@ -1461,7 +1483,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)
@@ -1473,7 +1495,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: [
@@ -1504,7 +1526,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: [
@@ -1540,7 +1562,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: [
@@ -1551,7 +1573,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)
@@ -1566,7 +1588,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: [
@@ -1578,7 +1600,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: [
@@ -1612,7 +1634,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)
@@ -1637,7 +1659,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)
@@ -1659,7 +1681,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) {
@@ -1689,7 +1711,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: [
@@ -1723,7 +1745,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: [
@@ -1737,7 +1759,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: [
@@ -1772,7 +1794,7 @@ 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,
+            F: __dxlog_file7,
             L: 127,
             S: this,
             C: (f, a) => f(...a)
@@ -1795,7 +1817,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;
@@ -1821,7 +1843,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: [
@@ -1867,7 +1889,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: [
@@ -1877,7 +1899,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: [
@@ -1916,7 +1938,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) {
@@ -1930,7 +1952,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;
   }
@@ -1942,7 +1967,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: [
@@ -1969,14 +1994,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)
@@ -1985,7 +2010,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)
@@ -1994,7 +2019,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)
@@ -2028,7 +2053,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)
@@ -2036,7 +2061,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 {
@@ -2051,7 +2076,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;
@@ -2070,7 +2098,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: [
@@ -2087,7 +2115,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)
@@ -2099,7 +2127,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)
@@ -2113,7 +2141,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)
@@ -2124,7 +2152,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)
@@ -2139,7 +2167,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)
@@ -2148,7 +2176,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)
@@ -2162,7 +2190,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)
@@ -2200,7 +2228,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)
@@ -2225,7 +2253,7 @@ var InvitationHostExtension = class extends import_teleport2.RpcExtension {
               status
             }
           }), {
-            F: __dxlog_file9,
+            F: __dxlog_file10,
             L: 202,
             S: this,
             C: (f, a) => f(...a)
@@ -2239,7 +2267,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)
@@ -2256,7 +2284,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)
@@ -2274,14 +2302,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)
@@ -2292,7 +2320,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)
@@ -2301,7 +2329,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)
@@ -2355,7 +2383,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)
@@ -2364,7 +2392,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;
@@ -2372,7 +2400,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: [
@@ -2384,7 +2412,7 @@ var InvitationTopology = class {
   }
   update() {
     (0, import_invariant9.invariant)(this._controller, "Not initialized.", {
-      F: __dxlog_file10,
+      F: __dxlog_file11,
       L: 47,
       S: this,
       A: [
@@ -2407,7 +2435,7 @@ var InvitationTopology = class {
         ownPeerId,
         remotePeerId: firstUnknownPeer
       }, {
-        F: __dxlog_file10,
+        F: __dxlog_file11,
         L: 69,
         S: this,
         C: (f, a) => f(...a)
@@ -2418,7 +2446,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: [
@@ -2435,7 +2463,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 {
   /**
@@ -2460,7 +2488,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: [
@@ -2489,7 +2517,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)
@@ -2497,7 +2525,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)
@@ -2509,7 +2537,7 @@ var InvitationsHandler = class {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 118,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2518,7 +2546,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)
@@ -2533,7 +2561,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)
@@ -2542,7 +2570,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)
@@ -2553,7 +2581,7 @@ var InvitationsHandler = class {
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 136,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2567,7 +2595,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)
@@ -2579,7 +2607,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)
@@ -2588,7 +2616,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)
@@ -2602,7 +2630,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)
@@ -2625,7 +2653,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: [
@@ -2643,7 +2671,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)
@@ -2670,7 +2698,7 @@ var InvitationsHandler = class {
               admitted,
               currentState: guardedState.current.state
             }, {
-              F: __dxlog_file11,
+              F: __dxlog_file12,
               L: 233,
               S: this,
               C: (f, a) => f(...a)
@@ -2688,7 +2716,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)
@@ -2700,7 +2728,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)
@@ -2709,7 +2737,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)
@@ -2722,7 +2750,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON(),
                 response: introductionResponse
               }, {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 265,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2743,7 +2771,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)
@@ -2755,7 +2783,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)
@@ -2768,7 +2796,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)
@@ -2778,7 +2806,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)
@@ -2786,7 +2814,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)
@@ -2798,7 +2826,7 @@ var InvitationsHandler = class {
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file11,
+                F: __dxlog_file12,
                 L: 318,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2814,7 +2842,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)
@@ -2822,7 +2850,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)
@@ -2840,7 +2868,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: [
@@ -2934,16 +2962,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 ![
@@ -2957,16 +2998,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)
       });
@@ -2984,8 +3025,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)
           });
@@ -3002,8 +3043,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)
     });
@@ -3117,7 +3158,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;
@@ -3151,79 +3192,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",
@@ -3232,8 +3237,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",
@@ -3242,8 +3247,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",
@@ -3255,8 +3260,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)
     });
@@ -3270,8 +3275,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",
@@ -3285,8 +3290,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",
@@ -3294,8 +3299,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",
@@ -3304,8 +3309,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",
@@ -3316,15 +3321,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",
@@ -3362,8 +3367,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",
@@ -3373,8 +3378,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'",
@@ -3382,8 +3387,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)",
@@ -3405,7 +3410,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;
@@ -3448,7 +3453,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)
@@ -3471,7 +3476,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: [
@@ -3490,7 +3495,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)
@@ -3522,13 +3527,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: [
@@ -3541,7 +3546,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)
@@ -3554,13 +3559,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: [
@@ -3634,12 +3639,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)
@@ -3672,7 +3680,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)
@@ -3683,7 +3691,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)
@@ -3695,12 +3703,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)
@@ -3745,7 +3756,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)
@@ -3798,7 +3809,7 @@ 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 runEpochMigration = async (ctx, context) => {
   switch (context.migration) {
     case import_services13.CreateEpochRequest.Migration.INIT_AUTOMERGE: {
@@ -3822,7 +3833,7 @@ var runEpochMigration = async (ctx, context) => {
     }
     case import_services13.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
       import_log13.log.info("Fragmenting", void 0, {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 63,
         S: void 0,
         C: (f, a) => f(...a)
@@ -3834,7 +3845,7 @@ var runEpochMigration = async (ctx, context) => {
       const properties = (0, import_echo_db.findInlineObjectOfType)(rootHandle.docSync(), import_echo_schema.TYPE_PROPERTIES);
       const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
       (0, import_invariant13.invariant)(properties, "Properties not found", {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 73,
         S: void 0,
         A: [
@@ -3850,7 +3861,7 @@ var runEpochMigration = async (ctx, context) => {
       };
       const newRoot = context.repo.create(newSpaceDoc);
       (0, import_invariant13.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 78,
         S: void 0,
         A: [
@@ -3881,7 +3892,7 @@ var runEpochMigration = async (ctx, context) => {
       const rootHandle = context.repo.find(currentRootUrl);
       await (0, import_context12.cancelWithContext)(ctx, (0, import_async15.asyncTimeout)(rootHandle.whenReady(), 1e4));
       (0, import_invariant13.invariant)(rootHandle.docSync(), "Root doc not found", {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 100,
         S: void 0,
         A: [
@@ -3894,7 +3905,7 @@ var runEpochMigration = async (ctx, context) => {
         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,
+          F: __dxlog_file15,
           L: 107,
           S: void 0,
           A: [
@@ -3916,7 +3927,7 @@ var runEpochMigration = async (ctx, context) => {
     }
     case import_services13.CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
       (0, import_invariant13.invariant)(context.newAutomergeRoot, void 0, {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 124,
         S: void 0,
         A: [
@@ -3932,14 +3943,17 @@ 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._ctx = new import_context13.Context(void 0, {
+      F: __dxlog_file16,
+      L: 62
+    });
     this._extensionOpened = new import_async16.Event();
     this._extensions = /* @__PURE__ */ new Set();
     this._processedCredentials = new import_util9.ComplexSet(import_keys11.PublicKey.hash);
@@ -3960,13 +3974,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: [
@@ -3980,7 +3994,7 @@ var NotarizationPlugin = class {
         import_log14.log.warn("Notarization error", {
           err
         }, {
-          F: __dxlog_file15,
+          F: __dxlog_file16,
           L: 99,
           S: this,
           C: (f, a) => f(...a)
@@ -3996,7 +4010,7 @@ var NotarizationPlugin = class {
           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)
@@ -4019,7 +4033,7 @@ 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)
@@ -4033,7 +4047,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)
@@ -4042,7 +4056,7 @@ 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)
@@ -4051,7 +4065,7 @@ var NotarizationPlugin = class {
       } 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)
@@ -4069,7 +4083,7 @@ var NotarizationPlugin = class {
         errors.wait()
       ]);
       (0, import_log14.log)("done", void 0, {
-        F: __dxlog_file15,
+        F: __dxlog_file16,
         L: 162,
         S: this,
         C: (f, a) => f(...a)
@@ -4091,7 +4105,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: [
@@ -4116,7 +4130,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: [
@@ -4136,7 +4150,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)
@@ -4148,7 +4162,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)
@@ -4263,10 +4277,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));
@@ -4296,7 +4313,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)
@@ -4351,12 +4368,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)
@@ -4374,13 +4394,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);
@@ -4407,7 +4430,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)
@@ -4415,7 +4438,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)
@@ -4424,7 +4447,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)
@@ -4444,7 +4467,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)
@@ -4461,7 +4484,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)
@@ -4477,7 +4500,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)
@@ -4540,7 +4563,7 @@ var DataSpace = class {
       space: this.key,
       rootUrl
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 388,
       S: this,
       C: (f, a) => f(...a)
@@ -4594,7 +4617,7 @@ var DataSpace = class {
           rootUrl,
           err
         }, {
-          F: __dxlog_file16,
+          F: __dxlog_file17,
           L: 431,
           S: this,
           C: (f, a) => f(...a)
@@ -4680,7 +4703,7 @@ var DataSpace = class {
     (0, import_log12.log)("new state", {
       state: import_services12.SpaceState[this._state]
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 512,
       S: this,
       C: (f, a) => f(...a)
@@ -4810,7 +4833,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__";
@@ -4824,7 +4847,10 @@ var DataSpaceManager = class {
     this._echoHost = _echoHost;
     this._invitationsManager = _invitationsManager;
     this._params = _params;
-    this._ctx = new import_context14.Context();
+    this._ctx = new import_context14.Context(void 0, {
+      F: __dxlog_file18,
+      L: 104
+    });
     this.updated = new import_async17.Event();
     this._spaces = new import_util10.ComplexMap(import_keys12.PublicKey.hash);
     this._isOpen = false;
@@ -4858,24 +4884,24 @@ 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)
     });
@@ -4884,8 +4910,8 @@ var DataSpaceManager = class {
         (0, import_log15.log)("load space", {
           spaceMetadata
         }, {
-          F: __dxlog_file17,
-          L: 152,
+          F: __dxlog_file18,
+          L: 162,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4895,8 +4921,8 @@ var DataSpaceManager = class {
           spaceMetadata,
           err
         }, {
-          F: __dxlog_file17,
-          L: 155,
+          F: __dxlog_file18,
+          L: 165,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4907,16 +4933,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)
     });
@@ -4932,8 +4958,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",
@@ -4953,8 +4979,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)
     });
@@ -4965,8 +4991,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'",
@@ -4997,8 +5023,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)
         });
@@ -5032,8 +5058,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",
@@ -5049,14 +5075,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",
@@ -5064,8 +5090,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)",
@@ -5085,6 +5111,43 @@ 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.
@@ -5096,12 +5159,24 @@ var DataSpaceManager = class {
       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)
     });
@@ -5129,6 +5204,7 @@ var DataSpaceManager = class {
         credentialAuthenticator: (0, import_util10.deferFunction)(() => dataSpace.authVerifier.verifier)
       },
       onAuthorizedConnection: (session) => {
+        session.addExtension("dxos.mesh.teleport.admission-discovery", new import_echo_pipeline5.CredentialServerExtension(space));
         session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
           remotePeerId: session.remotePeerId
         }));
@@ -5138,8 +5214,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)
         });
@@ -5171,8 +5247,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)
           });
@@ -5182,8 +5258,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)
           });
@@ -5201,8 +5277,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)
           });
@@ -5242,8 +5318,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)
     });
@@ -5257,8 +5333,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)
         });
@@ -5317,7 +5393,7 @@ _ts_decorate5([
 DataSpaceManager = _ts_decorate5([
   (0, import_async17.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;
@@ -5361,8 +5437,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",
@@ -5371,15 +5447,15 @@ 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 }) => {
@@ -5389,8 +5465,8 @@ var SpacesServiceImpl = class {
         (0, import_log16.log)("update", {
           spaces
         }, {
-          F: __dxlog_file18,
-          L: 111,
+          F: __dxlog_file19,
+          L: 115,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5481,8 +5557,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",
@@ -5490,8 +5566,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",
@@ -5500,8 +5576,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())",
@@ -5531,6 +5607,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,
@@ -5600,7 +5729,7 @@ function _ts_decorate6(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends import_context15.Resource {
   constructor(storage, level, networkManager, signalManager, _runtimeParams) {
     super();
@@ -5612,21 +5741,21 @@ var ServiceContext = class extends import_context15.Resource {
     this.initialized = new import_async19.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.metadataStore = new import_echo_pipeline6.MetadataStore(storage.createDirectory("metadata"));
+    this.snapshotStore = new import_echo_pipeline6.SnapshotStore(storage.createDirectory("snapshots"));
     this.blobStore = new import_teleport_extension_object_sync.BlobStore(storage.createDirectory("blobs"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
-    this.feedStore = new import_feed_store5.FeedStore({
-      factory: new import_feed_store5.FeedFactory({
+    this.feedStore = new import_feed_store6.FeedStore({
+      factory: new import_feed_store6.FeedFactory({
         root: storage.createDirectory("feeds"),
         signer: this.keyring,
         hypercore: {
-          valueEncoding: import_echo_pipeline5.valueEncoding,
+          valueEncoding: import_echo_pipeline6.valueEncoding,
           stats: true
         }
       })
     });
-    this.spaceManager = new import_echo_pipeline5.SpaceManager({
+    this.spaceManager = new import_echo_pipeline6.SpaceManager({
       feedStore: this.feedStore,
       networkManager: this.networkManager,
       blobStore: this.blobStore,
@@ -5644,7 +5773,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)
@@ -5652,7 +5781,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)
@@ -5670,7 +5799,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)
@@ -5678,13 +5807,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)
@@ -5692,7 +5821,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)
@@ -5709,7 +5838,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)
@@ -5717,13 +5846,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_context15.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: [
@@ -5743,7 +5875,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_context15.Context(void 0, {
+      F: __dxlog_file20,
+      L: 209
+    }));
     return identity;
   }
   async _checkStorageVersion() {
@@ -5755,7 +5890,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)
@@ -5778,7 +5913,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: [
@@ -5802,7 +5937,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)
@@ -5813,7 +5948,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)
@@ -5824,7 +5959,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)
@@ -5835,7 +5970,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)
@@ -5888,7 +6023,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;
@@ -5900,7 +6035,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)
@@ -5908,7 +6043,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)
@@ -5917,7 +6052,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: [
@@ -5989,7 +6124,7 @@ var createLevel = async (config) => {
   await level.open();
   return level;
 };
-var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
@@ -6007,7 +6142,7 @@ var DevicesServiceImpl = class {
           });
         } else {
           (0, import_invariant20.invariant)(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file21,
+            F: __dxlog_file22,
             L: 32,
             S: this,
             A: [
@@ -6100,11 +6235,88 @@ var findConfigs = () => {
   const configs = import_tracing10.TRACE_PROCESSOR.findResourcesByAnnotation(import_config3.ConfigResource);
   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_async22.UpdateScheduler(ctx, async () => {
+        const contacts = await this.getContacts();
+        next(contacts);
+      }, {
+        maxFrequency: 2
+      });
+      (0, import_async22.scheduleTask)(ctx, async () => {
+        const subscriptions = new import_async22.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._logs = new import_async23.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);
     };
@@ -6118,15 +6330,15 @@ var LoggingServiceImpl = class {
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
-      import_util15.tracer.clear();
+      import_util16.tracer.clear();
     }
     if (record === true) {
-      import_util15.tracer.start();
+      import_util16.tracer.start();
     } else if (record === false) {
-      import_util15.tracer.stop();
+      import_util16.tracer.stop();
     }
     return {
-      recording: import_util15.tracer.recording
+      recording: import_util16.tracer.recording
     };
   }
   /**
@@ -6134,13 +6346,13 @@ var LoggingServiceImpl = class {
   */
   queryMetrics({ interval = 5e3 }) {
     const getNumericalValues = (key) => {
-      const events = import_util15.tracer.get(key) ?? [];
+      const events = import_util16.tracer.get(key) ?? [];
       return {
         key,
-        stats: (0, import_util15.numericalValues)(events, "duration")
+        stats: (0, import_util16.numericalValues)(events, "duration")
       };
     };
-    return new import_codec_protobuf13.Stream(({ next }) => {
+    return new import_codec_protobuf14.Stream(({ next }) => {
       const update = () => {
         const metrics = {
           timestamp: /* @__PURE__ */ new Date(),
@@ -6162,7 +6374,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;
@@ -6175,7 +6387,7 @@ var LoggingServiceImpl = class {
         }
         const record = {
           ...entry2,
-          context: (0, import_util15.jsonify)((0, import_log20.getContextFromEntry)(entry2)),
+          context: (0, import_util16.jsonify)((0, import_log20.getContextFromEntry)(entry2)),
           timestamp: /* @__PURE__ */ new Date(),
           meta: {
             // TODO(dmaretskyi): Fix proto.
@@ -6184,7 +6396,7 @@ var LoggingServiceImpl = class {
             scope: {
               hostSessionId: this._sessionId,
               uptimeSeconds: (Date.now() - this._started) / 1e3,
-              name: (0, import_util15.getDebugName)(entry2.meta?.S)
+              name: (0, import_util16.getDebugName)(entry2.meta?.S)
             }
           }
         };
@@ -6222,7 +6434,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,
@@ -6265,7 +6477,7 @@ var SystemServiceImpl = class {
     const diagnostics = await this._getDiagnostics();
     return {
       timestamp: /* @__PURE__ */ new Date(),
-      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util16.jsonKeyReplacer)({
+      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util17.jsonKeyReplacer)({
         truncate: keys === import_services21.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
         humanize: keys === import_services21.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
       })))
@@ -6279,7 +6491,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()
@@ -6308,7 +6520,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_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var ClientServicesHost = class {
   constructor({
     config,
@@ -6341,7 +6553,10 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open(new import_context16.Context());
+            void this.open(new import_context16.Context(void 0, {
+              F: __dxlog_file23,
+              L: 121
+            }));
           }
         },
         onRelease: () => this.close()
@@ -6397,8 +6612,8 @@ var ClientServicesHost = class {
   */
   initialize({ config, ...options }) {
     (0, import_invariant19.invariant)(!this._open, "service host is open", {
-      F: __dxlog_file22,
-      L: 186,
+      F: __dxlog_file23,
+      L: 187,
       S: this,
       A: [
         "!this._open",
@@ -6406,15 +6621,15 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_log19.log)("initializing...", void 0, {
-      F: __dxlog_file22,
-      L: 187,
+      F: __dxlog_file23,
+      L: 188,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       (0, import_invariant19.invariant)(!this._config, "config already set", {
-        F: __dxlog_file22,
-        L: 190,
+        F: __dxlog_file23,
+        L: 191,
         S: this,
         A: [
           "!this._config",
@@ -6428,8 +6643,8 @@ var ClientServicesHost = class {
     }
     if (!options.signalManager) {
       import_log19.log.warn("running signaling without telemetry metadata.", void 0, {
-        F: __dxlog_file22,
-        L: 198,
+        F: __dxlog_file23,
+        L: 199,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6439,8 +6654,8 @@ var ClientServicesHost = class {
     }), signalManager = new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
     (0, import_invariant19.invariant)(!this._networkManager, "network manager already set", {
-      F: __dxlog_file22,
-      L: 209,
+      F: __dxlog_file23,
+      L: 210,
       S: this,
       A: [
         "!this._networkManager",
@@ -6453,8 +6668,8 @@ var ClientServicesHost = class {
       signalManager
     });
     (0, import_log19.log)("initialized", void 0, {
-      F: __dxlog_file22,
-      L: 216,
+      F: __dxlog_file23,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6467,14 +6682,14 @@ var ClientServicesHost = class {
     import_log19.log.trace("dxos.client-services.host.open", import_protocols15.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file22,
-      L: 227,
+      F: __dxlog_file23,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant19.invariant)(this._config, "config not set", {
-      F: __dxlog_file22,
-      L: 229,
+      F: __dxlog_file23,
+      L: 230,
       S: this,
       A: [
         "this._config",
@@ -6482,8 +6697,8 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_invariant19.invariant)(this._storage, "storage not set", {
-      F: __dxlog_file22,
-      L: 230,
+      F: __dxlog_file23,
+      L: 231,
       S: this,
       A: [
         "this._storage",
@@ -6491,8 +6706,8 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_invariant19.invariant)(this._signalManager, "signal manager not set", {
-      F: __dxlog_file22,
-      L: 231,
+      F: __dxlog_file23,
+      L: 232,
       S: this,
       A: [
         "this._signalManager",
@@ -6500,8 +6715,8 @@ var ClientServicesHost = class {
       ]
     });
     (0, import_invariant19.invariant)(this._networkManager, "network manager not set", {
-      F: __dxlog_file22,
-      L: 232,
+      F: __dxlog_file23,
+      L: 233,
       S: this,
       A: [
         "this._networkManager",
@@ -6512,8 +6727,8 @@ var ClientServicesHost = class {
     (0, import_log19.log)("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file22,
-      L: 235,
+      F: __dxlog_file23,
+      L: 236,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6524,16 +6739,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),
@@ -6566,16 +6783,16 @@ var ClientServicesHost = class {
     (0, import_log19.log)("opened", {
       deviceKey
     }, {
-      F: __dxlog_file22,
-      L: 314,
+      F: __dxlog_file23,
+      L: 322,
       S: this,
       C: (f, a) => f(...a)
     });
     import_log19.log.trace("dxos.client-services.host.open", import_protocols15.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file22,
-      L: 315,
+      F: __dxlog_file23,
+      L: 323,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6588,8 +6805,8 @@ var ClientServicesHost = class {
     (0, import_log19.log)("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file22,
-      L: 326,
+      F: __dxlog_file23,
+      L: 334,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6606,8 +6823,8 @@ var ClientServicesHost = class {
     (0, import_log19.log)("closed", {
       deviceKey
     }, {
-      F: __dxlog_file22,
-      L: 335,
+      F: __dxlog_file23,
+      L: 343,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6617,30 +6834,30 @@ var ClientServicesHost = class {
     import_log19.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file22,
-      L: 340,
+      F: __dxlog_file23,
+      L: 348,
       S: this,
       C: (f, a) => f(...a)
     });
     import_log19.log.info("resetting...", void 0, {
-      F: __dxlog_file22,
-      L: 342,
+      F: __dxlog_file23,
+      L: 350,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
     import_log19.log.info("reset", void 0, {
-      F: __dxlog_file22,
-      L: 345,
+      F: __dxlog_file23,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
     import_log19.log.trace("dxos.sdk.client-services-host.reset", import_protocols15.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file22,
-      L: 346,
+      F: __dxlog_file23,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6709,4 +6926,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-5B5T4YX6.cjs.map
+//# sourceMappingURL=chunk-SSRPYM2G.cjs.map