@dxos/client-services 0.5.9-next.728078d → 0.5.9-next.912f1ef

package/dist/lib/browser/{chunk-Q2PH3QCC.mjs → chunk-MD3R7DKE.mjs}

@@ -85,6 +85,7 @@ var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
 import { Stream as Stream2 } from "@dxos/codec-protobuf";
 import { Context } from "@dxos/context";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devtools/network.ts";
 var subscribeToNetworkStatus = ({ signalManager }) => new Stream2(({ next, close }) => {
   const update = () => {
     try {
@@ -100,7 +101,10 @@ var subscribeToNetworkStatus = ({ signalManager }) => new Stream2(({ next, close
   update();
 });
 var subscribeToSignal = ({ signalManager }) => new Stream2(({ next }) => {
-  const ctx = new Context();
+  const ctx = new Context(void 0, {
+    F: __dxlog_file,
+    L: 36
+  });
   signalManager.onMessage.on(ctx, (message) => {
     next({
       message: {
@@ -355,7 +359,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.5.9-next.728078d";
+var DXOS_VERSION = "0.5.9-next.912f1ef";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -388,7 +392,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts
-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 = {
@@ -405,7 +409,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
   await Promise.all([
     (async () => {
       invariant(clientServices.LoggingService, "SystemService is not available.", {
-        F: __dxlog_file,
+        F: __dxlog_file2,
         L: 110,
         S: void 0,
         A: [
@@ -510,7 +514,7 @@ var getStorageDiagnostics = async () => {
 // packages/sdk/client-services/src/packlets/diagnostics/browser-diagnostics-broadcast.ts
 import { Trigger } from "@dxos/async";
 import { log } from "@dxos/log";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/diagnostics/browser-diagnostics-broadcast.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/diagnostics/browser-diagnostics-broadcast.ts";
 var CHANNEL_NAME = "dxos.diagnostics.broadcast";
 var MessageType;
 (function(MessageType2) {
@@ -579,7 +583,7 @@ var createCollectDiagnosticsBroadcastHandler = (systemService) => {
           }
         } catch (error) {
           log.catch(error, void 0, {
-            F: __dxlog_file2,
+            F: __dxlog_file3,
             L: 77,
             S: void 0,
             C: (f, a) => f(...a)
@@ -687,7 +691,7 @@ import { Context as Context2 } from "@dxos/context";
 import { verifyCredential } from "@dxos/credentials";
 import { log as log2 } from "@dxos/log";
 import { schema } from "@dxos/protocols";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
 var Credential = schema.getCodecForType("dxos.halo.credentials.Credential");
 var createAuthProvider = (signer) => async (nonce) => {
   const credential = await signer.createCredential({
@@ -702,7 +706,10 @@ var createAuthProvider = (signer) => async (nonce) => {
 var TrustedKeySetAuthVerifier = class {
   constructor(_params) {
     this._params = _params;
-    this._ctx = new Context2();
+    this._ctx = new Context2(void 0, {
+      F: __dxlog_file4,
+      L: 45
+    });
   }
   async close() {
     await this._ctx.dispose();
@@ -713,7 +720,7 @@ var TrustedKeySetAuthVerifier = class {
       log2("authenticating...", {
         credential
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file4,
         L: 56,
         S: this,
         C: (f, a) => f(...a)
@@ -723,7 +730,7 @@ var TrustedKeySetAuthVerifier = class {
         log2("Invalid credential", {
           result
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file4,
           L: 60,
           S: this,
           C: (f, a) => f(...a)
@@ -735,7 +742,7 @@ var TrustedKeySetAuthVerifier = class {
           nonce,
           credential
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file4,
           L: 65,
           S: this,
           C: (f, a) => f(...a)
@@ -746,7 +753,7 @@ var TrustedKeySetAuthVerifier = class {
         log2("key is not currently in trusted set, waiting...", {
           key: credential.issuer
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file4,
           L: 70,
           S: this,
           C: (f, a) => f(...a)
@@ -762,7 +769,7 @@ var TrustedKeySetAuthVerifier = class {
           log2("auth success", {
             key: credential.issuer
           }, {
-            F: __dxlog_file3,
+            F: __dxlog_file4,
             L: 81,
             S: this,
             C: (f, a) => f(...a)
@@ -772,7 +779,7 @@ var TrustedKeySetAuthVerifier = class {
           log2("key is not currently in trusted set, waiting...", {
             key: credential.issuer
           }, {
-            F: __dxlog_file3,
+            F: __dxlog_file4,
             L: 84,
             S: this,
             C: (f, a) => f(...a)
@@ -813,7 +820,7 @@ import { ComplexSet } from "@dxos/util";
 import { getCredentialAssertion } from "@dxos/credentials";
 import { SpaceId } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/default-space-state-machine.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/default-space-state-machine.ts";
 var DefaultSpaceStateMachine = class {
   constructor(_params) {
     this._params = _params;
@@ -830,7 +837,7 @@ var DefaultSpaceStateMachine = class {
             expectedIdentity: this._params.identityKey,
             credential
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file5,
             L: 32,
             S: this,
             C: (f, a) => f(...a)
@@ -841,7 +848,7 @@ var DefaultSpaceStateMachine = class {
           log3.warn("Invalid default space id", {
             id: assertion.spaceId
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file5,
             L: 36,
             S: this,
             C: (f, a) => f(...a)
@@ -866,7 +873,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_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
 var Identity = class {
   constructor({ space, signer, identityKey, deviceKey, presence }) {
     this.stateUpdate = new Event();
@@ -878,7 +885,7 @@ var Identity = class {
     log4.trace("dxos.halo.device", {
       deviceKey
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 70,
       S: this,
       C: (f, a) => f(...a)
@@ -957,7 +964,7 @@ var Identity = class {
   */
   getIdentityCredentialSigner() {
     invariant2(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 159,
       S: this,
       A: [
@@ -1001,7 +1008,7 @@ var Identity = class {
       controlFeedKey,
       dataFeedKey
     }, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 184,
       S: this,
       C: (f, a) => f(...a)
@@ -1078,7 +1085,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_file6 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-manager.ts";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-manager.ts";
 var DEVICE_PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var DEVICE_PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var IdentityManager = class {
@@ -1102,7 +1109,7 @@ var IdentityManager = class {
     log5.trace("dxos.halo.identity-manager.open", trace3.begin({
       id: traceId
     }), {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 104,
       S: this,
       C: (f, a) => f(...a)
@@ -1111,7 +1118,7 @@ var IdentityManager = class {
     log5("identity record", {
       identityRecord
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 107,
       S: this,
       C: (f, a) => f(...a)
@@ -1124,7 +1131,7 @@ var IdentityManager = class {
         identityKey: identityRecord.identityKey,
         displayName: this._identity.profileDocument?.displayName
       }, {
-        F: __dxlog_file6,
+        F: __dxlog_file7,
         L: 112,
         S: this,
         C: (f, a) => f(...a)
@@ -1134,18 +1141,21 @@ var IdentityManager = class {
     log5.trace("dxos.halo.identity-manager.open", trace3.end({
       id: traceId
     }), {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    await this._identity?.close(new Context3());
+    await this._identity?.close(new Context3(void 0, {
+      F: __dxlog_file7,
+      L: 123
+    }));
   }
   async createIdentity({ displayName, deviceProfile } = {}) {
     invariant3(!this._identity, "Identity already exists.", {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 128,
       S: this,
       A: [
@@ -1154,7 +1164,7 @@ var IdentityManager = class {
       ]
     });
     log5("creating identity...", void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 129,
       S: this,
       C: (f, a) => f(...a)
@@ -1171,11 +1181,14 @@ var IdentityManager = class {
       }
     };
     const identity = await this._constructIdentity(identityRecord);
-    await identity.open(new Context3());
+    await identity.open(new Context3(void 0, {
+      F: __dxlog_file7,
+      L: 144
+    }));
     {
       const generator = new CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       invariant3(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
-        F: __dxlog_file6,
+        F: __dxlog_file7,
         L: 148,
         S: this,
         A: [
@@ -1184,7 +1197,7 @@ var IdentityManager = class {
         ]
       });
       invariant3(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
-        F: __dxlog_file6,
+        F: __dxlog_file7,
         L: 149,
         S: this,
         A: [
@@ -1223,7 +1236,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey,
       displayName: this._identity.profileDocument?.displayName
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 191,
       S: this,
       C: (f, a) => f(...a)
@@ -1234,7 +1247,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey,
       profile: identity.profileDocument
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 197,
       S: this,
       C: (f, a) => f(...a)
@@ -1271,13 +1284,13 @@ var IdentityManager = class {
     log5("accepting identity", {
       params
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(!this._identity, "Identity already exists.", {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 236,
       S: this,
       A: [
@@ -1297,7 +1310,10 @@ var IdentityManager = class {
       }
     };
     const identity = await this._constructIdentity(identityRecord);
-    await identity.open(new Context3());
+    await identity.open(new Context3(void 0, {
+      F: __dxlog_file7,
+      L: 251
+    }));
     this._identity = identity;
     await this._metadataStore.setIdentityRecord(identityRecord);
     await this._identity.ready();
@@ -1305,7 +1321,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey,
       displayName: this._identity.profileDocument?.displayName
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 255,
       S: this,
       C: (f, a) => f(...a)
@@ -1319,7 +1335,7 @@ var IdentityManager = class {
       identityKey: identity.identityKey,
       deviceKey: identity.deviceKey
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 265,
       S: this,
       C: (f, a) => f(...a)
@@ -1331,7 +1347,7 @@ var IdentityManager = class {
   */
   async updateProfile(profile) {
     invariant3(this._identity, "Identity not initialized.", {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 273,
       S: this,
       A: [
@@ -1362,7 +1378,7 @@ var IdentityManager = class {
   }
   async updateDeviceProfile(profile) {
     invariant3(this._identity, "Identity not initialized.", {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 290,
       S: this,
       A: [
@@ -1398,7 +1414,7 @@ var IdentityManager = class {
   }
   async _constructIdentity(identityRecord) {
     invariant3(!this._identity, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 316,
       S: this,
       A: [
@@ -1409,7 +1425,7 @@ var IdentityManager = class {
     log5("constructing identity", {
       identityRecord
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 317,
       S: this,
       C: (f, a) => f(...a)
@@ -1424,7 +1440,7 @@ var IdentityManager = class {
       gossip
     });
     invariant3(identityRecord.haloSpace.controlFeedKey, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 330,
       S: this,
       A: [
@@ -1436,7 +1452,7 @@ var IdentityManager = class {
       writable: true
     });
     invariant3(identityRecord.haloSpace.dataFeedKey, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 334,
       S: this,
       A: [
@@ -1470,7 +1486,7 @@ var IdentityManager = class {
     log5("done", {
       identityKey: identityRecord.identityKey
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 360,
       S: this,
       C: (f, a) => f(...a)
@@ -1495,7 +1511,7 @@ var IdentityManager = class {
       },
       onAuthFailure: () => {
         log5.warn("auth failure", void 0, {
-          F: __dxlog_file6,
+          F: __dxlog_file7,
           L: 385,
           S: this,
           C: (f, a) => f(...a)
@@ -1528,7 +1544,7 @@ import { invariant as invariant4 } from "@dxos/invariant";
 import { log as log6 } from "@dxos/log";
 import { SpaceState } from "@dxos/protocols/proto/dxos/client/services";
 import { safeAwaitAll } from "@dxos/util";
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-service.ts";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-service.ts";
 var DEFAULT_SPACE_SEARCH_TIMEOUT = 1e4;
 var IdentityServiceImpl = class extends Resource {
   constructor(_identityManager, _keyring, _dataSpaceManagerProvider, _createIdentity, _onProfileUpdate) {
@@ -1558,7 +1574,7 @@ var IdentityServiceImpl = class extends Resource {
     const space = await dataSpaceManager.createDefaultSpace();
     const identity = this._identityManager.identity;
     invariant4(identity, void 0, {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 59,
       S: this,
       A: [
@@ -1592,7 +1608,7 @@ var IdentityServiceImpl = class extends Resource {
   }
   async updateProfile(profile) {
     invariant4(this._identityManager.identity, "Identity not initialized.", {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 89,
       S: this,
       A: [
@@ -1606,7 +1622,7 @@ var IdentityServiceImpl = class extends Resource {
   }
   async signPresentation({ presentation, nonce }) {
     invariant4(this._identityManager.identity, "Identity not initialized.", {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 96,
       S: this,
       A: [
@@ -1641,8 +1657,8 @@ var IdentityServiceImpl = class extends Resource {
           log6.warn("Multiple default spaces found. Using the first one.", {
             duplicate: space.id
           }, {
-            F: __dxlog_file7,
-            L: 127,
+            F: __dxlog_file8,
+            L: 129,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1653,6 +1669,13 @@ var IdentityServiceImpl = class extends Resource {
         recodedDefaultSpace = true;
         recordedDefaultSpaceTrigger.wake();
       }
+    }, (err) => {
+      log6.catch(err, void 0, {
+        F: __dxlog_file8,
+        L: 140,
+        S: this,
+        C: (f, a) => f(...a)
+      });
     });
     await Promise.race([
       allProcessed,
@@ -1669,7 +1692,7 @@ var IdentityServiceImpl = class extends Resource {
 import { invariant as invariant5 } from "@dxos/invariant";
 import { AlreadyJoinedError } from "@dxos/protocols";
 import { Invitation } from "@dxos/protocols/proto/dxos/client/services";
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts";
+var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts";
 var DeviceInvitationProtocol = class {
   constructor(_keyring, _getIdentity, _acceptIdentity) {
     this._keyring = _keyring;
@@ -1695,7 +1718,7 @@ var DeviceInvitationProtocol = class {
   }
   async admit(_, request) {
     invariant5(request.device, void 0, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 50,
       S: this,
       A: [
@@ -1741,7 +1764,7 @@ var DeviceInvitationProtocol = class {
   }
   async accept(response, request) {
     invariant5(response.device, void 0, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 95,
       S: this,
       A: [
@@ -1751,7 +1774,7 @@ var DeviceInvitationProtocol = class {
     });
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
     invariant5(request.device, void 0, {
-      F: __dxlog_file8,
+      F: __dxlog_file9,
       L: 98,
       S: this,
       A: [
@@ -1820,7 +1843,7 @@ var tryAcquireBeforeContextDisposed = async (ctx, mutex) => {
 };
 
 // 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 __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts";
 var OPTIONS_TIMEOUT = 1e4;
 var InvitationGuestExtension = class extends RpcExtension {
   constructor(_invitationFlowMutex, _callbacks) {
@@ -1834,7 +1857,10 @@ var InvitationGuestExtension = class extends RpcExtension {
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
-    this._ctx = new Context4();
+    this._ctx = new Context4(void 0, {
+      F: __dxlog_file10,
+      L: 33
+    });
     this._remoteOptionsTrigger = new Trigger4();
     this._invitationFlowLock = null;
   }
@@ -1846,7 +1872,7 @@ var InvitationGuestExtension = class extends RpcExtension {
       InvitationHostService: {
         options: async (options) => {
           invariant6(!this._remoteOptions, "Remote options already set.", {
-            F: __dxlog_file9,
+            F: __dxlog_file10,
             L: 63,
             S: this,
             A: [
@@ -1873,14 +1899,14 @@ var InvitationGuestExtension = class extends RpcExtension {
     await super.onOpen(context);
     try {
       log7("guest acquire lock", void 0, {
-        F: __dxlog_file9,
+        F: __dxlog_file10,
         L: 84,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
       log7("guest lock acquired", void 0, {
-        F: __dxlog_file9,
+        F: __dxlog_file10,
         L: 86,
         S: this,
         C: (f, a) => f(...a)
@@ -1889,7 +1915,7 @@ var InvitationGuestExtension = class extends RpcExtension {
         role: Options.Role.GUEST
       }));
       log7("options sent", void 0, {
-        F: __dxlog_file9,
+        F: __dxlog_file10,
         L: 88,
         S: this,
         C: (f, a) => f(...a)
@@ -1898,7 +1924,7 @@ var InvitationGuestExtension = class extends RpcExtension {
         timeout: OPTIONS_TIMEOUT
       }));
       log7("options received", void 0, {
-        F: __dxlog_file9,
+        F: __dxlog_file10,
         L: 90,
         S: this,
         C: (f, a) => f(...a)
@@ -1932,7 +1958,7 @@ var InvitationGuestExtension = class extends RpcExtension {
       this._invitationFlowLock.release();
       this._invitationFlowLock = null;
       log7("invitation flow lock released", void 0, {
-        F: __dxlog_file9,
+        F: __dxlog_file10,
         L: 123,
         S: this,
         C: (f, a) => f(...a)
@@ -1952,7 +1978,7 @@ import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleEr
 import { Invitation as Invitation3 } from "@dxos/protocols/proto/dxos/client/services";
 import { AuthenticationResponse, Options as Options2 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
-var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
+var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
 var OPTIONS_TIMEOUT2 = 1e4;
 var MAX_OTP_ATTEMPTS = 3;
 var InvitationHostExtension = class extends RpcExtension2 {
@@ -1967,7 +1993,10 @@ var InvitationHostExtension = class extends RpcExtension2 {
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
-    this._ctx = new Context5();
+    this._ctx = new Context5(void 0, {
+      F: __dxlog_file11,
+      L: 52
+    });
     this._remoteOptionsTrigger = new Trigger5();
     this._challenge = void 0;
     this.guestProfile = void 0;
@@ -1986,7 +2015,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
       InvitationHostService: {
         options: async (options) => {
           invariant7(!this._remoteOptions, "Remote options already set.", {
-            F: __dxlog_file10,
+            F: __dxlog_file11,
             L: 101,
             S: this,
             A: [
@@ -2003,7 +2032,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
           log8.trace("dxos.sdk.invitation-handler.host.introduce", trace4.begin({
             id: traceId
           }), {
-            F: __dxlog_file10,
+            F: __dxlog_file11,
             L: 110,
             S: this,
             C: (f, a) => f(...a)
@@ -2015,7 +2044,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
               expected: invitation.invitationId,
               actual: invitationId
             }, {
-              F: __dxlog_file10,
+              F: __dxlog_file11,
               L: 116,
               S: this,
               C: (f, a) => f(...a)
@@ -2029,7 +2058,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
           log8("guest introduced themselves", {
             guestProfile: profile
           }, {
-            F: __dxlog_file10,
+            F: __dxlog_file11,
             L: 125,
             S: this,
             C: (f, a) => f(...a)
@@ -2040,7 +2069,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
           log8.trace("dxos.sdk.invitation-handler.host.introduce", trace4.end({
             id: traceId
           }), {
-            F: __dxlog_file10,
+            F: __dxlog_file11,
             L: 132,
             S: this,
             C: (f, a) => f(...a)
@@ -2055,7 +2084,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
           log8.trace("dxos.sdk.invitation-handler.host.authenticate", trace4.begin({
             id: traceId
           }), {
-            F: __dxlog_file10,
+            F: __dxlog_file11,
             L: 141,
             S: this,
             C: (f, a) => f(...a)
@@ -2064,7 +2093,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
           log8("received authentication request", {
             authCode: code
           }, {
-            F: __dxlog_file10,
+            F: __dxlog_file11,
             L: 144,
             S: this,
             C: (f, a) => f(...a)
@@ -2078,7 +2107,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
           switch (invitation.authMethod) {
             case Invitation3.AuthMethod.NONE: {
               log8("authentication not required", void 0, {
-                F: __dxlog_file10,
+                F: __dxlog_file11,
                 L: 152,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2116,7 +2145,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
               log8.error("invalid authentication method", {
                 authMethod: invitation.authMethod
               }, {
-                F: __dxlog_file10,
+                F: __dxlog_file11,
                 L: 190,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2141,7 +2170,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
               status
             }
           }), {
-            F: __dxlog_file10,
+            F: __dxlog_file11,
             L: 202,
             S: this,
             C: (f, a) => f(...a)
@@ -2155,7 +2184,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
           log8.trace("dxos.sdk.invitation-handler.host.admit", trace4.begin({
             id: traceId
           }), {
-            F: __dxlog_file10,
+            F: __dxlog_file11,
             L: 208,
             S: this,
             C: (f, a) => f(...a)
@@ -2172,7 +2201,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
             log8.trace("dxos.sdk.invitation-handler.host.admit", trace4.end({
               id: traceId
             }), {
-              F: __dxlog_file10,
+              F: __dxlog_file11,
               L: 222,
               S: this,
               C: (f, a) => f(...a)
@@ -2190,14 +2219,14 @@ var InvitationHostExtension = class extends RpcExtension2 {
     await super.onOpen(context);
     try {
       log8("host acquire lock", void 0, {
-        F: __dxlog_file10,
+        F: __dxlog_file11,
         L: 237,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
       log8("host lock acquired", void 0, {
-        F: __dxlog_file10,
+        F: __dxlog_file11,
         L: 239,
         S: this,
         C: (f, a) => f(...a)
@@ -2208,7 +2237,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
         role: Options2.Role.HOST
       });
       log8("options sent", void 0, {
-        F: __dxlog_file10,
+        F: __dxlog_file11,
         L: 243,
         S: this,
         C: (f, a) => f(...a)
@@ -2217,7 +2246,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
         timeout: OPTIONS_TIMEOUT2
       }));
       log8("options received", void 0, {
-        F: __dxlog_file10,
+        F: __dxlog_file11,
         L: 245,
         S: this,
         C: (f, a) => f(...a)
@@ -2271,7 +2300,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
       this._invitationFlowLock?.release();
       this._invitationFlowLock = null;
       log8("invitation flow lock released", void 0, {
-        F: __dxlog_file10,
+        F: __dxlog_file11,
         L: 300,
         S: this,
         C: (f, a) => f(...a)
@@ -2287,7 +2316,7 @@ import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
 import { Options as Options3 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { ComplexSet as ComplexSet2 } from "@dxos/util";
-var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
+var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
 var InvitationTopology = class {
   constructor(_role) {
     this._role = _role;
@@ -2295,7 +2324,7 @@ var InvitationTopology = class {
   }
   init(controller) {
     invariant8(!this._controller, "Already initialized.", {
-      F: __dxlog_file11,
+      F: __dxlog_file12,
       L: 42,
       S: this,
       A: [
@@ -2307,7 +2336,7 @@ var InvitationTopology = class {
   }
   update() {
     invariant8(this._controller, "Not initialized.", {
-      F: __dxlog_file11,
+      F: __dxlog_file12,
       L: 47,
       S: this,
       A: [
@@ -2330,7 +2359,7 @@ var InvitationTopology = class {
         ownPeerId,
         remotePeerId: firstUnknownPeer
       }, {
-        F: __dxlog_file11,
+        F: __dxlog_file12,
         L: 69,
         S: this,
         C: (f, a) => f(...a)
@@ -2341,7 +2370,7 @@ var InvitationTopology = class {
   }
   async onOffer(peer) {
     invariant8(this._controller, "Not initialized.", {
-      F: __dxlog_file11,
+      F: __dxlog_file12,
       L: 76,
       S: this,
       A: [
@@ -2360,7 +2389,7 @@ var InvitationTopology = class {
 };
 
 // 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 __dxlog_file13 = "/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 {
   /**
@@ -2385,7 +2414,7 @@ var InvitationsHandler = class {
           try {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             invariant9(deviceKey, void 0, {
-              F: __dxlog_file12,
+              F: __dxlog_file13,
               L: 90,
               S: this,
               A: [
@@ -2414,7 +2443,7 @@ var InvitationsHandler = class {
               log10.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.begin({
                 id: traceId
               }), {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 115,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2422,7 +2451,7 @@ var InvitationsHandler = class {
               log10("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 116,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2434,7 +2463,7 @@ var InvitationsHandler = class {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 118,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2443,7 +2472,7 @@ var InvitationsHandler = class {
               log10.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.end({
                 id: traceId
               }), {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 120,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2458,7 +2487,7 @@ var InvitationsHandler = class {
                   log10("timeout", {
                     ...protocol.toJSON()
                   }, {
-                    F: __dxlog_file12,
+                    F: __dxlog_file13,
                     L: 129,
                     S: this,
                     C: (f, a) => f(...a)
@@ -2467,7 +2496,7 @@ var InvitationsHandler = class {
               } else {
                 if (guardedState.error(extension, err)) {
                   log10.error("failed", err, {
-                    F: __dxlog_file12,
+                    F: __dxlog_file13,
                     L: 133,
                     S: this,
                     C: (f, a) => f(...a)
@@ -2478,7 +2507,7 @@ var InvitationsHandler = class {
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 136,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2492,7 +2521,7 @@ var InvitationsHandler = class {
             log10("invalid role", {
               ...err.context
             }, {
-              F: __dxlog_file12,
+              F: __dxlog_file13,
               L: 144,
               S: this,
               C: (f, a) => f(...a)
@@ -2504,7 +2533,7 @@ var InvitationsHandler = class {
               log10("timeout", {
                 err
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 149,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2513,7 +2542,7 @@ var InvitationsHandler = class {
           } else {
             if (guardedState.error(extension, err)) {
               log10.error("failed", err, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 153,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2527,7 +2556,7 @@ var InvitationsHandler = class {
     if (invitation.lifetime && invitation.created) {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
         log10.warn("invitation has already expired", void 0, {
-          F: __dxlog_file12,
+          F: __dxlog_file13,
           L: 164,
           S: this,
           C: (f, a) => f(...a)
@@ -2550,7 +2579,7 @@ var InvitationsHandler = class {
     const { timeout = INVITATION_TIMEOUT } = invitation;
     if (deviceProfile) {
       invariant9(invitation.kind === Invitation4.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
-        F: __dxlog_file12,
+        F: __dxlog_file13,
         L: 197,
         S: this,
         A: [
@@ -2568,7 +2597,7 @@ var InvitationsHandler = class {
         invitationType: Invitation4.Type.DELEGATED,
         triedPeers: triedPeersIds.size
       }, {
-        F: __dxlog_file12,
+        F: __dxlog_file13,
         L: 205,
         S: this,
         C: (f, a) => f(...a)
@@ -2595,7 +2624,7 @@ var InvitationsHandler = class {
               admitted,
               currentState: guardedState.current.state
             }, {
-              F: __dxlog_file12,
+              F: __dxlog_file13,
               L: 233,
               S: this,
               C: (f, a) => f(...a)
@@ -2613,7 +2642,7 @@ var InvitationsHandler = class {
               log10.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.begin({
                 id: traceId
               }), {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 245,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2625,7 +2654,7 @@ var InvitationsHandler = class {
               log10("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 256,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2634,7 +2663,7 @@ var InvitationsHandler = class {
               log10("introduce", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 260,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2647,7 +2676,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON(),
                 response: introductionResponse
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 265,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2668,7 +2697,7 @@ var InvitationsHandler = class {
               log10("request admission", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 291,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2680,7 +2709,7 @@ var InvitationsHandler = class {
               log10("admitted by host", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 302,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2693,7 +2722,7 @@ var InvitationsHandler = class {
               log10.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.end({
                 id: traceId
               }), {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 308,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2703,7 +2732,7 @@ var InvitationsHandler = class {
                 log10("timeout", {
                   ...protocol.toJSON()
                 }, {
-                  F: __dxlog_file12,
+                  F: __dxlog_file13,
                   L: 311,
                   S: this,
                   C: (f, a) => f(...a)
@@ -2711,7 +2740,7 @@ var InvitationsHandler = class {
                 guardedState.set(extension, Invitation4.State.TIMEOUT);
               } else {
                 log10("auth failed", err, {
-                  F: __dxlog_file12,
+                  F: __dxlog_file13,
                   L: 314,
                   S: this,
                   C: (f, a) => f(...a)
@@ -2723,7 +2752,7 @@ var InvitationsHandler = class {
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file12,
+                F: __dxlog_file13,
                 L: 318,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2739,7 +2768,7 @@ var InvitationsHandler = class {
             log10("timeout", {
               ...protocol.toJSON()
             }, {
-              F: __dxlog_file12,
+              F: __dxlog_file13,
               L: 327,
               S: this,
               C: (f, a) => f(...a)
@@ -2747,7 +2776,7 @@ var InvitationsHandler = class {
             guardedState.set(extension, Invitation4.State.TIMEOUT);
           } else {
             log10("auth failed", err, {
-              F: __dxlog_file12,
+              F: __dxlog_file13,
               L: 330,
               S: this,
               C: (f, a) => f(...a)
@@ -2765,7 +2794,7 @@ var InvitationsHandler = class {
         await ctx.dispose();
       } else {
         invariant9(invitation.swarmKey, void 0, {
-          F: __dxlog_file12,
+          F: __dxlog_file13,
           L: 345,
           S: this,
           A: [
@@ -2859,16 +2888,29 @@ var InvitationsHandler = class {
     };
   }
   _logStateUpdate(invitation, actor, newState) {
-    log10("invitation state update", {
-      actor: actor?.constructor.name,
-      newState: stateToString(newState),
-      oldState: stateToString(invitation.state)
-    }, {
-      F: __dxlog_file12,
-      L: 438,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    if (this._isNotTerminal(newState)) {
+      log10("invitation state update", {
+        actor: actor?.constructor.name,
+        newState: stateToString(newState),
+        oldState: stateToString(invitation.state)
+      }, {
+        F: __dxlog_file13,
+        L: 439,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    } else {
+      log10.info("invitation state update", {
+        actor: actor?.constructor.name,
+        newState: stateToString(newState),
+        oldState: stateToString(invitation.state)
+      }, {
+        F: __dxlog_file13,
+        L: 445,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
   }
   _isNotTerminal(currentState) {
     return ![
@@ -2882,16 +2924,16 @@ var InvitationsHandler = class {
   async _handleGuestOtpAuth(extension, setState, authenticated, options) {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       log10("guest waiting for authentication code...", void 0, {
-        F: __dxlog_file12,
-        L: 462,
+        F: __dxlog_file13,
+        L: 470,
         S: this,
         C: (f, a) => f(...a)
       });
       setState(Invitation4.State.READY_FOR_AUTHENTICATION);
       const authCode = await authenticated.wait(options);
       log10("sending authentication request", void 0, {
-        F: __dxlog_file12,
-        L: 466,
+        F: __dxlog_file13,
+        L: 474,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2909,8 +2951,8 @@ var InvitationsHandler = class {
           log10("retrying invalid code", {
             attempt
           }, {
-            F: __dxlog_file12,
-            L: 477,
+            F: __dxlog_file13,
+            L: 485,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2927,8 +2969,8 @@ var InvitationsHandler = class {
       throw new Error("challenge missing in the introduction");
     }
     log10("sending authentication request", void 0, {
-      F: __dxlog_file12,
-      L: 496,
+      F: __dxlog_file13,
+      L: 504,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3048,14 +3090,14 @@ var InvitationsServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts
-import { createAdmissionCredentials, createCancelDelegatedSpaceInvitationCredential, createDelegatedSpaceInvitationCredential, getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
+import { createCancelDelegatedSpaceInvitationCredential, createDelegatedSpaceInvitationCredential, getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
 import { writeMessages as writeMessages2 } from "@dxos/feed-store";
 import { invariant as invariant10 } from "@dxos/invariant";
 import { log as log11 } from "@dxos/log";
 import { AlreadyJoinedError as AlreadyJoinedError2, AuthorizationError, InvalidInvitationError, SpaceNotFoundError } from "@dxos/protocols";
 import { Invitation as Invitation5 } from "@dxos/protocols/proto/dxos/client/services";
 import { SpaceMember as SpaceMember2 } from "@dxos/protocols/proto/dxos/halo/credentials";
-var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
+var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
 var SpaceInvitationProtocol = class {
   constructor(_spaceManager, _signingContext, _keyring, _spaceKey) {
     this._spaceManager = _spaceManager;
@@ -3089,79 +3131,43 @@ var SpaceInvitationProtocol = class {
     };
   }
   async admit(invitation, request, guestProfile) {
-    invariant10(this._spaceKey, void 0, {
-      F: __dxlog_file13,
-      L: 76,
-      S: this,
-      A: [
-        "this._spaceKey",
-        ""
-      ]
-    });
-    const space = this._spaceManager.spaces.get(this._spaceKey);
-    invariant10(space, void 0, {
-      F: __dxlog_file13,
-      L: 78,
-      S: this,
-      A: [
-        "space",
-        ""
-      ]
-    });
-    invariant10(request.space, void 0, {
-      F: __dxlog_file13,
-      L: 80,
+    invariant10(this._spaceKey && request.space, void 0, {
+      F: __dxlog_file14,
+      L: 74,
       S: this,
       A: [
-        "request.space",
+        "this._spaceKey && request.space",
         ""
       ]
     });
-    const { identityKey, deviceKey } = request.space;
-    if (space.inner.spaceState.getMemberRole(identityKey) !== SpaceMember2.Role.REMOVED) {
-      throw new AlreadyJoinedError2();
-    }
     log11("writing guest credentials", {
       host: this._signingContext.deviceKey,
-      guest: deviceKey
+      guest: request.space.deviceKey
     }, {
-      F: __dxlog_file13,
-      L: 87,
+      F: __dxlog_file14,
+      L: 75,
       S: this,
       C: (f, a) => f(...a)
     });
-    const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, invitation.role ?? SpaceMember2.Role.ADMIN, space.inner.spaceState.membershipChainHeads, guestProfile, invitation.delegationCredentialId);
-    invariant10(credentials[0].credential, void 0, {
-      F: __dxlog_file13,
-      L: 101,
-      S: this,
-      A: [
-        "credentials[0].credential",
-        ""
-      ]
-    });
-    const spaceMemberCredential = credentials[0].credential.credential;
-    invariant10(getCredentialAssertion2(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file13,
-      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 ?? SpaceMember2.Role.ADMIN,
+      profile: guestProfile,
+      delegationCredentialId: invitation.delegationCredentialId
     });
-    await writeMessages2(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) {
     invariant10(this._spaceKey, void 0, {
-      F: __dxlog_file13,
-      L: 116,
+      F: __dxlog_file14,
+      L: 95,
       S: this,
       A: [
         "this._spaceKey",
@@ -3170,8 +3176,8 @@ var SpaceInvitationProtocol = class {
     });
     const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant10(space, void 0, {
-      F: __dxlog_file13,
-      L: 118,
+      F: __dxlog_file14,
+      L: 97,
       S: this,
       A: [
         "space",
@@ -3180,8 +3186,8 @@ var SpaceInvitationProtocol = class {
     });
     if (invitation.authMethod === Invitation5.AuthMethod.KNOWN_PUBLIC_KEY) {
       invariant10(invitation.guestKeypair?.publicKey, void 0, {
-        F: __dxlog_file13,
-        L: 120,
+        F: __dxlog_file14,
+        L: 99,
         S: this,
         A: [
           "invitation.guestKeypair?.publicKey",
@@ -3193,8 +3199,8 @@ var SpaceInvitationProtocol = class {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
-      F: __dxlog_file13,
-      L: 123,
+      F: __dxlog_file14,
+      L: 102,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3208,8 +3214,8 @@ var SpaceInvitationProtocol = class {
       guestKey: invitation.authMethod === Invitation5.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
     });
     invariant10(credential.credential, void 0, {
-      F: __dxlog_file13,
-      L: 143,
+      F: __dxlog_file14,
+      L: 122,
       S: this,
       A: [
         "credential.credential",
@@ -3223,8 +3229,8 @@ var SpaceInvitationProtocol = class {
   }
   async cancelDelegation(invitation) {
     invariant10(this._spaceKey, void 0, {
-      F: __dxlog_file13,
-      L: 149,
+      F: __dxlog_file14,
+      L: 128,
       S: this,
       A: [
         "this._spaceKey",
@@ -3232,8 +3238,8 @@ var SpaceInvitationProtocol = class {
       ]
     });
     invariant10(invitation.type === Invitation5.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
-      F: __dxlog_file13,
-      L: 150,
+      F: __dxlog_file14,
+      L: 129,
       S: this,
       A: [
         "invitation.type === Invitation.Type.DELEGATED && invitation.delegationCredentialId",
@@ -3242,8 +3248,8 @@ var SpaceInvitationProtocol = class {
     });
     const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant10(space, void 0, {
-      F: __dxlog_file13,
-      L: 152,
+      F: __dxlog_file14,
+      L: 131,
       S: this,
       A: [
         "space",
@@ -3254,15 +3260,15 @@ var SpaceInvitationProtocol = class {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
-      F: __dxlog_file13,
-      L: 154,
+      F: __dxlog_file14,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
     const credential = await createCancelDelegatedSpaceInvitationCredential(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
     invariant10(credential.credential, void 0, {
-      F: __dxlog_file13,
-      L: 161,
+      F: __dxlog_file14,
+      L: 140,
       S: this,
       A: [
         "credential.credential",
@@ -3300,8 +3306,8 @@ var SpaceInvitationProtocol = class {
   }
   async accept(response) {
     invariant10(response.space, void 0, {
-      F: __dxlog_file13,
-      L: 196,
+      F: __dxlog_file14,
+      L: 175,
       S: this,
       A: [
         "response.space",
@@ -3311,8 +3317,8 @@ var SpaceInvitationProtocol = class {
     const { credential, controlTimeframe, dataTimeframe } = response.space;
     const assertion = getCredentialAssertion2(credential);
     invariant10(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
-      F: __dxlog_file13,
-      L: 199,
+      F: __dxlog_file14,
+      L: 178,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3320,8 +3326,8 @@ var SpaceInvitationProtocol = class {
       ]
     });
     invariant10(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
-      F: __dxlog_file13,
-      L: 200,
+      F: __dxlog_file14,
+      L: 179,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
@@ -3355,7 +3361,7 @@ import { PublicKey as PublicKey8 } from "@dxos/keys";
 import { log as log12 } from "@dxos/log";
 import { Invitation as Invitation6 } from "@dxos/protocols/proto/dxos/client/services";
 import { SpaceMember as SpaceMember3 } from "@dxos/protocols/proto/dxos/halo/credentials";
-var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
+var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
 var InvitationsManager = class {
   constructor(_invitationsHandler, _getHandler, _metadataStore) {
     this._invitationsHandler = _invitationsHandler;
@@ -3398,7 +3404,7 @@ var InvitationsManager = class {
       await this._persistIfRequired(handler, stream, invitation);
     } catch (err) {
       log12.catch(err, void 0, {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 82,
         S: this,
         C: (f, a) => f(...a)
@@ -3421,7 +3427,7 @@ var InvitationsManager = class {
       const freshInvitations = persistentInvitations.filter((invitation) => !hasInvitationExpired(invitation));
       const loadTasks = freshInvitations.map((persistentInvitation) => {
         invariant11(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
-          F: __dxlog_file14,
+          F: __dxlog_file15,
           L: 103,
           S: this,
           A: [
@@ -3440,7 +3446,7 @@ var InvitationsManager = class {
       };
     } catch (err) {
       log12.catch(err, void 0, {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 110,
         S: this,
         C: (f, a) => f(...a)
@@ -3472,13 +3478,13 @@ var InvitationsManager = class {
   }
   async authenticate({ invitationId, authCode }) {
     log12("authenticating...", void 0, {
-      F: __dxlog_file14,
+      F: __dxlog_file15,
       L: 140,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant11(invitationId, void 0, {
-      F: __dxlog_file14,
+      F: __dxlog_file15,
       L: 141,
       S: this,
       A: [
@@ -3491,7 +3497,7 @@ var InvitationsManager = class {
       log12.warn("invalid invitation", {
         invitationId
       }, {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 144,
         S: this,
         C: (f, a) => f(...a)
@@ -3504,13 +3510,13 @@ var InvitationsManager = class {
     log12("cancelInvitation...", {
       invitationId
     }, {
-      F: __dxlog_file14,
+      F: __dxlog_file15,
       L: 151,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant11(invitationId, void 0, {
-      F: __dxlog_file14,
+      F: __dxlog_file15,
       L: 152,
       S: this,
       A: [
@@ -3584,12 +3590,15 @@ var InvitationsManager = class {
         stream.error(err);
         void ctx.dispose();
       }
+    }, {
+      F: __dxlog_file15,
+      L: 234
     });
     ctx.onDispose(() => {
       log12("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 241,
         S: this,
         C: (f, a) => f(...a)
@@ -3622,7 +3631,7 @@ var InvitationsManager = class {
           log12("timeout", {
             ...handler.toJSON()
           }, {
-            F: __dxlog_file14,
+            F: __dxlog_file15,
             L: 261,
             S: this,
             C: (f, a) => f(...a)
@@ -3633,7 +3642,7 @@ var InvitationsManager = class {
           });
         } else {
           log12.warn("auth failed", err, {
-            F: __dxlog_file14,
+            F: __dxlog_file15,
             L: 264,
             S: this,
             C: (f, a) => f(...a)
@@ -3645,12 +3654,15 @@ var InvitationsManager = class {
         }
         void ctx.dispose();
       }
+    }, {
+      F: __dxlog_file15,
+      L: 258
     });
     ctx.onDispose(() => {
       log12("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 271,
         S: this,
         C: (f, a) => f(...a)
@@ -3695,7 +3707,7 @@ var InvitationsManager = class {
       await this._metadataStore.removeInvitation(invitation.invitationId);
     } catch (err) {
       log12.catch(err, void 0, {
-        F: __dxlog_file14,
+        F: __dxlog_file15,
         L: 307,
         S: this,
         C: (f, a) => f(...a)
@@ -3712,10 +3724,10 @@ var InvitationsManager = class {
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
 import { Event as Event6, Mutex as Mutex2, scheduleTask as scheduleTask5, sleep as sleep3, synchronized, trackLeaks } from "@dxos/async";
 import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
-import { Context as Context8, ContextDisposedError as ContextDisposedError3, cancelWithContext as cancelWithContext5 } from "@dxos/context";
+import { Context as Context8, ContextDisposedError as ContextDisposedError3, cancelWithContext as cancelWithContext4 } from "@dxos/context";
 import { timed, warnAfterTimeout } from "@dxos/debug";
 import { createMappedFeedWriter } from "@dxos/echo-pipeline";
-import { SpaceDocVersion } from "@dxos/echo-protocol";
+import { SpaceDocVersion as SpaceDocVersion2 } from "@dxos/echo-protocol";
 import { failedInvariant } from "@dxos/invariant";
 import { PublicKey as PublicKey10 } from "@dxos/keys";
 import { log as log15 } from "@dxos/log";
@@ -3772,22 +3784,19 @@ var AutomergeSpaceState = class extends Resource2 {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts
-import { asyncTimeout as asyncTimeout2 } from "@dxos/async";
-import { next as am } from "@dxos/automerge/automerge";
-import { cancelWithContext as cancelWithContext4 } from "@dxos/context";
 import { convertLegacyReferences, convertLegacySpaceRootDoc, findInlineObjectOfType, migrateDocument } from "@dxos/echo-db";
-import { AutomergeDocumentLoaderImpl } from "@dxos/echo-pipeline";
+import { SpaceDocVersion } from "@dxos/echo-protocol";
 import { TYPE_PROPERTIES } from "@dxos/echo-schema";
 import { invariant as invariant12 } from "@dxos/invariant";
 import { log as log13 } from "@dxos/log";
 import { CreateEpochRequest } from "@dxos/protocols/proto/dxos/client/services";
-import { assignDeep } from "@dxos/util";
-var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts";
+var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts";
+var LOAD_DOC_TIMEOUT = 1e4;
 var runEpochMigration = async (ctx, context) => {
   switch (context.migration) {
     case CreateEpochRequest.Migration.INIT_AUTOMERGE: {
-      const document = context.repo.create();
-      await context.repo.flush();
+      const document = context.echoHost.createDoc();
+      await context.echoHost.flush();
       return {
         newRoot: document.url
       };
@@ -3796,77 +3805,88 @@ var runEpochMigration = async (ctx, context) => {
       if (!context.currentRoot) {
         throw new Error("Space does not have an automerge root");
       }
-      const rootHandle = context.repo.find(context.currentRoot);
-      await cancelWithContext4(ctx, asyncTimeout2(rootHandle.whenReady(), 1e4));
-      const newRoot = context.repo.create(rootHandle.docSync());
-      await context.repo.flush();
+      const rootHandle = await context.echoHost.loadDoc(ctx, context.currentRoot, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
+      const newRoot = context.echoHost.createDoc(rootHandle.docSync());
+      await context.echoHost.flush();
       return {
         newRoot: newRoot.url
       };
     }
     case CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
       log13.info("Fragmenting", void 0, {
-        F: __dxlog_file15,
-        L: 63,
+        F: __dxlog_file16,
+        L: 64,
         S: void 0,
         C: (f, a) => f(...a)
       });
       const currentRootUrl = context.currentRoot;
-      const rootHandle = context.repo.find(currentRootUrl);
-      await cancelWithContext4(ctx, asyncTimeout2(rootHandle.whenReady(), 1e4));
+      const rootHandle = await context.echoHost.loadDoc(ctx, currentRootUrl, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
       const objects = Object.entries(rootHandle.docSync().objects);
       const properties = findInlineObjectOfType(rootHandle.docSync(), TYPE_PROPERTIES);
       const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
       invariant12(properties, "Properties not found", {
-        F: __dxlog_file15,
-        L: 73,
+        F: __dxlog_file16,
+        L: 75,
         S: void 0,
         A: [
           "properties",
           "'Properties not found'"
         ]
       });
-      const newSpaceDoc = {
+      const newRoot = context.echoHost.createDoc({
         ...rootHandle.docSync(),
         objects: Object.fromEntries([
           properties
         ])
-      };
-      const newRoot = context.repo.create(newSpaceDoc);
+      });
       invariant12(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-        F: __dxlog_file15,
-        L: 78,
+        F: __dxlog_file16,
+        L: 82,
         S: void 0,
         A: [
           "typeof newRoot.url === 'string' && newRoot.url.length > 0",
           ""
         ]
       });
-      const docLoader = new AutomergeDocumentLoaderImpl(context.spaceId, context.repo, context.spaceKey);
-      await docLoader.loadSpaceRootDocHandle(ctx, {
-        rootUrl: newRoot.url
-      });
-      otherObjects.forEach(([key, value]) => {
-        const handle = docLoader.createDocumentForObject(key);
-        handle.change((doc) => {
-          assignDeep(doc, [
-            "objects",
-            key
-          ], value);
+      const newLinks = [];
+      for (const [id, objData] of otherObjects) {
+        const handle = context.echoHost.createDoc({
+          version: SpaceDocVersion.CURRENT,
+          access: {
+            spaceKey: context.spaceKey.toHex()
+          },
+          objects: {
+            [id]: objData
+          }
         });
+        newLinks.push([
+          id,
+          handle.url
+        ]);
+      }
+      newRoot.change((doc) => {
+        doc.links ??= {};
+        for (const [id, url] of newLinks) {
+          doc.links[id] = url;
+        }
       });
-      await context.repo.flush();
+      await context.echoHost.flush();
       return {
         newRoot: newRoot.url
       };
     }
     case CreateEpochRequest.Migration.MIGRATE_REFERENCES_TO_DXN: {
       const currentRootUrl = context.currentRoot;
-      const rootHandle = context.repo.find(currentRootUrl);
-      await cancelWithContext4(ctx, asyncTimeout2(rootHandle.whenReady(), 1e4));
+      const rootHandle = await context.echoHost.loadDoc(ctx, currentRootUrl, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
       invariant12(rootHandle.docSync(), "Root doc not found", {
-        F: __dxlog_file15,
-        L: 100,
+        F: __dxlog_file16,
+        L: 115,
         S: void 0,
         A: [
           "rootHandle.docSync()",
@@ -3875,40 +3895,59 @@ var runEpochMigration = async (ctx, context) => {
       });
       const newRootContent = await convertLegacySpaceRootDoc(structuredClone(rootHandle.docSync()));
       for (const [id, url] of Object.entries(newRootContent.links ?? {})) {
-        const handle = context.repo.find(url);
-        await cancelWithContext4(ctx, asyncTimeout2(handle.whenReady(), 1e4));
-        invariant12(handle.docSync(), "Doc not found", {
-          F: __dxlog_file15,
-          L: 107,
-          S: void 0,
-          A: [
-            "handle.docSync()",
-            "'Doc not found'"
-          ]
-        });
-        const newDoc = await convertLegacyReferences(structuredClone(handle.docSync()));
-        const migratedDoc = migrateDocument(handle.docSync(), newDoc);
-        const newHandle = context.repo.import(am.save(migratedDoc));
-        newRootContent.links[id] = newHandle.url;
-      }
-      const migratedRoot = migrateDocument(rootHandle.docSync(), newRootContent);
-      const newRoot = context.repo.import(am.save(migratedRoot));
-      await context.repo.flush();
-      return {
-        newRoot: newRoot.url
-      };
-    }
-    case CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
-      invariant12(context.newAutomergeRoot, void 0, {
-        F: __dxlog_file15,
-        L: 124,
-        S: void 0,
+        try {
+          const handle = await context.echoHost.loadDoc(ctx, url, {
+            timeout: LOAD_DOC_TIMEOUT
+          });
+          invariant12(handle.docSync(), void 0, {
+            F: __dxlog_file16,
+            L: 122,
+            S: void 0,
+            A: [
+              "handle.docSync()",
+              ""
+            ]
+          });
+          const newDoc = await convertLegacyReferences(structuredClone(handle.docSync()));
+          const migratedDoc = migrateDocument(handle.docSync(), newDoc);
+          const newHandle = context.echoHost.createDoc(migratedDoc, {
+            preserveHistory: true
+          });
+          newRootContent.links[id] = newHandle.url;
+        } catch (err) {
+          log13.warn("Failed to migrate reference", {
+            id,
+            url,
+            error: err
+          }, {
+            F: __dxlog_file16,
+            L: 128,
+            S: void 0,
+            C: (f, a) => f(...a)
+          });
+          delete newRootContent.links[id];
+        }
+      }
+      const migratedRoot = migrateDocument(rootHandle.docSync(), newRootContent);
+      const newRoot = context.echoHost.createDoc(migratedRoot, {
+        preserveHistory: true
+      });
+      await context.echoHost.flush();
+      return {
+        newRoot: newRoot.url
+      };
+    }
+    case CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
+      invariant12(context.newAutomergeRoot, void 0, {
+        F: __dxlog_file16,
+        L: 143,
+        S: void 0,
         A: [
           "context.newAutomergeRoot",
           ""
         ]
       });
-      await context.repo.flush();
+      await context.echoHost.flush();
       return {
         newRoot: context.newAutomergeRoot
       };
@@ -3926,14 +3965,17 @@ import { log as log14 } from "@dxos/log";
 import { schema as schema4 } from "@dxos/protocols";
 import { RpcExtension as RpcExtension3 } from "@dxos/teleport";
 import { ComplexMap as ComplexMap2, ComplexSet as ComplexSet4, entry } from "@dxos/util";
-var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
+var __dxlog_file17 = "/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 Context7();
+    this._ctx = new Context7(void 0, {
+      F: __dxlog_file17,
+      L: 62
+    });
     this._extensionOpened = new Event5();
     this._extensions = /* @__PURE__ */ new Set();
     this._processedCredentials = new ComplexSet4(PublicKey9.hash);
@@ -3954,13 +3996,13 @@ var NotarizationPlugin = class {
     log14("notarize", {
       credentials
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant13(credentials.every((credential) => credential.id), "Credentials must have an id", {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 91,
       S: this,
       A: [
@@ -3974,7 +4016,7 @@ var NotarizationPlugin = class {
         log14.warn("Notarization error", {
           err
         }, {
-          F: __dxlog_file16,
+          F: __dxlog_file17,
           L: 99,
           S: this,
           C: (f, a) => f(...a)
@@ -3990,7 +4032,7 @@ var NotarizationPlugin = class {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
-          F: __dxlog_file16,
+          F: __dxlog_file17,
           L: 111,
           S: this,
           C: (f, a) => f(...a)
@@ -4013,7 +4055,7 @@ var NotarizationPlugin = class {
           log14.info("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
-            F: __dxlog_file16,
+            F: __dxlog_file17,
             L: 136,
             S: this,
             C: (f, a) => f(...a)
@@ -4027,7 +4069,7 @@ var NotarizationPlugin = class {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
-          F: __dxlog_file16,
+          F: __dxlog_file17,
           L: 143,
           S: this,
           C: (f, a) => f(...a)
@@ -4036,7 +4078,7 @@ var NotarizationPlugin = class {
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
         log14("success", void 0, {
-          F: __dxlog_file16,
+          F: __dxlog_file17,
           L: 147,
           S: this,
           C: (f, a) => f(...a)
@@ -4045,7 +4087,7 @@ var NotarizationPlugin = class {
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
           log14.info("error notarizing (recoverable)", err, {
-            F: __dxlog_file16,
+            F: __dxlog_file17,
             L: 151,
             S: this,
             C: (f, a) => f(...a)
@@ -4063,7 +4105,7 @@ var NotarizationPlugin = class {
         errors.wait()
       ]);
       log14("done", void 0, {
-        F: __dxlog_file16,
+        F: __dxlog_file17,
         L: 162,
         S: this,
         C: (f, a) => f(...a)
@@ -4085,7 +4127,7 @@ var NotarizationPlugin = class {
   }
   setWriter(writer) {
     invariant13(!this._writer, "Writer already set.", {
-      F: __dxlog_file16,
+      F: __dxlog_file17,
       L: 181,
       S: this,
       A: [
@@ -4110,7 +4152,7 @@ var NotarizationPlugin = class {
     }
     for (const credential of request.credentials ?? []) {
       invariant13(credential.id, "Credential must have an id", {
-        F: __dxlog_file16,
+        F: __dxlog_file17,
         L: 200,
         S: this,
         A: [
@@ -4130,7 +4172,7 @@ var NotarizationPlugin = class {
         log14("extension opened", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file16,
+          F: __dxlog_file17,
           L: 211,
           S: this,
           C: (f, a) => f(...a)
@@ -4142,7 +4184,7 @@ var NotarizationPlugin = class {
         log14("extension closed", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file16,
+          F: __dxlog_file17,
           L: 216,
           S: this,
           C: (f, a) => f(...a)
@@ -4259,10 +4301,13 @@ function _using_ctx() {
     }
   };
 }
-var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
+var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var DataSpace = class {
   constructor(params) {
-    this._ctx = new Context8();
+    this._ctx = new Context8(void 0, {
+      F: __dxlog_file18,
+      L: 84
+    });
     this._notarizationPlugin = new NotarizationPlugin();
     this._cache = void 0;
     // TODO(dmaretskyi): Move into Space?
@@ -4296,7 +4341,7 @@ var DataSpace = class {
     log15("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file17,
+      F: __dxlog_file18,
       L: 146,
       S: this,
       C: (f, a) => f(...a)
@@ -4351,12 +4396,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 Context8());
+    await this._inner.open(new Context8(void 0, {
+      F: __dxlog_file18,
+      L: 215
+    }));
     this._state = SpaceState2.CONTROL_ONLY;
     log15("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file17,
+      F: __dxlog_file18,
       L: 217,
       S: this,
       C: (f, a) => f(...a)
@@ -4374,13 +4422,16 @@ var DataSpace = class {
     log15("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file17,
+      F: __dxlog_file18,
       L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
-    this._ctx = new Context8();
+    this._ctx = new Context8(void 0, {
+      F: __dxlog_file18,
+      L: 233
+    });
     await this.authVerifier.close();
     await this._inner.close();
     await this._inner.spaceState.removeCredentialProcessor(this._automergeSpaceState);
@@ -4407,7 +4458,7 @@ var DataSpace = class {
       } catch (err) {
         if (err instanceof CancelledError || err instanceof ContextDisposedError3) {
           log15("data pipeline initialization cancelled", err, {
-            F: __dxlog_file17,
+            F: __dxlog_file18,
             L: 265,
             S: this,
             C: (f, a) => f(...a)
@@ -4415,7 +4466,7 @@ var DataSpace = class {
           return;
         }
         log15.error("Error initializing data pipeline", err, {
-          F: __dxlog_file17,
+          F: __dxlog_file18,
           L: 269,
           S: this,
           C: (f, a) => f(...a)
@@ -4424,7 +4475,7 @@ var DataSpace = class {
         log15("new state", {
           state: SpaceState2[this._state]
         }, {
-          F: __dxlog_file17,
+          F: __dxlog_file18,
           L: 271,
           S: this,
           C: (f, a) => f(...a)
@@ -4444,7 +4495,7 @@ var DataSpace = class {
     log15("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file17,
+      F: __dxlog_file18,
       L: 287,
       S: this,
       C: (f, a) => f(...a)
@@ -4461,7 +4512,7 @@ var DataSpace = class {
     log15("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file17,
+      F: __dxlog_file18,
       L: 306,
       S: this,
       C: (f, a) => f(...a)
@@ -4477,7 +4528,7 @@ var DataSpace = class {
     this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
     log15("writable feeds created", void 0, {
-      F: __dxlog_file17,
+      F: __dxlog_file18,
       L: 322,
       S: this,
       C: (f, a) => f(...a)
@@ -4540,7 +4591,7 @@ var DataSpace = class {
       space: this.key,
       rootUrl
     }, {
-      F: __dxlog_file17,
+      F: __dxlog_file18,
       L: 388,
       S: this,
       C: (f, a) => f(...a)
@@ -4551,7 +4602,7 @@ var DataSpace = class {
         try {
           var _usingCtx = _using_ctx();
           await warnAfterTimeout(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
-            await cancelWithContext5(this._ctx, handle.whenReady());
+            await cancelWithContext4(this._ctx, handle.whenReady());
           });
           if (this._ctx.disposed) {
             return;
@@ -4570,7 +4621,7 @@ var DataSpace = class {
           }
           const root = await this._echoHost.openSpaceRoot(handle.url);
           this._databaseRoot = root;
-          if (root.getVersion() !== SpaceDocVersion.CURRENT) {
+          if (root.getVersion() !== SpaceDocVersion2.CURRENT) {
             if (this._state !== SpaceState2.REQUIRES_MIGRATION) {
               this._state = SpaceState2.REQUIRES_MIGRATION;
               this.stateUpdate.emit();
@@ -4594,8 +4645,8 @@ var DataSpace = class {
           rootUrl,
           err
         }, {
-          F: __dxlog_file17,
-          L: 431,
+          F: __dxlog_file18,
+          L: 433,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4623,7 +4674,7 @@ var DataSpace = class {
       return null;
     }
     const { newRoot } = await runEpochMigration(ctx, {
-      repo: this._echoHost.automergeRepo,
+      echoHost: this._echoHost,
       spaceId: this.id,
       spaceKey: this.key,
       migration: options.migration,
@@ -4680,8 +4731,8 @@ var DataSpace = class {
     log15("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file17,
-      L: 512,
+      F: __dxlog_file18,
+      L: 514,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4740,21 +4791,23 @@ DataSpace = _ts_decorate4([
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
 import { Event as Event7, synchronized as synchronized2, trackLeaks as trackLeaks2 } from "@dxos/async";
 import { PropertiesType } from "@dxos/client-protocol";
-import { Context as Context9, cancelWithContext as cancelWithContext6 } from "@dxos/context";
-import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
+import { Context as Context9, cancelWithContext as cancelWithContext5 } from "@dxos/context";
+import { getCredentialAssertion as getCredentialAssertion3, createAdmissionCredentials } from "@dxos/credentials";
 import { convertLegacyReferences as convertLegacyReferences2, findInlineObjectOfType as findInlineObjectOfType2 } from "@dxos/echo-db";
 import { AuthStatus } from "@dxos/echo-pipeline";
-import { LEGACY_TYPE_PROPERTIES, SpaceDocVersion as SpaceDocVersion2, encodeReference } from "@dxos/echo-protocol";
+import { CredentialServerExtension } from "@dxos/echo-pipeline";
+import { LEGACY_TYPE_PROPERTIES, SpaceDocVersion as SpaceDocVersion3, encodeReference } from "@dxos/echo-protocol";
 import { TYPE_PROPERTIES as TYPE_PROPERTIES2, generateEchoId, getTypeReference } from "@dxos/echo-schema";
+import { writeMessages as writeMessages3 } from "@dxos/feed-store";
 import { invariant as invariant14 } from "@dxos/invariant";
 import { PublicKey as PublicKey11 } from "@dxos/keys";
 import { log as log16 } from "@dxos/log";
-import { trace as Trace2 } from "@dxos/protocols";
+import { trace as Trace2, AlreadyJoinedError as AlreadyJoinedError3 } from "@dxos/protocols";
 import { Invitation as Invitation7, SpaceState as SpaceState3 } from "@dxos/protocols/proto/dxos/client/services";
 import { SpaceMember as SpaceMember6 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Gossip as Gossip2, Presence as Presence2 } from "@dxos/teleport-extension-gossip";
 import { trace as trace7 } from "@dxos/tracing";
-import { ComplexMap as ComplexMap3, assignDeep as assignDeep2, deferFunction as deferFunction2, forEachAsync } from "@dxos/util";
+import { ComplexMap as ComplexMap3, assignDeep, deferFunction as deferFunction2, forEachAsync } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/genesis.ts
 import { createCredential } from "@dxos/credentials";
@@ -4837,7 +4890,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_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
+var __dxlog_file19 = "/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__";
@@ -4851,7 +4904,10 @@ var DataSpaceManager = class {
     this._echoHost = _echoHost;
     this._invitationsManager = _invitationsManager;
     this._params = _params;
-    this._ctx = new Context9();
+    this._ctx = new Context9(void 0, {
+      F: __dxlog_file19,
+      L: 104
+    });
     this.updated = new Event7();
     this._spaces = new ComplexMap3(PublicKey11.hash);
     this._isOpen = false;
@@ -4885,24 +4941,24 @@ var DataSpaceManager = class {
   }
   async open() {
     log16("open", void 0, {
-      F: __dxlog_file18,
-      L: 146,
+      F: __dxlog_file19,
+      L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
     log16.trace("dxos.echo.data-space-manager.open", Trace2.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file18,
-      L: 147,
+      F: __dxlog_file19,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
     log16("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
-      F: __dxlog_file18,
-      L: 148,
+      F: __dxlog_file19,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4911,8 +4967,8 @@ var DataSpaceManager = class {
         log16("load space", {
           spaceMetadata
         }, {
-          F: __dxlog_file18,
-          L: 152,
+          F: __dxlog_file19,
+          L: 162,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4922,8 +4978,8 @@ var DataSpaceManager = class {
           spaceMetadata,
           err
         }, {
-          F: __dxlog_file18,
-          L: 155,
+          F: __dxlog_file19,
+          L: 165,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4934,16 +4990,16 @@ var DataSpaceManager = class {
     log16.trace("dxos.echo.data-space-manager.open", Trace2.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file18,
-      L: 162,
+      F: __dxlog_file19,
+      L: 172,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
     log16("close", void 0, {
-      F: __dxlog_file18,
-      L: 167,
+      F: __dxlog_file19,
+      L: 177,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4959,8 +5015,8 @@ var DataSpaceManager = class {
   */
   async createSpace() {
     invariant14(this._isOpen, "Not open.", {
-      F: __dxlog_file18,
-      L: 181,
+      F: __dxlog_file19,
+      L: 191,
       S: this,
       A: [
         "this._isOpen",
@@ -4980,8 +5036,8 @@ var DataSpaceManager = class {
     log16("creating space...", {
       spaceKey
     }, {
-      F: __dxlog_file18,
-      L: 193,
+      F: __dxlog_file19,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4992,8 +5048,8 @@ var DataSpaceManager = class {
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
     invariant14(getCredentialAssertion3(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file18,
-      L: 203,
+      F: __dxlog_file19,
+      L: 213,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -5010,11 +5066,11 @@ var DataSpaceManager = class {
       return false;
     }
     switch (space.databaseRoot.getVersion()) {
-      case SpaceDocVersion2.CURRENT: {
+      case SpaceDocVersion3.CURRENT: {
         const [_, properties] = findInlineObjectOfType2(space.databaseRoot.docSync(), TYPE_PROPERTIES2) ?? [];
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
-      case SpaceDocVersion2.LEGACY: {
+      case SpaceDocVersion3.LEGACY: {
         const convertedDoc = await convertLegacyReferences2(space.databaseRoot.docSync());
         const [_, properties] = findInlineObjectOfType2(convertedDoc, LEGACY_TYPE_PROPERTIES) ?? [];
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
@@ -5024,8 +5080,8 @@ var DataSpaceManager = class {
           version: space.databaseRoot.getVersion(),
           spaceId: space.id
         }, {
-          F: __dxlog_file18,
-          L: 228,
+          F: __dxlog_file19,
+          L: 238,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5048,7 +5104,7 @@ var DataSpaceManager = class {
     };
     const propertiesId = generateEchoId();
     document.change((doc) => {
-      assignDeep2(doc, [
+      assignDeep(doc, [
         "objects",
         propertiesId
       ], properties);
@@ -5059,8 +5115,8 @@ var DataSpaceManager = class {
   async _getSpaceRootDocument(space) {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant14(automergeIndex, void 0, {
-      F: __dxlog_file18,
-      L: 261,
+      F: __dxlog_file19,
+      L: 271,
       S: this,
       A: [
         "automergeIndex",
@@ -5076,14 +5132,14 @@ var DataSpaceManager = class {
     log16("accept space", {
       opts
     }, {
-      F: __dxlog_file18,
-      L: 270,
+      F: __dxlog_file19,
+      L: 280,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant14(this._isOpen, "Not open.", {
-      F: __dxlog_file18,
-      L: 271,
+      F: __dxlog_file19,
+      L: 281,
       S: this,
       A: [
         "this._isOpen",
@@ -5091,8 +5147,8 @@ var DataSpaceManager = class {
       ]
     });
     invariant14(!this._spaces.has(opts.spaceKey), "Space already exists.", {
-      F: __dxlog_file18,
-      L: 272,
+      F: __dxlog_file19,
+      L: 282,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -5112,23 +5168,72 @@ var DataSpaceManager = class {
     this.updated.emit();
     return space;
   }
+  async admitMember(options) {
+    const space = this._spaceManager.spaces.get(options.spaceKey);
+    invariant14(space, void 0, {
+      F: __dxlog_file19,
+      L: 302,
+      S: this,
+      A: [
+        "space",
+        ""
+      ]
+    });
+    if (space.spaceState.getMemberRole(options.identityKey) !== SpaceMember6.Role.REMOVED) {
+      throw new AlreadyJoinedError3();
+    }
+    const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId);
+    invariant14(credentials[0].credential, void 0, {
+      F: __dxlog_file19,
+      L: 321,
+      S: this,
+      A: [
+        "credentials[0].credential",
+        ""
+      ]
+    });
+    const spaceMemberCredential = credentials[0].credential.credential;
+    invariant14(getCredentialAssertion3(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file19,
+      L: 323,
+      S: this,
+      A: [
+        "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
+        ""
+      ]
+    });
+    await writeMessages3(space.controlPipeline.writer, credentials);
+    return spaceMemberCredential;
+  }
   /**
   * Wait until the space data pipeline is fully initialized.
   * Used by invitation handler.
   * TODO(dmaretskyi): Consider removing.
   */
   async waitUntilSpaceReady(spaceKey) {
-    await cancelWithContext6(this._ctx, this.updated.waitForCondition(() => {
+    await cancelWithContext5(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
       return !!space && space.state === SpaceState3.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) {
     log16("construct space", {
       metadata
     }, {
-      F: __dxlog_file18,
-      L: 306,
+      F: __dxlog_file19,
+      L: 358,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5156,6 +5261,7 @@ var DataSpaceManager = class {
         credentialAuthenticator: deferFunction2(() => dataSpace.authVerifier.verifier)
       },
       onAuthorizedConnection: (session) => {
+        session.addExtension("dxos.mesh.teleport.admission-discovery", new CredentialServerExtension(space));
         session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
           remotePeerId: session.remotePeerId
         }));
@@ -5165,8 +5271,8 @@ var DataSpaceManager = class {
       },
       onAuthFailure: () => {
         log16.warn("auth failure", void 0, {
-          F: __dxlog_file18,
-          L: 343,
+          F: __dxlog_file19,
+          L: 396,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5198,8 +5304,8 @@ var DataSpaceManager = class {
           log16("before space ready", {
             space: space.key
           }, {
-            F: __dxlog_file18,
-            L: 370,
+            F: __dxlog_file19,
+            L: 423,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5209,8 +5315,8 @@ var DataSpaceManager = class {
             space: space.key,
             open: this._isOpen
           }, {
-            F: __dxlog_file18,
-            L: 373,
+            F: __dxlog_file19,
+            L: 426,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5228,8 +5334,8 @@ var DataSpaceManager = class {
           log16("before space close", {
             space: space.key
           }, {
-            F: __dxlog_file18,
-            L: 381,
+            F: __dxlog_file19,
+            L: 434,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5269,8 +5375,8 @@ var DataSpaceManager = class {
       peersOnline: presence.getPeersOnline().length,
       closedSessions
     }, {
-      F: __dxlog_file18,
-      L: 417,
+      F: __dxlog_file19,
+      L: 470,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5284,8 +5390,8 @@ var DataSpaceManager = class {
         log16("closing a session with a removed peer", {
           peerId: peerState.peerId
         }, {
-          F: __dxlog_file18,
-          L: 431,
+          F: __dxlog_file19,
+          L: 484,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5350,13 +5456,13 @@ import { EventSubscriptions as EventSubscriptions2, UpdateScheduler, scheduleTas
 import { Stream as Stream10 } from "@dxos/codec-protobuf";
 import { createAdmissionCredentials as createAdmissionCredentials2, getCredentialAssertion as getCredentialAssertion4 } from "@dxos/credentials";
 import { raise as raise2 } from "@dxos/debug";
-import { writeMessages as writeMessages3 } from "@dxos/feed-store";
+import { writeMessages as writeMessages4 } from "@dxos/feed-store";
 import { invariant as invariant15 } from "@dxos/invariant";
 import { log as log17 } from "@dxos/log";
 import { ApiError, SpaceNotFoundError as SpaceNotFoundError2, encodeError, IdentityNotInitializedError, AuthorizationError as AuthorizationError2 } from "@dxos/protocols";
 import { SpaceMember as SpaceMember7, SpaceState as SpaceState4 } from "@dxos/protocols/proto/dxos/client/services";
 import { trace as trace8 } from "@dxos/tracing";
-var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
+var __dxlog_file20 = "/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;
@@ -5400,8 +5506,8 @@ var SpacesServiceImpl = class {
     }
     const credentials = await createAdmissionCredentials2(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
     invariant15(credentials[0].credential, void 0, {
-      F: __dxlog_file19,
-      L: 98,
+      F: __dxlog_file20,
+      L: 102,
       S: this,
       A: [
         "credentials[0].credential",
@@ -5410,15 +5516,15 @@ var SpacesServiceImpl = class {
     });
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant15(getCredentialAssertion4(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file19,
-      L: 100,
+      F: __dxlog_file20,
+      L: 104,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
         ""
       ]
     });
-    await writeMessages3(space.controlPipeline.writer, credentials);
+    await writeMessages4(space.controlPipeline.writer, credentials);
   }
   querySpaces() {
     return new Stream10(({ next, ctx }) => {
@@ -5428,8 +5534,8 @@ var SpacesServiceImpl = class {
         log17("update", {
           spaces
         }, {
-          F: __dxlog_file19,
-          L: 111,
+          F: __dxlog_file20,
+          L: 115,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5520,8 +5626,8 @@ var SpacesServiceImpl = class {
         });
       } else {
         invariant15(!credential.id, "Id on unsigned credentials is not allowed", {
-          F: __dxlog_file19,
-          L: 209,
+          F: __dxlog_file20,
+          L: 213,
           S: this,
           A: [
             "!credential.id",
@@ -5529,8 +5635,8 @@ var SpacesServiceImpl = class {
           ]
         });
         invariant15(this._identityManager.identity, "Identity is not available", {
-          F: __dxlog_file19,
-          L: 210,
+          F: __dxlog_file20,
+          L: 214,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -5539,8 +5645,8 @@ var SpacesServiceImpl = class {
         });
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         invariant15(credential.issuer.equals(signer.getIssuer()), void 0, {
-          F: __dxlog_file19,
-          L: 212,
+          F: __dxlog_file20,
+          L: 216,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -5570,6 +5676,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 = getCredentialAssertion4(credential);
+    invariant15(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
+      F: __dxlog_file20,
+      L: 250,
+      S: this,
+      A: [
+        "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
+        "'Invalid credential'"
+      ]
+    });
+    const myIdentity = this._identityManager.identity;
+    invariant15(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
+      F: __dxlog_file20,
+      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,
@@ -5587,7 +5746,8 @@ var SpacesServiceImpl = class {
         startDataTimeframe: void 0,
         currentDataTimeframe: void 0,
         targetDataTimeframe: void 0,
-        totalDataTimeframe: void 0
+        totalDataTimeframe: void 0,
+        spaceRootUrl: space.databaseRoot?.url
       },
       members: Array.from(space.inner.spaceState.members.values()).map((member) => {
         const peers = space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key));
@@ -5657,7 +5817,7 @@ function _ts_decorate6(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends Resource3 {
   constructor(storage, level, networkManager, signalManager, _runtimeParams) {
     super();
@@ -5701,7 +5861,7 @@ var ServiceContext = class extends Resource3 {
   async _open(ctx) {
     await this._checkStorageVersion();
     log18("opening...", void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 149,
       S: this,
       C: (f, a) => f(...a)
@@ -5709,7 +5869,7 @@ var ServiceContext = class extends Resource3 {
     log18.trace("dxos.sdk.service-context.open", trace9.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 150,
       S: this,
       C: (f, a) => f(...a)
@@ -5727,7 +5887,7 @@ var ServiceContext = class extends Resource3 {
     log18("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 163,
       S: this,
       C: (f, a) => f(...a)
@@ -5735,13 +5895,13 @@ var ServiceContext = class extends Resource3 {
     log18.trace("dxos.sdk.service-context.open", trace9.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
     log18("opened", void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 166,
       S: this,
       C: (f, a) => f(...a)
@@ -5749,7 +5909,7 @@ var ServiceContext = class extends Resource3 {
   }
   async _close(ctx) {
     log18("closing...", void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 170,
       S: this,
       C: (f, a) => f(...a)
@@ -5766,7 +5926,7 @@ var ServiceContext = class extends Resource3 {
     await this.networkManager.close();
     await this.signalManager.close();
     log18("closed", void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 182,
       S: this,
       C: (f, a) => f(...a)
@@ -5774,13 +5934,16 @@ var ServiceContext = class extends Resource3 {
   }
   async createIdentity(params = {}) {
     const identity = await this.identityManager.createIdentity(params);
-    await this._initialize(new Context10());
+    await this._initialize(new Context10(void 0, {
+      F: __dxlog_file21,
+      L: 187
+    }));
     return identity;
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant16(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 193,
       S: this,
       A: [
@@ -5800,7 +5963,10 @@ var ServiceContext = class extends Resource3 {
   }
   async _acceptIdentity(params) {
     const identity = await this.identityManager.acceptIdentity(params);
-    await this._initialize(new Context10());
+    await this._initialize(new Context10(void 0, {
+      F: __dxlog_file21,
+      L: 209
+    }));
     return identity;
   }
   async _checkStorageVersion() {
@@ -5812,7 +5978,7 @@ var ServiceContext = class extends Resource3 {
   // Called when identity is created.
   async _initialize(ctx) {
     log18("initializing spaces...", void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 224,
       S: this,
       C: (f, a) => f(...a)
@@ -5835,7 +6001,7 @@ var ServiceContext = class extends Resource3 {
     await this.dataSpaceManager.open();
     this._handlerFactories.set(Invitation8.Kind.SPACE, (invitation) => {
       invariant16(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file20,
+        F: __dxlog_file21,
         L: 249,
         S: this,
         A: [
@@ -5859,7 +6025,7 @@ var ServiceContext = class extends Resource3 {
           log18("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file20,
+            F: __dxlog_file21,
             L: 265,
             S: this,
             C: (f, a) => f(...a)
@@ -5870,7 +6036,7 @@ var ServiceContext = class extends Resource3 {
           log18("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file20,
+            F: __dxlog_file21,
             L: 269,
             S: this,
             C: (f, a) => f(...a)
@@ -5881,7 +6047,7 @@ var ServiceContext = class extends Resource3 {
           log18("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file20,
+            F: __dxlog_file21,
             L: 274,
             S: this,
             C: (f, a) => f(...a)
@@ -5892,7 +6058,7 @@ var ServiceContext = class extends Resource3 {
           });
         } catch (err) {
           log18.catch(err, void 0, {
-            F: __dxlog_file20,
+            F: __dxlog_file21,
             L: 280,
             S: this,
             C: (f, a) => f(...a)
@@ -5939,7 +6105,7 @@ var ServiceRegistry = class {
 };
 
 // packages/sdk/client-services/src/packlets/locks/browser.ts
-import { asyncTimeout as asyncTimeout3, Trigger as Trigger9 } from "@dxos/async";
+import { asyncTimeout as asyncTimeout2, Trigger as Trigger9 } from "@dxos/async";
 import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
 import { log as log19, logInfo } from "@dxos/log";
 function _ts_decorate7(decorators, target, key, desc) {
@@ -5952,7 +6118,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_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/browser.ts";
+var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/browser.ts";
 var Message;
 (function(Message2) {
   Message2["ACQUIRING"] = "acquiring";
@@ -5975,28 +6141,28 @@ var Lock = class {
     });
     try {
       log19("aquiring lock...", void 0, {
-        F: __dxlog_file21,
+        F: __dxlog_file22,
         L: 42,
         S: this,
         C: (f, a) => f(...a)
       });
-      await asyncTimeout3(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
+      await asyncTimeout2(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
       log19("acquired lock", void 0, {
-        F: __dxlog_file21,
+        F: __dxlog_file22,
         L: 44,
         S: this,
         C: (f, a) => f(...a)
       });
     } catch {
       log19("stealing lock...", void 0, {
-        F: __dxlog_file21,
+        F: __dxlog_file22,
         L: 46,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._requestLock(true);
       log19("stolen lock", void 0, {
-        F: __dxlog_file21,
+        F: __dxlog_file22,
         L: 48,
         S: this,
         C: (f, a) => f(...a)
@@ -6015,7 +6181,7 @@ var Lock = class {
     log19("requesting lock...", {
       steal
     }, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 63,
       S: this,
       C: (f, a) => f(...a)
@@ -6029,14 +6195,14 @@ var Lock = class {
       this._releaseTrigger = new Trigger9();
       await this._releaseTrigger.wait();
       log19("releasing lock...", void 0, {
-        F: __dxlog_file21,
+        F: __dxlog_file22,
         L: 72,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._onRelease?.();
       log19("released lock", void 0, {
-        F: __dxlog_file21,
+        F: __dxlog_file22,
         L: 74,
         S: this,
         C: (f, a) => f(...a)
@@ -6048,7 +6214,7 @@ var Lock = class {
     log19("recieved lock", {
       steal
     }, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 81,
       S: this,
       C: (f, a) => f(...a)
@@ -6142,7 +6308,7 @@ import { invariant as invariant17 } from "@dxos/invariant";
 import { log as log20 } from "@dxos/log";
 import { ProfileArchiveEntryType } from "@dxos/protocols";
 import { arrayToBuffer } from "@dxos/util";
-var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.ts";
+var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.ts";
 var encodeProfileArchive = (profile) => cbor.encode(profile);
 var decodeProfileArchive = (data) => cbor.decode(data);
 var exportProfileData = async ({ storage, level }) => {
@@ -6158,7 +6324,7 @@ var exportProfileData = async ({ storage, level }) => {
     log20.info("begin exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 30,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6176,7 +6342,7 @@ var exportProfileData = async ({ storage, level }) => {
     log20.info("done exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 41,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6184,7 +6350,7 @@ var exportProfileData = async ({ storage, level }) => {
   }
   {
     log20.info("begin exporting kv pairs", void 0, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 45,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6205,7 +6371,7 @@ var exportProfileData = async ({ storage, level }) => {
     log20.info("done exporting kv pairs", {
       count
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 56,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6214,14 +6380,15 @@ var exportProfileData = async ({ storage, level }) => {
   return archive;
 };
 var importProfileData = async ({ storage, level }, archive) => {
-  const batch = level.batch();
+  let batch = level.batch();
+  let count = 0;
   for (const entry2 of archive.storage) {
     switch (entry2.type) {
       case ProfileArchiveEntryType.FILE: {
         const directory = await storage.createDirectory();
         invariant17(typeof entry2.key === "string", "Invalid key type", {
-          F: __dxlog_file22,
-          L: 78,
+          F: __dxlog_file23,
+          L: 79,
           S: void 0,
           A: [
             "typeof entry.key === 'string'",
@@ -6230,8 +6397,8 @@ var importProfileData = async ({ storage, level }, archive) => {
         });
         const file = await directory.getOrCreateFile(entry2.key);
         invariant17(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file22,
-          L: 80,
+          F: __dxlog_file23,
+          L: 81,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -6244,8 +6411,8 @@ var importProfileData = async ({ storage, level }, archive) => {
       }
       case ProfileArchiveEntryType.KEY_VALUE: {
         invariant17(entry2.key instanceof Uint8Array, "Invalid key type", {
-          F: __dxlog_file22,
-          L: 86,
+          F: __dxlog_file23,
+          L: 87,
           S: void 0,
           A: [
             "entry.key instanceof Uint8Array",
@@ -6253,8 +6420,8 @@ var importProfileData = async ({ storage, level }, archive) => {
           ]
         });
         invariant17(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file22,
-          L: 87,
+          F: __dxlog_file23,
+          L: 88,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -6270,7 +6437,27 @@ var importProfileData = async ({ storage, level }, archive) => {
       default:
         throw new Error(`Invalid entry type: ${entry2.type}`);
     }
+    if (++count % 1e3 === 0) {
+      await batch.write();
+      batch = level.batch();
+      log20.info("importing", {
+        count,
+        total: archive.storage.length,
+        progress: `${(count / archive.storage.length * 100).toFixed()}%`
+      }, {
+        F: __dxlog_file23,
+        L: 101,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+    }
   }
+  log20.info("committing changes..", void 0, {
+    F: __dxlog_file23,
+    L: 109,
+    S: void 0,
+    C: (f, a) => f(...a)
+  });
   await batch.write();
 };
 
@@ -6279,7 +6466,7 @@ import { Event as Event9, synchronized as synchronized3 } from "@dxos/async";
 import { clientServiceBundle } from "@dxos/client-protocol";
 import { Context as Context11 } from "@dxos/context";
 import { invariant as invariant19 } from "@dxos/invariant";
-import { PublicKey as PublicKey16 } from "@dxos/keys";
+import { PublicKey as PublicKey17 } from "@dxos/keys";
 import { log as log22 } from "@dxos/log";
 import { WebsocketSignalManager } from "@dxos/messaging";
 import { SwarmNetworkManager, createSimplePeerTransportFactory } from "@dxos/network-manager";
@@ -6293,7 +6480,7 @@ import { EventSubscriptions as EventSubscriptions3 } from "@dxos/async";
 import { Stream as Stream11 } from "@dxos/codec-protobuf";
 import { invariant as invariant18 } from "@dxos/invariant";
 import { Device as Device2, DeviceKind as DeviceKind2 } from "@dxos/protocols/proto/dxos/client/services";
-var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+var __dxlog_file24 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
@@ -6311,7 +6498,7 @@ var DevicesServiceImpl = class {
           });
         } else {
           invariant18(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file23,
+            F: __dxlog_file24,
             L: 32,
             S: this,
             A: [
@@ -6417,10 +6604,93 @@ var findConfigs = () => {
   return configs.map((r) => r.instance.deref()).filter(nonNullable);
 };
 
-// packages/sdk/client-services/src/packlets/logging/logging-service.ts
-import { Event as Event8 } from "@dxos/async";
+// packages/sdk/client-services/src/packlets/identity/contacts-service.ts
+import { EventSubscriptions as EventSubscriptions4, scheduleTask as scheduleTask7, UpdateScheduler as UpdateScheduler2 } from "@dxos/async";
 import { Stream as Stream12 } from "@dxos/codec-protobuf";
 import { PublicKey as PublicKey15 } from "@dxos/keys";
+import { ComplexMap as ComplexMap4, ComplexSet as ComplexSet6 } from "@dxos/util";
+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 ComplexMap4(PublicKey15.hash));
+    return {
+      contacts: [
+        ...contacts.values()
+      ]
+    };
+  }
+  queryContacts() {
+    const subscribedSpaceKeySet = new ComplexSet6(PublicKey15.hash);
+    return new Stream12(({ next, ctx }) => {
+      const pushUpdateTask = new UpdateScheduler2(ctx, async () => {
+        const contacts = await this.getContacts();
+        next(contacts);
+      }, {
+        maxFrequency: 2
+      });
+      scheduleTask7(ctx, async () => {
+        const subscriptions = new EventSubscriptions4();
+        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();
+      });
+    });
+  }
+};
+
+// packages/sdk/client-services/src/packlets/logging/logging-service.ts
+import { Event as Event8 } from "@dxos/async";
+import { Stream as Stream13 } from "@dxos/codec-protobuf";
+import { PublicKey as PublicKey16 } from "@dxos/keys";
 import { getContextFromEntry, log as log21 } from "@dxos/log";
 import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { getDebugName, jsonify, numericalValues, tracer } from "@dxos/util";
@@ -6428,7 +6698,7 @@ var LoggingServiceImpl = class {
   constructor() {
     this._logs = new Event8();
     this._started = Date.now();
-    this._sessionId = PublicKey15.random().toHex();
+    this._sessionId = PublicKey16.random().toHex();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
@@ -6464,7 +6734,7 @@ var LoggingServiceImpl = class {
         stats: numericalValues(events, "duration")
       };
     };
-    return new Stream12(({ next }) => {
+    return new Stream13(({ next }) => {
       const update = () => {
         const metrics = {
           timestamp: /* @__PURE__ */ new Date(),
@@ -6486,7 +6756,7 @@ var LoggingServiceImpl = class {
     });
   }
   queryLogs(request) {
-    return new Stream12(({ ctx, next }) => {
+    return new Stream13(({ ctx, next }) => {
       const handler = (entry2) => {
         if (LOG_PROCESSING > 0) {
           return;
@@ -6542,14 +6812,14 @@ var shouldLog = (entry2, request) => {
 var LOG_PROCESSING = 0;
 
 // packages/sdk/client-services/src/packlets/network/network-service.ts
-import { Stream as Stream13 } from "@dxos/codec-protobuf";
+import { Stream as Stream14 } from "@dxos/codec-protobuf";
 var NetworkServiceImpl = class {
   constructor(networkManager, signalManager) {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
   }
   queryStatus() {
-    return new Stream13(({ next }) => {
+    return new Stream14(({ next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
@@ -6575,7 +6845,7 @@ var NetworkServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/system/system-service.ts
-import { Stream as Stream14 } from "@dxos/codec-protobuf";
+import { Stream as Stream15 } from "@dxos/codec-protobuf";
 import { GetDiagnosticsRequest as GetDiagnosticsRequest2 } from "@dxos/protocols/proto/dxos/client/services";
 import { jsonKeyReplacer as jsonKeyReplacer2 } from "@dxos/util";
 var SystemServiceImpl = class {
@@ -6611,7 +6881,7 @@ var SystemServiceImpl = class {
   }
   // TODO(burdon): Standardize interval option in stream request?
   queryStatus({ interval = 3e3 } = {}) {
-    return new Stream14(({ next }) => {
+    return new Stream15(({ next }) => {
       const update = () => {
         next({
           status: this._getCurrentStatus()
@@ -6642,7 +6912,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_file24 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file25 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var ClientServicesHost = class {
   constructor({
     config,
@@ -6675,7 +6945,10 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open(new Context11());
+            void this.open(new Context11(void 0, {
+              F: __dxlog_file25,
+              L: 121
+            }));
           }
         },
         onRelease: () => this.close()
@@ -6731,8 +7004,8 @@ var ClientServicesHost = class {
   */
   initialize({ config, ...options }) {
     invariant19(!this._open, "service host is open", {
-      F: __dxlog_file24,
-      L: 186,
+      F: __dxlog_file25,
+      L: 187,
       S: this,
       A: [
         "!this._open",
@@ -6740,15 +7013,15 @@ var ClientServicesHost = class {
       ]
     });
     log22("initializing...", void 0, {
-      F: __dxlog_file24,
-      L: 187,
+      F: __dxlog_file25,
+      L: 188,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       invariant19(!this._config, "config already set", {
-        F: __dxlog_file24,
-        L: 190,
+        F: __dxlog_file25,
+        L: 191,
         S: this,
         A: [
           "!this._config",
@@ -6762,8 +7035,8 @@ var ClientServicesHost = class {
     }
     if (!options.signalManager) {
       log22.warn("running signaling without telemetry metadata.", void 0, {
-        F: __dxlog_file24,
-        L: 198,
+        F: __dxlog_file25,
+        L: 199,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6773,8 +7046,8 @@ var ClientServicesHost = class {
     }), signalManager = new WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
     invariant19(!this._networkManager, "network manager already set", {
-      F: __dxlog_file24,
-      L: 209,
+      F: __dxlog_file25,
+      L: 210,
       S: this,
       A: [
         "!this._networkManager",
@@ -6787,8 +7060,8 @@ var ClientServicesHost = class {
       signalManager
     });
     log22("initialized", void 0, {
-      F: __dxlog_file24,
-      L: 216,
+      F: __dxlog_file25,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6797,18 +7070,18 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    const traceId = PublicKey16.random().toHex();
+    const traceId = PublicKey17.random().toHex();
     log22.trace("dxos.client-services.host.open", trace10.begin({
       id: traceId
     }), {
-      F: __dxlog_file24,
-      L: 227,
+      F: __dxlog_file25,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant19(this._config, "config not set", {
-      F: __dxlog_file24,
-      L: 229,
+      F: __dxlog_file25,
+      L: 230,
       S: this,
       A: [
         "this._config",
@@ -6816,8 +7089,8 @@ var ClientServicesHost = class {
       ]
     });
     invariant19(this._storage, "storage not set", {
-      F: __dxlog_file24,
-      L: 230,
+      F: __dxlog_file25,
+      L: 231,
       S: this,
       A: [
         "this._storage",
@@ -6825,8 +7098,8 @@ var ClientServicesHost = class {
       ]
     });
     invariant19(this._signalManager, "signal manager not set", {
-      F: __dxlog_file24,
-      L: 231,
+      F: __dxlog_file25,
+      L: 232,
       S: this,
       A: [
         "this._signalManager",
@@ -6834,8 +7107,8 @@ var ClientServicesHost = class {
       ]
     });
     invariant19(this._networkManager, "network manager not set", {
-      F: __dxlog_file24,
-      L: 232,
+      F: __dxlog_file25,
+      L: 233,
       S: this,
       A: [
         "this._networkManager",
@@ -6846,8 +7119,8 @@ var ClientServicesHost = class {
     log22("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file24,
-      L: 235,
+      F: __dxlog_file25,
+      L: 236,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6858,16 +7131,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),
@@ -6900,16 +7175,16 @@ var ClientServicesHost = class {
     log22("opened", {
       deviceKey
     }, {
-      F: __dxlog_file24,
-      L: 314,
+      F: __dxlog_file25,
+      L: 322,
       S: this,
       C: (f, a) => f(...a)
     });
     log22.trace("dxos.client-services.host.open", trace10.end({
       id: traceId
     }), {
-      F: __dxlog_file24,
-      L: 315,
+      F: __dxlog_file25,
+      L: 323,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6922,8 +7197,8 @@ var ClientServicesHost = class {
     log22("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file24,
-      L: 326,
+      F: __dxlog_file25,
+      L: 334,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6940,41 +7215,41 @@ var ClientServicesHost = class {
     log22("closed", {
       deviceKey
     }, {
-      F: __dxlog_file24,
-      L: 335,
+      F: __dxlog_file25,
+      L: 343,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
-    const traceId = PublicKey16.random().toHex();
+    const traceId = PublicKey17.random().toHex();
     log22.trace("dxos.sdk.client-services-host.reset", trace10.begin({
       id: traceId
     }), {
-      F: __dxlog_file24,
-      L: 340,
+      F: __dxlog_file25,
+      L: 348,
       S: this,
       C: (f, a) => f(...a)
     });
     log22.info("resetting...", void 0, {
-      F: __dxlog_file24,
-      L: 342,
+      F: __dxlog_file25,
+      L: 350,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
     log22.info("reset", void 0, {
-      F: __dxlog_file24,
-      L: 345,
+      F: __dxlog_file25,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
     log22.trace("dxos.sdk.client-services-host.reset", trace10.end({
       id: traceId
     }), {
-      F: __dxlog_file24,
-      L: 346,
+      F: __dxlog_file25,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7048,4 +7323,4 @@ export {
   ClientServicesProviderResource,
   DiagnosticsCollector
 };
-//# sourceMappingURL=chunk-Q2PH3QCC.mjs.map
+//# sourceMappingURL=chunk-MD3R7DKE.mjs.map